packages: wicd/wicd.spec, wicd/org.wicd.daemon.service (NEW), wicd/wicd.ser...

[cactus]

Author: cactus                       Date: Tue Jan 17 17:17:21 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; add systemd subpackage

---- Files affected:
packages/wicd:
   wicd.spec (1.49 -> 1.50) , org.wicd.daemon.service (NONE -> 1.1)  (NEW), wicd.service (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.49 packages/wicd/wicd.spec:1.50
--- packages/wicd/wicd.spec:1.49	Thu Feb  3 20:02:39 2011
+++ packages/wicd/wicd.spec	Tue Jan 17 18:17:16 2012
@@ -13,12 +13,14 @@
 Summary(pl.UTF-8):	Zarządca sieci przewodowych i bezprzewodowych
 Name:		wicd
 Version:	1.7.0
-Release:	6
+Release:	7
 License:	GPL v2+
 Group:		X11/Applications/Networking
 Source0:	http://downloads.sourceforge.net/wicd/%{name}-%{version}.tar.gz
 # Source0-md5:	003d2e67240989db55934553437ba32a
 Source1:	%{name}.init
+Source2:	%{name}.service
+Source3:	org.wicd.daemon.service
 Patch0:		%{name}-init_status.patch
 Patch1:		bashism.patch
 Patch2:		%{name}-desktop.patch
@@ -126,6 +128,14 @@
 %description -n pm-utils-wicd -l pl.UTF-8
 Skrypt wicd dla pm-utils.
 
+%package systemd
+Summary:	systemd unit for wicd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description systemd
+systemd unit for wicd.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -162,6 +172,12 @@
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wicd
 
+# systemd
+install -d $RPM_BUILD_ROOT/%{systemdunitdir}
+install -d $RPM_BUILD_ROOT/%{_datadir}/dbus-1/system-services
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{systemdunitdir}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/dbus-1/system-services
+
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
@@ -185,6 +201,15 @@
 	/sbin/chkconfig --del %{name}
 fi
 
+%post systemd
+%systemd_post wicd.service
+
+%preun systemd
+%systemd_preun wicd.service
+
+%postun systemd
+%systemd_reload
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGES INSTALL README
@@ -248,12 +273,20 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/pm-utils/sleep.d/*wicd
 
+%files systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/wicd.service
+%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2012/01/17 17:17:16  cactus
+- rel 7; add systemd subpackage
+
 Revision 1.49  2011/02/03 19:02:39  lisu
 - use __rm and sed macros
 - S: wireless-tools

================================================================
Index: packages/wicd/org.wicd.daemon.service
diff -u /dev/null packages/wicd/org.wicd.daemon.service:1.1
--- /dev/null	Tue Jan 17 18:17:21 2012
+++ packages/wicd/org.wicd.daemon.service	Tue Jan 17 18:17:16 2012
@@ -0,0 +1,11 @@
+# This D-Bus service activation file is only for systemd support since
+# an auto-activated wicd would be quite surprising for those people
+# who have wicd installed but turned off.  Thus the Exec path available to
+# D-Bus is /bin/false, but systemd knows the real Exec path due to the
+# wicd systemd .service file.
+
+[D-BUS Service]
+Name=org.wicd.daemon
+Exec=/bin/false
+User=root
+SystemdService=dbus-org.wicd.daemon.service

================================================================
Index: packages/wicd/wicd.service
diff -u /dev/null packages/wicd/wicd.service:1.1
--- /dev/null	Tue Jan 17 18:17:21 2012
+++ packages/wicd/wicd.service	Tue Jan 17 18:17:16 2012
@@ -0,0 +1,15 @@
+[Unit]
+Description=Wicd a wireless and wired network manager for Linux
+After=syslog.target
+Wants=network.target
+Before=network.target
+Conflicts=NetworkManager.service
+
+[Service]
+Type=dbus
+BusName=org.wicd.daemon
+ExecStart=/usr/sbin/wicd --no-daemon
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-org.wicd.daemon.service
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wicd/wicd.spec?r1=1.49&r2=1.50&f=u