- renamed client/server binaries to freeciv-gtk2 freeciv-server

- update to 2.2.0 : changes since 2.1.x
    * Built-in editor
    * Expanded ruleset format: 
        * Unit classes
        * Movement restrictions 
            * Can limit which terrains a unit can enter
            * River-boats
            * Wheeled units
            * Which units another unit can transport 
        * Migration
        * Plague
        * Bases
        * Calendar effects 
    * Changes to gameplay with default ruleset: 
        * New terrains:
              o Deep Ocean (as Ocean but no specials and cannot be transformed)
              o Lake (as Ocean but no Whales special; inland water below a certain size is generated as Lake) 
        * Triremes are not restricted to tiles next to land, but to (shallow) Ocean tiles; they now cannot even attempt to enter unsafe tiles
        * Triremes no longer get the +1 movement bonus from Nuclear Power that other sea units get
        * Triremes and Carriers can no longer attack land units
        * Submarine attack strength reduced from 15 to 12 (to make it easier to defend against them with escorts)
        * New base type buoy, which can be built by Engineers on water tiles with the Radio advance, and gives vision.
        * Ruins (left behind by destroyed cities, no effect on gameplay currently)
        * New advance Environmentalism and Solar Plant improvement, which can eliminate pollution from production
        * Trade route value now depends on size of cities, not on trade generated in them
        * New national borders system
        * Coastal Defense now available earlier (requires Gunpowder instead of Metallurgy)
        * No restrictions on specialists in small cities

OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=10

freeciv-2.1.11-no-nb.diff

@@ -1,12 +0,0 @@
-diff -rup freeciv-2.1.11.orig/configure.ac freeciv-2.1.11/configure.ac
---- freeciv-2.1.11.orig/configure.ac	2010-02-20 15:51:23.417784936 +0100
-+++ freeciv-2.1.11/configure.ac	2010-02-20 15:52:14.969286394 +0100
-@@ -193,7 +193,7 @@ fi
- 
- dnl I18n support
- ALL_LINGUAS="ar cs ca da de el en_GB eo es et fa fi fr he hu it ja ko lt nl 
--nb no pl pt pt_BR ro ru sv tr uk zh_CN"
-+nb pl pt pt_BR ro ru sv tr uk zh_CN"
- AM_GNU_GETTEXT(,need-ngettext)
- 
- dnl AM_GNU_GETTEXT doesn't have all features we want

freeciv-2.1.11.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f52fb8318cf121b74da04d5279c24d2045d829718c67cc21cb62439f50754707
-size 29884418

freeciv-2.2.1-no-nb.diff

