From 9b10a10d22dbe7ea1071dc93bbd8790b53beb223d93300325de5468fdf7af1cb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 19 Mar 2015 19:54:01 +0000 Subject: [PATCH] Accepting request 291203 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/291203 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pigz?expand=0&rev=12 --- pigz-2.3.3.tar.gz | 3 +++ pigz-2.3.tar.bz2 | 3 --- pigz-fix-missing-linker.patch | 11 +++++++++++ pigz-fix-wrong-include.patch | 11 +++++++++++ pigz-lm.patch | 19 ------------------- pigz.changes | 12 ++++++++++++ pigz.spec | 15 ++++++++------- 7 files changed, 45 insertions(+), 29 deletions(-) create mode 100644 pigz-2.3.3.tar.gz delete mode 100644 pigz-2.3.tar.bz2 create mode 100644 pigz-fix-missing-linker.patch create mode 100644 pigz-fix-wrong-include.patch delete mode 100644 pigz-lm.patch diff --git a/pigz-2.3.3.tar.gz b/pigz-2.3.3.tar.gz new file mode 100644 index 0000000..c8af5af --- /dev/null +++ b/pigz-2.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c +size 92787 diff --git a/pigz-2.3.tar.bz2 b/pigz-2.3.tar.bz2 deleted file mode 100644 index 678cdd6..0000000 --- a/pigz-2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03f9b5509159202806dc142d9242b5d0f383366833f432b8eb25d44fa4b3e128 -size 77606 diff --git a/pigz-fix-missing-linker.patch b/pigz-fix-missing-linker.patch new file mode 100644 index 0000000..241d943 --- /dev/null +++ b/pigz-fix-missing-linker.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2015-01-20 05:12:31.000000000 +0100 ++++ b/Makefile 2015-03-11 22:19:16.745781499 +0100 +@@ -5,7 +5,7 @@ + # use gcc and gmake on Solaris + + pigz: pigz.o yarn.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o +- $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm ++ $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm -lz + ln -f pigz unpigz + + pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h diff --git a/pigz-fix-wrong-include.patch b/pigz-fix-wrong-include.patch new file mode 100644 index 0000000..1608b6b --- /dev/null +++ b/pigz-fix-wrong-include.patch @@ -0,0 +1,11 @@ +--- a/pigz.c 2015-01-24 20:10:12.000000000 +0100 ++++ b/pigz.c 2015-03-11 22:00:59.976144690 +0100 +@@ -362,7 +362,7 @@ + # include + #endif + +-#include "zlib.h" /* deflateInit2(), deflateReset(), deflate(), */ ++#include /* deflateInit2(), deflateReset(), deflate(), */ + /* deflateEnd(), deflateSetDictionary(), crc32(), + adler32(), inflateBackInit(), inflateBack(), + inflateBackEnd(), Z_DEFAULT_COMPRESSION, diff --git a/pigz-lm.patch b/pigz-lm.patch deleted file mode 100644 index 2967e85..0000000 --- a/pigz-lm.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Adam Mizerski -Date: 2013-03-15 00:01:33 +0100 -Subject: adds missing "-lm" -Upstream: sent - -It's required, because zopfli/tree.c uses "log". - -diff -rupN pigz-2.3/Makefile pigz-2.3_mod/Makefile ---- pigz-2.3/Makefile 2013-03-04 07:06:35.000000000 +0100 -+++ pigz-2.3_mod/Makefile 2013-03-14 23:57:03.333838222 +0100 -@@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra - - - pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o -- $(CC) -o pigz $^ -lpthread -lz -+ $(CC) -o pigz $^ -lpthread -lz -lm - ln -f pigz unpigz - - pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h diff --git a/pigz.changes b/pigz.changes index 36f3f3a..70d956b 100644 --- a/pigz.changes +++ b/pigz.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Mar 11 21:30:11 UTC 2015 - p.drouand@gmail.com + +- Update to version 2.3.3 + * Portability improvements + * Update copyright years in documentation +- Add build fix patches + * pigz-fix-wrong-include.patch + * pigz-fix-missing-linker.patch +- Remove pigz-lm.patch; fixed +- Use download Url as source + ------------------------------------------------------------------- Thu Mar 14 22:30:57 UTC 2013 - adam@mizerski.pl diff --git a/pigz.spec b/pigz.spec index 9cf884a..fd164b4 100644 --- a/pigz.spec +++ b/pigz.spec @@ -1,7 +1,7 @@ # # spec file for package pigz # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,15 @@ Name: pigz -Version: 2.3 +Version: 2.3.3 Release: 0 Summary: Multi-core gzip version License: Zlib Group: Productivity/Archiving/Compression Url: http://www.zlib.net/pigz/ -# http://www.zlib.net/pigz/pigz-%%{version}.tar.gz -Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-lm.patch +Source: http://www.zlib.net/pigz/%{name}-%{version}.tar.gz +Patch: pigz-fix-wrong-include.patch +Patch1: pigz-fix-missing-linker.patch BuildRequires: glibc-devel BuildRequires: zlib-devel >= 1.2.3 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,6 +37,7 @@ multi-core machines %prep %setup -q %patch -p1 +%patch1 -p1 %build make CC="gcc" CFLAGS="%{optflags}" @@ -55,8 +56,8 @@ ln -sv pigz.1.gz %{buildroot}/%{_mandir}/man1/unpigz.1 %files %defattr(-,root,root) %doc README -%doc %{_mandir}/man1/pigz.1.gz -%doc %{_mandir}/man1/unpigz.1.gz +%{_mandir}/man1/pigz.1.gz +%{_mandir}/man1/unpigz.1.gz %{_bindir}/pigz %{_bindir}/unpigz