Merge remote-tracking branch 'stevee/selinux-libs'

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

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 3cb1f12ecec0094c02c0acfad8743df56580a1fa..3a418a67fada0cfc94e96176c81c04762ee0fdd8 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.21
+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
@@ -60,7 +61,7 @@ packages
 
                files
                        /usr/lib/pakfire/pakfire-multicall.py
-                       /usr/lib*/python*/site-packages/pakfire*
+                       %{libdir}/python*/site-packages/pakfire*
                        /usr/share/locale
                end
        end
@@ -73,18 +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}
+               provides = pakfire-build = %{thisver}
+               obsoletes = pakfire-build < %{thisver}
                conflicts = build-essentials
 
                files
-                       /usr/lib/libpakfire_preload.so
+                       %{libdir}/libpakfire_preload.so
                        /usr/bin/pakfire-builder
                        /usr/bin/pakfire-server
                        /usr/lib/pakfire/*
@@ -107,7 +107,15 @@ packages
                        /usr/lib/pakfire/quality-agent*
                end
 
-               requires = binutils file grep
+               requires
+                       gawk
+                       binutils
+                       coreutils
+                       findutils
+                       file
+                       grep
+                       sed
+               end
        end
 
        package %{name}-debuginfo