[packages/warzone2100] - up to 3.1.0 - removed obsolete patches

baggins baggins at pld-linux.org
Fri Nov 8 01:04:17 CET 2013


commit a3e3ab1a79dfc7dfc2cb439293498d1e5da3c49e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 8 01:04:03 2013 +0100

    - up to 3.1.0
    - removed obsolete patches

 warzone2100-desktop.patch | 18 ------------------
 warzone2100-link.patch    | 21 ---------------------
 warzone2100.spec          | 11 ++++-------
 3 files changed, 4 insertions(+), 46 deletions(-)
---
diff --git a/warzone2100.spec b/warzone2100.spec
index 093f17f..0ae6040 100644
--- a/warzone2100.spec
+++ b/warzone2100.spec
@@ -1,13 +1,12 @@
 Summary:	3D realtime strategy on a future Earth
 Summary(pl.UTF-8):	Gra RTS, której akcja toczy się w przyszłości
 Name:		warzone2100
-Version:	2.3.9
-Release:	5
+Version:	3.1.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games/Strategy
-Source0:	http://downloads.sourceforge.net/warzone2100/%{name}-%{version}.tar.gz
-# Source0-md5:	7185090a089c9c0e0eca7535a8f25dca
-Patch0:		%{name}-desktop.patch
+Source0:	http://downloads.sourceforge.net/warzone2100/%{name}-%{version}.tar.xz
+# Source0-md5:	7f061f3e5a2a6a83c146508ccefabd86
 Patch1:		%{name}-link.patch
 URL:		http://www.wz2100.net/
 BuildRequires:	OpenAL-devel >= 0.0.8-4
@@ -51,8 +50,6 @@ artyleryjskich oraz obronie przeciwlotniczej.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 # et_EE -> et
 %{__sed} -e 's/et_EE/et/g' -i po/LINGUAS
diff --git a/warzone2100-desktop.patch b/warzone2100-desktop.patch
deleted file mode 100644
index 1625973..0000000
--- a/warzone2100-desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- warzone2100-2.0.10/icons/warzone2100.desktop.orig	2007-12-04 21:05:25.000000000 +0100
-+++ warzone2100-2.0.10/icons/warzone2100.desktop	2007-12-30 22:41:18.000000000 +0100
-@@ -3,11 +3,15 @@
- Type=Application
- Name=Warzone 2100
- Name[de]=Warzone 2100
-+GenericName[pl]=Gra Strategiczna
- GenericName=Strategy Game
- GenericName[de]=Strategiespiel
- Comment=Postnuclear realtime strategy
- Comment[de]=Postnukleare Echtzeit Strategie
-+Comment[pl]=Gra strategiczna czasu rzeczywistego
- Icon=warzone2100
- TryExec=warzone2100
- Exec=warzone2100
- Categories=Game;StrategyGame;
-+Categories=Game;StrategyGame;
-+# vi: encoding=utf-8
diff --git a/warzone2100-link.patch b/warzone2100-link.patch
deleted file mode 100644
index 7fd1f78..0000000
--- a/warzone2100-link.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- warzone2100-2.3.1/configure.ac~	2010-06-13 01:11:33.000000000 +0200
-+++ warzone2100-2.3.1/configure.ac	2010-06-13 19:30:03.925768612 +0200
-@@ -374,6 +374,7 @@
- 		], AS_IF([test "$enable_motif" = "yes"],
- 			[AC_MSG_ERROR([Motif library not found])]))
- ])
-+AC_SUBST([XTOOLKIT_LIBS], [-lXt])
- AM_CONDITIONAL([MOTIF_AVAILABLE], test -n "$MOTIF_LIBS")
- 
- # Look for Popt
---- warzone2100-2.3.1/src/Makefile.am~	2010-06-13 01:11:34.000000000 +0200
-+++ warzone2100-2.3.1/src/Makefile.am	2010-06-13 19:38:39.249051449 +0200
-@@ -296,7 +296,7 @@
- 	$(top_builddir)/lib/iniparser/libiniparser.a \
- 	$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a
- 
--warzone2100_LDADD += $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(POPT_LIBS) $(MOTIF_LIBS) $(X11_LIBS) $(GLee_LIBS)
-+warzone2100_LDADD += $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(POPT_LIBS) $(MOTIF_LIBS) $(XTOOLKIT_LIBS) $(X11_LIBS) $(GLee_LIBS)
- 
- if MINGW32
- warzone2100_LDADD += $(top_builddir)/win32/warzone2100.o $(WIN32_LIBS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/warzone2100.git/commitdiff/a3e3ab1a79dfc7dfc2cb439293498d1e5da3c49e



More information about the pld-cvs-commit mailing list