X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=pakfire%2Fpakfire.nm;h=b16f0791807c7d98f09011ff1416417118c97cdc;hb=d6bd23b5746ac18bd13ef0bc3d5d46579f93f131;hp=c071243e4837e8e2adbc29425ee57045be4733f9;hpb=d3d304e4884ecd596ebedaee1f8288c70070987e;p=ipfire-3.x.git

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index c071243e4..b16f07918 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,12 +4,12 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.23
-release    = 1
+version    = 0.9.27
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Packaging
-url        = http://www.ipfire.org/
+url        = http://git.ipfire.org/?p=pakfire.git;a=summary
 license    = GPLv3+
 summary    = Package installer/updater.
 
@@ -22,32 +22,37 @@ source_dl  = http://source.ipfire.org/releases/pakfire/
 
 build
 	requires
-		beecrypt-devel
-		elfutils-devel
-		gettext
+		autoconf
+		automake
+		gettext-devel
+		intltool
 		libcap-devel
 		libsolv-devel >= 0.0.0-4
-		popt-devel
 		python-devel
+		systemd-devel
+		systemd-units
 		xz-devel
 	end
 
-	# libgomp was broken in earlier releases.
-	requires += gcc >= 4.6.2-4
-	requires += beecrypt >= 4.2.1-2
-
-	CFLAGS += -fno-strict-aliasing
+	prepare_cmds
+		# Generate the build system, if this was not a release
+		# tarball.
+		[ -x "configure" ] || sh ./autogen.sh
+	end
 
 	test
-		# Check, if the binary modules are loadable.
-		cd %{DIR_APP}/python/src/ && python -c "import _pakfire"
-		cd %{DIR_APP}/python/src/ && python -c "import _lzma"
+		make check
 	end
 
 	install_cmds
 		# Remove all example repository definitions.
 		# Those will be solely provided by system-release.
 		rm -rfv %{BUILDROOT}%{sysconfdir}/pakfire/repos/*
+
+		mkdir -pv %{BUILDROOT}%{datadir}/pakfire
+		for i in $(find %{datadir}/automake-* -name config.guess -or -name config.sub); do
+			cp -vf ${i} %{BUILDROOT}%{datadir}/pakfire/
+		done
 	end
 end
 
@@ -55,10 +60,13 @@ packages
 	package %{name}
 		groups += Base
 
-		requires = pakfire-common = %{thisver}
-	end
+		provides
+			pakfire-common = %{thisver}
+		end
+		obsoletes
+			pakfire-common < %{thisver}
+		end
 
-	package %{name}-common
 		requires
 			libsolv >= 0.0.0-4
 			pygpgme
@@ -67,13 +75,6 @@ packages
 			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
 
@@ -87,6 +88,7 @@ packages
 		requires
 			# For --rpm-requires.
 			bash >= 4.2-7
+			debugedit
 
 			%{name} = %{thisver}
 			quality-agent = %{thisver}
@@ -101,24 +103,27 @@ packages
 			systemd-devel < 38
 		end
 
+		# Requires GCC 4.9 or later for -fstack-protector-strong
+		conflicts += gcc < 4.9
+
 		configfiles
-			/etc/pakfire/builder.conf
-			/etc/pakfire/distros
+			%{sysconfdir}/pakfire/builder.conf
+			%{sysconfdir}/pakfire/distros
 		end
 
 		files
-			/etc/pakfire/builder.conf
-			/etc/pakfire/distros
+			%{sysconfdir}/pakfire/builder.conf
+			%{sysconfdir}/pakfire/distros
 			%{libdir}/libpakfire_preload.so
 			%{bindir}/pakfire-builder
-			%{bindir}/pakfire-server
-			/usr/lib/pakfire/*
-			!/usr/lib/pakfire/pakfire-multicall.py
+
+			%{prefix}/lib/pakfire
+			%{libdir}/pakfire
 		end
 	end
 
 	package %{name}-client
-		summary = The Pakfire XMLRPC client.
+		summary = The Pakfire Hub client.
 		description
 			The pakfire client has the power to create build jobs
 			and communicate with the Pakfire Build Service.
@@ -151,6 +156,24 @@ packages
 			%{bindir}/pakfire-daemon
 		end
 		configfiles = %{sysconfdir}/pakfire/daemon.conf
+
+		script postin
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script preun
+			systemctl --no-reload disable pakfire-daemon.service > /dev/null 2>&1 || :
+			systemctl stop pakfire-daemon.service > /dev/null 2>&1 || :
+		end
+
+		script postun
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			systemctl daemon-reload 2>&1 || :
+			systemctl reload-or-try-restart pakfire-daemon.service >/dev/null 2>&1 || :
+		end
 	end
 
 	package quality-agent