packages: wicd/wicd.spec - rel 2; fix wicd libdir on x86_64

[cactus]

Author: cactus                       Date: Fri Aug 21 16:41:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix wicd libdir on x86_64

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

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.26 packages/wicd/wicd.spec:1.27
--- packages/wicd/wicd.spec:1.26	Fri Aug 21 17:56:12 2009
+++ packages/wicd/wicd.spec	Fri Aug 21 18:41:05 2009
@@ -1,12 +1,9 @@
 # $Revision$, $Date$
-# 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.6.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
@@ -76,7 +73,10 @@
 mv -f translations/{ru_RU,ru}
 
 %{__python} setup.py configure \
-	--pidfile /var/run/wicd.pid
+	--backends %{_libdir}/%{name}/backends \
+	--lib %{_libdir}/%{name} \
+	--pidfile /var/run/wicd.pid \
+	--pmutils %{_libdir}/pm-utils/sleep.d
 
 %build
 %{__python} setup.py build
@@ -119,12 +119,11 @@
 %{_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
-%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 %{_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 %{py_sitescriptdir}/wicd
 %{py_sitescriptdir}/wicd/*.py[co]
@@ -148,8 +147,7 @@
 %files client-curses
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/wicd-curses
-%attr(755,root,root) %{_prefix}/lib/%{name}/*curses*.py
-
+%attr(755,root,root) %{_libdir}/%{name}/*curses*.py
 %{_mandir}/man8/wicd-curses.8*
 
 %files -n pm-utils-wicd
@@ -162,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2009/08/21 16:41:05  cactus
+- rel 2; fix wicd libdir on x86_64
+
 Revision 1.26  2009/08/21 15:56:12  cactus
 - up to 1.6.2
 - new subpackages - wicd-client-curses, pm-utils-wicd
================================================================

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