This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 8c1983ef6a80689b4db587785ef4d5f00dce0a4e (commit) via f32f7e83bdefac3dae867cc8652a1ee44b797afc (commit) from 98dd7d7c81714084404c21f24aba6e254e4e1f89 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 8c1983ef6a80689b4db587785ef4d5f00dce0a4e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 22 20:14:03 2011 +0100

perl: Make package work on x86_64.

commit f32f7e83bdefac3dae867cc8652a1ee44b797afc Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 22 20:13:54 2011 +0100

bzip2: Make package work on x86_64.

-----------------------------------------------------------------------

Summary of changes: bzip2/bzip2.nm | 43 +++++++++++++++++++++++++++---------------- perl/perl.nm | 54 +++++++++++++++++++++++++++--------------------------- 2 files changed, 54 insertions(+), 43 deletions(-)

Difference in files: diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm index 39dcf18..44b0dd2 100644 --- a/bzip2/bzip2.nm +++ b/bzip2/bzip2.nm @@ -5,7 +5,7 @@

name = bzip2 version = 1.0.6 -release = 3 +release = 4

groups = Applications/Compression url = http://www.bzip.org/ @@ -29,28 +29,39 @@ build

build %{DO_FIX_LIBTOOL} - make -f Makefile-libbz2_so %{PARALLELISMFLAGS} \ - CFLAGS="%{CFLAGS}" + make -f Makefile-libbz2_so %{PARALLELISMFLAGS} CFLAGS="%{CFLAGS}"

make clean - make %{PARALLELISMFLAGS} \ - CFLAGS="%{CFLAGS}" + make %{PARALLELISMFLAGS} CFLAGS="%{CFLAGS}" end

install - make PREFIX=%{BUILDROOT}/usr install - - mkdir -pv %{BUILDROOT}/{bin,lib} + # Install binaries. + mkdir -pv %{BUILDROOT}/bin cp -v bzip2-shared %{BUILDROOT}/bin/bzip2 - cp -av libbz2.so* %{BUILDROOT}/lib - ln -sfv ../../lib/libbz2.so.1.0 %{BUILDROOT}/usr/lib/libbz2.so - rm -fv %{BUILDROOT}/usr/bin/{bunzip2,bzcat,bzip2} - ln -sfv bzip2 %{BUILDROOT}/bin/bunzip2 - ln -sfv bzip2 %{BUILDROOT}/bin/bzcat - rm -vf %{BUILDROOT}/usr/lib/libbz2.a + ln -svf bzip2 %{BUILDROOT}%{bindir}/bunzip2 + ln -svf bzip2 %{BUILDROOT}%{bindir}/bzcat + ln -svf bzip2 %{BUILDROOT}%{bindir}/bzcmp + ln -svf bzip2 %{BUILDROOT}%{bindir}/bless + + # Install libs. + mkdir -pv %{BUILDROOT}%{libdir} %{BUILDROOT}/%{lib} + install -m 755 libbz2.so.%{version} %{BUILDROOT}/%{lib} + ln -svf libbz2.so.%{version} %{BUILDROOT}/lib/libbz2.so.1 + ln -svf ../../lib/libbz2.so.1.0 %{BUILDROOT}%{libdir}/libbz2.so + + # Install headers. + mkdir -pv %{BUILDROOT}%{includedir} + install -m 644 bzlib.h %{BUILDROOT}%{includedir}

- mkdir -pv %{BUIDLROOT}/usr/share - mv -vf %{BUILDROOT}/usr/man %{BUILDROOT}/usr/share/ + # Install man pages. + mkdir -pv %{BUIDLROOT}%{mandir}/man1 + cp -vp bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 %{BUILDROOT}%{mandir}/man1 + ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bzip2recover.1 + ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bunzip2.1 + ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bzcat.1 + ln -svf bzdiff.1 %{BUILDROOT}%{mandir}/man1/bzcmp.1 + ln -svf bzmore2.1 %{BUILDROOT}%{mandir}/man1/bzless.1 end end

diff --git a/perl/perl.nm b/perl/perl.nm index 4ce9214..9a221fa 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -6,7 +6,7 @@ name = perl version = 5.14.2 # Never reset release in this package, just increase. -release = 9 +release = 10

maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Languages @@ -50,7 +50,7 @@ build build sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \ -e "s|INCLUDE\s*= ./zlib-src|INCLUDE = /usr/include|" \ - -e "s|LIB\s*= ./zlib-src|LIB = /usr/lib|" \ + -e "s|LIB\s*= ./zlib-src|LIB = %{libdir}|" \ cpan/Compress-Raw-Zlib/config.in

