systemd: Update to version 232.

* Drop sub-package for compat-libs which will not be provided
  anymore since systemd 230.

* Drop sub-package for python binding, which have been moved to
  an own package.

* Remove unneeded file for X11 and ZSH.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 760c38e93c1c0f2d55784e563f6a24573cad6485..074440e489df071b8a01d0e3c5869716398357cb 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 231
-release    = 2
+version    = 232
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -70,9 +70,7 @@ build
                PYTHON=%{python3} \
                --with-sysvinit-path= \
                --with-sysvrcnd-path= \
-               --enable-introspection \
                --enable-zlib \
-               --enable-compat-libs \
                --disable-smack \
                --disable-backlight \
                --disable-firstboot \
@@ -86,7 +84,6 @@ build
                --disable-timesyncd \
                --disable-timedated \
                --disable-polkit \
-               --disable-kdbus \
                --disable-static
 
        prepare_cmds
@@ -147,9 +144,15 @@ build
                        ln -svf ../system/${i}.target ${i}.target || exit 1
                done
 
+               # Remove .so file for the shared library, it's not supposed to be used for anything.
+               rm -rvf %{BUILDROOT}%{prefix}/lib/systemd/libsystemd-shared.so
+
                # Remove tmpfile for X11
                rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
 
+               # Drop X11 related config files
+               rm -rvf %{BUILDROOT}%{sysconfdir}/X11
+
                # Remove unneeded stuff for xdg
                rm -rfv %{BUILDROOT}/etc/xdg
 
@@ -157,6 +160,9 @@ build
                rm -rvf %{BUILDROOT}/etc/rpm
                rm -rvf %{BUILDROOT}/usr/lib/rpm
 
+               # Drop ZSH related files
+               rm -rvf %{BUILDROOT}%{datadir}/zsh
+
                # Use journald. Enable the import of kernel messages.
                # Stop forwarding to a syslog daemon.
                sed \
@@ -350,6 +356,7 @@ packages
 
                obsoletes
                        nss-myhostname <= 0.3-3
+                       systemd-compat-libs < 230
                end
 
                conflicts
@@ -380,30 +387,9 @@ packages
                end
        end
 
-       package %{name}-compat-libs
-               summary = systemd compatibility libraries.
-               description
-                       Compatibility libraries for systemd. If your package requires this
-                       package, you need to update your link options and build.
-               end
-
-               requires
-                       %{name}-libs = %{thisver}
-               end
-
-               files
-                       %{libdir}/libsystemd-daemon.so.*
-                       %{libdir}/libsystemd-login.so.*
-                       %{libdir}/libsystemd-journal.so.*
-                       %{libdir}/libsystemd-id128.so.*
-               end
-       end
-
        package %{name}-devel
                template DEVEL
 
-               requires += %{name}-compat-libs = %{thisver}
-
                files += %{prefix}/lib/pakfire/macros/
        end
 
@@ -448,10 +434,6 @@ packages
                end
        end
 
-       package python3-%{name}
-               template PYTHON3
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end