pakfire: Add patch from upstream to fix pkgconfig dependencies.

[people/ms/ipfire-3.x.git] / pakfire / pakfire.nm

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 3756da90b207490d8ce4d17abf226397e2c299a6..f615de8492e911488694827933f48a2bcd6e5811 100644 (file)
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.13
-release    = 1
+version    = 0.9.20
+release    = 7
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Packaging
@@ -22,16 +22,26 @@ source_dl  = http://source.ipfire.org/releases/pakfire/
 
 build
        requires
+               beecrypt-devel
+               elfutils-devel
                gettext
+               libcap-devel
                libsolv-devel
+               popt-devel
                python-devel
+               xz-devel
        end
 
+       # libgomp was broken in earlier releases.
+       requires += gcc >= 4.6.2-4
+       requires += beecrypt >= 4.2.1-2
+
        CFLAGS += -fno-strict-aliasing
 
        test
-               # Check, if the binary module is loadable.
+               # Check, if the binary modules are loadable.
                cd %{DIR_APP}/python/src/ && python -c "import _pakfire"
+               cd %{DIR_APP}/python/src/ && python -c "import _lzma"
        end
 end
 
@@ -39,26 +49,24 @@ packages
        package %{name}
                groups += Base
 
-               requires = pakfire-common=%{thisver}
+               requires = pakfire-common = %{thisver}
        end
 
        package %{name}-common
                requires
-                       pyliblzma
                        python-progressbar
                        python-urlgrabber
-                       pyxattr
                        system-release
                end
 
                files
                        /usr/lib/pakfire/pakfire-multicall.py
-                       /usr/lib*/python*/site-packages/pakfire*
+                       %{libdir}/python*/site-packages/pakfire*
                        /usr/share/locale
                end
        end
        
-       package %{name}-build
+       package %{name}-builder
                summary = The pakfire builder.
                description
                        The tools that are needed to build new pakfire packages.
@@ -66,12 +74,17 @@ 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}
                conflicts = build-essentials
 
                files
+                       %{libdir}/libpakfire_preload.so
                        /usr/bin/pakfire-builder
                        /usr/bin/pakfire-server
                        /usr/lib/pakfire/*
@@ -94,6 +107,18 @@ packages
                        /usr/lib/pakfire/quality-agent*
                end
 
-               requires = binutils file grep
+               requires
+                       gawk
+                       binutils
+                       coreutils
+                       findutils
+                       file
+                       grep
+                       sed
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
        end
 end