systemd: Update to 201.

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

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index ef11d6eba5c3b4c959cb6a01bc074563eba05610..9c1ca212ccf7f8e805e340135d01d3b8b3c7698b 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = systemd
-version    = 196
+version    = 201
 release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
@@ -54,7 +54,9 @@ build
        end
 
        configure_options += \
-               --with-distro=ipfire \
+               --with-sysvinit-path= \
+               --with-sysvrcnd-path= \
+               --enable-introspection=yes \
                --disable-static
 
        prepare_cmds
@@ -101,15 +103,18 @@ build
 
                # Replace absolute symlinks by relative ones.
                cd %{BUILDROOT}%{unitdir}/../user
-               for i in bluetooth local-fs printer remote-fs shutdown sockets sound swap; do
+               for i in bluetooth local-fs paths printer remote-fs shutdown smartcard sockets sound swap timers; do
                        ln -svf ../system/${i}.target ${i}.target || exit 1
                done
 
                # Remove tmpfile for X11
                rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
 
-               # Remove unneeded symlink for xdg
-               rm -rfv %{BUILDROOT}/etc/xdg/systemd
+               # Remove unneeded stuff for xdg
+               rm -rfv %{BUILDROOT}/etc/xdg
+
+               # Remove unneeded stuff for rpm.
+               rm -rvf %{BUILDROOT}/etc/rpm
 
                # Use journald. Enable the import of kernel messages.
                # Stop forwarding to a syslog daemon.
@@ -117,6 +122,9 @@ build
                        -e "s/^#ForwardToSyslog=.*$/ForwardToSyslog=no/" \
                        -e "s/^#ImportKernel=.*$/ImportKernel=yes/" \
                        -i %{BUILDROOT}/etc/systemd/journald.conf
+
+               # Install legacy tmpfile to autocreate /run/lock on startup.
+               install -v -m 644 %{DIR_APP}/tmpfiles.d/legacy.conf %{BUILDROOT}%{prefix}/lib/tmpfiles.d/
        end
 end
 
@@ -131,6 +139,7 @@ packages
                        hwdata
                        python-cairo
                        python-dbus
+                       python-gobject3
                        %{name}-units=%{thisver}
                        util-linux>=2.19
                end
@@ -148,6 +157,7 @@ packages
                end
 
                conflicts
+                       bash-completion < 2.1
                        dracut < 019
                        filesystem < 002
                        rsyslog < 5.8.6-4
@@ -261,6 +271,10 @@ packages
                end
        end
 
+       package %{name}-libs
+               template LIBS
+       end
+
        package %{name}-devel
                template DEVEL
 
@@ -280,7 +294,7 @@ packages
                end
 
                files
-                       %{libdir}/libgudev*.so.*
+                       %{libdir}/lib*udev*.so.*
                        %{libidr}/girepository*/
                end
        end