diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-12-11 13:34:49 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2015-12-16 18:45:26 +0100 |
| commit | ec331efdd54cce4df955998f9f7f07133e9eb7a5 (patch) | |
| tree | c401a278e36567eb44a7c42166af8003be0e740f /packaging | |
| parent | fe5ffe06a77518f60f1955c5e1aabe6e03c407a1 (diff) | |
rpm packaging: direct dependency to zipmerge binary
The name of the package containing zipmerge varies, e.g. 'libzip' in
Fedora 22 vs. 'libzip-tools' in Fedora 23.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/git-buildpackage.spec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec index 7d0c638b..5bfd4c47 100644 --- a/packaging/git-buildpackage.spec +++ b/packaging/git-buildpackage.spec @@ -64,7 +64,7 @@ BuildRequires: %{dpkg_pkg_name} BuildRequires: rpm-build BuildRequires: %{rpm_python_pkg_name} BuildRequires: unzip -BuildRequires: libzip +BuildRequires: /usr/bin/zipmerge BuildRequires: gnupg # Missing dep of dpkg in openSUSE %if 0%{?suse_version} @@ -88,10 +88,10 @@ Requires: python-setuptools Requires: python-dateutil %if 0%{?centos_ver} && 0%{?centos_ver} <= 7 Requires: unzip -Requires: libzip +Requires: /usr/bin/zipmerge %else Recommends: unzip -Recommends: libzip +Recommends: /usr/bin/zipmerge Recommends: pristine-tar %endif |