systemd: Update to 201.

* Remove old patch for branding, because this doens't work in this way anymore.
* Drop rpm stuff, we don't want to ship that.
* Add dependeny to python-gobect3 for systemd-analyze.

Fixes #10327.

diff --git a/systemd/patches/systemd-187-ipfire.patch b/systemd/patches/systemd-187-ipfire.patch
deleted file mode 100644 (file)
index fbd8ea6..0000000
--- a/systemd/patches/systemd-187-ipfire.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur a/configure.ac b/configure.ac
---- a/configure.ac     2012-07-20 00:40:32.000000000 +0200
-+++ b/configure.ac     2012-07-26 21:01:58.319135633 +0200
-@@ -504,7 +504,7 @@
- AC_PATH_PROG([XSLTPROC], [xsltproc])
- AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
- 
--AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other]))
-+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom, ipfire or other]))
- if test "z$with_distro" = "z"; then
-         if test "$cross_compiling" = yes; then
-                 AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
-@@ -587,6 +587,12 @@
-                 AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia])
-                 M4_DEFINES=-DTARGET_MAGEIA=1
-                 ;;
-+      ipfire)
-+              SYSTEM_SYSVINIT_PATH=
-+              SYSTEM_SYSVRCND_PATH=
-+              AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire])
-+                M4_DEFINES=-DTARGET_IPFIRE=1
-+              ;;
-         other)
-                 ;;
-         *)
-@@ -639,6 +645,7 @@
- AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva)
- AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom)
- AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia)
-+AM_CONDITIONAL(TARGET_IPFIRE, test x"$with_distro" = xipfire)
- 
- AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")
- 

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index d93414bc3f712bf8d3398cb8817e1ba89c9886ce..9c1ca212ccf7f8e805e340135d01d3b8b3c7698b 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 196
-release    = 3
+version    = 201
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -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.
@@ -134,6 +139,7 @@ packages
                        hwdata
                        python-cairo
                        python-dbus
+                       python-gobject3
                        %{name}-units=%{thisver}
                        util-linux>=2.19
                end
@@ -151,6 +157,7 @@ packages
                end
 
                conflicts
+                       bash-completion < 2.1
                        dracut < 019
                        filesystem < 002
                        rsyslog < 5.8.6-4