Mailinglist Archive: opensuse-commit (1003 mails)
| < Previous | Next > |
commit bzip2
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 03 Jun 2007 21:05:48 +0200
- Message-id: <20070603190548.73B96678183@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package bzip2
checked in at Sun Jun 3 21:05:48 CEST 2007.
--------
--- bzip2/bzip2.changes 2007-05-25 23:28:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/bzip2/bzip2.changes 2007-05-30 14:54:53.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 30 11:53:18 CEST 2007 - lmichnovic@xxxxxxx
+
+- renamed lib to libbz2-1 according to Shared Library Packaging
+ Policy
+- calling ldconfig for libbz2-1 package
+
+-------------------------------------------------------------------
Old:
----
shared-lib.diff
New:
----
bzip2-shared_lib.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bzip2.spec ++++++
--- /var/tmp/diff_new_pack.Cf7645/_old 2007-06-03 21:04:55.000000000 +0200
+++ /var/tmp/diff_new_pack.Cf7645/_new 2007-06-03 21:04:55.000000000 +0200
@@ -12,21 +12,21 @@
Name: bzip2
Version: 1.0.4
-Release: 19
+Release: 22
Provides: bzip
Obsoletes: bzip
# The following is a kludge to get updating bzip2 to after the split work
-PreReq: libbz2
+PreReq: libbz2-1
Autoreqprov: on
Group: Productivity/Archiving/Compression
-License: BSD License and BSD-like
+License: BSD License and BSD-like, bzip2-1.0 is distributed under a BSD-style license
URL: http://www.bzip.org/
Summary: A Program for Compressing Files
Source: bzip2-%{version}.tar.gz
Source1: bznew.gz
Source2: bznew.1.gz
Source100: rpmlintrc
-Patch1: shared-lib.diff
+Patch1: bzip2-shared_lib.patch
Patch2: bzip2-maxlen20.patch
Patch3: bzip2-faster.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -53,11 +53,11 @@
--------
Julian Seward <jseward@xxxxxxx>
-%package -n libbz2
+%package -n libbz2-1
Summary: bzip2 runtime library
Group: Productivity/Archiving/Compression
-%description -n libbz2
+%description -n libbz2-1
bzip2 runtime library
@@ -121,9 +121,9 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
+%post -n libbz2-1 -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun -n libbz2-1 -p /sbin/ldconfig
%files
%defattr(-,root,root)
@@ -135,7 +135,7 @@
%defattr(-,root,root)
%doc manual.ps.gz manual*.html
-%files -n libbz2
+%files -n libbz2-1
%defattr(-,root,root)
/%{_lib}/libbz2.so.1
/%{_lib}/libbz2.so.1.*
@@ -147,6 +147,10 @@
%{_libdir}/libbz2.so
%changelog
+* Wed May 30 2007 - lmichnovic@xxxxxxx
+- renamed lib to libbz2-1 according to Shared Library Packaging
+ Policy
+- calling ldconfig for libbz2-1 package
* Fri May 25 2007 - dmueller@xxxxxxx
- build with profile feedback enabled (7-15%% speedup)
* Fri Mar 30 2007 - rguenther@xxxxxxx
++++++ bzip2-shared_lib.patch ++++++
--- Makefile
+++ Makefile
@@ -24,8 +24,9 @@
CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
-PREFIX=/usr/local
-
+PREFIX=/usr
+MANDIR=$(PREFIX)/man
+LIBDIR=$(PREFIX)/lib
OBJS= blocksort.o \
huffman.o \
@@ -35,10 +36,10 @@
decompress.o \
bzlib.o
-all: libbz2.a bzip2 bzip2recover test
+all: libbz2.a libbz2.so bzip2 bzip2recover test
-bzip2: libbz2.a bzip2.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+bzip2: libbz2.a libbz2.so bzip2.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o libbz2.so
bzip2recover: bzip2recover.o
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
@@ -52,6 +53,10 @@
$(RANLIB) libbz2.a ; \
fi
+libbz2.so: $(OBJS)
+ rm -f libbz2.so*
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o libbz2.so -Wl,-soname,libbz2.so.1 $(OBJS)
+
check: test
test: bzip2
@cat words1
@@ -71,45 +76,29 @@
install: bzip2 bzip2recover
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+ if ( test ! -d $(LIBDIR) ) ; then mkdir -p $(LIBDIR) ; 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 $(MANDIR)/man1 ) ; then mkdir -p $(MANDIR)/man1 ; fi
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
cp -f bzip2 $(PREFIX)/bin/bzip2
- cp -f bzip2 $(PREFIX)/bin/bunzip2
- cp -f bzip2 $(PREFIX)/bin/bzcat
+ ln -sf bzip2 $(PREFIX)/bin/bunzip2
+ ln -sf bzip2 $(PREFIX)/bin/bzcat
cp -f bzip2recover $(PREFIX)/bin/bzip2recover
chmod a+x $(PREFIX)/bin/bzip2
- chmod a+x $(PREFIX)/bin/bunzip2
- chmod a+x $(PREFIX)/bin/bzcat
chmod a+x $(PREFIX)/bin/bzip2recover
- cp -f bzip2.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzip2.1
+ cp -f bzip2.1 $(MANDIR)/man1
+ chmod a+r $(MANDIR)/man1/bzip2.1
cp -f bzlib.h $(PREFIX)/include
chmod a+r $(PREFIX)/include/bzlib.h
- cp -f libbz2.a $(PREFIX)/lib
- chmod a+r $(PREFIX)/lib/libbz2.a
- cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
- chmod a+x $(PREFIX)/bin/bzgrep
- cp -f bzmore $(PREFIX)/bin/bzmore
- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
- chmod a+x $(PREFIX)/bin/bzmore
- cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
- chmod a+x $(PREFIX)/bin/bzdiff
- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzgrep.1
- chmod a+r $(PREFIX)/man/man1/bzmore.1
- chmod a+r $(PREFIX)/man/man1/bzdiff.1
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
+ cp -f libbz2.a $(LIBDIR)
+ chmod a+r $(LIBDIR)/libbz2.a
+ cp -f libbz2.so $(LIBDIR)
+ chmod a+r $(LIBDIR)/libbz2.so
+ echo ".so man1/bzip2.1" > $(MANDIR)/man1/bunzip2.1
+ echo ".so man1/bzip2.1" > $(MANDIR)/man1/bzcat.1
clean:
- rm -f *.o libbz2.a bzip2 bzip2recover \
+ rm -f *.o libbz2.a libbz2.so bzip2 bzip2recover \
sample1.rb2 sample2.rb2 sample3.rb2 \
sample1.tst sample2.tst sample3.tst
++++++ rpmlintrc ++++++
--- bzip2/rpmlintrc 2007-05-24 16:25:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/bzip2/rpmlintrc 2007-05-31 11:50:42.935365000 +0200
@@ -1,4 +1,4 @@
# This line is mandatory to access the configuration functions
from Config import *
-addFilter("bzip2 explicit-lib-dependency libbz2")
+addFilter("bzip2 explicit-lib-dependency libbz2-1")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |