From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 3 Oct 2011 00:12:20 +0000 (+0200)
Subject: pakfire: Update to 0.9.10.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d37182ca57df3cd2c0e6c2b195295cc21549127;p=ipfire-3.x.git

pakfire: Update to 0.9.10.
---

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 883cba131..a96e3e0ce 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.6
+version    = 0.9.10
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -18,21 +18,19 @@ description
 	packages.
 end
 
-source_dl  =
+source_dl  = http://source.ipfire.org/releases/pakfire/
 
 build
 	requires
-		intltool
 		libsolv-devel
 		python-devel
-		python-distutils-extra
 	end
 
 	CFLAGS += -fno-strict-aliasing
 
 	test
 		# Check, if the binary module is loadable.
-		cd %{DIR_APP}/build/lib*/pakfire/ && python -c "import _pakfire"
+		cd %{DIR_APP}/python/src/ && python -c "import _pakfire"
 	end
 end
 
@@ -40,6 +38,10 @@ packages
 	package %{name}
 		groups += Base
 
+		requires = pakfire-common=%{thisver}
+	end
+
+	package %{name}-common
 		requires
 			pyliblzma
 			python-progressbar
@@ -47,6 +49,12 @@ packages
 			pyxattr
 			system-release
 		end
+
+		files
+			/usr/lib/pakfire/pakfire-multicall.py
+			/usr/lib*/python*/site-packages/pakfire*
+			/usr/share/locale
+		end
 	end
 	
 	package %{name}-build
@@ -55,13 +63,36 @@ packages
 			The tools that are needed to build new pakfire packages.
 		end
 		groups += Build
-	
+
 		requires
 			%{name}=%{thisver}
+			quality-agent=%{thisver}
+		end
+		conflicts = build-essentials
+
+		files
+			/usr/bin/pakfire-builder
+			/usr/bin/pakfire-server
+			/usr/lib/pakfire/*
+			!/usr/lib/pakfire/pakfire-multicall.py
+		end
+	end
+
+	package quality-agent
+		arch = noarch
+
+		summary = The pakfire quality agent.
+		description
+			The quality agent tests resulting packages that come out
+			of the build service.
+			It is a collection of scripts that check if everything is
+			working right.
 		end
 
 		files
-			/usr/bin/pakfire-build
+			/usr/lib/pakfire/quality-agent*
 		end
+
+		requires = binutils file grep
 	end
 end