Author: baggins Date: Sun Feb 5 17:03:44 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 8 - merged systemd stuff into main package
---- Files affected: packages/wicd: wicd.spec (1.52 -> 1.53) ---- Diffs: ================================================================ Index: packages/wicd/wicd.spec diff -u packages/wicd/wicd.spec:1.52 packages/wicd/wicd.spec:1.53 --- packages/wicd/wicd.spec:1.52 Wed Jan 18 10:32:04 2012 +++ packages/wicd/wicd.spec Sun Feb 5 18:03:39 2012 @@ -13,7 +13,7 @@ Summary(pl.UTF-8): Zarządca sieci przewodowych i bezprzewodowych Name: wicd Version: 1.7.0 -Release: 7 +Release: 8 License: GPL v2+ Group: X11/Applications/Networking Source0: http://downloads.sourceforge.net/wicd/%{name}-%{version}.tar.gz @@ -41,6 +41,7 @@ Requires: python-pygtk-glade >= 2:2.0 Requires: python-pygtk-gtk >= 2:2.0 Requires: python-wpactrl +Requires: systemd-units >= 0.38 Suggests: wireless-tools # not noarch due pm-utils packaging stupidity #BuildArch: noarch @@ -128,15 +129,6 @@ %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} -Requires: systemd-units - -%description systemd -systemd unit for wicd. - %prep %setup -q %patch0 -p1 @@ -195,22 +187,21 @@ %post /sbin/chkconfig --add %{name} %service %{name} restart +%systemd_post wicd.service %preun if [ "$1" = "0" ]; then %service -q %{name} stop /sbin/chkconfig --del %{name} fi - -%post systemd -%systemd_post wicd.service - -%preun systemd %systemd_preun wicd.service -%postun systemd +%postun %systemd_reload +%triggerpostun -- %{name} < 1.7.0-8 +%systemd_trigger wicd.service + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS CHANGES INSTALL README @@ -225,6 +216,8 @@ %lang(nl) %{_mandir}/nl/man5/wicd-wireless-settings.conf.5* %{_mandir}/man8/wicd.8* %lang(nl) %{_mandir}/nl/man8/wicd.8* +%{systemdunitdir}/wicd.service +%{_datadir}/dbus-1/system-services/org.wicd.daemon.service /etc/dbus-1/system.d/wicd.conf %{_sysconfdir}/wicd %dir %{_datadir}/%{name} @@ -274,17 +267,16 @@ %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 <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.53 2012/02/05 17:03:39 baggins +- rel 8 +- merged systemd stuff into main package + Revision 1.52 2012/01/18 09:32:04 glen - deps for systemd, according to PLD-doc/BuildRequires.txt ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wicd/wicd.spec?r1=1.52&r2=1.53&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
