- updated to 2.3.1

- removed obsolete makefile patch
- pl

diff --git a/pigz-makefile.patch b/pigz-makefile.patch
deleted file mode 100644 (file)
index 2632027..0000000
--- a/pigz-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pigz-2.3/Makefile~ 2013-03-04 07:06:35.000000000 +0100
-+++ pigz-2.3/Makefile  2013-06-16 15:01:59.000000000 +0200
-@@ -3,7 +3,7 @@
- 
- 
- 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.spec b/pigz.spec
index 6511785e8978c91fb53de63a284ddf1805b6366d..7ae401c8788bada63253a5aa28197197e8ceb52f 100644 (file)
--- a/pigz.spec
+++ b/pigz.spec
@@ -1,12 +1,12 @@
 Summary:       A parallel implementation of gzip
+Summary(pl.UTF-8):     Zrównoleglona implementacja gzipa
 Name:          pigz
-Version:       2.3
+Version:       2.3.1
 Release:       1
 License:       BSD
 Group:         Applications/Archiving
 Source0:       http://www.zlib.net/pigz/%{name}-%{version}.tar.gz
-# Source0-md5: 042e3322534f2c3d761736350cac303f
-Patch0:                %{name}-makefile.patch
+# Source0-md5: e803f8bc0770c7a5e96dccb1d2dd2aab
 URL:           http://www.zlib.net/pigz/
 BuildRequires: rpmbuild(macros)
 BuildRequires: zlib-devel
@@ -14,22 +14,30 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A parallel implementation of gzip for modern multi-processor,
-multi-core machines
+multi-core machines.
+
+%description -l pl.UTF-8
+Zrównoleglona implementacja gzipa dla nowoczesnych maszyn -
+wieloprocesorowych i wielordzeniowych.
 
 %prep
 %setup -q
-%patch0        -p1
 
 %build
-%{__make} CFLAGS="%{rpmcflags}"
+%{__make} \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+       LDFLAGS="%{rpmldflags} %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/%{_bindir}
-install -d $RPM_BUILD_ROOT/%{_mandir}/man1
-install {pigz,unpigz} $RPM_BUILD_ROOT/%{_bindir}
-install pigz.1 $RPM_BUILD_ROOT/%{_mandir}/man1
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+
+install pigz unpigz $RPM_BUILD_ROOT%{_bindir}
+install pigz.1 $RPM_BUILD_ROOT%{_mandir}/man1
+echo '.so pigz.1' >$RPM_BUILD_ROOT%{_mandir}/man1/unpigz.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,3 +48,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pigz
 %attr(755,root,root) %{_bindir}/unpigz
 %{_mandir}/man1/pigz.1*
+%{_mandir}/man1/unpigz.1*