From d9a7a9fa40fafc41276d960ade0e718e73222d04c96f724803d1f94e445b081f Mon Sep 17 00:00:00 2001
From: Dmitriy Perlow <dap.darkness@gmail.com>
Date: Mon, 23 Jul 2018 15:31:05 +0000
Subject: [PATCH] Accepting request 624686 from
 home:Guillaume_G:branches:openSUSE:Factory:ARM

- Use %cmake macro. This fixes build for aarch64.
- Make use of %license

OBS-URL: https://build.opensuse.org/request/show/624686
OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=19
---
 MyGUI.changes |  6 ++++++
 MyGUI.spec    | 53 ++++++++++++++++++++++-----------------------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/MyGUI.changes b/MyGUI.changes
index c02e7ca..31a748d 100644
--- a/MyGUI.changes
+++ b/MyGUI.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 20 14:27:43 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Use %cmake macro. This fixes build for aarch64.
+- Make use of %license
+
 -------------------------------------------------------------------
 Wed Jan 24 11:34:18 UTC 2018 - kasimir_@outlook.de
 
diff --git a/MyGUI.spec b/MyGUI.spec
index b28bb73..0803d92 100644
--- a/MyGUI.spec
+++ b/MyGUI.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package MyGUI
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -130,35 +130,27 @@ chmod 644 *.txt COPYING.MIT
 
 %build
 install -dm 755 build
-pushd build
-	# this is probably an error in OGRE packaging... but let's just fix the build.
-	export OGRE_LIBRARIES="`pkg-config --libs OGRE` -lboost_system"
-	cmake \
-		-DOGRE_LIBRARIES="$OGRE_LIBRARIES" \
-		-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-		-DCMAKE_SKIP_RPATH=YES \
-		-DCMAKE_BUILD_TYPE=release \
-%ifarch x86_64 aarch64 ppc64 ppc64le s390x
-		-DLIB_SUFFIX=64 \
-%endif
-		-DMYGUI_STATIC=FALSE \
-		-DMYGUI_USE_FREETYPE=TRUE \
-		-DMYGUI_BUILD_SAMPLES=TRUE \
-		-DMYGUI_BUILD_PLUGINS=TRUE \
-		-DMYGUI_BUILD_TOOLS=TRUE \
-		-DMYGUI_BUILD_WRAPPER=FALSE \
-		-DMYGUI_INSTALL_SAMPLES=TRUE \
-		-DMYGUI_INSTALL_TOOLS=TRUE \
-		-DMYGUI_INSTALL_DOCS=TRUE \
-		-DMYGUI_INSTALL_MEDIA=TRUE \
-		-DMYGUI_INSTALL_SAMPLES_SOURCE=TRUE \
-		-DMYGUI_FULL_RPATH=FALSE \
-		..
+# this is probably an error in OGRE packaging... but let's just fix the build.
+export OGRE_LIBRARIES="`pkg-config --libs OGRE` -lboost_system"
+%cmake \
+	-DCMAKE_BUILD_TYPE=release \
+	-DOGRE_LIBRARIES="$OGRE_LIBRARIES" \
+	-DMYGUI_STATIC=FALSE \
+	-DMYGUI_USE_FREETYPE=TRUE \
+	-DMYGUI_BUILD_SAMPLES=TRUE \
+	-DMYGUI_BUILD_PLUGINS=TRUE \
+	-DMYGUI_BUILD_TOOLS=TRUE \
+	-DMYGUI_BUILD_WRAPPER=FALSE \
+	-DMYGUI_INSTALL_SAMPLES=TRUE \
+	-DMYGUI_INSTALL_TOOLS=TRUE \
+	-DMYGUI_INSTALL_DOCS=TRUE \
+	-DMYGUI_INSTALL_MEDIA=TRUE \
+	-DMYGUI_INSTALL_SAMPLES_SOURCE=TRUE \
+	-DMYGUI_FULL_RPATH=FALSE
 
-	make %{?_smp_mflags} V=1
-popd
+make %{?_smp_mflags} V=1
 
-pushd Docs
+pushd ../Docs
 	doxygen -s -g Doxyfile 2> /dev/null
 	doxygen Doxyfile
 popd
@@ -262,7 +254,8 @@ rm Docs/html/installdox || true
 
 %files
 %defattr(-,root,root)
-%doc *.txt COPYING.MIT
+%doc *.txt 
+%license COPYING.MIT
 %{_bindir}/%{name}.sh
 %{_bindir}/FontEditor
 %{_bindir}/ImageEditor
@@ -301,7 +294,7 @@ rm Docs/html/installdox || true
 %dir %{_includedir}/%{capname}
 %{_includedir}/%{capname}/*.h
 %{_libdir}/libMyGUIEngine.so
-%{_libdir}/libMyGUI.OgrePlatform.a
+%{_libdir}/libMyGUI.OgrePlatform.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/Plugin_StrangeButton.so
 %{_libdir}/libEditorFramework.so