<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39545 >

 Noticed that freeciv.spec.in still contains package for gtk-client
(that is: gtk1.2). Attached patch fixes obvious errors from
freeciv.spec.in

 - gtk-client package removed
 - typofixes
 - doc/PEOPLE removed
 - history ruleset removed
 - amplio tileset added


 This is totally untested, as I have no environment to build rpm packages.
 Still, even if this does not fix it completely, at least it goes to
right direction. So if nobody points out some errors in it, I will
commit.


 - ML

diff -Nurd -X.diff_ignore freeciv/bootstrap/freeciv.spec.in freeciv/bootstrap/freeciv.spec.in
--- freeciv/bootstrap/freeciv.spec.in	2007-08-04 18:37:57.000000000 +0300
+++ freeciv/bootstrap/freeciv.spec.in	2007-08-12 11:27:45.000000000 +0300
@@ -23,9 +23,8 @@
 Requires: %name-server = %version-%release
 
 %def_with gtk2
-%def_with gtk
 %def_with xaw
-%define clients_list %{?_with_gtk2:gtk2} %{?_with_gtk:gtk} %{?_with_xaw:xaw}
+%define clients_list %{?_with_gtk2:gtk2} %{?_with_xaw:xaw}
 
 BuildRoot:	%{_tmppath}/%{name}-%{version_full}-buildroot
 Packager:	Freeciv Team <[EMAIL PROTECTED]>
@@ -50,12 +49,6 @@
 Provides: %name-client-gui = %version-%release
 Requires: %name-common = %version-%release
 
-%package client-gtk
-Summary: Turn-based strategy game, inspired by the commercial Civilization series - GTK client
-Group: Games/Strategy
-Provides: %name-client-gui = %version-%release
-Requires: %name-common = %version-%release
-
 %package client-xaw
 Summary: Turn-based strategy game, inspired by the commercial Civilization series - Xaw client
 Group: Games/Strategy
@@ -82,7 +75,7 @@
 enthusiasts, and is easily one of the most fun and addictive network 
 games out there! 
 
-This package contains files common for client ans server.
+This package contains files common for client and server.
 
 %description server
 Freeciv is a free turn-based multiplayer strategy game, in which each 
@@ -121,18 +114,6 @@
 This package contains Freeciv client with Gtk2 interface (default
 Freeciv GUI).
 
-%description client-gtk
-Freeciv is a free turn-based multiplayer strategy game, in which each 
-player becomes the leader of a civilization, fighting to obtain the 
-ultimate goal: To become the greatest civilization.
-Players of Civilization II by Microprose should feel at home, since 
-one aim of Freeciv is to have compatible rules.
-Freeciv is maintained by an international team of coders and 
-enthusiasts, and is easily one of the most fun and addictive network 
-games out there! 
-
-This package contains Freeciv client with Gtk+ interface.
-
 %description client-xaw
 Freeciv is a free turn-based multiplayer strategy game, in which each 
 player becomes the leader of a civilization, fighting to obtain the 
@@ -223,18 +204,6 @@
 				%name-client \
 				%{_gamesbindir}/civclient-gtk2
 
-%post client-gtk
-/usr/sbin/update-alternatives --install \
-				%{_gamesbindir}/civclient \
-				%name-client \
-				%{_gamesbindir}/civclient-gtk 20
-
-%preun client-gtk
-[ $1 = 0 ] || exit 0
-/usr/sbin/update-alternatives --remove \
-				%name-client \
-				%{_gamesbindir}/civclient-gtk
-
 %post client-xaw
 /usr/sbin/update-alternatives --install \
 				%{_gamesbindir}/civclient \
@@ -257,7 +226,7 @@
 %{_gamesbindir}/civserver
 %defattr(644, root, root, 0755)
 %doc COPYING NEWS
-%doc doc/BUGS doc/HACKING doc/PEOPLE doc/README
+%doc doc/BUGS doc/HACKING 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
 #README.graphics and README.sound are included in client package
@@ -265,12 +234,10 @@
 %{_gamesdatadir}/%{name}/civ1
 %{_gamesdatadir}/%{name}/civ2	
 %{_gamesdatadir}/%{name}/default
-%{_gamesdatadir}/%{name}/history
 %{_gamesdatadir}/%{name}/nation
 %{_gamesdatadir}/%{name}/scenario
 %{_gamesdatadir}/%{name}/civ1.serv
 %{_gamesdatadir}/%{name}/civ2.serv
-%{_gamesdatadir}/%{name}/history.serv
 %{_mandir}/man6/civserver.6
 
 %files client
@@ -280,6 +247,7 @@
 %{_gamesdatadir}/%{name}/flags
 %{_gamesdatadir}/%{name}/isotrident
 %{_gamesdatadir}/%{name}/misc
+%{_gamesdatadir}/%{name}/amplio
 %{_gamesdatadir}/%{name}/trident
 %{_gamesdatadir}/%{name}/isophex
 %{_gamesdatadir}/%{name}/helpdata.txt
@@ -294,12 +262,6 @@
 %{_gamesbindir}/civclient-gtk2
 %endif #gtk2
 
-%if_with gtk
-%files client-gtk
-%{_gamesdatadir}/%{name}/freeciv.rc
-%{_gamesbindir}/civclient-gtk
-%endif #gtk
-
 %if_with xaw
 %files client-xaw
 %{_gamesdatadir}/%{name}/Freeciv
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to