packages: wicd/wicd.spec - resort translations - drop libexecdir, use datad...

Tue Jan 19 08:40:33 CET 2010

Author: glen                         Date: Tue Jan 19 07:40:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resort translations
- drop libexecdir, use datadir macro

---- Files affected:
packages/wicd:
   wicd.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.39 packages/wicd/wicd.spec:1.40

--- packages/wicd/wicd.spec:1.39	Mon Jan 18 21:55:24 2010
+++ packages/wicd/wicd.spec	Tue Jan 19 08:40:27 2010
@@ -4,9 +4,10 @@
 # - package (acpid-XXX):
 #   /etc/acpi/resume.d/80-wicd-connect.sh
 #   /etc/acpi/suspend.d/50-wicd-suspend.sh
-# - now python libraries installs into /usr/share/wicd by default, so I commented libexecdir redefinition. but its now easy to revert and change install behaviour simply uncomenting it
-# - translations installing is broken. fr and FR both exists, hack with renaming doesnt work for hr_HR and ar_PS isnt in glibc yet. something is really fucked up, because I cannot find fr_FR nowhere in source dir (find + grep), but instalation creates empty dirs that break installation later :/
-
+# - notes about translations:
+#   - duplicate fr and fr_FR exist, we prefer fr_FR
+#   - ar_PS (Palestine) isn't in glibc yet.
+#   - ar_EG (Egypt) isn't in glibc yet. using ar instead
 Summary:	wired and wireless network manager
 Summary(pl.UTF-8):	Zarządca sieci przewodowych i bezprzewodowych
 Name:		wicd
@@ -39,8 +40,6 @@
 #BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-#%define		_libexecdir	%{_prefix}/lib/%{name}
-
 %description
 Wicd is an open source wired and wireless network manager for Linux
 which aims to provide a simple interface to connect to networks with a
@@ -106,13 +105,13 @@
 %patch0 -p1
 %patch1 -p1
 
-mv translations/{ar_EG,ar} # WTF? Then what do with ar_PS?
-rm -rf translations/ar_PS # so removing it temporary until somebody put those dirs into glibc
+mv translations/{ar_EG,ar}
+rm -rf translations/ar_PS
 mv translations/{de_DE,de}
 mv translations/{es_ES,es}
 rm -rf translations/fr
-mv translations/{fr_FR,fr} # We got serious problem there, because both fr and fr_FR exsists and differs
-#mv translations/{hr_HR,hr} # Doesnt work for me
+mv translations/{fr_FR,fr}
+mv translations/{hr_HR,hr}
 mv translations/{it_IT,it}
 mv translations/{nl_NL,nl}
 mv translations/{no,nb}
@@ -122,11 +121,6 @@
 
 %build
 %{__python} setup.py configure \
-	--backends %{_libexecdir}/backends \
-	--cli %{_libexecdir}/cli \
-	--curses %{_libexecdir}/curses \
-	--daemon %{_libexecdir}/daemon \
-	--gtk %{_libexecdir}/gtk \
 	--pidfile /var/run/wicd.pid \
 	--pmutils %{_libdir}/pm-utils/sleep.d
 
@@ -147,6 +141,8 @@
 %find_lang %{name}
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+rm -f $RPM_BUILD_ROOT/var/lib/%{name}/configurations/.empty_on_purpose
+rm -f $RPM_BUILD_ROOT/var/log/%{name}/.empty_on_purpose
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -178,39 +174,40 @@
 /etc/dbus-1/system.d/wicd.conf
 %{_sysconfdir}/wicd
 %{_sysconfdir}/xdg/autostart/wicd-tray.desktop
-%dir %{_libexecdir}
-%dir %{_libexecdir}/backends
-%attr(755,root,root) %{_libexecdir}/backends/*.py
-%dir %{_libexecdir}/daemon
-%attr(755,root,root) %{_libexecdir}/daemon/*.py
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/backends
+%attr(755,root,root) %{_datadir}/%{name}/backends/*.py
+%dir %{_datadir}/%{name}/daemon
+%attr(755,root,root) %{_datadir}/%{name}/daemon/*.py
 %dir %{py_sitescriptdir}/wicd
 %{py_sitescriptdir}/wicd/*.py[co]
 %{py_sitescriptdir}/Wicd-*.egg-info
 %dir /var/lib/%{name}
+%dir /var/lib/%{name}/configurations
 /var/lib/%{name}/WHEREAREMYFILES
 %dir /var/log/%{name}
 
 %files client-cli
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/wicd-cli
-%dir %{_libexecdir}/cli
-%attr(755,root,root) %{_libexecdir}/cli/*.py
+%dir %{_datadir}/%{name}/cli
+%attr(755,root,root) %{_datadir}/%{name}/cli/*.py
 %{_mandir}/man8/wicd-cli.8*
 
 %files client-curses
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/wicd-curses
-%dir %{_libexecdir}/curses
-%attr(755,root,root) %{_libexecdir}/curses/*.py
+%dir %{_datadir}/%{name}/curses
+%attr(755,root,root) %{_datadir}/%{name}/curses/*.py
 %{_mandir}/man8/wicd-curses.8*
 %lang(nl) %{_mandir}/nl/man8/wicd-curses.8*
 
 %files client-gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/wicd-gtk
-%dir %{_libexecdir}/gtk
-%{_libexecdir}/gtk/%{name}.glade
-%attr(755,root,root) %{_libexecdir}/gtk/*.py
+%dir %{_datadir}/%{name}/gtk
+%{_datadir}/%{name}/gtk/%{name}.glade
+%attr(755,root,root) %{_datadir}/%{name}/gtk/*.py
 %{_datadir}/autostart/wicd-tray.desktop
 %{_desktopdir}/wicd.desktop
 %{_iconsdir}/hicolor/*/apps/wicd-gtk.*
@@ -229,14 +226,21 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2010/01/19 07:40:27  glen
+- resort translations
+- drop libexecdir, use datadir macro
+
 Revision 1.39  2010/01/18 20:55:24  evil
 - up to 1.7.0
 - package netherland's manuals
 - split GTK client from main to client subpackage
 - CLI client added
 - client subpackages descriptionss/summaries totally (were totally inconsistent)
-- commented _libexecdir redefinition (but setup reworked, so it can be uncommented and spec builds/works). not sure about that anyway
-- package installation doesnt work because of fr_FR, etc. but instalation scripts has been fucked by wicd devs (so its not mine fault and dont have time now to fix it)
+- commented _libexecdir redefinition (but setup reworked, so it can be
+  uncommented and spec builds/works). not sure about that anyway
+- package installation doesnt work because of fr_FR, etc. but instalation
+  scripts has been fucked by wicd devs (so its not mine fault and dont have
+  time now to fix it)
 
 Revision 1.38  2009/11/09 10:50:43  glen
 - back to arch due bad pm-utils packaging; rel 6
================================================================

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

