pakfire: Fix for database conversion.

[people/ms/ipfire-3.x.git] / pakfire / pakfire.nm

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index eef125a4a355b016f2f8a89cd856060911db2032..3fb99bfa535621dcab78c9f1a5bef0dbbbe2687b 100644 (file)
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,12 +4,12 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.22
-release    = 3
+version    = 0.9.26
+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,13 +22,18 @@ source_dl  = http://source.ipfire.org/releases/pakfire/
 
 build
        requires
+               autoconf
+               automake
                beecrypt-devel
                elfutils-devel
-               gettext
+               gettext-devel
+               intltool
                libcap-devel
-               libsolv-devel
+               libsolv-devel >= 0.0.0-4
                popt-devel
                python-devel
+               systemd-devel
+               systemd-units
                xz-devel
        end
 
@@ -36,12 +41,14 @@ build
        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
@@ -55,24 +62,21 @@ 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
                        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
 
@@ -101,23 +105,23 @@ packages
                end
 
                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.
@@ -150,6 +154,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