packages: wicd/wicd.spec - up to 1.7.0 - package netherland's manuals - spl...
evil
evil at pld-linux.org
Mon Jan 18 21:55:30 CET 2010
Author: evil Date: Mon Jan 18 20:55:30 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.7.0
- package netherland's manuals
- split GTK client from main to client subpackage
- CLI client added
- client subpackages descriptionss/summaries totally (were totally inconsistent)
- commented _libexecdir redefinition (but setup reworked, so it can be uncommented and spec builds/works). not sure about that anyway
- package installation doesnt work because of fr_FR, etc. but instalation scripts has been fucked by wicd devs (so its not mine fault and dont have time now to fix it)
---- Files affected:
packages/wicd:
wicd.spec (1.38 -> 1.39)
---- Diffs:
================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.38 packages/wicd/wicd.spec:1.39
--- packages/wicd/wicd.spec:1.38 Mon Nov 9 11:50:43 2009
+++ packages/wicd/wicd.spec Mon Jan 18 21:55:24 2010
@@ -4,15 +4,18 @@
# - 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: 6
+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
Patch1: bashism.patch
@@ -22,8 +25,8 @@
BuildRequires: python-devel
BuildRequires: python-modules
BuildRequires: rpm-pythonprov
-BuildRequires: sed >= 4.0
BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: sed >= 4.0
Requires(post,preun): /sbin/chkconfig
Requires: dbus(org.freedesktop.Notifications)
Requires: python-dbus
@@ -36,7 +39,7 @@
#BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _libexecdir %{_prefix}/lib/%{name}
+#%define _libexecdir %{_prefix}/lib/%{name}
%description
Wicd is an open source wired and wireless network manager for Linux
@@ -48,18 +51,42 @@
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
@@ -69,7 +96,7 @@
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.
@@ -79,9 +106,13 @@
%patch0 -p1
%patch1 -p1
-mv translations/{ar_EG,ar}
+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}
@@ -91,6 +122,11 @@
%build
%{__python} setup.py configure \
+ --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
@@ -131,42 +167,57 @@
%attr(755,root,root) %{_bindir}/wicd-client
%attr(755,root,root) %{_sbindir}/wicd
%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%{_mandir}/man1/wicd-client.1*
%{_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 %{_libexecdir}
%dir %{_libexecdir}/backends
-%attr(755,root,root) %{_libexecdir}/*.py
%attr(755,root,root) %{_libexecdir}/backends/*.py
-%exclude %{_libexecdir}/*curses*.py
-
-%{_datadir}/%{name}
-%{_datadir}/autostart/wicd-tray.desktop
-
-%{_desktopdir}/wicd.desktop
-%{_iconsdir}/hicolor/*/apps/wicd-client.*
-%{_pixmapsdir}/%{name}
-
+%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}
+%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) %{_libexecdir}/*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)
@@ -178,6 +229,15 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.39 2010/01/18 20:55:24 evil
+- up to 1.7.0
+- package netherland's manuals
+- split GTK client from main to client subpackage
+- CLI client added
+- client subpackages descriptionss/summaries totally (were totally inconsistent)
+- commented _libexecdir redefinition (but setup reworked, so it can be uncommented and spec builds/works). not sure about that anyway
+- package installation doesnt work because of fr_FR, etc. but instalation scripts has been fucked by wicd devs (so its not mine fault and dont have time now to fix it)
+
Revision 1.38 2009/11/09 10:50:43 glen
- back to arch due bad pm-utils packaging; rel 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wicd/wicd.spec?r1=1.38&r2=1.39&f=u
More information about the pld-cvs-commit
mailing list