packages: wicd/wicd.spec - back to arch due bad pm-utils packaging; rel 6

[glen]

Author: glen                         Date: Mon Nov  9 10:50:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- back to arch due bad pm-utils packaging; rel 6

---- Files affected:
packages/wicd:
   wicd.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.37 packages/wicd/wicd.spec:1.38
--- packages/wicd/wicd.spec:1.37	Fri Nov  6 21:49:31 2009
+++ packages/wicd/wicd.spec	Mon Nov  9 11:50:43 2009
@@ -1,9 +1,14 @@
 # $Revision$, $Date$
+# TODO
+# - fix pm-utils to store addons in non-arch dependant path so we could make this pkg noarch
+# - package (acpid-XXX):
+#   /etc/acpi/resume.d/80-wicd-connect.sh
+#   /etc/acpi/suspend.d/50-wicd-suspend.sh
 Summary:	wired and wireless network manager
 Summary(pl.UTF-8):	Zarządca sieci przewodowych i bezprzewodowych
 Name:		wicd
 Version:	1.6.2.2
-Release:	5
+Release:	6
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
@@ -27,9 +32,12 @@
 Requires:	python-pygtk-glade >= 2:2.0
 Requires:	python-pygtk-gtk >= 2:2.0
 Requires:	python-wpactrl
-BuildArch:	noarch
+# not noarch due pm-utils packaging stupidity
+#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
@@ -83,8 +91,6 @@
 
 %build
 %{__python} setup.py configure \
-	--backends %{_libdir}/%{name}/backends \
-	--lib %{_libdir}/%{name} \
 	--pidfile /var/run/wicd.pid \
 	--pmutils %{_libdir}/pm-utils/sleep.d
 
@@ -134,11 +140,11 @@
 %{_sysconfdir}/wicd
 %{_sysconfdir}/xdg/autostart/wicd-tray.desktop
 
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/backends
-%attr(755,root,root) %{_libdir}/%{name}/*.py
-%attr(755,root,root) %{_libdir}/%{name}/backends/*.py
-%exclude %{_libdir}/%{name}/*curses*.py
+%dir %{_libexecdir}
+%dir %{_libexecdir}/backends
+%attr(755,root,root) %{_libexecdir}/*.py
+%attr(755,root,root) %{_libexecdir}/backends/*.py
+%exclude %{_libexecdir}/*curses*.py
 
 %{_datadir}/%{name}
 %{_datadir}/autostart/wicd-tray.desktop
@@ -159,7 +165,7 @@
 %files client-curses
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/wicd-curses
-%attr(755,root,root) %{_libdir}/%{name}/*curses*.py
+%attr(755,root,root) %{_libexecdir}/*curses*.py
 %{_mandir}/man8/wicd-curses.8*
 
 %files -n pm-utils-wicd
@@ -172,6 +178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2009/11/09 10:50:43  glen
+- back to arch due bad pm-utils packaging; rel 6
+
 Revision 1.37  2009/11/06 20:49:31  glen
 - cleanup shebangs; rel 5
 
================================================================

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