@@ -0,0 +1,13 @@
+Index: freeciv-2.2.1/configure.ac
+===================================================================
+--- freeciv-2.2.1.orig/configure.ac
++++ freeciv-2.2.1/configure.ac
+@@ -280,7 +280,7 @@ fi
+ 
+ dnl I18n support
+ ALL_LINGUAS="ar cs ca da de el en_GB eo es et fa fi fr he hu it ja ko lt 
+-nl nb no pl pt pt_BR ro ru sv tr uk zh_CN"
++nl nb pl pt pt_BR ro ru sv tr uk zh_CN"
+ 
+ AC_ARG_ENABLE([nls],
+ [  --disable-nls        do not add localization support],

freeciv-2.2.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cecf98af004fa49e5fc8b3e4447eefbad27e237377e4c9add2e9da60da53cb31
+size 33400493

freeciv.changes

@@ -1,3 +1,57 @@
+-------------------------------------------------------------------
+Thu Jul 15 09:55:23 UTC 2010 - mseben@novell.com
+
+- renamed client/server binaries to freeciv-gtk2 freeciv-server
+- update to 2.2.0 : changes since 2.1.x
+    * Built-in editor
+    * Expanded ruleset format: 
+        * Unit classes
+        * Movement restrictions 
+            * Can limit which terrains a unit can enter
+            * River-boats
+            * Wheeled units
+            * Which units another unit can transport 
+        * Migration
+        * Plague
+        * Bases
+        * Calendar effects 
+    * Changes to gameplay with default ruleset: 
+        * New terrains:
+              o Deep Ocean (as Ocean but no specials and cannot be transformed)
+              o Lake (as Ocean but no Whales special; inland water below a certain size is generated as Lake) 
+        * Triremes are not restricted to tiles next to land, but to (shallow) Ocean tiles; they now cannot even attempt to enter unsafe tiles
+        * Triremes no longer get the +1 movement bonus from Nuclear Power that other sea units get
+        * Triremes and Carriers can no longer attack land units
+        * Submarine attack strength reduced from 15 to 12 (to make it easier to defend against them with escorts)
+        * New base type buoy, which can be built by Engineers on water tiles with the Radio advance, and gives vision.
+        * Ruins (left behind by destroyed cities, no effect on gameplay currently)
+        * New advance Environmentalism and Solar Plant improvement, which can eliminate pollution from production
+        * Trade route value now depends on size of cities, not on trade generated in them
+        * New national borders system
+        * Coastal Defense now available earlier (requires Gunpowder instead of Metallurgy)
+        * No restrictions on specialists in small cities
+        * Terrain within working range of a city can no longer remain unknown
+        * Units in fortresses now regain 25% HP per turn (as in 2.0.x) instead of 100%
+        * New nations 
+    * AI difficulty level: Cheating
+    * New server options: 
+        * foggedborders: visibility of borders is subject to fog of war
+        * borders gains new modes where player can see all tiles inside borders, and borders extend to unknown tiles revealing them
+        * endspaceship controls whether spaceship reaching Alpha Cen ends the game
+        * trademindist controls the minimum distance for trade routes between your cities
+        * Times now specified in turns instead of years (endyear becomes endturn, onsetbarbs expressed in turns)
+        * simultaneousphases renamed to phasemode and gains new options 
+    * Client interface changes: 
+        * Menus and shortcut keys revamped; notable changes include:
+              o Connect with Road/Rail/Irrigation changes from Ctrl+Shift+R/L/I to Shift+R/L/I
+              o City Report: F1 to F4
+              o Go/Airlift to City: Shift+L to T
+              o Wake up Others (Shift+W) becomes Unsentry all on tile (Shift+S)
+              o Orders menu split into Select, Unit, Work, and Combat; Reports becomes Civilization 
+    * Scripting improvements
+    * Event cache: messages from the last few turns can be replayed to clients on connection and saved in savegames
+    * Featured text in Gtk client, including colour coding and clickable links to mentioned cities/units/tiles 
+
 -------------------------------------------------------------------
 Sat Feb 20 12:00:00 CEST 2010 - freespacer@gmx.de
 

freeciv.desktop

@@ -64,7 +64,7 @@ GenericName[xh]=Indlela ethile Yomdlalo
 GenericName[zh_CN]=策略游戏
 GenericName[zh_TW]=策略遊戲
 GenericName[zu]=Umdlalo weplani
-Exec=civclient
+Exec=freeciv-gtk2
 Icon=freeciv
 Path=
 Terminal=false

freeciv.spec

@@ -19,14 +19,15 @@
 
 
 Name:           freeciv
-BuildRequires:  audiofile-devel gtk2-devel imlib-config imlib-devel readline-devel update-desktop-files 
+BuildRequires:  gcc-c++ audiofile-devel gtk2-devel readline-devel update-desktop-files fdupes
+# imlib-config imlib-devel 
 BuildRequires:  SDL_mixer-devel
 Url:            http://www.freeciv.org
 License:        GPL v2 or later
 Group:          Amusements/Games/Strategy/Turn Based
 AutoReqProv:    on
 Summary:        Free Civilization Clone
-Version:        2.1.11
+Version:        2.2.1
 Release:        1
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        freeciv.desktop
@@ -64,11 +65,9 @@ echo "X-SuSE-translate=false" >> bootstrap/freeciv-server.desktop.in
 autoreconf -fi
 %configure \
   --enable-client=gtk2 \
-  --disable-esd \
+  --with-readline \
-  --with-zlib \
+  --disable-static
-  --with-readline
+%{__make} %{?jobs:-j%jobs}
-grep '^#define SDL 1$' config.h
-make
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -79,16 +78,20 @@ install -m 644 $RPM_SOURCE_DIR/*.png $RPM_BUILD_ROOT/usr/share/pixmaps
 %suse_update_desktop_file -i freeciv-manual Game StrategyGame
 rm -f $RPM_BUILD_ROOT/usr/share/applications/freecivserver.desktop
 rm -f $RPM_BUILD_ROOT/usr/share/pixmaps/freeciv-manual
+#--disable-static doesn't work so work in configure phase so we drop static libs by hand :
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libfreeciv*.{a,la}
 # make rpmlint happy
 find doc -name "Makefile*" | xargs rm -f
 %find_lang %name
+%fdupes %{buildroot}/%{_datadir}/ 
 
 %files -f %name.lang
 %defattr(-,root,root)
 %doc ABOUT-NLS COPYING ChangeLog NEWS doc
-%{_bindir}/civclient
+%doc %{_mandir}/man6/freeciv-*.6.gz
+%{_bindir}/freeciv-gtk2
+%{_bindir}/freeciv-server
 %{_bindir}/civmanual
-%{_bindir}/civserver
 %{_bindir}/freeciv-manual
 %{_datadir}/applications/freeciv-manual.desktop
 %{_datadir}/applications/freeciv-server.desktop
@@ -104,8 +107,6 @@ find doc -name "Makefile*" | xargs rm -f
 %{_datadir}/icons/hicolor/48x48/apps/freeciv-server.png
 %{_datadir}/icons/hicolor/64x64/apps/freeciv-client.png
 %{_datadir}/icons/hicolor/64x64/apps/freeciv-server.png
-%{_mandir}/man6/civclient.6.gz
-%{_mandir}/man6/civserver.6.gz
 %{_datadir}/pixmaps/freeciv-client.png
 %{_datadir}/pixmaps/freeciv-manual.png
 %{_datadir}/pixmaps/%name.png