packages: wicd/wicd.spec - up to 1.6.2 - new subpackages - wicd-client-curs...

Fri Aug 21 17:56:18 CEST 2009

Author: cactus                       Date: Fri Aug 21 15:56:18 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.6.2
- new subpackages - wicd-client-curses, pm-utils-wicd
- some clean up's

---- Files affected:
packages/wicd:
   wicd.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.25 packages/wicd/wicd.spec:1.26

--- packages/wicd/wicd.spec:1.25	Thu Aug 20 23:03:51 2009
+++ packages/wicd/wicd.spec	Fri Aug 21 17:56:12 2009
@@ -1,14 +1,16 @@
 # $Revision$, $Date$
-# TODO: Fix files list
+# 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.9
-Release:	2
+Version:	1.6.2
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
-# Source0-md5:	4743a30eb8e3898b8b1a319b0c373ce5
+# Source0-md5:	29c418355610574e35490e340198ce08
 Patch0:		%{name}-init_status.patch
 URL:		http://wicd.net/
 # /etc/pld-release used to detect platform
@@ -35,10 +37,44 @@
 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
 %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
 
@@ -55,33 +91,6 @@
 %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}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{fa_IR,fa}
-
-
 %find_lang %{name}
 
 %clean
@@ -102,34 +111,62 @@
 %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/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
+
 %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.26  2009/08/21 15:56:12  cactus
+- up to 1.6.2
+- new subpackages - wicd-client-curses, pm-utils-wicd
+- some clean up's
+
 Revision 1.25  2009/08/20 21:03:51  cactus
 - fix daemon status and stop - send this patch upstream
 
================================================================

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

