packages: NetworkManager/NetworkManager.spec - build with systemd session t...

[kiesiu]

Author: kiesiu                       Date: Sat Mar 31 22:47:54 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build with systemd session tracking by default; added a patch to fallback to ConsoleKit on runtime
- rel. 3

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.106 -> 1.107) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.106 packages/NetworkManager/NetworkManager.spec:1.107
--- packages/NetworkManager/NetworkManager.spec:1.106	Sat Mar 31 07:02:07 2012
+++ packages/NetworkManager/NetworkManager.spec	Sun Apr  1 00:47:49 2012
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build
-%bcond_with	systemd # rely on systemd for session tracking instead of ConsoleKit
+%bcond_without	systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
 %bcond_with	wimax	# enable wimax support
 #
 %define		ppp_version	2.4.5
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
 Version:	0.9.4.0
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Admin
@@ -21,6 +21,7 @@
 Source3:	%{name}.tmpfiles
 Patch0:		%{name}-pld.patch
 Patch1:		ifcfg-path.patch
+%{?with_systemd:Patch2: systemd-fallback.patch}
 URL:		http://projects.gnome.org/NetworkManager/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10
@@ -137,6 +138,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%{?with_systemd:%patch2 -p1}
 
 %build
 %{__gtkdocize}
@@ -166,7 +168,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},/usr/lib/tmpfiles.d} \
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{systemdtmpfilesdir}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections}
 
 %{__make} install \
@@ -177,7 +179,7 @@
 install -d $RPM_BUILD_ROOT/etc/init
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/init/NetworkManager.conf
 
-install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 # Cleanup
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -244,7 +246,7 @@
 %{systemdunitdir}/NetworkManager.service
 %{systemdunitdir}/NetworkManager-wait-online.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/gdb-cmd
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
@@ -311,6 +313,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107  2012/03/31 22:47:49  kiesiu
+- build with systemd session tracking by default; added a patch to fallback to ConsoleKit on runtime
+- rel. 3
+
 Revision 1.106  2012/03/31 05:02:07  qboosh
 - udev epoch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/NetworkManager/NetworkManager.spec?r1=1.106&r2=1.107