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 831339b09c4c2f0cf6d0b76f8d33b07ddef2cf32 (commit) via 938865aead7a97860dbafe383674b16ec08d6f79 (commit) via 383de0c646d30731c6d65fcd491cddd905f4ccd3 (commit) from 208ef3422a0b06787d6f79a9c480be4aa1f63a09 (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 831339b09c4c2f0cf6d0b76f8d33b07ddef2cf32 Merge: 938865a 208ef34 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 28 23:32:31 2012 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 938865aead7a97860dbafe383674b16ec08d6f79 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 28 23:31:51 2012 +0100

pakfire: Update to 0.9.20.

commit 383de0c646d30731c6d65fcd491cddd905f4ccd3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 25 21:06:48 2012 +0100

pcre: Update to 8.30.

Add temporary compat package.

References bug #10026.

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

Summary of changes: pakfire/pakfire.nm | 22 +++++++++++++--------- pcre/pcre.nm | 31 +++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 15 deletions(-)

Difference in files: diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 8292df0..1873907 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -4,8 +4,8 @@ ###############################################################################

name = pakfire -version = 0.9.19 -release = 2 +version = 0.9.20 +release = 1

maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Packaging @@ -33,7 +33,8 @@ build end

# libgomp was broken in earlier releases. - requires += gcc>=4.6.2-4, beecrypt>=4.2.1-2 + requires += gcc >= 4.6.2-4 + requires += beecrypt >= 4.2.1-2

CFLAGS += -fno-strict-aliasing

@@ -48,7 +49,7 @@ packages package %{name} groups += Base

- requires = pakfire-common=%{thisver} + requires = pakfire-common = %{thisver} end

package %{name}-common @@ -73,14 +74,13 @@ packages groups += Build

requires - %{name}=%{thisver} - quality-agent=%{thisver} - + %{name} = %{thisver} + quality-agent = %{thisver} cpio elfutils end - provides = pakfire-build=%{thisver} - obsoletes = pakfire-build<%{thisver} + provides = pakfire-build = %{thisver} + obsoletes = pakfire-build < %{thisver} conflicts = build-essentials

files @@ -108,9 +108,13 @@ packages end

requires + gawk binutils + coreutils + findutils file grep + sed end end

diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 1875f29..9615bb3 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -4,8 +4,10 @@ ###############################################################################

name = pcre -version = 8.21 -release = 2 +version = 8.30 +release = 1 + +compat_version = 8.21

groups = System/Libraries url = http://www.pcre.org/ @@ -19,12 +21,12 @@ description end

source_dl = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +sources += %{name}-%{compat_version}.tar.gz

build requires bzip2-devel gcc-c++ - pkg-config readline-devel zlib-devel end @@ -33,14 +35,23 @@ build --disable-static \ --docdir=/usr/share/doc/pcre-%{version} \ --enable-utf8 \ + --enable-jit \ --enable-pcregrep-libz \ --enable-pcregrep-libbz2 \ --enable-unicode-properties

+ build_cmds + cd %{DIR_SRC}/%{name}-%{compat_version} + ./configure \ + %{configure_options} + + make %{PARALLELISMFLAGS} + end + install_cmds - mkdir -pv %{BUILDROOT}/{,usr/}%{lib} - mv -v %{BUILDROOT}%{libdir}/libpcre.so.* %{BUILDROOT}/%{lib} - ln -v -sf ../../%{lib}/libpcre.so.0 %{BUILDROOT}%{libdir}/libpcre.so + cd %{DIR_SRC}/%{name}-%{compat_version} + install -m 644 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir} + ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libprce.so.0 end end

@@ -51,6 +62,14 @@ packages template DEVEL end

+ package %{name}-compat + summary = Compat libraries of %{thisapp}. + + files + %{libdir}/libpcre.so.0* + end + end + package %{name}-debuginfo template DEBUGINFO end

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