- up to 1.6.2

[packages/wicd.git] / wicd.spec

diff --git a/wicd.spec b/wicd.spec
index d46be07a118da3db58dfba5149d30da7eb2db394..9d87d4a0d4be92d061b67b9a3e91dcbb49c5c545 100644 (file)
--- a/wicd.spec
+++ b/wicd.spec
@@ -1,14 +1,16 @@
-# TODO: Needs review
-# TODO: Fix daemon status and stop (wicd dead but subsys locked but daemon running)
+# TODO:
+#      - Fix files list
+#      - mv from /lib/ to /lib64/ on x86_64
 Summary:       wired and wireless network manager
 Summary(pl.UTF-8):     Zarządca sieci przewodowych i bezprzewodowych
 Name:          wicd
-Version:       1.5.1
-Release:       8
+Version:       1.6.2
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
-# Source0-md5: dda372b0778de24552850d3d877d1b65
+# Source0-md5: 29c418355610574e35490e340198ce08
+Patch0:                %{name}-init_status.patch
 URL:           http://wicd.net/
 # /etc/pld-release used to detect platform
 BuildRequires: issue
@@ -34,9 +36,46 @@ Wicd jest zarządcą sieci przewodowych i bezprzewodowych dla Linuksa,
 mającym zapewnić prosty interfejs do podłączania do sieci z
 różnorakimi opcjami.
 
+%package client-curses
+Summary:       wicd console client
+Summary(pl.UTF-8):     klient wicd dla konsoli
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+Requires:      python-urwid
+
+%description client-curses
+wicd curses client.
+
+%description client-curses -l pl.UTF-8
+Klient wicd dla konsoli.
+
+%package -n pm-utils-wicd
+Summary:       wicd script for pm-utils
+Summary(pl.UTF-8):     Skrypt wicd dla pm-utils
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+Requires:      pm-utils
+
+%description -n pm-utils-wicd
+wicd script for pm-utils.
+
+%description -n pm-utils-wicd -l pl.UTF-8
+Skrypt wicd dla pm-utils.
+
 %prep
 %setup -q
-%{__python} setup.py configure
+%patch0 -p1
+
+mv -f translations/{ar_EG,ar}
+mv -f translations/{de_DE,de}
+mv -f translations/{es_ES,es}
+mv -f translations/{it_IT,it}
+mv -f translations/{nl_NL,nl}
+mv -f translations/{no,nb}
+mv -f translations/{ru_RU,ru}
+
+%{__python} setup.py configure \
+       --pidfile /var/run/wicd.pid
 
 %build
 %{__python} setup.py build
@@ -51,31 +90,6 @@ rm -rf $RPM_BUILD_ROOT
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
-# no other ar exists here
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ar_EG,ar}
-# 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}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{cs_CZ,cs}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{da_DK,da}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{el_GR,el}
-# duplicate of gl_ES
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/es_GL
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{et_EE,et}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{eu_ES,eu}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{gl_ES,gl}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ko_KR,ko}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ml_IN,ml}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{no,nb}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sl_SI,sl}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sp_MX,es_MX}
-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}
-
 %find_lang %{name}
 
 %clean
@@ -96,24 +110,47 @@ fi
 %doc AUTHORS README
 %attr(755,root,root) %{_bindir}/wicd-client
 %attr(755,root,root) %{_sbindir}/wicd
+#% {_sysconfdir}/acpi/resume.d/80-wicd-connect.sh
+#% {_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh
+
+%{_sysconfdir}/dbus-1/system.d/wicd.conf
+%{_sysconfdir}/wicd
+%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+
 # NOTE: must be in /usr/lib even on 64bit systems
-%{_prefix}/lib/%{name}
+%dir %{_prefix}/lib/%{name}
+%dir %{_prefix}/lib/%{name}/backends
 %attr(755,root,root) %{_prefix}/lib/%{name}/*.py
+%attr(755,root,root) %{_prefix}/lib/%{name}/backends/*.py
+%exclude %{_prefix}/lib/%{name}/*curses*.py
+
 %dir %{py_sitescriptdir}/wicd
 %{py_sitescriptdir}/wicd/*.py[co]
 %{py_sitescriptdir}/Wicd-*.egg-info
+
 %{_datadir}/%{name}
 %{_datadir}/autostart/wicd-tray.desktop
+
 %{_desktopdir}/wicd.desktop
 %{_iconsdir}/hicolor/*/apps/wicd-client.*
 %{_pixmapsdir}/%{name}
-%{_sysconfdir}/wicd
-%{_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*
 %{_mandir}/man8/wicd.8*
+
+%files client-curses
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/wicd-curses
+%attr(755,root,root) %{_prefix}/lib/%{name}/*curses*.py
+
+%{_mandir}/man8/wicd-curses.8*
+
+%files -n pm-utils-wicd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/pm-utils/sleep.d/*wicd