summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-09-12 12:31:52 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-09-15 14:22:47 +0300
commit8d032634ada4df7004dedfdae810e30ab4dba60f (patch)
tree8365e93609d04f392a531b345a8814903daa679a
parent08c61fb3046d3f9f116f6305f06edf69c827f720 (diff)
downloadpristine-tar-8d032634ada4df7004dedfdae810e30ab4dba60f.tar.gz
pristine-tar-8d032634ada4df7004dedfdae810e30ab4dba60f.tar.bz2
pristine-tar-8d032634ada4df7004dedfdae810e30ab4dba60f.zip
rpm packaging: fix build for CentOS 7
Change-Id: I81406ed8de243c759f1a52f2c6537188d95f950f Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rw-r--r--packaging/pristine-tar.spec6
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/pristine-tar.spec b/packaging/pristine-tar.spec
index 9509099..b16b6fd 100644
--- a/packaging/pristine-tar.spec
+++ b/packaging/pristine-tar.spec
@@ -16,7 +16,7 @@ Patch5: 0006-Add-.gbp.conf.patch
Patch6: 0007-Use-posix-tar-format-by-default.patch
Patch7: 0008-Mangle-PAX-headers-when-using-posix-tar-format.patch
Patch8: 0009-HACK-workaround-for-some-broken-pristine-tar-branche.patch
-%if 0%{?fedora} || 0%{?centos_version}
+%if 0%{?fedora} || 0%{?centos_version} || 0%{?centos_ver}
Requires: tar < 2:1.27
%else
Requires: tar < 1.27
@@ -34,7 +34,7 @@ Requires: perl-base
%else
Requires: perl
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos_ver} >= 7
Requires: xdelta1
%else
Requires: xdelta < 3
@@ -97,7 +97,7 @@ control.
%patch8 -p1
%build
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos_ver} >= 7
%define makemaker_extraopts XDELTA_PROGRAM=xdelta1
%endif
perl Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix} %{?makemaker_extraopts}