- fix daemon status and stop - send this patch upstream

[packages/wicd.git] / wicd.spec

diff --git a/wicd.spec b/wicd.spec
index 4919f5087e2005d2fd4ea770f4a30376f23ae9e3..ff7cf316481d4a58ad84e2cce0a2c20a85157baa 100644 (file)
--- a/wicd.spec
+++ b/wicd.spec
@@ -1,14 +1,14 @@
-# TODO: Needs review
-# TODO: Fix daemon status and stop (wicd dead but subsys locked but daemon running)
+# TODO: Fix files list
 Summary:       wired and wireless network manager
 Summary(pl.UTF-8):     Zarządca sieci przewodowych i bezprzewodowych
 Name:          wicd
-Version:       1.5.1
-Release:       6
+Version:       1.5.9
+Release:       2
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
-# Source0-md5: dda372b0778de24552850d3d877d1b65
+# Source0-md5: 4743a30eb8e3898b8b1a319b0c373ce5
+Patch0:                %{name}-init_status.patch
 URL:           http://wicd.net/
 # /etc/pld-release used to detect platform
 BuildRequires: issue
@@ -36,7 +36,10 @@ różnorakimi opcjami.
 
 %prep
 %setup -q
-%{__python} setup.py configure
+%patch0 -p1
+
+%{__python} setup.py configure \
+       --pidfile /var/run/wicd.pid
 
 %build
 %{__python} setup.py build
@@ -53,8 +56,8 @@ rm -rf $RPM_BUILD_ROOT
 
 # no other ar exists here
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ar_EG,ar}
-# bg_BG is empty
-# %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/bg_BG
+# bg_BG is empty, it will not be packaged
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{bg,bg_bogus}
 # bogus? but see above
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{bg_PHO,bg}
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ca_ES,ca}
@@ -75,6 +78,8 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sv_SE,sv}
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{te_IN,te}
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ua,uk}
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{vi_VN,vi}
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{fa_IR,fa}
+
 
 %find_lang %{name}
 
@@ -111,8 +116,8 @@ fi
 %{_sysconfdir}/xdg/autostart/wicd-tray.desktop
 /etc/dbus-1/system.d/wicd.conf
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-/var/lib/%{name}
 /var/log/%{name}
+%{_mandir}/man1/wicd-client.1*
 %{_mandir}/man5/wicd-manager-settings.conf.5*
 %{_mandir}/man5/wicd-wired-settings.conf.5*
 %{_mandir}/man5/wicd-wireless-settings.conf.5*