[packages/crossfire-client] - updated to 1.71.0 (last version with sounds+images)

[qboosh]

commit a7383a7f65e7ce9a0b87ba2362d00d54192d69a1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 23 21:50:24 2025 +0100

    - updated to 1.71.0 (last version with sounds+images)

 crossfire-client-link.patch |  8 ++++----
 crossfire-client-lua.patch  | 28 ----------------------------
 crossfire-client.spec       | 28 +++++++++++++---------------
 3 files changed, 17 insertions(+), 47 deletions(-)
---
diff --git a/crossfire-client.spec b/crossfire-client.spec
index 146c00f..53eef1e 100644
--- a/crossfire-client.spec
+++ b/crossfire-client.spec
@@ -2,22 +2,21 @@
 # Conditional build:
 %bcond_without	images	# images package
 #
-%define		sndver	1.70.0
-%define		imgver	1.70.0
+%define		sndver	1.71.0
+%define		imgver	1.71.0
 Summary:	Crossfire client
 Summary(pl.UTF-8):	Klient Crossfire
 Name:		crossfire-client
-Version:	1.70.0
+Version:	1.71.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/Games
-Source0:	https://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
-# Source0-md5:	657a773fc2223629474c7ec16635d2ef
-Source1:	https://downloads.sourceforge.net/crossfire/%{name}-sounds-%{sndver}.tar.gz
-# Source1-md5:	48133bb0d220d3b7dee60fa218819b08
-Source2:	https://downloads.sourceforge.net/crossfire/%{name}-images-%{imgver}.tar.gz
-# Source2-md5:	5f5dfa091ae1e3a3660c935f36bd8022
-Patch0:		%{name}-lua.patch
+Source0:	https://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.bz2
+# Source0-md5:	a32b9a3cb42f65820c5a9193dcfa56d5
+Source1:	https://downloads.sourceforge.net/crossfire/%{name}-sounds-%{sndver}.tar.bz2
+# Source1-md5:	3c9b8045231d4f861986b76b1bfde328
+Source2:	https://downloads.sourceforge.net/crossfire/%{name}-images-%{imgver}.tar.bz2
+# Source2-md5:	91e9ad93276be1565d190fccdcfb810d
 Patch1:		%{name}-link.patch
 URL:		http://crossfire.real-time.com/
 BuildRequires:	OpenGL-GLU-devel
@@ -93,13 +92,12 @@ Trochę obrazków wyciągniętych z serwera do Crossfire.
 
 %prep
 %setup -q -a1
-%patch -P0 -p1
 %patch -P1 -p1
 %{__mv} sounds cfsounds
 %if %{with images}
 install -d images
 cd images
-tar xzf %{SOURCE2}
+tar xf %{SOURCE2}
 cd ..
 %endif
 
@@ -124,7 +122,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name}/sounds
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -p cfsounds/*.raw $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds/
+cp -p cfsounds/*.wav cfsounds/sounds.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds/
 %if %{with images}
 cp -p images/bmaps.client images/crossfire.base images/crossfire.clsc \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -139,12 +137,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/crossfire-client-gtk2
 %{_mandir}/man6/crossfire-client-gtk2.6*
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/glade-gtk2
 %{_datadir}/%{name}/themes
+%{_datadir}/%{name}/ui
 
 %files sounds
 %defattr(644,root,root,755)
-%doc cfsounds/README
+%doc cfsounds/AUTHORS
 %attr(755,root,root) %{_bindir}/cfsndserv*
 %{_datadir}/%{name}/sounds
 
diff --git a/crossfire-client-link.patch b/crossfire-client-link.patch
index 7f1a8f3..d7418da 100644
--- a/crossfire-client-link.patch
+++ b/crossfire-client-link.patch
@@ -1,7 +1,7 @@
---- crossfire-client-1.70.0/sound-src/Makefile.am.orig	2025-03-23 19:09:10.871185111 +0100
-+++ crossfire-client-1.70.0/sound-src/Makefile.am	2025-03-23 19:09:13.944501794 +0100
-@@ -61,6 +61,7 @@ cfsndserv_SOURCES = \
- 	cfsndserv.c
+--- crossfire-client-1.71.0/sound-src/Makefile.am.orig	2025-03-23 21:37:41.089580984 +0100
++++ crossfire-client-1.71.0/sound-src/Makefile.am	2025-03-23 21:38:08.319433467 +0100
+@@ -33,6 +33,7 @@ cfsndserv_SOURCES = \
+ 	sndproto.h
  
  cfsndserv_LDADD = \
 +	$(SDL_LIBS) \
diff --git a/crossfire-client-lua.patch b/crossfire-client-lua.patch
deleted file mode 100644
index 4067b28..0000000
--- a/crossfire-client-lua.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- crossfire-client-1.70.0/configure.ac.orig	2012-03-18 07:18:25.000000000 +0100
-+++ crossfire-client-1.70.0/configure.ac	2025-03-23 18:08:13.057667853 +0100
-@@ -195,12 +195,9 @@ AC_CHECK_LIB(m, sqrt)
- 
- AC_SEARCH_LIBS(pthread_create, [pthread, pthreadgc, pthreadgc1, pthreadgc2], [AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define to 1 if you have the 'pthread' library.])])
- 
--PKG_CHECK_MODULES(LUA, lua >= 5.0.0, [lua_scripting=yes], [lua_scripting=no])
--if eval "test x$lua_scripting = xyes" ; then
--    LUA_LIBS=`$PKG_CONFIG --libs lua`
--fi
-+PKG_CHECK_MODULES(LUA, lua5.0 >= 5.0.0, [lua_scripting=yes], [lua_scripting=no])
- 
--PKG_CHECK_MODULES(LUA, lua >= 5.1.0, [HAVE_LUA_5_1=yes], [HAVE_LUA_5_1=no])
-+PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1.0, [HAVE_LUA_5_1=yes], [HAVE_LUA_5_1=no])
- if eval "test x$HAVE_LUA_5_1 = xyes" ; then
-     AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
- fi
---- crossfire-client-1.70.0/common/Makefile.am.orig	2012-03-18 07:17:45.000000000 +0100
-+++ crossfire-client-1.70.0/common/Makefile.am	2025-03-23 18:08:27.534256093 +0100
-@@ -64,7 +64,7 @@ EXTRA_DIST = \
- 	item-types \
- 	items.pl
- 
--AM_CFLAGS = $(PTHREAD_CFLAGS)
-+AM_CFLAGS = $(PTHREAD_CFLAGS) $(LUA_CFLAGS)
- 
- proto:
- 	cproto -DCPROTO -DCFCLIENT $(DEFAULT_INCLUDES) $(AM_CFLAGS) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossfire-client.git/commitdiff/a7383a7f65e7ce9a0b87ba2362d00d54192d69a1