Accepting request 159508 from Base:System

update to 2.3 (forwarded request 159493 from etamPL)

OBS-URL: https://build.opensuse.org/request/show/159508
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pigz?expand=0&rev=9

pigz-2.2.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95c416245b157c336c654de86f68923363044e9548f4cc3e3187e8283e873e4c
-size 46422

pigz-2.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03f9b5509159202806dc142d9242b5d0f383366833f432b8eb25d44fa4b3e128
+size 77606

pigz-lm.patch

@@ -0,0 +1,19 @@
+From: Adam Mizerski <adam@mizerski.pl>
+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

pigz.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Mar 14 22:30:57 UTC 2013 - adam@mizerski.pl
+
+- update to 2.3
+  * Don't complain about missing suffix when not writing output file
+  * Put all global variables in one global structure for readability
+  * Do not decompress concatenated zlib streams -- only gzip streams
+  * Add option for compression level 11 to use zopfli
+  * Fix handling of junk after compressed data
+- added pigz-lm.patch
+  * adds missing "-lm"
+- provide unpigz binary and manpage as symlink, not copy.
+- removed fake cc script - build system honors CC
+- cleanup spec file
+
 -------------------------------------------------------------------
 Tue Nov 27 08:32:43 UTC 2012 - sweet_f_a@gmx.de
 

pigz.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pigz
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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,56 +17,47 @@
 
 
 Name:           pigz
-Version:        2.2.5
+Version:        2.3
 Release:        0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  binutils
-BuildRequires:  filesystem
-BuildRequires:  glibc-devel
-BuildRequires:  zlib-devel >= 1.2.3
-Source:         %name-%version.tar.bz2
-Url:            http://www.zlib.net/pigz/
 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
+BuildRequires:  glibc-devel
+BuildRequires:  zlib-devel >= 1.2.3
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 A parallel implementation of gzip for modern multi-processor,
 multi-core machines
 
-
-
 %prep
-%setup
+%setup -q
+%patch -p1
 
 %build
-export MYCFLAGS="${RPM_OPT_FLAGS}"
+make CC="gcc" CFLAGS="%{optflags}"
-echo -e "#!/bin/bash\nexec %__cc \"\$@\"" >cc
-chmod 755 cc
-export PATH=.:$PATH
-%{__make} CFLAGS="$MYCFLAGS" PREFIX=%{_prefix} LIBDIR=%{_libdir}
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
+mkdir -p %{buildroot}%{_prefix}/bin
-cp -v pigz $RPM_BUILD_ROOT/usr/bin/
+cp -v pigz %{buildroot}%{_bindir}/
-cp -v unpigz $RPM_BUILD_ROOT/usr/bin/
+ln -sv pigz %{buildroot}%{_bindir}/unpigz
 
 #man page
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/
+mkdir -p %{buildroot}/%{_mandir}/man1/
-cp -v pigz.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
+cp -v pigz.1 %{buildroot}/%{_mandir}/man1/
-cp -v pigz.1 $RPM_BUILD_ROOT/%{_mandir}/man1/unpigz.1
+gzip %{buildroot}/%{_mandir}/man1/pigz.1
-gzip $RPM_BUILD_ROOT/%{_mandir}/man1/pigz.1
+ln -sv pigz.1.gz %{buildroot}/%{_mandir}/man1/unpigz.1
-gzip $RPM_BUILD_ROOT/%{_mandir}/man1/unpigz.1
-
-%clean
-%{__rm} -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
 %doc README
-%doc %{_mandir}/man1/pigz.1.*
+%doc %{_mandir}/man1/pigz.1.gz
-%doc %{_mandir}/man1/unpigz.1.*
+%doc %{_mandir}/man1/unpigz.1.gz
-/usr/bin/pigz
+%{_bindir}/pigz
-/usr/bin/unpigz
+%{_bindir}/unpigz
 
 %changelog