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

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 8292df0647959927ba7da3fba10d16c14456c75c..187390762258242bd002555af002c8bec5de45b0 100644 (file)
--- 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 1875f29260b4db016d88d828498f465fcb7739b4..9615bb355c7ed194a4300b55cec38bf5909824a8 100644 (file)
--- 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