sh ./Configure -des \ @@ -67,8 +67,8 @@ build -Dsitearch="/usr/local/lib/perl5" \ -Dprivlib="/usr/share/perl5" \ -Dvendorlib="/usr/share/perl5/vendor_perl" \ - -Darchlib="/usr/lib/perl5" \ - -Dvendorarch="/usr/lib/perl5/vendor_perl" \ + -Darchlib="%{libdir}/perl5" \ + -Dvendorarch="%{libdir}/perl5/vendor_perl" \ -Darchname=%{arch}-linux-thread-multi \ -Dpager="/usr/bin/less -isr" \ -Dman1dir=/usr/share/man/man1 \ @@ -112,9 +112,9 @@ end

quality-agent whitelist_rpath - /lib - /usr/lib - /usr/lib/perl5/CORE + /%{lib} + %{libdir} + %{libdir}/perl5/CORE end end

@@ -220,7 +220,7 @@ packages end

files - /usr/lib/perl5/CORE/libperl.so + %{libdir}/perl5/CORE/libperl.so end end

@@ -237,7 +237,7 @@ packages /usr/share/man/man1/libnetcfg* /usr/bin/perlivp /usr/share/man/man1/perlivp* - /usr/lib/perl5/CORE/*.h + %{libdir}/perl5/CORE/*.h /usr/bin/xsubpp /usr/share/man/man1/xsubpp* /usr/share/man/man1/perlxs* @@ -253,7 +253,7 @@ packages # end # # files - # /usr/lib/perl5-tests + # %{libdir}/perl5-tests # end #end

@@ -562,8 +562,8 @@ packages end

files - /usr/lib/perl5/Digest - !/usr/lib/perl5/Digest/* + %{libdir}/perl5/Digest + !%{libdir}/perl5/Digest/* /usr/share/perl5/Digest.pm /usr/share/perl5/Digest/base.pm /usr/share/perl5/Digest/file.pm @@ -591,8 +591,8 @@ packages end

files - /usr/lib/perl5/Digest/MD5.pm - /usr/lib/perl5/auto/Digest/MD5 + %{libdir}/perl5/Digest/MD5.pm + %{libdir}/perl5/auto/Digest/MD5 /usr/share/man/man3/Digest::MD5.3* end end @@ -811,7 +811,7 @@ packages

files /usr/share/perl5/Compress/Zlib.pm - /usr/lib/perl5/auto/Compress/Zlib/ + %{libdir}/perl5/auto/Compress/Zlib/ /usr/share/man/man3/Compress::Zlib* /usr/share/perl5/File/GlobMapper.pm /usr/share/perl5/IO/Compress/Base/ @@ -1252,8 +1252,8 @@ packages end

files - /usr/lib/perl5/Cwd.pm - /usr/lib/perl5/File/Spec* + %{libdir}/perl5/Cwd.pm + %{libdir}/perl5/File/Spec* /usr/share/man/man3/Cwd* /usr/share/man/man3/File::Spec* end @@ -1355,9 +1355,9 @@ packages end

files - /usr/lib/perl5/List - /usr/lib/perl5/Scalar - /usr/lib/perl5/auto/List + %{libdir}/perl5/List + %{libdir}/perl5/Scalar + %{libdir}/perl5/auto/List /usr/share/man/man3/List::Util* /usr/share/man/man3/Scalar::Util* end @@ -1461,9 +1461,9 @@ packages end

files - /usr/lib/perl5/Time/Piece.pm - /usr/lib/perl5/Time/Seconds.pm - /usr/lib/perl5/auto/Time/Piece/ + %{libdir}/perl5/Time/Piece.pm + %{libdir}/perl5/Time/Seconds.pm + %{libdir}/perl5/auto/Time/Piece/ /usr/share/man/man3/Time::Piece.3* /usr/share/man/man3/Time::Seconds.3* end @@ -1532,8 +1532,8 @@ packages end

files - /usr/lib/perl5/auto/threads/threads* - /usr/lib/perl5/threads.pm + %{libdir}/perl5/auto/threads/threads* + %{libdir}/perl5/threads.pm /usr/share/man/man3/threads.3* end end @@ -1557,8 +1557,8 @@ packages end

files - /usr/lib/perl5/auto/threads/shared* - /usr/lib/perl5/threads/shared* + %{libdir}/perl5/auto/threads/shared* + %{libdir}/perl5/threads/shared* /usr/share/man/man3/threads::shared* end end

hooks/post-receive -- IPFire 3.x development tree