packages: pidgin/pidgin.spec - updated to 2.7.9 - use rm macros and drop ob...

lisu lisu at pld-linux.org
Wed Dec 29 09:38:54 CET 2010


Author: lisu                         Date: Wed Dec 29 08:38:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.7.9
- use rm macros and drop obsoleted ones

---- Files affected:
packages/pidgin:
   pidgin.spec (1.279 -> 1.280) 

---- Diffs:

================================================================
Index: packages/pidgin/pidgin.spec
diff -u packages/pidgin/pidgin.spec:1.279 packages/pidgin/pidgin.spec:1.280
--- packages/pidgin/pidgin.spec:1.279	Mon Dec 27 16:02:29 2010
+++ packages/pidgin/pidgin.spec	Wed Dec 29 09:38:48 2010
@@ -48,12 +48,12 @@
 Summary(pl.UTF-8):	Klient kompatybilny z AOL Instant Messenger
 Summary(pt_BR.UTF-8):	Um cliente para o AOL Instant Messenger (AIM)
 Name:		pidgin
-Version:	2.7.8
-Release:	3
+Version:	2.7.9
+Release:	1
 License:	GPL v2+
 Group:		Applications/Communications
 Source0:	http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2
-# Source0-md5:	737d6a2a5bc04fe11eb0c3e0958d29fe
+# Source0-md5:	9bc6cf953ed7d383b215fa8487bf8829
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-dbus-dir.patch
 # Patch2:		%{name}-libgadu.patch
@@ -558,29 +558,28 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ca at valencia
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/mhr
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ca at valencia
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/mhr
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/my{_MM,}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/ms{_MY,}
 %find_lang %{name} --with-gnome
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/{,private}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/finch/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/purple/ca-certs
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/purple/ca-certs
 
 %if %{with perl}
-rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Pidgin/{,GtkUI}/.packlist}
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/perl5/*/perllocal.pod
-rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/perl/auto/Pidgin/.packlist
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/perl/auto/Purple/.packlist
+%{__rm} $RPM_BUILD_ROOT%{_prefix}/lib/perl5/*/perllocal.pod
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pidgin/perl/auto/Pidgin/.packlist
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/purple-2/perl/auto/Purple/.packlist
 %endif
 
 %if %{with dbus}
-rm $RPM_BUILD_ROOT%{_bindir}/purple-client-example
-rm $RPM_BUILD_ROOT%{_libdir}/purple-2/dbus-example.so
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/purple-client-example
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/purple-2/dbus-example.so
 %endif
 
 # resolve soname symlinks, affected plugins have rpath pointing there
@@ -589,16 +588,13 @@
 	mv $a $(dirname $a)/$soname
 	rm ${a%.*.*.*}
 done
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
 
 # no svg icons
-rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/pidgin.svg
-rm -r $RPM_BUILD_ROOT%{_pixmapsdir}/pidgin/*/scalable
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/pidgin.svg
+%{__rm} -r $RPM_BUILD_ROOT%{_pixmapsdir}/pidgin/*/scalable
 
 # rm windows icons
-rm $RPM_BUILD_ROOT%{_pixmapsdir}/pidgin/tray/*/*.ico
+%{__rm} $RPM_BUILD_ROOT%{_pixmapsdir}/pidgin/tray/*/*.ico
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -866,6 +862,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.280  2010/12/29 08:38:48  lisu
+- updated to 2.7.9
+- use rm macros and drop obsoleted ones
+
 Revision 1.279  2010/12/27 15:02:29  glen
 - fix locale before find_lang
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pidgin/pidgin.spec?r1=1.279&r2=1.280&f=u



More information about the pld-cvs-commit mailing list