From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Dec 2011 13:46:47 +0000 (+0100)
Subject: pakfire: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=640a1a653d94f579d6198110be0edfe5d5910192;p=ipfire-3.x.git

pakfire: Make package work on x86_64.
---

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 3cb1f12ec..8292df064 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -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