rpms/freeciv/F-8 freeciv-2.1.0-open.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 freeciv-aifill.patch, 1.1, 1.2 freeciv.spec, 1.28, 1.29 sources, 1.12, 1.13 freeciv-2.0.9-open.patch, 1.1, NONE freeciv-desktop.patch, 1.4, NONE freeciv-server.desktop, 1.2, NONE freeciv.xpm, 1.1, NONE

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Mon Nov 12 18:55:47 UTC 2007 

Author: bpepple

Update of /cvs/pkgs/rpms/freeciv/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27861

Modified Files:
	.cvsignore freeciv-aifill.patch freeciv.spec sources 
Added Files:
	freeciv-2.1.0-open.patch 
Removed Files:
	freeciv-2.0.9-open.patch freeciv-desktop.patch 
	freeciv-server.desktop freeciv.xpm 
Log Message:
* Sun Oct 28 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.1.0-1
- Update to 2.1.0.
- Update urls.
- Update aifill & open patches.
- Remove old freeciv pixmap.
- Remove desktop patch.


freeciv-2.1.0-open.patch:

--- NEW FILE freeciv-2.1.0-open.patch ---
diff -urp freeciv-2.1.0.OLD/client/connectdlg_common.c freeciv-2.1.0/client/connectdlg_common.c
--- freeciv-2.1.0.OLD/client/connectdlg_common.c	2007-10-27 07:24:38.000000000 -0400
+++ freeciv-2.1.0/client/connectdlg_common.c	2007-10-28 11:12:08.000000000 -0400
@@ -252,8 +252,8 @@ bool client_start_server(void)
 
     /* include the port to avoid duplication */
     if (logfile) {
-      fd = open(logfile, O_WRONLY | O_CREAT);
-
+      fd = open(logfile, O_WRONLY | O_CREAT,0644);
+      
       if (fd != 1) {
         dup2(fd, 1);
       }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Feb 2007 21:03:13 -0000	1.12
+++ .cvsignore	12 Nov 2007 18:55:14 -0000	1.13
@@ -1,2 +1 @@
-freeciv-2.0.9.tar.bz2
-stdsounds3.tar.gz
+freeciv-2.1.0.tar.bz2

freeciv-aifill.patch:

Index: freeciv-aifill.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-8/freeciv-aifill.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeciv-aifill.patch	19 Apr 2005 03:12:41 -0000	1.1
+++ freeciv-aifill.patch	12 Nov 2007 18:55:14 -0000	1.2
@@ -1,6 +1,7 @@
---- common/game.h.OLD	2005-04-18 22:55:37.000000000 -0400
-+++ common/game.h	2005-04-18 22:54:40.000000000 -0400
-@@ -323,7 +323,7 @@
+diff -urp freeciv-2.1.0.OLD/common/game.h freeciv-2.1.0/common/game.h
+--- freeciv-2.1.0.OLD/common/game.h	2007-10-27 07:23:29.000000000 -0400
++++ freeciv-2.1.0/common/game.h	2007-10-28 11:16:53.000000000 -0400
+@@ -192,7 +192,7 @@ bool setting_class_is_changeable(enum ss
  #define GAME_MIN_MAX_PLAYERS         1
  #define GAME_MAX_MAX_PLAYERS         MAX_NUM_PLAYERS
  


Index: freeciv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-8/freeciv.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- freeciv.spec	16 Sep 2007 19:39:34 -0000	1.28
+++ freeciv.spec	12 Nov 2007 18:55:14 -0000	1.29
@@ -1,18 +1,14 @@
 Name:           freeciv
-Version:        2.0.9
-Release:        4%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
-URL:            http://www.freeciv.org/index.php/Freeciv
-Source0:        ftp://freeciv.org/pub/%{name}/stable/%{name}-%{version}.tar.bz2
-Source1:	ftp://ftp.freeciv.org/%{name}/contrib/sounds/sets/stdsounds3.tar.gz
-Source2:	%{name}-server.desktop
-Source3:	%{name}.xpm
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-aifill.patch
-Patch3:		%{name}-%{version}-open.patch
+URL:            http://freeciv.wikia.com/index.php/Freeciv
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch1:		%{name}-aifill.patch
+Patch2:		%{name}-%{version}-open.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -36,13 +32,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .desktop
-%patch2 -p0 -b .aifill
-%patch3 -p1 -b .open
+%patch1 -p1 -b .aifill
+%patch2 -p1 -b .open
 
 
 %build
-%configure --enable-client=gtk2
+%configure --enable-client=gtk
 make %{?_smp_mflags}
 
 
@@ -53,36 +48,37 @@
 
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	--remove-category=Strategy			\
-	--add-category=StrategyGame			\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor fedora			\
+desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications  	\
-	--remove-category=Strategy			\
-	--add-category=StrategyGame			\
-	%{SOURCE2}
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-server.desktop
 
 # Remove civmanual
 rm $RPM_BUILD_ROOT%{_bindir}/civmanual
 
-# Add the sound files.
-tar xzf %{SOURCE1}
-cp -p data/stdsounds.soundspec $RPM_BUILD_ROOT%{_datadir}/%{name}
-mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds
-cp -p data/stdsounds/*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds
-
-# Add pixmap.
-%{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING NEWS doc/BUGS doc/HOWTOPLAY doc/PEOPLE doc/README
+%doc COPYING NEWS doc/BUGS doc/HOWTOPLAY doc/README
 %doc doc/README.AI doc/README.agents doc/README.attributes doc/README.cma
 %doc doc/README.delta doc/README.effects doc/README.ftwl doc/HACKING
 %doc doc/README.scorelog doc/TODO
@@ -90,13 +86,25 @@
 %{_bindir}/civserver
 %{_bindir}/civclient
 %{_datadir}/%{name}/
-%{_datadir}/pixmaps/%{name}.xpm
 %{_datadir}/applications/fedora-*.desktop
+%{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/32x32/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/64x64/apps/*.png
+%{_datadir}/icons/hicolor/128x128/apps/*.png
+%{_datadir}/pixmaps/%{name}-client.png
 %{_mandir}/man6/civserver.6.gz
 %{_mandir}/man6/civclient.6.gz
 
 
 %changelog
+* Sun Oct 28 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0.
+- Update urls.
+- Update aifill & open patches.
+- Remove old freeciv pixmap.
+- Remove desktop patch.
+
 * Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.0.9-4
 - Add patch to fix open function build bug.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Feb 2007 21:03:13 -0000	1.12
+++ sources	12 Nov 2007 18:55:14 -0000	1.13
@@ -1,2 +1 @@
-7bfa40220bd8e19a263ca247202682ce  freeciv-2.0.9.tar.bz2
-77215914712f2f351092918f5e41e39e  stdsounds3.tar.gz
+f640aa48abca0a235220d6df22b9bc82  freeciv-2.1.0.tar.bz2


--- freeciv-2.0.9-open.patch DELETED ---


--- freeciv-desktop.patch DELETED ---


--- freeciv-server.desktop DELETED ---


--- freeciv.xpm DELETED ---

More information about the fedora-extras-commits mailing list