packages: tmw/tmw-desktop.patch, tmw/tmw.spec - updated to 0.5.2 - switched...

lisu lisu at pld-linux.org
Wed Apr 27 14:12:00 CEST 2011


Author: lisu                         Date: Wed Apr 27 12:12:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.5.2
- switched to cmake build system
- more verbose files

---- Files affected:
packages/tmw:
   tmw-desktop.patch (1.2 -> 1.3) , tmw.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: packages/tmw/tmw-desktop.patch
diff -u packages/tmw/tmw-desktop.patch:1.2 packages/tmw/tmw-desktop.patch:1.3
--- packages/tmw/tmw-desktop.patch:1.2	Sat May 16 18:34:53 2009
+++ packages/tmw/tmw-desktop.patch	Wed Apr 27 14:11:55 2011
@@ -1,11 +1,19 @@
---- tmw-0.0.29/tmw.desktop.orig	2009-05-10 16:34:37.000000000 +0200
-+++ tmw-0.0.29/tmw.desktop	2009-05-16 18:25:36.110120117 +0200
-@@ -7,9 +7,11 @@
+--- tmw-0.5.2/tmw.desktop~	2011-04-17 01:17:57.000000000 +0200
++++ tmw-0.5.2/tmw.desktop	2011-04-27 13:55:27.943333377 +0200
+@@ -1,17 +1,16 @@
+-#!/usr/bin/env xdg-open
+-
+ [Desktop Entry]
+-Version=1.0
+ Name=The Mana World
+ Comment=A 2D MMORPG client
+ Comment[fr]=Un jeu en ligne dans un univers fantastique
  Comment[de]=ein Online Fantasy Spiel
  Comment[it]=Un gioco fantasy online
  Comment[nl]=Een online role playing game
 +Comment[pl]=Internetowa gra fantasy RPG
- Exec=tmw
+ Comment[sv]=Ett fantasyrollspel online
+ Exec=mana tmw.mana
  StartupNotify=false
  Terminal=false
  Type=Application

================================================================
Index: packages/tmw/tmw.spec
diff -u packages/tmw/tmw.spec:1.45 packages/tmw/tmw.spec:1.46
--- packages/tmw/tmw.spec:1.45	Sun Feb 28 02:14:17 2010
+++ packages/tmw/tmw.spec	Wed Apr 27 14:11:55 2011
@@ -3,24 +3,22 @@
 Summary:	A free Open Source 2D MMORPG
 Summary(pl.UTF-8):	Gra typu MMORPG 2D o otwartych źródłach
 Name:		tmw
-Version:	0.0.29.1
-Release:	2
+Version:	0.5.2
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
-Source0:	http://dl.sourceforge.net/themanaworld/%{name}-%{version}.tar.gz
-# Source0-md5:	263de26c8545a261c6b82b7ae639f733
+Source0:	http://downloads.sourceforge.net/themanaworld/%{name}-%{version}.tar.bz2
+# Source0-md5:	c843ef420aced82db1e51fa14e80174a
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-OpenGL.patch
-Patch2:		%{name}-guichan_sdl.patch
 URL:		http://themanaworld.org/
 %{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
 %{?with_opengl:BuildRequires:	OpenGL-devel}
+BuildRequires:	SDL_gfx-devel
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	SDL_net-devel
 BuildRequires:	SDL_ttf-devel
-BuildRequires:	autoconf
-BuildRequires:	automake >= 1:1.9
+BuildRequires:	cmake
 BuildRequires:	curl-devel
 BuildRequires:	gettext-devel
 BuildRequires:	guichan-devel >= 0.8.0
@@ -28,7 +26,7 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	physfs-devel
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.600
 Requires:	SDL_image
 Requires:	SDL_mixer
 Requires:	SDL_net
@@ -63,24 +61,19 @@
 Online.
 
 %prep
-%setup -q
+%setup -q -c
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
 
 %build
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--with%{!?with_opengl:out}-opengl
+install -d build
+cd build
+%cmake ..
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name} --all-name
@@ -91,11 +84,10 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/tmw
-%{_desktopdir}/tmw.desktop
-%{_mandir}/man6/%{name}.6*
-%{_pixmapsdir}/*
+%attr(755,root,root) %{_bindir}/mana
+%{_datadir}/mana
+%{_desktopdir}/mana.desktop
+%{_pixmapsdir}/mana.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +95,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2011/04/27 12:11:55  lisu
+- updated to 0.5.2
+- switched to cmake build system
+- more verbose files
+
 Revision 1.45  2010/02/28 01:14:17  sparky
 - BR: gettext-devel, libpng-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tmw/tmw-desktop.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tmw/tmw.spec?r1=1.45&r2=1.46&f=u



More information about the pld-cvs-commit mailing list