[packages/doomsday] - up to 2.0.0

Mon Apr 17 22:51:15 CEST 2017

commit e943ed70d5f31fce655523845efba8f699e851b4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 17 22:51:04 2017 +0200

    - up to 2.0.0

 doomsday.spec | 80 ++++++++++++++++++++++++++++++++---------------------------
 link.patch    | 19 ++++++++++++++
 2 files changed, 63 insertions(+), 36 deletions(-)
---

diff --git a/doomsday.spec b/doomsday.spec
index 17ec9b5..dd80639 100644
--- a/doomsday.spec
+++ b/doomsday.spec
@@ -1,18 +1,12 @@
-# TODO
-# - sync pl
-# Conditional build:
-%bcond_with	qt4	# use Qt4 instead of Qt5
-
-%define		subver	stable
 Summary:	jDoom, jHeretic and jHexen for Linux
 Summary(pl.UTF-8):	jDoom, jHeretic i jHexen dla Linuksa
 Name:		doomsday
-Version:	1.15.8
-Release:	0.1
+Version:	2.0.0
+Release:	1
 License:	GPL v2 / CC 3.0 (icons)
 Group:		Applications/Games
-Source0:	http://downloads.sourceforge.net/deng/%{name}-%{subver}-%{version}.tar.gz
-# Source0-md5:	14487b988bd3b46580164cdcfa5989d5
+Source0:	http://downloads.sourceforge.net/deng/%{name}-%{version}.tar.gz
+# Source0-md5:	add8b4b70878aa9d98b8bb9a6502882b
 Source1:	http://www.iconarchive.com/icons/3xhumed/mega-games-pack-26/Doom-1-48x48.png
 # Source1-md5:	b7b7a9389eba56679e5db65d95c06803
 Source2:	http://www.iconarchive.com/icons/3xhumed/mega-games-pack-23/Hexen-1-48x48.png
@@ -24,10 +18,11 @@ Source5:	%{name}-heretic.desktop
 Source6:	%{name}-hexen.desktop
 URL:		http://www.dengine.net/
 BuildRequires:	OpenGL-devel
-BuildRequires:	Qt%{!?with_qt4:5}Core-devel
-BuildRequires:	Qt%{!?with_qt4:5}Network-devel
-BuildRequires:	Qt%{!?with_qt4:5}OpenGL-devel
-BuildRequires:	Qt%{!?with_qt4:5}X11Extras-devel
+BuildRequires:	Qt5Core-devel
+BuildRequires:	Qt5Network-devel
+BuildRequires:	Qt5OpenGL-devel
+BuildRequires:	Qt5OpenGLExtensions-devel
+BuildRequires:	Qt5X11Extras-devel
 BuildRequires:	SDL2-devel
 BuildRequires:	SDL2_mixer-devel
 BuildRequires:	assimp-devel
@@ -37,8 +32,8 @@ BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python
 BuildRequires:	python-modules
-BuildRequires:	qt%{?with_qt4:4}%{!?with_qt4:5}-build
-BuildRequires:	qt%{?with_qt4:4}%{!?with_qt4:5}-qmake
+BuildRequires:	qt5-build
+BuildRequires:	qt5-qmake
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.595
 BuildRequires:	xorg-lib-libXrandr-devel
@@ -55,27 +50,25 @@ hardware accelerated 3D graphics, surround sound and much more.
 jDoom, jHeretic i jHexen dla Linuksa.
 
 %prep
-%setup -q -n %{name}-%{subver}-%{version}
+%setup -q
 
 %build
-install -d build
-cd build
-LDFLAGS="-lm"
-qmake-qt%{?with_qt4:4}%{!?with_qt4:5} CONFIG+=deng_notools \
-	-r ../doomsday/doomsday.pro
+install -d doomsday/_build
+cd doomsday/_build
+%{cmake} ..
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
-%{__make} -C build install \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_mandir}/man6}
+
+%{__make} -C doomsday/_build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 # no -devel package. cleanup
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libdeng_*.so
-# junk links
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libdeng_*.so.1.15
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libdeng_core.so.2.0
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/cmake
 
 install -d $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/doom.png
