rpms/freeciv/devel freeciv-server.desktop, NONE, 1.1 freeciv.xpm, NONE, 1.1 freeciv_desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 freeciv.spec, 1.4, 1.5 sources, 1.2, 1.3 NEWS-1.14.2, 1.1, NONE freeciv-1.13.0-aifill.patch, 1.1, NONE freeciv-desktop-xauth.patch, 1.1, NONE freeciv-desktop.patch, 1.1, NONE

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Tue Apr 19 00:01:57 UTC 2005 

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10990/devel

Modified Files:
	.cvsignore freeciv.spec sources 
Added Files:
	freeciv-server.desktop freeciv.xpm freeciv_desktop.patch 
Removed Files:
	NEWS-1.14.2 freeciv-1.13.0-aifill.patch 
	freeciv-desktop-xauth.patch freeciv-desktop.patch 
Log Message:
auto-import freeciv-2.0.0-1.fc4 on branch devel from freeciv-2.0.0-1.fc4.src.rpm


--- NEW FILE freeciv-server.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=FreeCiv Server
Comment=FreeCiv Game Server
Exec=civserver
Icon=freeciv.xpm
StartupNotify=true
Terminal=true
Type=Application
Categories=GNOME;Application;Game;Strategy;
Version=0.9.4


--- NEW FILE freeciv.xpm ---
/* XPM */
static char * test_xpm[] = {
"31 29 18 1",
" 	c None",
".	c #704030",
"+	c #202020",
"@	c #805040",
"#	c #603020",
"$	c #A0A0A0",
"%	c #C0C0C0",
"&	c #808080",
"*	c #909090",
"=	c #E0E0E0",
"-	c #606060",
";	c #000000",
">	c #505050",
",	c #404040",
"'	c #502020",
")	c #303030",
"!	c #002060",
"~	c #3050A0",
"                    .+ ++      ",
"          +   ++    .++ at +      ",
"          #+++ at +   +.#$%&+     ",
"          @+@*=++++@$%%=$+     ",
"        ++@*===&#@$%%=%=%+     ",
"      ++@*=====*#%==%=%=%+     ",
"     +@*======%%+$==%==$*++    ",
"     +*======%=%+$==%=%$-@;    ",
"  ++++>=====%==%+$==$%$#@%+    ",
" +@@@@,====%===%,%%%&@@%%=+    ",
" @#''')===%====%-%$@.%==%=*+   ",
" @...#)==%====%&$@@%%===%=$+   ",
" @....,=%===%%&+@%==%====%%+   ",
" #@@..>%==%%$&-+$===%====%%+   ",
" '#.@'&=%%$*-+++*===%====%%+   ",
" +'#.'*%$*-''+'+-===%=====*+   ",
" ++##&%*-'''''+',===%=====*+   ",
" !+'#.@''''#'+'+>===%====%+    ",
" !!'#+.@@###+'+'-===%==%%*++   ",
" !!'''#+.@@#'+'+&===%%%*&'++   ",
" !!!''#'#+.@@'+'*==%$*&''. at .+  ",
" !!!!!''#'#+.@@+%%%*&''''''@@+ ",
"   !!!!!''#'#+.&%*&''''#..#''@+",
"    ~~!!!!''#'#+.'''###.....#@+",
"      ~~!!!!''#'#+..@@@..... at .+",
"     ~~ ~~!!!!''#'####.@@@@@#++",
"       ~~   !!!!'''###''''+'+++",
"             ~!!!!'''''''+'+++!",
"               ~~!!!!''+'++++!!"};

freeciv_desktop.patch:

--- NEW FILE freeciv_desktop.patch ---
--- bootstrap/freeciv.desktop.in.OLD	2005-04-17 19:44:51.000000000 -0400
+++ bootstrap/freeciv.desktop.in	2005-04-17 19:46:20.000000000 -0400
@@ -18,5 +18,4 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=GNOME;Application;Game;Strategy
-StartupNotify=true
+Categories=GNOME;Application;Game;Strategy;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2005 01:08:07 -0000	1.2
+++ .cvsignore	19 Apr 2005 00:01:55 -0000	1.3
@@ -1,3 +1,2 @@
-freeciv-1.14.2.tar.bz2
-freeciv-desktop.tar.bz2
 stdsounds2.tar.gz
