X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=wicd.spec;h=26124cc8e79ddcf235070ec5a5234ab5c4f97620;hb=a6143590cbd3c76424821a64a76b7f01fd84d574;hp=7bed043bed3c73e34a156f98850122a8659598f2;hpb=478429ab14c1a9b53cb155e0e0148fef5ebb890b;p=packages%2Fwicd.git

diff --git a/wicd.spec b/wicd.spec
index 7bed043..26124cc 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -1,26 +1,49 @@
-# TODO: Needs review
-# TODO: Fix daemon status and stop (wicd dead but subsys locked but daemon running)
+# 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(hu.UTF-8):	Vezeték és vezeték néklküli hálózati menedzser
 Summary(pl.UTF-8):	Zarządca sieci przewodowych i bezprzewodowych
 Name:		wicd
-Version:	1.5.1
-Release:	5
-License:	GPL v2
-Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
-# Source0-md5:	dda372b0778de24552850d3d877d1b65
-URL:		http://wicd.net/
+Version:	1.7.0
+Release:	8
+License:	GPL v2+
+Group:		X11/Applications/Networking
+Source0:	http://downloads.sourceforge.net/wicd/%{name}-%{version}.tar.gz
+# Source0-md5:	003d2e67240989db55934553437ba32a
+Source1:	%{name}.init
+Source2:	%{name}.service
+Source3:	org.%{name}.daemon.service
+Patch0:		%{name}-init_status.patch
+Patch1:		bashism.patch
+Patch2:		%{name}-desktop.patch
+Patch3:		no-deepcopy.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:	rpmbuild(macros) >= 1.623
+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
+Requires:	systemd-units >= 0.38
+Suggests:	wireless-tools
+# not noarch due pm-utils packaging stupidity
+#BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -28,16 +51,109 @@ 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
 wide variety of settings.
 
+%description  -l hu.UTF-8
+Wicd egy nyílt forráskódú vezeték és vezeték nélküli menedzser
+Linuxhoz, maely egy egyszerű felületet biztosít hálózatokhoz való
+csatlakozásokhoz a beállítások széles tárházával.
+
 %description -l pl.UTF-8
 Wicd jest zarządcą sieci przewodowych i bezprzewodowych dla Linuksa,
 mającym zapewnić prosty interfejs do podłączania do sieci z
 różnorakimi opcjami.
 
+%package client-cli
+Summary:	wicd CLI client
+Summary(hu.UTF-8):	wicd CLI kliens
+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 hu.UTF-8
+Wicd parancssoros (ncurses) kliens.
+
+%description client-cli -l pl.UTF-8
+Klient Wicd z międzymordziem wiersza poleceń (ncurses).
+
+%package client-curses
+Summary:	wicd TUI client
+Summary(hu.UTF-8):	wicd TUI kliens
+Summary(pl.UTF-8):	Klient wicd z TUI
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+Requires:	python-urwid
+
+%description client-curses
+Wicd text user interface (ncurses) client.
+
+%description client-curses -l hu.UTF-8
+Wicd szöveges (ncurses) kliens.
+
+%description client-curses -l pl.UTF-8
+Klient Wicd z tesktowym międzymordziem uzytkownika (ncurses).
+
+%package client-gtk
+Summary:	wicd GUI client
+Summary(hu.UTF-8):	wicd GUI kliens
+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 hu.UTF-8
+Wicd grafikus (GTK+2) kliens.
+
+%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(hu.UTF-8):	wicd szkript pm-utils-hoz
+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 hu.UTF-8
+Wicd szkript pm-utils-hoz.
+
+%description -n pm-utils-wicd -l pl.UTF-8
+Skrypt wicd dla pm-utils.
+
 %prep
 %setup -q
-%{__python} setup.py configure
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+mv translations/{ar_EG,ar}
+%{__rm} -r translations/ar_PS
+mv translations/{de_DE,de}
+mv translations/{es_ES,es}
+%{__rm} -r 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
@@ -46,48 +162,106 @@ rm -rf $RPM_BUILD_ROOT
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wicd
+
+# systemd
+install -d $RPM_BUILD_ROOT%{systemdunitdir}
+install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/system-services
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/dbus-1/system-services
+
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
 %find_lang %{name}
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+%{__rm} $RPM_BUILD_ROOT/var/lib/%{name}/configurations/.empty_on_purpose
+%{__rm} $RPM_BUILD_ROOT/var/log/%{name}/.empty_on_purpose
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
 %service %{name} restart
+%systemd_post wicd.service
 
 %preun
 if [ "$1" = "0" ]; then
 	%service -q %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
+%systemd_preun wicd.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- %{name} < 1.7.0-8
+%systemd_trigger wicd.service
 
 %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
-%dir %{py_sitescriptdir}/wicd
-%{py_sitescriptdir}/wicd*.py[co]
-%{py_sitescriptdir}/*.egg-info
-%{_datadir}/%{name}
-%{_datadir}/autostart/wicd-tray.desktop
-%{_desktopdir}/wicd.desktop
-%{_iconsdir}/hicolor/*/apps/wicd-client.*
-%{_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/lib/%{name}
-/var/log/%{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*
+%{systemdunitdir}/wicd.service
+%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
+/etc/dbus-1/system.d/wicd.conf
+%{_sysconfdir}/wicd
+%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
+%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
+%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
+%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-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)
+%attr(755,root,root) %{_libdir}/pm-utils/sleep.d/*wicd