pakfire: Update to 0.9.30

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 6f405232f4551e007ca51c0d1e27e3b3a2a7384e..c4229e67da1c7566c452f9fe0e76ce6ccf065563 100644 (file)
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.29
+version    = 0.9.30
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -27,32 +27,27 @@ build
                automake
                bison
                curl-devel
+               elfutils-devel
                file-devel
                flex
                gettext-devel
-               gpgme-devel
                intltool >= 0.40.0
                json-c-devel >= 0.15
+               krb5-devel
                libarchive-devel >= 3.4.0
                libbpf-devel
                libcap-devel
-               libmount-devel
                libnl3-devel
                libseccomp-devel
                libsolv-devel >= 0.7.5
                libuuid-devel
                openssl-devel >= 1.1.1
                pcre2-devel
-               python3-cpuinfo
                python3-devel >= 3.6
-               python3-kerberos
-               python3-psutil
-               python3-setproctitle
-               python3-systemd
-               python3-tornado
                sqlite-devel
                systemd-devel
                xz-devel
+               zlib-devel
                zstd-devel
        end
 
@@ -66,7 +61,7 @@ build
                --enable-debug
 
        test
-               LD_LIBRARY_PATH=%{DIR_APP}/src/.libs make check || true
+               make check || true
        end
 
        install_cmds
@@ -79,13 +74,6 @@ end
 packages
        package %{name}
                requires
-                       python3-cpuinfo
-                       python3-kerberos
-                       python3-psutil
-                       python3-setproctitle
-                       python3-systemd
-                       python3-tornado
-
                        system-release
                end
 
@@ -94,11 +82,14 @@ packages
                        build-essential
                end
 
-               configfiles = %{sysconfdir}/pakfire/general.conf
+               configfiles
+                       %{sysconfdir}/pakfire/pakfire.conf
+               end
        end
 
        package %{name}-builder
                summary = The Pakfire builder
+
                description
                        The tools that are needed to build new pakfire packages.
                end
@@ -107,53 +98,43 @@ packages
                        pakfire = %{thisver}
                end
 
-               configfiles
-                       %{sysconfdir}/pakfire/builder.conf
-                       %{sysconfdir}/pakfire/distros
-               end
-
-               files
-                       %{sysconfdir}/pakfire/builder.conf
-                       %{sysconfdir}/pakfire/distros
-                       %{bindir}/pakfire-builder
-                       %{mandir}/man*/pakfire-builder*
+               provides
+                       pakfire-client = %{thisver}
                end
-       end
 
-       package %{name}-client
-               summary = The Pakfire Hub client
-               description
-                       The pakfire client has the power to create build jobs
-                       and communicate with the Pakfire Build Service.
+               obsoletes
+                       pakfire-client <= %{thisver}
                end
 
-               requires
-                       pakfire = %{thisver}
+               configfiles
+                       %{sysconfdir}/pakfire/distros
                end
 
                files
-                       %{sysconfdir}/pakfire/client.conf
+                       %{sysconfdir}/pakfire/distros
+                       %{bindir}/pakfire-builder
                        %{bindir}/pakfire-client
+                       %{prefix}/lib/pakfire
                end
-               configfiles = %{sysconfdir}/pakfire/client.conf
        end
 
        package %{name}-daemon
-               summary = The Pakfire daemon.
+               summary = The Pakfire daemon
+
                description
                        The Pakfire daemon takes build jobs from the
                        Pakfire Build Service and compiles them.
                end
 
                requires
+                       pakfire = %{thisver}
                        pakfire-builder = %{thisver}
                end
 
                files
-                       %{sysconfdir}/pakfire/daemon.conf
                        %{bindir}/pakfire-daemon
+                       %{unitdir}/pakfire-daemon.service
                end
-               configfiles = %{sysconfdir}/pakfire/daemon.conf
 
                script postin
                        systemctl daemon-reload >/dev/null 2>&1 || :
@@ -174,6 +155,15 @@ packages
                end
        end
 
+       package python3-%{name}
+               template PYTHON3
+
+               requires
+                       pakfire = %{thisver}
+                       pakfire-builder = %{thisver}
+               end
+       end
+
        package %{name}-debuginfo
                template DEBUGINFO
        end