dosfstools: Update to 3.0.26.

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

diff --git a/dbus/dbus.nm b/dbus/dbus.nm
index 7286d068a5a643f9c99c06e2147ad74709a72446..1531535eda870228ae6509e77a7222dd727931e7 100644 (file)
--- a/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@ -4,9 +4,10 @@
 ###############################################################################
 
 name       = dbus
-version    = 1.4.14
-release    = 2
+version    = 1.4.20
+release    = 1
 
+maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Daemons
 url        = http://www.freedesktop.org/software/dbus/
 license    = GPLv2+ AFL
@@ -24,33 +25,16 @@ build
        requires
                audit-devel
                expat-devel
+               libcap-ng-devel
                libselinux-devel
+               systemd-units
        end
 
        configure_options += \
-               --sysconfdir=/etc \
-               --localstatedir=/var \
-               --libdir=/lib \
-               --libexecdir=/lib \
                --enable-libaudit \
                --enable-selinux=yes \
-               --with-systemdsystemunitdir=/lib/systemd/system/ \
+               --with-systemdsystemunitdir=%{unitdir} \
                --with-dbus-user=dbus
-
-       install_cmds
-               mkdir -pv %{BUILDROOT}/usr/lib
-               mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
-
-               #change the arch-deps.h include directory to /usr/lib instead of /lib
-               sed -e 's@-I${libdir}@-I${prefix}/lib@' -i %{BUILDROOT}/usr/lib/pkgconfig/dbus-1.pc
-
-               mkdir -pv %{BUILDROOT}/usr/lib/dbus-1.0/include
-               mv -v %{BUILDROOT}/lib/dbus-1.0/include/* %{BUILDROOT}/usr/lib/dbus-1.0/include
-               rm -rvf %{BUILDROOT}/lib/dbus-1.0
-
-               rm -vf %{BUILDROOT}/lib/libdbus-1.so
-               ln -svf ../../lib/libdbus-1.so.3 %{BUILDROOT}/usr/lib/libdbus-1.so
-       end
 end
 
 packages
@@ -67,27 +51,27 @@ packages
 
                # Just search for new unit files that were just installed.
                script postin
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       systemctl daemon-reload >/dev/null 2>&1 || :
 
                        # The dbus service should be started on default.
-                       /bin/systemctl enable dbus.service > /dev/null 2>&1 || :
+                       systemctl enable dbus.service > /dev/null 2>&1 || :
                end
 
                # Disable the service that is to be removed and stop it if it is still running.
                script preun
-                       /bin/systemctl --no-reload disable dbus.service >/dev/null 2>&1 || :
-                       /bin/systemctl stop dbus.service >/dev/null 2>&1 || :
+                       systemctl --no-reload disable dbus.service >/dev/null 2>&1 || :
+                       systemctl stop dbus.service >/dev/null 2>&1 || :
                end
 
                # Just tell systemd that unitfiles have been removed.
                script postun
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       systemctl daemon-reload >/dev/null 2>&1 || :
                end
 
                # Try to restart the service if it is running.
                script postup
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-                       /bin/systemctl try-restart dbus.service >/dev/null 2>&1 || :
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+                       systemctl try-restart dbus.service >/dev/null 2>&1 || :
                end
        end
 
@@ -98,7 +82,7 @@ packages
        package %{name}-devel
                template DEVEL
 
-               files += /usr/lib/dbus-1.0
+               files += %{libdir}/dbus-1.0
        end
 
        package %{name}-debuginfo