+freeciv-2.0.0.tar.bz2


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freeciv.spec	26 Mar 2005 15:54:37 -0000	1.4
+++ freeciv.spec	19 Apr 2005 00:01:55 -0000	1.5
@@ -1,27 +1,29 @@
-%define desktop_file 1
-
-Name:		freeciv
-Version:	1.14.2
-Release:	7
-Summary:	The Freeciv multi-player strategy game
-
-Group:		Amusements/Games
-License:	GPL
-URL:		http://www.freeciv.org/index.php/Freeciv
-Source:		ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2
-Source1:	freeciv-desktop.tar.bz2
-Source2:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
-Source3:	NEWS-1.14.2
-Patch1:		freeciv-desktop.patch
-Patch2:		freeciv-desktop-xauth.patch
-Patch3:		freeciv-1.13.0-aifill.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	gtk2-devel
-BuildRequires:	imlib-devel
-%if %{desktop_file}
+Name:           freeciv
+Version:        2.0.0
+Release:        1.fc4
+Summary:        The Freeciv multi-player strategy game
+
+Group:          Amusements/Games
+License:        GPL
+URL:            http://www.freeciv.org/index.php/Freeciv
+Source0:        ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2
+Source1:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz 
+Source2:	%{name}-server.desktop
+Source3:	%{name}.xpm
+Patch1:		%{name}_desktop.patch   
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  gtk2-devel
+BuildRequires:	readline-devel
+BuildRequires:	zlib-devel
+BuildRequires:	bind-devel
+BuildRequires:	SDL-devel
+BuildRequires:	SDL_mixer-devel
+BuildRequires:	esound-devel
+BuildRequires:	alsa-lib-devel
+BuildRequires:	ncurses-devel
 BuildRequires:	desktop-file-utils
-%endif
+BuildRequires:	gettext
 
 %description
 Freeciv is a turn-based, multi-player, X based strategy game. Freeciv
@@ -31,86 +33,70 @@
 in order to become the leader of the greatest civilization.
 
 %prep
-%setup -a 1
-%patch1 -p1 -b .desktop
-%patch2 -p1 -b .xauth
-%patch3 -p1 -b .aifill
+%setup -q -n %{name}-%{version}
+%patch1
 
 %build
