diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-09-12 16:31:20 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:47:21 +0200 |
| commit | 215c6e237efee30bea6e3f27230b6bd38e167511 (patch) | |
| tree | a55b13315d52846e104db76f39ca7766eb4d8ef9 /packaging | |
| parent | f7faf56ac38dc0e702c82ae44e6c1c34ef00dfde (diff) | |
| download | git-buildpackage-215c6e237efee30bea6e3f27230b6bd38e167511.tar.gz git-buildpackage-215c6e237efee30bea6e3f27230b6bd38e167511.tar.bz2 git-buildpackage-215c6e237efee30bea6e3f27230b6bd38e167511.zip | |
rpm packaging: enable CentOS 7
Fix dependencies and enable git-buildpackage(-deb) subpackage for
CentOS 7.
Also fixes one excess dependency for Fedora: no need for dpkg-devel,
dpkg-dev is enough.
Change-Id: I2c3929ae623c9694aa9afcb8a4e3155696179f05
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/git-buildpackage.spec | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec index bfa2d3e9..48bc5bce 100644 --- a/packaging/git-buildpackage.spec +++ b/packaging/git-buildpackage.spec @@ -12,11 +12,15 @@ URL: https://honk.sigxcpu.org/piki/projects/git-buildpackage/ Source0: %{name}_%{version}.tar.gz # Conditional package names for requirements -%if 0%{?fedora} || 0%{?centos_ver} +%if 0%{?fedora} || 0%{?centos_ver} > 7 +%define dpkg_pkg_name dpkg-dev +%else +%if 0%{?centos_version} %define dpkg_pkg_name dpkg-devel %else %define dpkg_pkg_name dpkg %endif +%endif %if 0%{?suse_version} && 0%{?suse_version} < 1230 %define devscripts_pkg_name devscripts-fixes @@ -30,7 +34,7 @@ Source0: %{name}_%{version}.tar.gz %define man_pkg_name man %endif -%if 0%{?fedora} || 0%{?centos_ver} || 0%{?tizen_version:1} +%if 0%{?fedora} || 0%{?centos_version} || 0%{?centos_ver} || 0%{?tizen_version:1} %define python_pkg_name python %else %define python_pkg_name python-base @@ -205,8 +209,8 @@ cat >> files.list << EOF EOF %endif -# Disable the debian tools for CentOS -%if 0%{?centos_version} +# Disable the debian tools for old CentOS +%if 0%{?centos_version} && 0%{?centos_ver} < 7 for f in `cat files.list`; do rm -rfv %{buildroot}/$f done |