- added link patch (needs explicit linking with -lX11)

- updated BRs for guichan interfaces split
- let opengl bcond actually do anything
- release 6

diff --git a/tmw-link.patch b/tmw-link.patch
new file mode 100644 (file)
index 0000000..7b21c5b
--- /dev/null
+++ b/tmw-link.patch
@@ -0,0 +1,10 @@
+--- tmw-0.5.2/src/CMakeLists.txt.orig  2011-04-17 01:17:57.000000000 +0200
++++ tmw-0.5.2/src/CMakeLists.txt       2017-07-15 09:22:55.721508970 +0200
+@@ -650,6 +650,7 @@
+     ${LIBXML2_LIBRARIES}
+     ${GUICHAN_LIBRARIES}
+     ${OPENGL_LIBRARIES}
++    ${X11_LIBRARIES}
+     ${LIBINTL_LIBRARIES}
+     ${EXTRA_LIBRARIES})
+ 

diff --git a/tmw.spec b/tmw.spec
index ca054647d2e806a159d3d3645805f08d2ad8fea1..9ead5589f3b2eb42efb4896602cc714eea856c62 100644 (file)
--- a/tmw.spec
+++ b/tmw.spec
@@ -1,37 +1,39 @@
-%bcond_without opengl  #disable OpenGL support
+#
+# Conditional build:
+%bcond_without opengl  # OpenGL support
+#
 Summary:       A free Open Source 2D MMORPG
 Summary(pl.UTF-8):     Gra typu MMORPG 2D o otwartych źródłach
 Name:          tmw
 Version:       0.5.2
-Release:       5
+Release:       6
 License:       GPL v2+
 Group:         X11/Applications/Games
 Source0:       http://downloads.sourceforge.net/themanaworld/%{name}-%{version}.tar.bz2
 # Source0-md5: c843ef420aced82db1e51fa14e80174a
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-build.patch
+Patch2:                %{name}-link.patch
 URL:           http://themanaworld.org/
 %{?with_opengl:BuildRequires:  OpenGL-GLU-devel}
 %{?with_opengl:BuildRequires:  OpenGL-devel}
+BuildRequires: SDL-devel
 BuildRequires: SDL_gfx-devel
 BuildRequires: SDL_image-devel
 BuildRequires: SDL_mixer-devel
 BuildRequires: SDL_net-devel
 BuildRequires: SDL_ttf-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6
 BuildRequires: curl-devel
 BuildRequires: gettext-tools
 BuildRequires: guichan-devel >= 0.8.0
+BuildRequires: guichan-sdl-devel >= 0.8.0
 BuildRequires: libpng-devel
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2
 BuildRequires: physfs-devel
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.600
-Requires:      SDL_image
-Requires:      SDL_mixer
-Requires:      SDL_net
-# should be autodetected
-Requires:      curl
+BuildRequires: rpmbuild(macros) >= 1.605
+BuildRequires: xorg-lib-libX11-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,11 +66,13 @@ Online.
 %setup -q -c
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
 cd build
-%cmake ..
+%cmake .. \
+       %{!?with_opengl:-DWITH_OPENGL=OFF}
 %{__make}
 
 %install