Change spec and rebase patches. Also, add an RPM changelog.
Change-Id: Ieb5e477f42888005b45882e9fea5edf80c517689
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pit/suse-bzip2/Makefile b/pit/suse-bzip2/Makefile
-index 4960037..0977534 100644
+index 3e41319..ef3f9d8 100644
--- a/pit/suse-bzip2/Makefile
+++ b/pit/suse-bzip2/Makefile
@@ -12,8 +12,8 @@
+sominor=$(somajor).0.6
SHELL=/bin/sh
- # To assist in cross-compiling
+ # Determine the operating system name to decide whether to build a
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile.PL b/Makefile.PL
-index d11e396..4d40774 100755
+index 60a5103..8a2fe1c 100755
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -20,6 +20,8 @@ extra_build: zgz/zgz pristine-tar.spec
+@@ -59,6 +59,8 @@ extra_build: zgz/zgz pristine-tar.spec
pod2man -c pristine-xz pristine-xz > pristine-xz.1
pod2man -c zgz zgz/zgz.pod > zgz.1
- make -C pit/suse-bzip2
-+ make -C pit/upstream-bzip2
-+ sed -i s'|^my $$__upstream_bzip2_prefix.*|my $$__upstream_bzip2_prefix = "$(ZGZ_LIB)/upstream-bzip2/";|' pristine-bz2
+ $(MAKE) -C pit/suse-bzip2 PREFIX=$(PREFIX)
++ $(MAKE) -C pit/upstream-bzip2
++ sed -i s'|^my $$__upstream_bzip2_prefix.*|my $$__upstream_bzip2_prefix = "$(PKGLIBDIR)/upstream-bzip2/";|' pristine-bz2
ZGZ_SOURCES = zgz/zgz.c zgz/gzip/*.c zgz/old-bzip2/*.c
zgz/zgz: $(ZGZ_SOURCES)
-@@ -37,6 +39,9 @@ extra_install:
- install -d $(DESTDIR)$(ZGZ_LIB)/suse-bzip2
- install pit/suse-bzip2/bzip2 $(DESTDIR)$(ZGZ_LIB)/suse-bzip2
- install pit/suse-bzip2/libbz2* $(DESTDIR)$(ZGZ_LIB)/suse-bzip2
-+ install -d $(DESTDIR)$(ZGZ_LIB)/upstream-bzip2
-+ install pit/upstream-bzip2/bzip2 $(DESTDIR)$(ZGZ_LIB)/upstream-bzip2
-+ install pit/upstream-bzip2/libbz2* $(DESTDIR)$(ZGZ_LIB)/upstream-bzip2
+@@ -71,6 +73,9 @@ extra_install:
+ install -m 0644 *.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ install -d $(DESTDIR)$(PKGLIBDIR)/suse-bzip2
+ install pit/suse-bzip2/bzip2 pit/suse-bzip2/libbz2* $(DESTDIR)$(PKGLIBDIR)/suse-bzip2
++ install -d $(DESTDIR)$(PKGLIBDIR)/upstream-bzip2
++ install pit/upstream-bzip2/bzip2 $(DESTDIR)$(PKGLIBDIR)/upstream-bzip2
++ install pit/upstream-bzip2/libbz2* $(DESTDIR)$(PKGLIBDIR)/upstream-bzip2
- extra_clean: pristine-tar.spec
- rm -f *.1 zgz/zgz
+ extra_clean:
+ $(MAKE) clean -C pit/suse-bzip2 PREFIX=$(PREFIX)
diff --git a/pristine-bz2 b/pristine-bz2
-index 147ad86..dd9690c 100755
+index 53c42bc..7da6607 100755
--- a/pristine-bz2
+++ b/pristine-bz2
@@ -91,7 +91,9 @@ use IO::Handle;
+++ /dev/null
-From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-Date: Mon, 3 Sep 2012 15:21:43 +0300
-Subject: Fedora HACK: use custom (older) xdelta
-
-Gbp-Rpm: If 0%{?fedora}
-Gbp: Ignore
-
-Change-Id: Id0658bbc428034aeb38d61cf0245909c38845534
-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
----
- pristine-gz | 4 ++--
- pristine-tar | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/pristine-gz b/pristine-gz
-index 3668256..4818e28 100755
---- a/pristine-gz
-+++ b/pristine-gz
-@@ -234,7 +234,7 @@ sub reproducegz {
- else {
- # generate a binary delta and see if this is the
- # best variant so far
-- my $ret=system("xdelta delta -0 --pristine $tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
-+ my $ret=system("xdelta1 delta -0 --pristine $tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
- # xdelta exits 1 on success
- if ($ret == 1) {
- my $size=(stat("$tempdir/tmpdelta"))[7];
-@@ -297,7 +297,7 @@ sub gengz {
- my $tempdir=tempdir();
- my $tfile="$tempdir/".basename($file).".gz";
- doit_redir($file, $tfile, @zgz);
-- doit("xdelta", "patch", "--pristine", $delta->{delta}, $tfile, "$file.gz");
-+ doit("xdelta1", "patch", "--pristine", $delta->{delta}, $tfile, "$file.gz");
- }
- else {
- doit_redir("$file", "$file.gz", @zgz);
-diff --git a/pristine-tar b/pristine-tar
-index c75e4fc..b08702b 100755
---- a/pristine-tar
-+++ b/pristine-tar
-@@ -391,7 +391,7 @@ sub gentar {
- my $ok;
- foreach my $variant (@try) {
- my $recreatetarball=$variant->();
-- my $ret=try_doit("xdelta", "patch", $delta->{delta}, $recreatetarball, $out);
-+ my $ret=try_doit("xdelta1", "patch", $delta->{delta}, $recreatetarball, $out);
- if ($ret == 0) {
- $ok=1;
- last;
-@@ -503,7 +503,7 @@ sub gendelta {
- }
-
- $delta{delta}="$tempdir/delta";
-- my $ret=system("xdelta delta -0 --pristine $recreatetarball $tarball $delta{delta}") >> 8;
-+ my $ret=system("xdelta1 delta -0 --pristine $recreatetarball $tarball $delta{delta}") >> 8;
- # xdelta exits 1 on success if there were differences
- if ($ret != 1 && $ret != 0) {
- error "xdelta failed with return code $ret";
--- /dev/null
+From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+Date: Fri, 31 May 2013 11:01:05 +0300
+Subject: pristine-gz: obey the XDELTA_PROGRAM build parameter
+
+Change-Id: I571466bacc8b50a7b2d2c7681b4d7ab1083508ad
+Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
+---
+ pristine-gz | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/pristine-gz b/pristine-gz
+index 3668256..00c0055 100755
+--- a/pristine-gz
++++ b/pristine-gz
+@@ -96,6 +96,11 @@ use File::Basename qw/basename/;
+
+ delete $ENV{GZIP};
+
++# The following assignment is potentially munged during the
++# build process to hold the value of XDELTA_PROGRAM
++# parameter as given to Makefile.PL.
++my $xdelta_program = "xdelta";
++
+ dispatch(
+ commands => {
+ usage => [\&usage],
+@@ -234,7 +239,7 @@ sub reproducegz {
+ else {
+ # generate a binary delta and see if this is the
+ # best variant so far
+- my $ret=system("xdelta delta -0 --pristine $tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
++ my $ret=system("$xdelta_program delta -0 --pristine $tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
+ # xdelta exits 1 on success
+ if ($ret == 1) {
+ my $size=(stat("$tempdir/tmpdelta"))[7];
+@@ -297,7 +302,7 @@ sub gengz {
+ my $tempdir=tempdir();
+ my $tfile="$tempdir/".basename($file).".gz";
+ doit_redir($file, $tfile, @zgz);
+- doit("xdelta", "patch", "--pristine", $delta->{delta}, $tfile, "$file.gz");
++ doit("$xdelta_program", "patch", "--pristine", $delta->{delta}, $tfile, "$file.gz");
+ }
+ else {
+ doit_redir("$file", "$file.gz", @zgz);
+++ /dev/null
-From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-Date: Mon, 13 May 2013 10:36:39 +0300
-Subject: Add .gbp.conf
-
-Needed for gbp-pq-rpm tool.
-
-Change-Id: Idb1677653b08de7763ccaf7fe001267c06ff3109
-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
----
- .gbp.conf | 3 +++
- 1 file changed, 3 insertions(+)
- create mode 100644 .gbp.conf
-
-diff --git a/.gbp.conf b/.gbp.conf
-new file mode 100644
-index 0000000..666174f
---- /dev/null
-+++ b/.gbp.conf
-@@ -0,0 +1,3 @@
-+[gbp-pq-rpm]
-+upstream-tag = %(upstreamversion)s
-+packaging-dir = packaging
--- /dev/null
+* Mon May 13 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 1.28
+- Version bump to 1.28
+
Name: pristine-tar
Summary: Regenerate pristine tarballs
-Version: 1.26
+Version: 1.28
Release: 0
Group: Development/Tools/Building
License: GPLv2
Patch1: 0002-openSUSE-HACK-add-upstream-bzip2-v1.0.6-sources.patch
Patch2: 0003-openSUSE-HACK-modify-Makefile-in-upstream-bzip2.patch
Patch3: 0004-openSUSE-HACK-enable-special-upstream-bzip2.patch
-Patch4: 0005-Fedora-HACK-use-custom-older-xdelta.patch
-Patch5: 0006-Add-.gbp.conf.patch
+Patch4: 0005-pristine-gz-obey-the-XDELTA_PROGRAM-build-parameter.patch
Requires: gzip
Requires: bzip2
%if 0%{?suse_version} >= 1210
%if 0%{?suse_version}
%patch3 -p1
%endif
-# 0005-Fedora-HACK-use-custom-older-xdelta.patch
-%if 0%{?fedora}
+# 0005-pristine-gz-obey-the-XDELTA_PROGRAM-build-parameter.patch
%patch4 -p1
-%endif
-# 0006-Add-.gbp.conf.patch
-%patch5 -p1
%build
-perl Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix}
+%if 0%{?fedora}
+%define makemaker_extraopts XDELTA_PROGRAM=xdelta1
+%endif
+perl Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix} %{?makemaker_extraopts}
make %{?jobs:-j%jobs}
%install
rm -rf %{buildroot}
-
%make_install
-find %{buildroot}/usr/lib/zgz/ -name '*.a' | xargs rm
+find %{buildroot}/usr/lib/pristine-tar/ -name '*.a' | xargs rm
# Run fdupes if building in openSUSE
%if 0%{?suse_version}
-%fdupes -s %{buildroot}/usr/lib/zgz/
+%fdupes -s %{buildroot}/usr/lib/pristine-tar/
%endif
+
%files
%defattr(-,root,root,-)
%{_bindir}/*
-%dir /usr/lib/zgz/
-/usr/lib/zgz/*
+/usr/lib/pristine-tar
%{perl_vendorlib}/*
%{perl_archlib}/*
%{_mandir}/man1/*.gz
projects / tools / pristine-tar.git / commitdiff