summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-07-15 08:54:48 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-07-18 16:17:44 +0300
commit78b5f54c98045f012a713e63342f3b92a37e0733 (patch)
tree4c6b6c27f05ec9fe70fd2bab4ee6009dfe8d9d9f
parenteb2e28fe963959365f4f2a68a50e7ad59a5612b9 (diff)
downloadgit-buildpackage-78b5f54c98045f012a713e63342f3b92a37e0733.tar.gz
git-buildpackage-78b5f54c98045f012a713e63342f3b92a37e0733.tar.bz2
git-buildpackage-78b5f54c98045f012a713e63342f3b92a37e0733.zip
packaging: recommend/require zipmerge
Needed by CatenateZipArchive(). Change-Id: I8f25d9da418414bbcc2eff7797b4f57ee5c69e1f Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rw-r--r--debian/control2
-rw-r--r--packaging/git-buildpackage.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 3b3cca0c..7eb2e227 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Depends: ${python:Depends},
man-db,
python-pkg-resources
Recommends: pristine-tar (>= 0.5)
-Suggests: python-notify, unzip
+Suggests: python-notify, unzip, zipmerge
Description: Suite to help with packaging in Git repositories
This package contains the common API and scripts for Debian and rpm packaging
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index 59c4c502..86780bfe 100644
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -66,6 +66,7 @@ BuildRequires: %{dpkg_pkg_name}
BuildRequires: %{rpm_python_pkg_name}
BuildRequires: pristine-tar
BuildRequires: unzip
+BuildRequires: libzip
BuildRequires: gnupg
# Missing dep of dpkg in openSUSE
%if 0%{?suse_version}
@@ -87,9 +88,11 @@ Requires: %{python_pkg_name}
%if 0%{?suse_version} || 0%{?tizen_version:1}
Recommends: pristine-tar
Recommends: unzip
+Recommends: libzip
%else
Requires: pristine-tar
Requires: unzip
+Requires: libzip
%endif
%description common