[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 47a5ddc10e8bffd874f520fb6be69872b941468f

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4316 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  47a5ddc10e8bffd874f520fb6be69872b941468f (commit)
      from  d72c8258c21fc52ee258ecb67ea0cd3a732032fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 47a5ddc10e8bffd874f520fb6be69872b941468f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Apr 14 20:09:57 2012 +0200

    pakfire: Update to 0.9.22.
    
    Split into more little packages to not have
    too many crap around.

-----------------------------------------------------------------------

Summary of changes:
 pakfire/pakfire.nm |   75 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 68 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 3a418a6..26c7bc5 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.21
+version    = 0.9.22
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -43,6 +43,12 @@ build
 		cd %{DIR_APP}/python/src/ && python -c "import _pakfire"
 		cd %{DIR_APP}/python/src/ && python -c "import _lzma"
 	end
+
+	install_cmds
+		# Remove all example repository definitions.
+		# Those will be solely provided by system-release.
+		rm -rfv %{BUILDROOT}%{sysconfdir}/pakfire/repos/*
+	end
 end
 
 packages
@@ -54,26 +60,33 @@ packages
 
 	package %{name}-common
 		requires
+			pygpgme
 			python-progressbar
 			python-urlgrabber
 			system-release
 		end
 
 		files
+			%{sysconfdir}/pakfire/general.conf
+			%{bindir}/pakfire-key
 			/usr/lib/pakfire/pakfire-multicall.py
 			%{libdir}/python*/site-packages/pakfire*
 			/usr/share/locale
 		end
+		configfiles = %{sysconfdir}/pakfire/general.conf
 	end
-	
+
 	package %{name}-builder
-		summary = The pakfire builder.
+		summary = The Pakfire builder.
 		description
 			The tools that are needed to build new pakfire packages.
 		end
 		groups += Build
 
 		requires
+			# For --rpm-requires.
+			bash >= 4.2-7
+
 			%{name} = %{thisver}
 			quality-agent = %{thisver}
 			cpio
@@ -81,17 +94,64 @@ packages
 		end
 		provides = pakfire-build = %{thisver}
 		obsoletes = pakfire-build < %{thisver}
-		conflicts = build-essentials
+
+		conflicts
+			build-essentials
+			systemd-devel < 38
+		end
+
+		configfiles
+			/etc/pakfire/builder.conf
+			/etc/pakfire/distros
+		end
 
 		files
+			/etc/pakfire/builder.conf
+			/etc/pakfire/distros
 			%{libdir}/libpakfire_preload.so
-			/usr/bin/pakfire-builder
-			/usr/bin/pakfire-server
+			%{bindir}/pakfire-builder
+			%{bindir}/pakfire-server
 			/usr/lib/pakfire/*
 			!/usr/lib/pakfire/pakfire-multicall.py
 		end
 	end
 
+	package %{name}-client
+		summary = The Pakfire XMLRPC client.
+		description
+			The pakfire client has the power to create build jobs
+			and communicate with the Pakfire Build Service.
+		end
+
+		requires
+			pakfire-common = %{thisver}
+		end
+
+		files
+			%{sysconfdir}/pakfire/client.conf
+			%{bindir}/pakfire-client
+		end
+		configfiles = %{sysconfdir}/pakfire/client.conf
+	end
+
+	package %{name}-daemon
+		summary = The Pakfire daemon.
+		description
+			The Pakfire daemon takes build jobs from the
+			Pakfire Build Service and compiles them.
+		end
+
+		requires
+			pakfire-builder = %{thisver}
+		end
+
+		files
+			%{sysconfdir}/pakfire/daemon.conf
+			%{bindir}/pakfire-daemon
+		end
+		configfiles = %{sysconfdir}/pakfire/daemon.conf
+	end
+
 	package quality-agent
 		arch = noarch
 
@@ -104,7 +164,8 @@ packages
 		end
 
 		files
-			/usr/lib/pakfire/quality-agent*
+			/usr/lib/pakfire/quality-agent
+			/usr/lib/quality-agent*
 		end
 
 		requires


hooks/post-receive
--
IPFire 3.x development tree