[NetworkManager/f14/master] Specfile fixes for systemd support
Daniel Williams
dcbw at fedoraproject.org
Tue Aug 17 14:54:55 UTC 2010
commit ef66b584a219313599c9ddb9bc9cd9a1c8e3050d
Author: Dan Williams <dcbw at redhat.com>
Date: Tue Aug 17 09:56:29 2010 -0500
Specfile fixes for systemd support
NetworkManager.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index abb78a7..ab93dba 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,5 +1,3 @@
-%define udev_scriptdir /lib/udev
-
%define dbus_version 1.1
%define dbus_glib_version 0.86-4
@@ -82,6 +80,9 @@ BuildRequires: desktop-file-utils
%ifnarch s390 s390x
BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
%endif
+%if 0%{?fedora} >= 14
+BuildRequires: systemd
+%endif
%description
NetworkManager is a system network service that manages your network devices
@@ -324,7 +325,12 @@ fi
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
%{_datadir}/polkit-1/actions/*.policy
-%{udev_scriptdir}/rules.d/*.rules
+/lib/udev/rules.d/*.rules
+# systemd stuff
+%if 0%{?fedora} >= 14
+/lib/systemd/system/NetworkManager.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+%endif
%files devel
%defattr(-,root,root,0755)
More information about the scm-commits
mailing list