-# TODO: Fix daemon status and stop (wicd dead but subsys locked but daemon running)
-# TODO: Fix files list
+# 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
+# - notes about translations:
+# - duplicate fr and fr_FR exist, we prefer fr_FR
+# - ar_PS (Palestine) isn't in glibc yet.
+# - ar_EG (Egypt) isn't in glibc yet. using ar instead
Summary: wired and wireless network manager
Summary(pl.UTF-8): Zarządca sieci przewodowych i bezprzewodowych
Name: wicd
-Version: 1.5.9
+Version: 1.7.0
Release: 1
License: GPL v2
-Group: X11/Applications
+Group: X11/Applications/Networking
Source0: http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
-# Source0-md5: 4743a30eb8e3898b8b1a319b0c373ce5
-URL: http://wicd.net/
+# Source0-md5: 003d2e67240989db55934553437ba32a
+Source1: %{name}.init
+Patch0: %{name}-init_status.patch
+Patch1: bashism.patch
+Patch2: %{name}-desktop.patch
+URL: http://www.wicd.net/
# /etc/pld-release used to detect platform
BuildRequires: issue
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
-BuildArch: noarch
+Requires: python-wpactrl
+# not noarch due pm-utils packaging stupidity
+#BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
mającym zapewnić prosty interfejs do podłączania do sieci z
różnorakimi opcjami.
+%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 text user interface (ncurses) client.
+
+%description client-curses -l pl.UTF-8
+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
+Summary(pl.UTF-8): Skrypt wicd dla pm-utils
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires: pm-utils
+
+%description -n pm-utils-wicd
+Wicd script for pm-utils.
+
+%description -n pm-utils-wicd -l pl.UTF-8
+Skrypt wicd dla pm-utils.
+
%prep
%setup -q
-%{__python} setup.py configure \
- --pidfile /var/run/wicd.pid
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+mv translations/{ar_EG,ar}
+rm -rf translations/ar_PS
+mv translations/{de_DE,de}
+mv translations/{es_ES,es}
+rm -rf translations/fr
+mv translations/{fr_FR,fr}
+mv translations/{hr_HR,hr}
+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},'
%build
+%{__python} setup.py configure \
+ --pidfile /var/run/wicd.pid \
+ --pmutils %{_libdir}/pm-utils/sleep.d
+
%{__python} setup.py build
%install
--optimize=2 \
--root=$RPM_BUILD_ROOT
+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}
%py_postclean
-# no other ar exists here
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ar_EG,ar}
-# bg_BG is empty, it will not be packaged
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{bg,bg_bogus}
-# bogus? but see above
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{bg_PHO,bg}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ca_ES,ca}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{cs_CZ,cs}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{da_DK,da}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{el_GR,el}
-# duplicate of gl_ES
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/es_GL
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{et_EE,et}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{eu_ES,eu}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{gl_ES,gl}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ko_KR,ko}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ml_IN,ml}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{no,nb}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sl_SI,sl}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sp_MX,es_MX}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sv_SE,sv}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{te_IN,te}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ua,uk}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{vi_VN,vi}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{fa_IR,fa}
-
-
%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+rm -f $RPM_BUILD_ROOT/var/lib/%{name}/configurations/.empty_on_purpose
+rm -f $RPM_BUILD_ROOT/var/log/%{name}/.empty_on_purpose
+
%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
-# NOTE: must be in /usr/lib even on 64bit systems
-%{_prefix}/lib/%{name}
-%attr(755,root,root) %{_prefix}/lib/%{name}/*.py
+%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
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/backends
+%attr(755,root,root) %{_datadir}/%{name}/backends/*.py
+%dir %{_datadir}/%{name}/daemon
+%attr(755,root,root) %{_datadir}/%{name}/daemon/*.py
%dir %{py_sitescriptdir}/wicd
%{py_sitescriptdir}/wicd/*.py[co]
%{py_sitescriptdir}/Wicd-*.egg-info
-%{_datadir}/%{name}
+%dir /var/lib/%{name}
+%dir /var/lib/%{name}/configurations
+/var/lib/%{name}/WHEREAREMYFILES
+%dir /var/log/%{name}
+
+%files client-cli
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/wicd-cli
+%dir %{_datadir}/%{name}/cli
+%attr(755,root,root) %{_datadir}/%{name}/cli/*.py
+%{_mandir}/man8/wicd-cli.8*
+
+%files client-curses
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/wicd-curses
+%dir %{_datadir}/%{name}/curses
+%attr(755,root,root) %{_datadir}/%{name}/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 %{_datadir}/%{name}/gtk
+%{_datadir}/%{name}/gtk/%{name}.glade
+%attr(755,root,root) %{_datadir}/%{name}/gtk/*.py
%{_datadir}/autostart/wicd-tray.desktop
%{_desktopdir}/wicd.desktop
-%{_iconsdir}/hicolor/*/apps/wicd-client.*
+%{_iconsdir}/hicolor/*/apps/wicd-gtk.*
%{_pixmapsdir}/%{name}
-%{_sysconfdir}/wicd
-%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
-/etc/dbus-1/system.d/wicd.conf
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-/var/log/%{name}
+%{_pixmapsdir}/wicd-gtk.xpm
%{_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*
+%lang(nl) %{_mandir}/nl/man1/wicd-client.1*
+
+%files -n pm-utils-wicd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/pm-utils/sleep.d/*wicd
projects / packages / wicd.git / blobdiff