[packages/freeciv] - rediff patch, rel 3

[baggins]

commit 19a72140ce2a468ac7a0c65ecbba9a0d49241216
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 16 10:12:08 2022 +0200

    - rediff patch, rel 3

 freeciv-link.patch | 15 ++++++++-------
 freeciv.spec       |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/freeciv.spec b/freeciv.spec
index 46363fe..5ad34bb 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -20,7 +20,7 @@ Summary(pl.UTF-8):	Niekomercyjny klon CIVilization
 Summary(pt_BR.UTF-8):	Clone do jogo Civilization
 Name:		freeciv
 Version:	2.6.3
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Games/Strategy
 Source0:	http://downloads.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2
@@ -33,6 +33,7 @@ Patch3:		imagemagick7.patch
 URL:		http://freeciv.wikia.com/
 %{?with_magickwand:BuildRequires:	ImageMagick-devel}
 %{?with_sdl:BuildRequires:	SDL_image-devel}
+BuildRequires:	SDL_ttf-devel
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1:1.9
diff --git a/freeciv-link.patch b/freeciv-link.patch
index 79cf95a..12a997a 100644
--- a/freeciv-link.patch
+++ b/freeciv-link.patch
@@ -1,15 +1,16 @@
---- freeciv-2.0.7/configure.ac.orig	2005-10-13 09:45:45.000000000 +0200
-+++ freeciv-2.0.7/configure.ac	2005-12-26 16:30:36.000000000 +0100
-@@ -440,7 +440,7 @@
- dnl Checks for additional server libraries:
- if test x$server = xtrue; then
+diff -urNp -x '*.orig' freeciv-2.6.3.org/configure.ac freeciv-2.6.3/configure.ac
+--- freeciv-2.6.3.org/configure.ac	2020-12-31 13:12:07.000000000 +0100
++++ freeciv-2.6.3/configure.ac	2022-04-16 10:08:18.204521223 +0200
+@@ -1214,7 +1214,7 @@ if test "x$server" = "xyes"; then
+     SERVER_LIBS="-lm ${SERVER_LIBS}"
+ 
      dnl Some systems (e.g., BeOS) need this lib
 -    AC_CHECK_LIB(bind, gethostbyaddr, SERVER_LIBS="-lbind $SERVER_LIBS")
 +    AC_CHECK_FUNC(gethostbyaddr,,[AC_CHECK_LIB(bind, gethostbyaddr, SERVER_LIBS="-lbind $SERVER_LIBS")])
  
      dnl Readline library and header files.
      FC_HAS_READLINE()
-@@ -501,13 +501,13 @@
+@@ -1319,13 +1319,13 @@ dnl Check for extra socket libraries.
  dnl If the AC_CHECK_FUNCS check finds the function, we don't look any
  dnl further.  This is rumoured to prevent choosing the wrong libs on IRIX.
  if test $ac_cv_func_gethostbyname = no; then
@@ -25,4 +26,4 @@
 +  AC_SEARCH_LIBS(gethostbyaddr, bind)
  fi
  
- dnl The use of both AC_FUNC_VSNPRINTF and AC_CHECK_FUNCS(vsnprintf) is
+ dnl Windows fdopen does not work with sockets.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/freeciv.git/commitdiff/19a72140ce2a468ac7a0c65ecbba9a0d49241216