@@ -86,6 +79,8 @@ cp -p %{_sourcedir}/%{name}-doom.desktop $RPM_BUILD_ROOT%{_desktopdir}
 cp -p %{_sourcedir}/%{name}-hexen.desktop $RPM_BUILD_ROOT%{_desktopdir}
 cp -p %{_sourcedir}/%{name}-heretic.desktop $RPM_BUILD_ROOT%{_desktopdir}
 
+cp -p doomsday/doc/output/*.6 $RPM_BUILD_ROOT%{_mandir}/man6
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -106,22 +101,35 @@ EOF
 %defattr(644,root,root,755)
 #%doc doomsday/build/README
 %attr(755,root,root) %{_bindir}/doomsday
+%attr(755,root,root) %{_bindir}/doomsday-2.0.0
+%attr(755,root,root) %{_bindir}/doomsdayscript
+%attr(755,root,root) %{_bindir}/doomsdayscript-2.0.0
 %attr(755,root,root) %{_bindir}/doomsday-server
-%attr(755,root,root) %{_bindir}/launch-doomsday
+%attr(755,root,root) %{_bindir}/doomsday-server-2.0.0
+%attr(755,root,root) %{_bindir}/doomsday-shell
+%attr(755,root,root) %{_bindir}/doomsday-shell-2.0.0
+%attr(755,root,root) %{_bindir}/doomsday-shell-text
+%attr(755,root,root) %{_bindir}/doomsday-shell-text-2.0.0
+%attr(755,root,root) %{_bindir}/md2tool
+%attr(755,root,root) %{_bindir}/savegametool
+%attr(755,root,root) %{_bindir}/savegametool-2.0.0
+%attr(755,root,root) %{_bindir}/texc
+%attr(755,root,root) %{_bindir}/wadtool
 
 %attr(755,root,root) %{_libdir}/libdeng_core.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdeng_core.so.2
+%attr(755,root,root) %ghost %{_libdir}/libdeng_core.so.2.0
 %attr(755,root,root) %{_libdir}/libdeng_appfw.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdeng_appfw.so.1
+%attr(755,root,root) %ghost %{_libdir}/libdeng_appfw.so.2.0
 %attr(755,root,root) %{_libdir}/libdeng_doomsday.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdeng_doomsday.so.1
+%attr(755,root,root) %ghost %{_libdir}/libdeng_doomsday.so.2.0
+%attr(755,root,root) %{_libdir}/libdeng_gamefw.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdeng_gamefw.so.2.0
 %attr(755,root,root) %{_libdir}/libdeng_gui.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdeng_gui.so.1
+%attr(755,root,root) %ghost %{_libdir}/libdeng_gui.so.2.0
 %attr(755,root,root) %{_libdir}/libdeng_legacy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdeng_legacy.so.1
+%attr(755,root,root) %ghost %{_libdir}/libdeng_legacy.so.2.0
 %attr(755,root,root) %{_libdir}/libdeng_shell.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdeng_shell.so.1
-
+%attr(755,root,root) %ghost %{_libdir}/libdeng_shell.so.2.0
 
 %{_libdir}/doomsday
 %{_datadir}/doomsday
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..434f198
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,19 @@
+--- doomsday-2.0.0/doomsday/sdk/libgui/CMakeLists.txt.orig	2017-04-01 02:37:17.000000000 +0200
++++ doomsday-2.0.0/doomsday/sdk/libgui/CMakeLists.txt	2017-04-17 22:28:36.107038519 +0200
+@@ -123,7 +123,7 @@
+ 
+ if (DENG_X11)
+     target_include_directories (libgui PRIVATE ${X11_INCLUDE_DIR})
+-    target_link_libraries (libgui PRIVATE ${X11_LIBRARIES})
++    target_link_libraries (libgui PRIVATE ${X11_LIBRARIES} GL)
+     deng_target_link_qt (libgui PRIVATE X11Extras)
+     if (DENG_ENABLE_DISPLAYMODE)
+         if (NOT X11_Xrandr_FOUND)
+@@ -148,6 +148,7 @@
+ # If Assimp is part of the build, ensure that it gets compiled before libgui.
+ if (TARGET assimp)
+     add_dependencies (libgui assimp)
++    target_link_libraries (libgui PRIVATE z)
+     if (MSVC)
+         target_link_libraries (libgui PRIVATE zlibstatic)   # from assimp project
+     endif ()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/doomsday.git/commitdiff/e943ed70d5f31fce655523845efba8f699e851b4

