packages: freeciv/freeciv.spec - more cosmetics

[glen]

Author: glen                         Date: Sun Feb  7 21:47:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more cosmetics

---- Files affected:
packages/freeciv:
   freeciv.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: packages/freeciv/freeciv.spec
diff -u packages/freeciv/freeciv.spec:1.128 packages/freeciv/freeciv.spec:1.129
--- packages/freeciv/freeciv.spec:1.128	Sun Feb  7 22:45:13 2010
+++ packages/freeciv/freeciv.spec	Sun Feb  7 22:47:44 2010
@@ -4,7 +4,7 @@
 %bcond_without	gtk		# do not build gtk client
 %bcond_without  ggz_client	# build without ggz client
 %bcond_without  ggz_server	# build without ggz server
-#
+
 Summary:	FREE CIVilization clone
 Summary(es.UTF-8):	Clon del juego Civilization
 Summary(pl.UTF-8):	Niekomercyjny klon CIVilization
@@ -23,7 +23,7 @@
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-ggz.patch
-URL:		http://freeciv.wikia.com
+URL:		http://freeciv.wikia.com/
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -96,9 +96,9 @@
 %{__automake}
 %configure \
 	--with-ggzd-confdir=%{_sysconfdir}/ggzd \
-	%{?with_gtk:	--enable-client=gtk} \
-	%{!?with_ggz_client:	--without-ggz-client} \
-	%{!?with_ggz_server:	--without-ggz-server}
+	%{?with_gtk:--enable-client=gtk} \
+	%{!?with_ggz_client:--without-ggz-client} \
+	%{!?with_ggz_server:--without-ggz-server}
 
 %{__make}
 
@@ -109,22 +109,22 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -f client/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}-client.desktop
-cp -f server/%{name}-server.desktop $RPM_BUILD_ROOT%{_desktopdir}
+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
 
-cp -f data/icons/32x32/*.png $RPM_BUILD_ROOT%{_pixmapsdir}
-cp -rf data/stdsounds{,.soundspec} $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -f freeland.tilespec $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -rf freeland $RPM_BUILD_ROOT%{_datadir}/%{name}
+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
 
 %if %{with ggz_server}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/{games,rooms}
-install data/civserver.dsc $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/games/civserver.dsc
-install data/civserver.room $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/rooms/civserver.room
+cp -a data/civserver.dsc $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/games/civserver.dsc
+cp -a data/civserver.room $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/rooms/civserver.room
 %endif
 
 %find_lang %{name}
@@ -187,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2010/02/07 21:47:44  glen
+- more cosmetics
+
 Revision 1.128  2010/02/07 21:45:13  glen
 - readability with ggz_server bcond in file
 - "*" is evil, use "*.png" instead in files glob
@@ -200,7 +203,7 @@
 
 Revision 1.125  2009/11/26 11:45:14  lisu
 - up to 2.1.10
-- create inexistent dirs in %%files
+- create inexistent dirs in %files
 - adpater
 
 Revision 1.124  2009/03/31 09:33:05  lisu
@@ -442,7 +445,7 @@
 - upgrade to 1.14.1
 
 Revision 1.70  2003/12/10 16:23:49  grzegol
-- _applnkdir -> _desktopdir; rel. 1.%%{beta}.1
+- _applnkdir -> _desktopdir; rel. 1.%{beta}.1
 
 Revision 1.69  2003/11/20 17:23:28  jareq
 - upgrade to 1.14.1-beta4
@@ -502,17 +505,17 @@
 
 Revision 1.51  2002/05/21 10:32:06  pioklo
 - update to 1.12.2
-- fix %%doc section,STBR
+- fix %doc section,STBR
 
 Revision 1.50  2002/04/25 16:19:33  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.49  2002/02/22 23:28:54  kloczek
 - removed all Group fields translations (our rpm now can handle translating
   Group field using gettext).
 
 Revision 1.48  2002/01/18 02:12:58  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.47  2001/08/11 14:29:00  kloczek
 - updated to 1.12.0.
@@ -527,7 +530,7 @@
 - added automake, autoconf to BuildRequires.
 
 Revision 1.43  2001/04/13 15:35:17  wiget
-added gettext patch; rebuild with readline 4.2; release 2
+- added gettext patch; rebuild with readline 4.2; release 2
 
 Revision 1.42  2001/02/02 17:50:33  kloczek
 - perl -pi -e "s/^\%\{_datadir\}\/pixmaps/\%\{_pixmapsdir\}/"
@@ -554,10 +557,10 @@
 - updated to 1.10.2.
 
 Revision 1.34  2000/06/09 07:54:40  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.33  2000/06/09 07:22:50  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.32  2000/05/18 21:48:35  kloczek
 - spec adapterized.
@@ -599,4 +602,3 @@
 
 Revision 1.22  1999/07/12 23:05:56  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
================================================================

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