-export OLD_PO_FILE_INPUT=yes
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
-%configure --enable-debug=no --enable-client=gtk-2.0
-	   #--with-gtk-prefix=/usr/lib/gtk-2.0 #not used because of with-xaw3d
-           #--prefix=/usr --bindir=/usr/bin  --with-glib-prefix=/usr 
-make
-cp %{SOURCE3} .
+%configure --enable-debug=no	\
+	--enable-client=gtk2	\
+	--prefix=%{_prefix}	\
+	--mandir=%{_mandir}	\
+	--bindir=%{_bindir}	\
+	--datadir=%{_datadir}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
-chmod +x desktop/*wrapper
-cp desktop/*wrapper $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp desktop/*.desktop $RPM_BUILD_ROOT/etc/X11/applnk/Games
-
-%if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor net \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category "Application;Game;X-Fedora" \
-        $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
-desktop-file-install --vendor net \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category "Application;Game;X-Fedora" \
-        $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
-rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
-%endif
-
-cp desktop/*.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
-pushd client
-perl -p -i -e "s/CFLAGS = $RPM_OPT_FLAGS/CFLAGS = $RPM_OPT_FLAGS \`gtk-config --cflags\`/" gui-gtk/Makefile
-make clean
-for i in 0 1 2 3 4 5 6 7 8 9 10; do
-  perl -p -i -e "s/gui-xaw/gui-gtk/" Makefile
-  perl -p -i -e "s|-I/usr/X11R6/include|\`glib-config --cflags\` \`gtk-config --cflags\` \`imlib-config --cflags-gdk\` -I/usr/X11R6/include|" Makefile 
-  perl -p -i -e "s|-lXaw3d|\`glib-config --libs\` \`gtk-config --libs\` \`imlib-config --libs-gdk\`|" Makefile
-done
-make
-cp civclient $RPM_BUILD_ROOT%{_bindir}/civclient-gtk
-popd
-
-/usr/bin/install -c civ  $RPM_BUILD_ROOT%{_bindir}/civ
-
-/usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
-mv $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
+%makeinstall bindir=$RPM_BUILD_ROOT%{_bindir}	\
+	datadir=$RPM_BUILD_ROOT%{_datadir}	\
+	mandir=$RPM_BUILD_ROOT%{_mandir}	\
+	prefix=$RPM_BUILD_ROOT%{_prefix}	
+
+desktop-file-install --vendor fedora --delete-original	\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+desktop-file-install --vendor fedora			\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications  	\
+	--add-category X-Fedora			        \
+	%{SOURCE2}
+
+# Remove civmanual
+rm $RPM_BUILD_ROOT%{_bindir}/civmanual
 
-mv $RPM_BUILD_ROOT%{_bindir}/civclient $RPM_BUILD_ROOT%{_bindir}/civclient-xaw
-ln -sf civclient-gtk $RPM_BUILD_ROOT%{_bindir}/civclient
+# Add the sound files.
+(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE1}; )
 
-(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE2}; )
+%{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
 
-%find_lang %name
+%find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT 
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%if %{desktop_file}
+%doc COPYING NEWS doc/BUGS doc/HOWTOPLAY doc/PEOPLE 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
+%doc doc/README.graphics doc/README.sound
+%{_bindir}/civserver
+%{_bindir}/civclient
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/%{name}.xpm
 %config %{_datadir}/applications/*
-%doc NEWS*
-%else
-%config /etc/X11/applnk/Games/*
-%endif
-%config /usr/X11R6/lib/X11/app-defaults/Freeciv
-%{_bindir}/*
-%{_datadir}/freeciv
-%{_datadir}/pixmaps/*
-
+%{_mandir}/man6/civserver.6.gz
+%{_mandir}/man6/civclient.6.gz
 
 %changelog
+* Mon Apr 18 2005 Brian Pepple <bdpepple at ameritech.net> - 2.0.0-1.fc4
+- Update to 2.0.0.
+- Drop 1.14 patches.
+- Add new BR's for 2.0.0.
+
 * Sat Mar 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-7
 - Fixed typos.
 
@@ -217,11 +203,11 @@
 * Tue Aug  1 2000 Bernhard Rosenkraenzer <bero at redhat.com>
 - Fix warning in civclient-wrapper (Bug 14860)
 
-* Fri Jul 21 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Jul 21 2000 Trond Eivind Glomsrød <teg at redhat.com>
 - 1.11.4
 - move to /usr/bin and /usr/share/freeciv (no more /usr/games)
 
-* Wed Jul 12 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Jul 12 2000 Trond Eivind Glomsrød <teg at redhat.com>
 - remove icon, glint is obsoleted
 - don't use find to build file lists, it claimed to own
   lots of directories


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2005 01:08:07 -0000	1.2
+++ sources	19 Apr 2005 00:01:55 -0000	1.3
@@ -1,3 +1,2 @@
-280770591c8f87ac542dcd50702da205  freeciv-1.14.2.tar.bz2
-4f8f5234c6d9719b8eb6fa2526616124  freeciv-desktop.tar.bz2
 63b06631addeaccf45bc4bf6b8ddf7b3  stdsounds2.tar.gz
+fa7170026cc2aefdafd43b27a4bfaf80  freeciv-2.0.0.tar.bz2


--- NEWS-1.14.2 DELETED ---


--- freeciv-1.13.0-aifill.patch DELETED ---


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


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

More information about the fedora-extras-commits mailing list