From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Fri, 12 Sep 2014 09:31:52 +0000 (+0300)
Subject: rpm packaging: fix build for CentOS 7
X-Git-Tag: tizen/1.32-20140915~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d032634ada4df7004dedfdae810e30ab4dba60f;p=tools%2Fpristine-tar.git

rpm packaging: fix build for CentOS 7

Change-Id: I81406ed8de243c759f1a52f2c6537188d95f950f
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---

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}