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>

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