- use external python-iwscan, python-wpactrl packages, back to noarch

[packages/wicd.git] / wicd.spec

diff --git a/wicd.spec b/wicd.spec
index f289478227eed12ee1ed5ed685d477bcffed259a..cc9325aa3f4d261cad16d095d35680d53cf75a6d 100644 (file)
--- a/wicd.spec
+++ b/wicd.spec
@@ -1,17 +1,17 @@
 Summary:       wired and wireless network manager
 Summary(pl.UTF-8):     Zarządca sieci przewodowych i bezprzewodowych
 Name:          wicd
-Version:       1.6.2.1
-Release:       2
+Version:       1.6.2.2
+Release:       4
 License:       GPL v2
 Group:         X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
-# Source0-md5: 5d2668e12a4c7434ccde644d96c24cd0
+# Source0-md5: acbbe695abf7ff83161c62317dfc7509
+Source1:       %{name}.init
 Patch0:                %{name}-init_status.patch
-URL:           http://wicd.net/
+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
@@ -19,9 +19,12 @@ BuildRequires:       rpmbuild(macros) >= 1.228
 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
+Requires:      python-wpactrl
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,26 +67,21 @@ Skrypt wicd dla pm-utils.
 %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}
+mv translations/{ar_EG,ar}
+mv translations/{de_DE,de}
+mv translations/{es_ES,es}
+mv translations/{it_IT,it}
+mv translations/{nl_NL,nl}
+mv translations/{no,nb}
+mv translations/{ru_RU,ru}
 
+%build
 %{__python} setup.py configure \
        --backends %{_libdir}/%{name}/backends \
        --lib %{_libdir}/%{name} \
        --pidfile /var/run/wicd.pid \
        --pmutils %{_libdir}/pm-utils/sleep.d
 
-%build
-%{__python} setup.py build
-
-cd depends/python-iwscan
-%{__python} setup.py build
-cd ../python-wpactrl
 %{__python} setup.py build
 
 %install
@@ -92,17 +90,7 @@ rm -rf $RPM_BUILD_ROOT
        --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
-
-cd ../..
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wicd
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
@@ -110,6 +98,8 @@ cd ../..
 
 %find_lang %{name}
 
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -125,16 +115,18 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%doc AUTHORS CHANGES INSTALL 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
+%attr(754,root,root) /etc/rc.d/init.d/%{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*
+/etc/dbus-1/system.d/wicd.conf
 %{_sysconfdir}/wicd
 %{_sysconfdir}/xdg/autostart/wicd-tray.desktop
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
 
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/backends
@@ -142,19 +134,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/backends/*.py
 %exclude %{_libdir}/%{name}/*curses*.py
 
-%dir %{py_sitescriptdir}/wicd
-%{py_sitescriptdir}/wicd/*.py[co]
-%{py_sitescriptdir}/Wicd-*.egg-info
-
-%if "%{py_ver}" > "2.4"
-%{py_sitedir}/iwscan-*.egg-info
-%endif
-%{py_sitedir}/iwscan.so
-%if "%{py_ver}" > "2.4"
-%{py_sitedir}/wpactrl-*.egg-info
-%endif
-%{py_sitedir}/wpactrl.so
-
 %{_datadir}/%{name}
 %{_datadir}/autostart/wicd-tray.desktop
 
@@ -162,13 +141,14 @@ fi
 %{_iconsdir}/hicolor/*/apps/wicd-client.*
 %{_pixmapsdir}/%{name}
 
-/var/log/%{name}
+%dir %{py_sitescriptdir}/wicd
+%{py_sitescriptdir}/wicd/*.py[co]
+%{py_sitescriptdir}/Wicd-*.egg-info
 
-%{_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*
+%dir /var/lib/%{name}
+/var/lib/%{name}/WHEREAREMYFILES
+
+%dir /var/log/%{name}
 
 %files client-curses
 %defattr(644,root,root,755)