packages: crossfire-client/crossfire-client-libpng15.patch, crossfire-clien...
wiget
wiget at pld-linux.org
Sat Feb 18 18:12:48 CET 2012
Author: wiget Date: Sat Feb 18 17:12:48 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.60.0
- x11 and gtk 1.x clients dropped upstream
---- Files affected:
packages/crossfire-client:
crossfire-client-libpng15.patch (1.1 -> 1.2) , crossfire-client.spec (1.47 -> 1.48)
---- Diffs:
================================================================
Index: packages/crossfire-client/crossfire-client-libpng15.patch
diff -u packages/crossfire-client/crossfire-client-libpng15.patch:1.1 packages/crossfire-client/crossfire-client-libpng15.patch:1.2
--- packages/crossfire-client/crossfire-client-libpng15.patch:1.1 Sat Feb 11 12:12:16 2012
+++ packages/crossfire-client/crossfire-client-libpng15.patch Sat Feb 18 18:12:43 2012
@@ -1,42 +1,11 @@
---- crossfire-client-1.10.0/gtk/png.c~ 2007-03-05 06:51:47.000000000 +0100
-+++ crossfire-client-1.10.0/gtk/png.c 2012-02-11 12:08:56.328971164 +0100
-@@ -86,7 +86,7 @@
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- return NULL;
+--- crossfire-client-1.60.0/gtk-v2/src/png.c.wiget 2011-01-28 07:17:57.000000000 +0100
++++ crossfire-client-1.60.0/gtk-v2/src/png.c 2012-02-18 17:52:15.410954778 +0100
+@@ -571,7 +571,7 @@ int png_to_gdkpixmap(GdkWindow *window,
+ png_destroy_read_struct (&png_ptr, NULL, NULL);
+ return PNGX_OUTOFMEM;
}
- if (setjmp (png_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf(png_ptr))) {
- png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- return NULL;
- }
---- crossfire-client-1.10.0/x11/png.c~ 2007-03-05 06:51:49.000000000 +0100
-+++ crossfire-client-1.10.0/x11/png.c 2012-02-11 12:08:14.612095092 +0100
-@@ -88,7 +88,7 @@
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- return NULL;
- }
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp (png_jmpbuf(png_ptr))) {
- png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- return NULL;
- }
-@@ -600,7 +600,7 @@
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- return PNGX_OUTOFMEM;
- }
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp (png_jmpbuf(png_ptr))) {
- png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- return PNGX_DATA;
- }
---- crossfire-client-1.10.0/gtk-v2/src/png.c~ 2007-03-05 06:51:49.000000000 +0100
-+++ crossfire-client-1.10.0/gtk-v2/src/png.c 2012-02-11 12:09:43.339207061 +0100
-@@ -532,7 +532,7 @@
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- return PNGX_OUTOFMEM;
- }
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp (png_jmpbuf(png_ptr))) {
- png_destroy_read_struct (&png_ptr, &info_ptr,NULL);
- return PNGX_DATA;
+ png_destroy_read_struct (&png_ptr, &info_ptr,NULL);
+ return PNGX_DATA;
}
================================================================
Index: packages/crossfire-client/crossfire-client.spec
diff -u packages/crossfire-client/crossfire-client.spec:1.47 packages/crossfire-client/crossfire-client.spec:1.48
--- packages/crossfire-client/crossfire-client.spec:1.47 Sat Feb 11 12:12:07 2012
+++ packages/crossfire-client/crossfire-client.spec Sat Feb 18 18:12:43 2012
@@ -3,21 +3,21 @@
# Conditional build:
%bcond_without images # don't build images package
#
-%define sndver 1.10.0
-%define imgver 1.10.0
+%define sndver 1.60.0
+%define imgver 1.60.0
Summary: Crossfire client
Summary(pl.UTF-8): Klient Crossfire
Name: crossfire-client
-Version: 1.10.0
-Release: 5
+Version: 1.60.0
+Release: 1
License: GPL
Group: Applications/Games
Source0: http://dl.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
-# Source0-md5: 883296ef199cbf47334d52d8b5d61886
+# Source0-md5: 7b22bf93ebb581a5bfd5682df107af76
Source1: http://dl.sourceforge.net/crossfire/%{name}-sounds-%{sndver}.tar.gz
-# Source1-md5: b990e5e3bf321211312cba48fb885142
+# Source1-md5: 1985fc187a7624f48a4c4e9d609208ba
Source2: http://dl.sourceforge.net/crossfire/%{name}-images-%{imgver}.tar.gz
-# Source2-md5: 496ccabc31e773349ccc679812f66f7b
+# Source2-md5: e68b6f32c4d15e65af8535a346efe51a
Patch0: %{name}-libpng15.patch
URL: http://crossfire.real-time.com/
BuildRequires: OpenGL-glut-devel
@@ -33,11 +33,15 @@
BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
-Requires: %{name}-common = %{version}-%{release}
+Suggests: crossfire-client-sounds
+Suggests: crossfire-client-images
+Obsoletes: crossfire-client-gtk
+Obsoletes: crossfire-client-gtk2
+Obsoletes: crossfire-client-common
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-X11 client to crossfire.
+GTK+2 client to crossfire.
Crossfire is a multiplayer graphical arcade and adventure game made
for the X-Window environment. There are also Windows and Java clients
@@ -51,7 +55,7 @@
compete in the same "world".
%description -l pl.UTF-8
-Klient Crossfire pod X11.
+Klient Crossfire pod GTK+2.
Crossfire to graficzna gra przygodowa dla środowiska X-Window. Są
także dostępni klienci pod Windows i w Javie. Łączy cechy z kilku
@@ -65,7 +69,6 @@
Summary: Crossfire sounds
Summary(pl.UTF-8): Dźwięki do Crossfire
Group: Applications/Games
-Requires: %{name}-common = %{version}-%{release}
%description sounds
Some sound files and the sound server for crossfire.
@@ -73,73 +76,10 @@
%description sounds -l pl.UTF-8
Pliki dźwiękowe i serwer dźwięku dla Crossfire.
-%package gtk
-Summary: GTK+ Crossfire client
-Summary(pl.UTF-8): Klient Crossfire pod GTK+
-Group: Applications/Games
-Requires: %{name}-common = %{version}-%{release}
-
-%description gtk
-GTK+ client to crossfire.
-
-Crossfire is a multiplayer graphical arcade and adventure game made
-for the X-Window environment. There are also Windows and Java clients
-available.
-
-It has certain flavours from other games, especially Gauntlet (TM) and
-Nethack/Moria.
-
-Any number of players can move around in their own window, finding and
-sing items and battle monsters. They can choose to cooperate or
-compete in the same "world".
-
-%description gtk -l pl.UTF-8
-Klient Crossfire pod GTK+.
-
-Crossfire to graficzna gra przygodowa dla środowiska X-Window. Są
-także dostępni klienci pod Windows i w Javie. Łączy cechy z kilku
-gier, głównie Gauntleta i Nethacka/Morii.
-
-Dowolna liczba graczy może się poruszać w swoich oknach, szukając
-przedmiotów i walcząc z potworami. Mogą grać w kooperacji lub
-przeciwko sobie w tym samym "świecie".
-
-%package gtk2
-Summary: GTK+2 Crossfire client
-Summary(pl.UTF-8): Klient Crossfire pod GTK+2
-Group: Applications/Games
-Requires: %{name}-common = %{version}-%{release}
-
-%description gtk2
-GTK+2 client to crossfire.
-
-Crossfire is a multiplayer graphical arcade and adventure game made
-for the X-Window environment. There are also Windows and Java clients
-available.
-
-It has certain flavours from other games, especially Gauntlet (TM) and
-Nethack/Moria.
-
-Any number of players can move around in their own window, finding and
-sing items and battle monsters. They can choose to cooperate or
-compete in the same "world".
-
-%description gtk2 -l pl.UTF-8
-Klient Crossfire pod GTK+2.
-
-Crossfire to graficzna gra przygodowa dla środowiska X-Window. Są
-także dostępni klienci pod Windows i w Javie. Łączy cechy z kilku
-gier, głównie Gauntleta i Nethacka/Morii.
-
-Dowolna liczba graczy może się poruszać w swoich oknach, szukając
-przedmiotów i walcząc z potworami. Mogą grać w kooperacji lub
-przeciwko sobie w tym samym "świecie".
-
%package images
Summary: Crossfire images
Summary(pl.UTF-8): Obrazki do Crossfire
Group: Applications/Games
-Requires: %{name}-common = %{version}-%{release}
%description images
Some images extracted from server for Crossfire.
@@ -147,17 +87,6 @@
%description images -l pl.UTF-8
Trochę obrazków wyciągniętych z serwera do Crossfire.
-%package common
-Summary: Common Crossfire clients files
-Summary(pl.UTF-8): Pliki wspólne wszystkich klientów Crossfire
-Group: Applications/Games
-
-%description common
-This package includes files common to all Crossfire clients.
-
-%description common -l pl.UTF-8
-Ten pakiet zawiera pliki wspólne dla wszystkich klientów Crossfire.
-
%prep
%setup -q -a1
%patch0 -p1
@@ -171,7 +100,7 @@
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I macros
%{__autoconf}
%{__automake}
%configure \
@@ -198,13 +127,12 @@
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/cfclient
-%{_mandir}/man?/cf*
-
-%files common
-%defattr(644,root,root,755)
%doc ChangeLog README
+%attr(755,root,root) %{_bindir}/crossfire-client-gtk2
+%{_mandir}/man?/crossfire-client-gtk2.*
%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/glade-gtk2
+%{_datadir}/%{name}/themes
%files sounds
%defattr(644,root,root,755)
@@ -220,21 +148,16 @@
%{_datadir}/%{name}/crossfire.clsc
%endif
-%files gtk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gcfclient
-%{_mandir}/man?/gcfclient.*
-
-%files gtk2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gcfclient2
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2012/02/18 17:12:43 wiget
+- up to 1.60.0
+- x11 and gtk 1.x clients dropped upstream
+
Revision 1.47 2012/02/11 11:12:07 adamg
- release 5 (rebuild against libpng-1.5)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossfire-client/crossfire-client-libpng15.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossfire-client/crossfire-client.spec?r1=1.47&r2=1.48&f=u
More information about the pld-cvs-commit
mailing list