+# 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
+# - now python libraries installs into /usr/share/wicd by default, so I commented libexecdir redefinition. but its now easy to revert and change install behaviour simply uncomenting it
+# - translations installing is broken. fr and FR both exists, hack with renaming doesnt work for hr_HR and ar_PS isnt in glibc yet. something is really fucked up, because I cannot find fr_FR nowhere in source dir (find + grep), but instalation creates empty dirs that break installation later :/
+
Summary: wired and wireless network manager
Summary(pl.UTF-8): Zarządca sieci przewodowych i bezprzewodowych
Name: wicd
-Version: 1.6.2.2
-Release: 1
+Version: 1.7.0
+Release: 0.1
License: GPL v2
Group: X11/Applications/Networking
Source0: http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
-# Source0-md5: acbbe695abf7ff83161c62317dfc7509
+# Source0-md5: 003d2e67240989db55934553437ba32a
+Source1: %{name}.init
Patch0: %{name}-init_status.patch
-URL: http://wicd.net/
+Patch1: bashism.patch
+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
BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: sed >= 4.0
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
+# 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
mającym zapewnić prosty interfejs do podłączania do sieci z
różnorakimi opcjami.
-%package client-curses
-Summary: wicd console client
-Summary(pl.UTF-8): klient wicd dla konsoli
+%package client-cli
+Summary: wicd CLI client
+Summary(pl.UTF-8): klient wicd CLI
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: python-urwid
+%description client-cli
+Wicd command line interface (ncurses) client.
+
+%description client-cli -l pl.UTF-8
+Klient wicd z międzymordziem wiersza poleceń (ncurses).
+
+%package client-curses
+Summary: wicd TUI client
+Summary(pl.UTF-8): klient wicd z TUI
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
%description client-curses
-wicd curses client.
+Wicd text user interface (ncurses) client.
%description client-curses -l pl.UTF-8
-Klient wicd dla konsoli.
+Klient Wicd z tesktowym międzymordziem uzytkownika (ncurses).
+
+%package client-gtk
+Summary: wicd GUI client
+Summary(pl.UTF-8): klient wicd z GUI
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description client-gtk
+Wicd graphical user interface (GTK+2) client.
+
+%description client-gtk -l pl.UTF-8
+Klient Wicd z graficznym międzymordziem użytkownika (GTK+2).
%package -n pm-utils-wicd
Summary: wicd script for pm-utils
Requires: pm-utils
%description -n pm-utils-wicd
-wicd script for pm-utils.
+Wicd script for pm-utils.
%description -n pm-utils-wicd -l pl.UTF-8
Skrypt wicd dla pm-utils.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+
+mv translations/{ar_EG,ar} # WTF? Then what do with ar_PS?
+rm -rf translations/ar_PS # so removing it temporary until somebody put those dirs into glibc
+mv translations/{de_DE,de}
+mv translations/{es_ES,es}
+rm -rf translations/fr
+mv translations/{fr_FR,fr} # We got serious problem there, because both fr and fr_FR exsists and differs
+#mv translations/{hr_HR,hr} # Doesnt work for me
+mv translations/{it_IT,it}
+mv translations/{nl_NL,nl}
+mv translations/{no,nb}
+mv translations/{ru_RU,ru}
+
+grep -r bin/env.*python -l . | xargs sed -i -e '1s,^#!.*env python,#!%{__python},'
-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}
-
+%build
%{__python} setup.py configure \
- --backends %{_libdir}/%{name}/backends \
- --lib %{_libdir}/%{name} \
+ --backends %{_libexecdir}/backends \
+ --cli %{_libexecdir}/cli \
+ --curses %{_libexecdir}/curses \
+ --daemon %{_libexecdir}/daemon \
+ --gtk %{_libexecdir}/gtk \
--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
--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}
%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
%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}/man5/wicd-manager-settings.conf.5*
+%lang(nl) %{_mandir}/nl/man5/wicd-manager-settings.conf.5*
+%{_mandir}/man5/wicd-wired-settings.conf.5*
+%lang(nl) %{_mandir}/nl/man5/wicd-wired-settings.conf.5*
+%{_mandir}/man5/wicd-wireless-settings.conf.5*
+%lang(nl) %{_mandir}/nl/man5/wicd-wireless-settings.conf.5*
+%{_mandir}/man8/wicd.8*
+%lang(nl) %{_mandir}/nl/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
-%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}/backends/*.py
+%dir %{_libexecdir}/daemon
+%attr(755,root,root) %{_libexecdir}/daemon/*.py
%dir %{py_sitescriptdir}/wicd
%{py_sitescriptdir}/wicd/*.py[co]
%{py_sitescriptdir}/Wicd-*.egg-info
+%dir /var/lib/%{name}
+/var/lib/%{name}/WHEREAREMYFILES
+%dir /var/log/%{name}
-%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
-
-%{_desktopdir}/wicd.desktop
-%{_iconsdir}/hicolor/*/apps/wicd-client.*
-%{_pixmapsdir}/%{name}
-
-/var/log/%{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*
+%files client-cli
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/wicd-cli
+%dir %{_libexecdir}/cli
+%attr(755,root,root) %{_libexecdir}/cli/*.py
+%{_mandir}/man8/wicd-cli.8*
%files client-curses
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/wicd-curses
-%attr(755,root,root) %{_libdir}/%{name}/*curses*.py
+%dir %{_libexecdir}/curses
+%attr(755,root,root) %{_libexecdir}/curses/*.py
%{_mandir}/man8/wicd-curses.8*
+%lang(nl) %{_mandir}/nl/man8/wicd-curses.8*
+
+%files client-gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/wicd-gtk
+%dir %{_libexecdir}/gtk
+%{_libexecdir}/gtk/%{name}.glade
+%attr(755,root,root) %{_libexecdir}/gtk/*.py
+%{_datadir}/autostart/wicd-tray.desktop
+%{_desktopdir}/wicd.desktop
+%{_iconsdir}/hicolor/*/apps/wicd-gtk.*
+%{_pixmapsdir}/%{name}
+%{_pixmapsdir}/wicd-gtk.xpm
+%{_mandir}/man1/wicd-client.1*
+%lang(nl) %{_mandir}/nl/man1/wicd-client.1*
%files -n pm-utils-wicd
%defattr(644,root,root,755)
projects / packages / wicd.git / blobdiff