packages: freeciv/freeciv.spec - 2.2.4 - use rm macro

[lisu]

Author: lisu                         Date: Thu Dec  9 21:13:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.2.4
- use rm macro

---- Files affected:
packages/freeciv:
   freeciv.spec (1.142 -> 1.143) 

---- Diffs:

================================================================
Index: packages/freeciv/freeciv.spec
diff -u packages/freeciv/freeciv.spec:1.142 packages/freeciv/freeciv.spec:1.143
--- packages/freeciv/freeciv.spec:1.142	Mon Nov 15 14:58:49 2010
+++ packages/freeciv/freeciv.spec	Thu Dec  9 22:13:24 2010
@@ -10,12 +10,12 @@
 Summary(pl.UTF-8):	Niekomercyjny klon CIVilization
 Summary(pt_BR.UTF-8):	Clone do jogo Civilization
 Name:		freeciv
-Version:	2.2.3
-Release:	4
+Version:	2.2.4
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games/Strategy
 Source0:	http://downloads.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2
-# Source0-md5:	b324e3c59f029d0566482f584181a4b2
+# Source0-md5:	29dec5214b565c19d925cb82c4373831
 # NOTE: current version of freeland tiles does not work with newest freeciv version
 #Source1:	http://download.gna.org/freeciv/contrib/tilesets/freeland/freeland-normal-2.0.0.tar.gz
 Patch0:		%{name}-link.patch
@@ -111,15 +111,15 @@
 
 cp -a client/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}-client.desktop
 cp -a server/%{name}-server.desktop $RPM_BUILD_ROOT%{_desktopdir}
-rm $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 cp -a data/icons/32x32/*.png $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -a data/stdsounds{,.soundspec} $RPM_BUILD_ROOT%{_datadir}/%{name}
 #cp -a freeland.tilespec $RPM_BUILD_ROOT%{_datadir}/%{name}
 #cp -a freeland $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/no
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
 
 %{?with_gtk:cp -a data/gtk_menus.xml $RPM_BUILD_ROOT%{_datadir}/%{name}}
 
@@ -197,6 +197,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.143  2010/12/09 21:13:24  lisu
+- 2.2.4
+- use rm macro
+
 Revision 1.142  2010/11/15 13:58:49  lisu
 - one more change for freeland disable
 - release 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/freeciv/freeciv.spec?r1=1.142&r2=1.143&f=u