packaging: change dependency to tar

Require tar < 1.27 for now - the Debian PRISTINE_TAR_COMPAT patch for tar
to cope with tar file format changes is not generally available in other
distributions.

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

diff --git a/debian/control b/debian/control
index 93fe75b..8e3e913 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: http://kitenet.net/~joey/code/pristine-tar/
 Package: pristine-tar
 Architecture: any
 Section: utils
-Depends: xdelta, ${shlibs:Depends}, ${misc:Depends}, perl-modules, tar (>= 1.27-3)
+Depends: xdelta, ${shlibs:Depends}, ${misc:Depends}, perl-modules, tar (< 1.27)
 Recommends: pbzip2, bzip2, xz-utils
 Description: regenerate pristine tarballs
  pristine-tar can regenerate a pristine upstream tarball using only a small

diff --git a/packaging/pristine-tar.spec b/packaging/pristine-tar.spec
index f187517..ef86115 100644 (file)
--- a/packaging/pristine-tar.spec
+++ b/packaging/pristine-tar.spec
@@ -16,6 +16,11 @@ 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}
+Requires:   tar < 2:1.27
+%else
+Requires:   tar < 1.27
+%endif
 Requires:   gzip
 Requires:   bzip2
 %if 0%{?suse_version} >= 1210