Author: lisu Date: Thu Feb 3 19:02:44 2011 GMT Module: packages Tag: HEAD ---- Log message: - use __rm and sed macros - S: wireless-tools
---- Files affected: packages/wicd: wicd.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: packages/wicd/wicd.spec diff -u packages/wicd/wicd.spec:1.48 packages/wicd/wicd.spec:1.49 --- packages/wicd/wicd.spec:1.48 Thu Oct 7 23:23:19 2010 +++ packages/wicd/wicd.spec Thu Feb 3 20:02:39 2011 @@ -14,7 +14,7 @@ Name: wicd Version: 1.7.0 Release: 6 -License: GPL v2 +License: GPL v2+ Group: X11/Applications/Networking Source0: http://downloads.sourceforge.net/wicd/%{name}-%{version}.tar.gz # Source0-md5: 003d2e67240989db55934553437ba32a @@ -39,6 +39,7 @@ Requires: python-pygtk-glade >= 2:2.0 Requires: python-pygtk-gtk >= 2:2.0 Requires: python-wpactrl +Suggests: wireless-tools # not noarch due pm-utils packaging stupidity #BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -61,7 +62,7 @@ %package client-cli Summary: wicd CLI client Summary(hu.UTF-8): wicd CLI kliens -Summary(pl.UTF-8): klient wicd CLI +Summary(pl.UTF-8): Klient wicd CLI Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: python-urwid @@ -73,12 +74,12 @@ Wicd parancssoros (ncurses) kliens. %description client-cli -l pl.UTF-8 -Klient wicd z międzymordziem wiersza poleceń (ncurses). +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 +Summary(pl.UTF-8): Klient wicd z TUI Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: python-urwid @@ -95,7 +96,7 @@ %package client-gtk Summary: wicd GUI client Summary(hu.UTF-8): wicd GUI kliens -Summary(pl.UTF-8): klient wicd z GUI +Summary(pl.UTF-8): Klient wicd z GUI Group: Applications/System Requires: %{name} = %{version}-%{release} @@ -133,10 +134,10 @@ %patch3 -p1 mv translations/{ar_EG,ar} -rm -rf translations/ar_PS +%{__rm} -r translations/ar_PS mv translations/{de_DE,de} mv translations/{es_ES,es} -rm -rf translations/fr +%{__rm} -r translations/fr mv translations/{fr_FR,fr} mv translations/{hr_HR,hr} mv translations/{it_IT,it} @@ -144,7 +145,7 @@ mv translations/{no,nb} mv translations/{ru_RU,ru} -grep -r bin/env.*python -l . | xargs sed -i -e '1s,^#!.*env python,#!%{__python},' +grep -r bin/env.*python -l . | xargs %{__sed} -i -e '1s,^#!.*env python,#!%{__python},' %build %{__python} setup.py configure \ @@ -167,9 +168,9 @@ %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 +%{__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 @@ -253,6 +254,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.49 2011/02/03 19:02:39 lisu +- use __rm and sed macros +- S: wireless-tools + Revision 1.48 2010/10/07 21:23:19 uzsolt - removed "wired-settings.conf parse error" TODO (no-deepcopy patch updated) - rel 6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wicd/wicd.spec?r1=1.48&r2=1.49&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit