Hello community,
here is the log from the commit of package pbzip2 for openSUSE:Factory checked
in at 2015-03-12 16:39:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pbzip2 (Old)
and /work/SRC/openSUSE:Factory/.pbzip2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pbzip2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pbzip2/pbzip2.changes 2011-11-05
12:06:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pbzip2.new/pbzip2.changes 2015-03-12
16:39:06.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Mar 12 08:28:33 UTC 2015 - mplus...@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Remove pbzip2-fix_printf_format.patch
+- Update to 1.1.12
+ * for complete list of changes see provided ChangeLog
+
+-------------------------------------------------------------------
Old:
----
pbzip2-1.1.6.tar.gz
pbzip2-fix_printf_format.patch
New:
----
pbzip2-1.1.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pbzip2.spec ++++++
--- /var/tmp/diff_new_pack.RsRngJ/_old 2015-03-12 16:39:07.000000000 +0100
+++ /var/tmp/diff_new_pack.RsRngJ/_new 2015-03-12 16:39:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pbzip2
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,17 @@
#
-
Name: pbzip2
-Version: 1.1.6
-Release: 1
-%define pkg_version %{version}
-License: BSD-4-Clause
+Version: 1.1.12
+Release: 0
Summary: Parallelized Implementation of bzip2
-Url: http://compression.ca/pbzip2/
+License: BSD-4-Clause
Group: Productivity/Archiving/Compression
-Source: http://compression.ca/pbzip2/pbzip2-%{pkg_version}.tar.gz
+Url: http://compression.ca/pbzip2/
+Source0:
https://launchpad.net/pbzip2/1.1/%{version}/+download/pbzip2-%{version}.tar.gz
Source1: macros.pbzip2.in
# pbleser: add support for DESTDIR, MANDIR, BINDIR and OPTFLAGS in Makefile
Patch1: pbzip2-makefile.patch
-# pbleser: fix printf format specifications for size_t and such
-Patch2: pbzip2-fix_printf_format.patch
# pbleser: fix not using the result value of fwrite()
Patch3: pbzip2-fix_unused_result.patch
BuildRequires: gcc-c++
@@ -43,15 +39,12 @@
machines.
%prep
-%setup -q -n "%{name}-%{pkg_version}"
+%setup -q -n "%{name}-%{version}"
%patch1
-%patch2
%patch3
%build
-export SUSE_ASNEEDED=0
-
-%__make %{?_smp_flags} \
+make %{?_smp_mflags} \
OPTFLAGS="%{optflags} -Wall" \
PREFIX="%{_prefix}" \
BINDIR="%{_bindir}" \
@@ -59,22 +52,19 @@
all
%install
-%__make \
- DESTDIR="%{buildroot}" \
+make \
+ DESTDIR=%{buildroot} \
PREFIX="%{_prefix}" \
BINDIR="%{_bindir}" \
MANDIR="%{_mandir}" \
install
for x in pbunzip2 pbzcat; do
- %__ln_s "pbzip2.1%{ext_man}" "%{buildroot}%{_mandir}/man1/${x}.1%{ext_man}"
+ ln -s "pbzip2.1%{ext_man}" "%{buildroot}%{_mandir}/man1/${x}.1%{ext_man}"
done
-%__install -D -m 0644 "%{SOURCE1}"
"%{buildroot}%{_sysconfdir}/rpm/macros.%{name}"
-%__sed -i 's|@@BINDIR@@|%{_bindir}|g'
"%{buildroot}%{_sysconfdir}/rpm/macros.%{name}"
-
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/rpm/macros.%{name}"
+sed -i 's|@@BINDIR@@|%{_bindir}|g'
"%{buildroot}%{_sysconfdir}/rpm/macros.%{name}"
%files
%defattr(-,root,root)
++++++ pbzip2-1.1.6.tar.gz -> pbzip2-1.1.12.tar.gz ++++++
++++ 1984 lines of diff (skipped)
++++++ pbzip2-fix_unused_result.patch ++++++
--- /var/tmp/diff_new_pack.RsRngJ/_old 2015-03-12 16:39:07.000000000 +0100
+++ /var/tmp/diff_new_pack.RsRngJ/_new 2015-03-12 16:39:07.000000000 +0100
@@ -1,6 +1,8 @@
---- pbzip2.cpp.orig 2010-12-20 19:34:24.000000000 +0100
-+++ pbzip2.cpp 2010-12-20 19:44:06.000000000 +0100
-@@ -1802,7 +1802,17 @@
+Index: pbzip2.cpp
+===================================================================
+--- pbzip2.cpp.orig
++++ pbzip2.cpp
+@@ -2238,7 +2238,17 @@ int directdecompress(const char *InFilen
return ret;
}
if (nread > 0)
@@ -19,7 +21,7 @@
if (ferror(stream))
{
ret =
testBZ2ErrorHandling(bzerr, bzf, streamNo);
-@@ -1817,7 +1827,17 @@
+@@ -2259,7 +2269,17 @@ int directdecompress(const char *InFilen
}
}
if ((bzerr == BZ_OK || bzerr == BZ_STREAM_END) && nread
> 0)
++++++ pbzip2-makefile.patch ++++++
--- /var/tmp/diff_new_pack.RsRngJ/_old 2015-03-12 16:39:07.000000000 +0100
+++ /var/tmp/diff_new_pack.RsRngJ/_new 2015-03-12 16:39:07.000000000 +0100
@@ -1,37 +1,40 @@
---- Makefile.orig 2010-12-20 19:19:23.000000000 +0100
-+++ Makefile 2010-12-20 19:24:30.000000000 +0100
-@@ -3,7 +3,7 @@
-
- # Compiler to use
- CC = g++
--CFLAGS = -O2
-+CFLAGS = $(OPTFLAGS)
- #CFLAGS += -g -Wall
- #CFLAGS += -ansi
- #CFLAGS += -pedantic
-@@ -36,6 +36,9 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -17,7 +17,7 @@ LDLIBS_PTHREAD = -lpthread
+
+
+ # Optimization flags
+-CXXFLAGS = -O2
++CXXFLAGS = $(OPTFLAGS)
+
+ #CXXFLAGS += -g -Wall
+ #CXXFLAGS += -ansi
+@@ -60,6 +60,9 @@ LDLIBS += $(LDLIBS_PTHREAD)
# Where you want pbzip2 installed when you do 'make install'
PREFIX = /usr
-+DESTDIR=
++DESTDIR=
+BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/man
- all: pbzip2
-@@ -49,15 +52,10 @@
+ all: pbzip2
+@@ -74,16 +77,10 @@ pbzip2-static: pbzip2.cpp BZ2StreamScann
# Install the binary pbzip2 program and man page
install: pbzip2
- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
-- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
-- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1
; fi
+- if ( test ! -d $(PREFIX)/share ) ; then mkdir -p $(PREFIX)/share ; fi
+- if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p
$(PREFIX)/share/man ; fi
+- if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p
$(PREFIX)/share/man/man1 ; fi
- cp -f pbzip2 $(PREFIX)/bin/pbzip2
- chmod a+x $(PREFIX)/bin/pbzip2
-- ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbunzip2
-- ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbzcat
-- cp -f pbzip2.1 $(PREFIX)/man/man1
-- chmod a+r $(PREFIX)/man/man1/pbzip2.1
+- ln -s -f pbzip2 $(PREFIX)/bin/pbunzip2
+- ln -s -f pbzip2 $(PREFIX)/bin/pbzcat
+- cp -f pbzip2.1 $(PREFIX)/share/man/man1
+- chmod a+r $(PREFIX)/share/man/man1/pbzip2.1
+ install -D -m0755 pbzip2 $(DESTDIR)$(BINDIR)/pbzip2
+ ln -s -f pbzip2 $(DESTDIR)$(BINDIR)/pbunzip2
+ ln -s -f pbzip2 $(DESTDIR)$(BINDIR)/pbzcat
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
