- rel 2;

- proper Group
- build depends for ioctl backend

Changed files:
    wicd.spec -> 1.30

diff --git a/wicd.spec b/wicd.spec
index 2ad1bca54bea4d0983b868148c593163e37a57e6..12a5f25381d09fee6eecb89dfc32462bf5a70033 100644 (file)
--- a/wicd.spec
+++ b/wicd.spec
@@ -2,9 +2,9 @@ Summary:        wired and wireless network manager
 Summary(pl.UTF-8):     Zarządca sieci przewodowych i bezprzewodowych
 Name:          wicd
 Version:       1.6.2.1
-Release:       1
+Release:       2
 License:       GPL v2
-Group:         X11/Applications
+Group:         X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
 # Source0-md5: 5d2668e12a4c7434ccde644d96c24cd0
 Patch0:                %{name}-init_status.patch
@@ -79,12 +79,29 @@ mv -f translations/{ru_RU,ru}
 %build
 %{__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
+
+cd ../..
+
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
@@ -127,6 +144,15 @@ fi
 %{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