]> git.pld-linux.org Git - packages/wicd.git/blobdiff - wicd.spec
- added install_kde.patch
[packages/wicd.git] / wicd.spec
index e60c6842f025caaacd7e202dbc36c85652f315a4..3a6a56918fd07811c18ff26233201e9e5f3ff518 100644 (file)
--- a/wicd.spec
+++ b/wicd.spec
@@ -4,33 +4,37 @@
 #   /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.7.0
-Release:       6
+Version:       1.7.1
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Networking
 Source0:       http://downloads.sourceforge.net/wicd/%{name}-%{version}.tar.gz
-# Source0-md5: 003d2e67240989db55934553437ba32a
+# Source0-md5: 9c5664a0e850cddbe80942eabb10430a
 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
+Patch3:                install_kde.patch
 URL:           http://www.wicd.net/
+BuildRequires: gettext-devel
 # /etc/pld-release used to detect platform
 BuildRequires: issue
+BuildRequires: python-babel
 BuildRequires: python-devel
+BuildRequires: python-distribute
 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(post,preun,postun):   systemd-units >= 38
 Requires:      dbus(org.freedesktop.Notifications)
 Requires:      python-dbus
 Requires:      python-iwscan
@@ -38,7 +42,9 @@ Requires:     python-pygobject
 Requires:      python-pygtk-glade >= 2:2.0
 Requires:      python-pygtk-gtk >= 2:2.0
 Requires:      python-wpactrl
+Requires:      systemd-units >= 0.38
 Suggests:      wireless-tools
+Obsoletes:     wicd-systemd
 # not noarch due pm-utils packaging stupidity
 #BuildArch:    noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,6 +98,18 @@ Wicd szöveges (ncurses) kliens.
 %description client-curses -l pl.UTF-8
 Klient Wicd z tesktowym międzymordziem uzytkownika (ncurses).
 
+%package kde-tray
+Summary:       wicd-tray KDE autostart
+Summary(pl.UTF-8):     Automatyczny start wicd-tray dla KDE
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+
+%description kde-tray
+wicd-tray KDE autostart.
+
+%description kde-tray -l pl.UTF-8
+Automatyczny start wicd-tray dla KDE.
+
 %package client-gtk
 Summary:       wicd GUI client
 Summary(hu.UTF-8):     wicd GUI kliens
@@ -130,19 +148,10 @@ Skrypt wicd dla pm-utils.
 %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}
+%patch3 -p0
+
+mv po/{ar_EG,ar}.po
+rm po/ast.po
 
 grep -r bin/env.*python -l . | xargs %{__sed} -i -e '1s,^#!.*env python,#!%{__python},'
 
@@ -152,6 +161,7 @@ grep -r bin/env.*python -l . | xargs %{__sed} -i -e '1s,^#!.*env python,#!%{__py
        --pmutils %{_libdir}/pm-utils/sleep.d
 
 %{__python} setup.py build
+%{__python} setup.py compile_translations
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -161,6 +171,12 @@ rm -rf $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
@@ -177,12 +193,20 @@ 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)
@@ -190,6 +214,7 @@ fi
 %attr(755,root,root) %{_bindir}/wicd-client
 %attr(755,root,root) %{_sbindir}/wicd
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
+/etc/logrotate.d/wicd.logrotate
 %{_mandir}/man5/wicd-manager-settings.conf.5*
 %lang(nl) %{_mandir}/nl/man5/wicd-manager-settings.conf.5*
 %{_mandir}/man5/wicd-wired-settings.conf.5*
@@ -198,6 +223,8 @@ fi
 %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}
@@ -207,7 +234,7 @@ fi
 %attr(755,root,root) %{_datadir}/%{name}/daemon/*.py
 %dir %{py_sitescriptdir}/wicd
 %{py_sitescriptdir}/wicd/*.py[co]
-%{py_sitescriptdir}/Wicd-*.egg-info
+%{py_sitescriptdir}/wicd-*.egg-info
 %dir /var/lib/%{name}
 %dir /var/lib/%{name}/configurations
 /var/lib/%{name}/WHEREAREMYFILES
@@ -233,9 +260,8 @@ fi
 %attr(755,root,root) %{_bindir}/wicd-gtk
 %{_sysconfdir}/xdg/autostart/wicd-tray.desktop
 %dir %{_datadir}/%{name}/gtk
-%{_datadir}/%{name}/gtk/%{name}.glade
+%{_datadir}/%{name}/gtk/%{name}.ui
 %attr(755,root,root) %{_datadir}/%{name}/gtk/*.py
-%{_datadir}/autostart/wicd-tray.desktop
 %{_desktopdir}/wicd.desktop
 %{_iconsdir}/hicolor/*/apps/wicd-gtk.*
 %{_pixmapsdir}/%{name}
@@ -243,6 +269,10 @@ fi
 %{_mandir}/man1/wicd-client.1*
 %lang(nl) %{_mandir}/nl/man1/wicd-client.1*
 
+%files kde-tray
+%defattr(644,root,root,755)
+%{_datadir}/autostart/wicd-tray.desktop
+
 %files -n pm-utils-wicd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/pm-utils/sleep.d/*wicd
This page took 0.070592 seconds and 4 git commands to generate.