]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
pakfire: Make package work on x86_64.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 13:46:47 +0000 (14:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 13:46:47 +0000 (14:46 +0100)
pakfire/pakfire.nm

index 3cb1f12ecec0094c02c0acfad8743df56580a1fa..8292df0647959927ba7da3fba10d16c14456c75c 100644 (file)
@@ -33,7 +33,7 @@ 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, beecrypt>=4.2.1-2
 
        CFLAGS += -fno-strict-aliasing
 
@@ -60,7 +60,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
@@ -84,7 +84,7 @@ packages
                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,11 @@ packages
                        /usr/lib/pakfire/quality-agent*
                end
 
-               requires = binutils file grep
+               requires
+                       binutils
+                       file
+                       grep
+               end
        end
 
        package %{name}-debuginfo