From b457b129f7cf848d4db3dda394bd71c2965198bd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 21 Oct 2010 23:56:33 +0200 Subject: [PATCH] bzip2: update to 1.0.6. --- srcpkgs/bzip2/bzip2-devel.template | 2 -- .../Makefile_libbz2_so_fix_soname.diff | 27 +++++++------------ srcpkgs/bzip2/template | 6 ++--- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/srcpkgs/bzip2/bzip2-devel.template b/srcpkgs/bzip2/bzip2-devel.template index 946fec8ffd..3c4f338c91 100644 --- a/srcpkgs/bzip2/bzip2-devel.template +++ b/srcpkgs/bzip2/bzip2-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run glibc-devel Add_dependency run bzip2 diff --git a/srcpkgs/bzip2/patches/Makefile_libbz2_so_fix_soname.diff b/srcpkgs/bzip2/patches/Makefile_libbz2_so_fix_soname.diff index 6830330af9..0b1471af8c 100644 --- a/srcpkgs/bzip2/patches/Makefile_libbz2_so_fix_soname.diff +++ b/srcpkgs/bzip2/patches/Makefile_libbz2_so_fix_soname.diff @@ -1,22 +1,15 @@ ---- Makefile-libbz2_so.orig 2007-12-09 14:00:50.000000000 +0100 -+++ Makefile-libbz2_so 2009-02-18 02:30:10.000000000 +0100 -@@ -35,13 +35,14 @@ OBJS= blocksort.o \ +--- Makefile-libbz2_so.orig 2010-10-21 23:53:37.730855571 +0200 ++++ Makefile-libbz2_so 2010-10-21 23:54:25.784425275 +0200 +@@ -35,10 +35,11 @@ OBJS= blocksort.o \ bzlib.o all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 -- rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.4 libbz2.so.1.0 -+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.5 $(OBJS) -+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.5 -+ ln -s libbz2.so.1.0.5 libbz2.so -+ ln -s libbz2.so.1.0.5 libbz2.so.1 -+ #ln -s libbz2.so.1.0.5 libbz2.so.1.0 +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) ++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.6 libbz2.so.1.0 ++ ln -s libbz2.so.1.0.6 libbz2.so.1 clean: -- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared -+ rm -f $(OBJS) bzip2.o libbz2.so.* bzip2-shared - - blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c + rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared diff --git a/srcpkgs/bzip2/template b/srcpkgs/bzip2/template index 32a81a47ab..f21b2ed164 100644 --- a/srcpkgs/bzip2/template +++ b/srcpkgs/bzip2/template @@ -1,13 +1,13 @@ # Template build file for 'bzip2'. pkgname=bzip2 -version=1.0.5 -distfiles="http://www.bzip.org/1.0.5/$pkgname-$version.tar.gz" +version=1.0.6 +distfiles="http://www.bzip.org/$version/$pkgname-$version.tar.gz" build_style=gnu_makefile make_build_target="-f Makefile-libbz2_so" make_install_args="PREFIX=$XBPS_DESTDIR/$pkgname-$version/usr" short_desc="The bzip2 compression library" maintainer="Juan RP " -checksum=f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22 +checksum=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd long_desc=" bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10%% to 15%% of the best available