Merge remote-tracking branch 'ms/kernel-3.2'

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

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 9dac8a92bde1a7349c70bea28717b6b02a0c4f70..3a6adddd255fddfa98d1e50a1b555586f5effb2c 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 36
-release    = 2
+version    = 37
+release    = 4
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -18,9 +18,7 @@ description
        SysV and LSB init scripts.
 end
 
-conflicts += upstart
-
-source_dl  = http://cgit.freedesktop.org/systemd/snapshot/
+source_dl  = http://cgit.freedesktop.org/systemd/systemd/snapshot/
 
 build
        requires
@@ -29,7 +27,10 @@ build
                autoconf
                cryptsetup-luks-devel
                dbus-devel
+               docbook-utils
+               docbook-xsl
                gperf
+               gettext-devel
                intltool
                libacl-devel
                libcap-devel
@@ -37,17 +38,16 @@ build
                libtool
                libudev-devel>=172
                pam-devel
+               vala
        end
 
        configure_options += \
                --sysconfdir=/etc \
-               --libexecdir=/usr/lib \
+               --libexecdir=%{libdir} \
                --with-rootdir= \
-               --with-distro=other \
-               --with-sysvinit-path= \
-               --with-sysvrcd-path= \
+               --with-distro=ipfire \
                --with-udevrulesdir=/lib/udev/rules.d/ \
-               --with-pamlibdir=/lib/security
+               --with-pamlibdir=/%{lib}/security
 
        prepare_cmds
                ./autogen.sh ac
@@ -111,11 +111,13 @@ packages
                        dbus
                        python-cairo
                        python-dbus
+                       %{name}-units=%{thisver}
                        udev>=172
                        util-linux>=2.19
                end
 
                prerequires += authconfig
+               conflicts += upstart
 
                script postin
                        # Generate Machine ID.
@@ -138,7 +140,7 @@ packages
                        /bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
                end
        end
-       
+
        # Package information for systemd-units
        package %{name}-units
                summary =  Configuration files, directories and installation tool for systemd.
@@ -146,7 +148,12 @@ packages
                        This package contains all needed configuration files, directories
                        and installation / configuration tool for systemd.
                end
-       
+
+               prerequires
+                       /bin/sh
+                       coreutils
+               end
+
                files
                        /etc/systemd/system
                        /etc/tmpfiles.d
@@ -159,25 +166,29 @@ packages
 
                script postin
                        # Enable default services.
-                       systemctl enable \
+                       /bin/systemctl enable \
                                getty@.service \
                                remote-fs.target > /dev/null 2>&1 || :
                end
 
                script preun
                        # Disable default services.
-                       systemctl disable \
+                       /bin/systemctl disable \
                                getty@.service \
                                remote-fs.target > /dev/null 2>&1 || :
                end
 
                script postup
                        # Reload service files
-                       systemctl daemon-reload > /dev/null 2>&1 || :
+                       /bin/systemctl daemon-reload > /dev/null 2>&1 || :
                end
        end
-       
+
        package %{name}-devel
                template DEVEL
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end