From 49279612d9491ad36f022f550ce5156b1d1b1e15 Mon Sep 17 00:00:00 2001 From: jeffg Date: Tue, 13 Jan 2009 15:03:00 +0000 Subject: [PATCH] Updated code from upstream to 1.0.5 --- .cvsignore | 2 +- import.log | 1 + pbzip2.spec | 27 +++++++++++++++++++-------- sources | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 007db1e..0105201 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pbzip2-1.0.2.tar.gz +pbzip2-1.0.5.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..08a03d7 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +pbzip2-1_0_5-1:HEAD:pbzip2-1.0.5-1.src.rpm:1231858917 diff --git a/pbzip2.spec b/pbzip2.spec index 86acdca..22c8622 100644 --- a/pbzip2.spec +++ b/pbzip2.spec @@ -1,12 +1,16 @@ Name: pbzip2 -Version: 1.0.2 -Release: 4%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: Parallel implementation of bzip2 URL: http://www.compression.ca/pbzip2/ License: BSD Group: Applications/File BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel +%if %{?suse_version:1}0 +BuildRequires: bzip2 +%else +BuildRequires: bzip2-devel +%endif Source0: http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz %description @@ -19,7 +23,7 @@ decompressed with bzip2). %prep %setup -q -sed -i -e 's/ -O3 / %{optflags} /' Makefile +sed -i -e 's/ -O2/ %{optflags} /' Makefile %build @@ -31,6 +35,7 @@ rm -rf %{buildroot} install -D -m755 %{name} %{buildroot}%{_bindir}/%{name} install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 ln -sf ./%{name} %{buildroot}%{_bindir}/pbunzip2 +ln -sf ./%{name} %{buildroot}%{_bindir}/pbzcat %clean @@ -42,15 +47,21 @@ rm -rf %{buildroot} %doc AUTHORS ChangeLog COPYING README %{_bindir}/%{name} %{_bindir}/pbunzip2 +%{_bindir}/pbzcat %{_mandir}/man1/* %changelog -* Sun Feb 10 2008 Jeff Gilchrist - 1.0.2-4 -- Rebuild for gcc 4.3 +* Fri Jan 8 2009 Jeff Gilchrist - 1.0.5-1 +- Release 1.0.5 -* Wed Aug 29 2007 Fedora Release Engineering - 1.0.2-3 -- Rebuild for selinux ppc32 issue. +* Fri Dec 21 2008 Jeff Gilchrist - 1.0.4-1 +- Release 1.0.4 + +* Tue Oct 31 2008 Jeff Gilchrist - 1.0.3-1 +- Release 1.0.3 +- Added support for SUSE RPM build +- Added symlink for pbzcat * Thu Jul 26 2007 Jeff Gilchrist - 1.0.2-2 - Fixed symbolic link for pbunzip2 file diff --git a/sources b/sources index 912d3fb..1115811 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f58b4e844c74d0c98b98326c6a3945f pbzip2-1.0.2.tar.gz +e2448d22ee29d1e6549ac58b98df11ab pbzip2-1.0.5.tar.gz