packages: wicd/wicd.spec - use external python-iwscan, python-wpactrl packa...

[glen]

Author: glen                         Date: Fri Nov  6 20:37:57 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use external python-iwscan, python-wpactrl packages, back to noarch
- previous versions always obsoleted by newer one, drop pointless self obsolete
- rel 4

---- Files affected:
packages/wicd:
   wicd.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.35 packages/wicd/wicd.spec:1.36
--- packages/wicd/wicd.spec:1.35	Fri Nov  6 18:43:09 2009
+++ packages/wicd/wicd.spec	Fri Nov  6 21:37:51 2009
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Zarządca sieci przewodowych i bezprzewodowych
 Name:		wicd
 Version:	1.6.2.2
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
@@ -13,7 +13,6 @@
 URL:		http://www.wicd.net/
 # /etc/pld-release used to detect platform
 BuildRequires:	issue
-BuildRequires:	libiw-devel
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
@@ -21,10 +20,12 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	dbus(org.freedesktop.Notifications)
 Requires:	python-dbus
+Requires:	python-iwscan
 Requires:	python-pygobject
 Requires:	python-pygtk-glade >= 2:2.0
 Requires:	python-pygtk-gtk >= 2:2.0
-Obsoletes:	wicd < 1.6.0
+Requires:	python-wpactrl
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -84,32 +85,14 @@
 
 %{__python} setup.py build
 
-cd depends/python-iwscan
-%{__python} setup.py build
-cd ../python-wpactrl
-%{__python} setup.py build
-
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__python} setup.py install \
-	--optimize=2 \
-	--root=$RPM_BUILD_ROOT
-
-cd depends/python-iwscan
-%{__python} setup.py install \
-	--optimize=2 \
-	--root=$RPM_BUILD_ROOT
-
-cd ../python-wpactrl
 %{__python} setup.py install \
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wicd
 
-cd ../..
-
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
@@ -163,14 +146,6 @@
 %{py_sitescriptdir}/wicd/*.py[co]
 %{py_sitescriptdir}/Wicd-*.egg-info
 
-%{py_sitedir}/iwscan.so
-%{py_sitedir}/wpactrl.so
-
-%if "%{py_ver}" > "2.4"
-%{py_sitedir}/iwscan-*.egg-info
-%{py_sitedir}/wpactrl-*.egg-info
-%endif
-
 %dir /var/lib/%{name}
 /var/lib/%{name}/WHEREAREMYFILES
 
@@ -192,6 +167,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2009/11/06 20:37:51  glen
+- use external python-iwscan, python-wpactrl packages, back to noarch
+- previous versions always obsoleted by newer one, drop pointless self obsolete
+- rel 4
+
 Revision 1.35  2009/11/06 17:43:09  glen
 - pldize; rel 3
 
================================================================

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