Author: ankry Date: Sat Nov 3 22:56:36 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 4
---- Files affected: SPECS: NetworkManager.spec (1.37 -> 1.38) , amarok.spec (1.170 -> 1.171) ---- Diffs: ================================================================ Index: SPECS/NetworkManager.spec diff -u SPECS/NetworkManager.spec:1.37 SPECS/NetworkManager.spec:1.38 --- SPECS/NetworkManager.spec:1.37 Mon Oct 29 22:18:02 2007 +++ SPECS/NetworkManager.spec Sat Nov 3 23:56:31 2007 @@ -6,7 +6,7 @@ Summary(pl.UTF-8): ZarzÄ…dca sieci dla GNOME Name: NetworkManager Version: 0.6.5 -Release: 3 +Release: 4 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/%{name}-%{version}.tar.bz2 @@ -41,6 +41,8 @@ Requires: dhcdbd Requires: rc-scripts Requires: wpa_supplicant +# [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -119,6 +121,8 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/NetworkManagerDispatcher +[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ + mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} %find_lang %{name} --with-gnome --all-name %clean @@ -188,6 +192,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.38 2007/11/03 22:56:31 ankry +- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 4 + Revision 1.37 2007/10/29 21:18:02 megabajt - release 3 ================================================================ Index: SPECS/amarok.spec diff -u SPECS/amarok.spec:1.170 SPECS/amarok.spec:1.171 --- SPECS/amarok.spec:1.170 Thu Nov 1 16:45:35 2007 +++ SPECS/amarok.spec Sat Nov 3 23:56:31 2007 @@ -30,7 +30,7 @@ Summary(pl.UTF-8): Odtwarzacz audio dla KDE Name: amarok Version: 1.4.7 -Release: 3 +Release: 4 License: GPL Group: X11/Applications/Multimedia Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2 @@ -102,6 +102,8 @@ Suggests: libvisual-plugin-morph-tentacle Obsoletes: amarok-arts Obsoletes: amarok-xmms +# [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # temporary hack for proper libgpod::itdb_get_mountpoint() detection. @@ -283,6 +285,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la rm $RPM_BUILD_ROOT%{_libdir}/ruby_lib/libhttp11.la +[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ + mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} %find_lang amarok --all-name --with-kde %clean @@ -483,6 +487,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.171 2007/11/03 22:56:31 ankry +- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 4 + Revision 1.170 2007/11/01 15:45:35 arekm - rel 3; rebuild with fixed pcre ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/NetworkManager.spec?r1=1.37&r2=1.38&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.170&r2=1.171&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
