From 929a70f4dba3a1e47048c3a2cffda4e5433e0349f8d28a5ab962f1855e61c1c2 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 25 Jan 2019 13:59:52 +0000 Subject: [PATCH] Accepting request 668638 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Add _constraints to avoid OOM errors - Handle properly libCommon.so* - Add patch to get a versionned libCommon.so file: * MyGUI-libCommon-fixup.patch OBS-URL: https://build.opensuse.org/request/show/668638 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=20 --- MyGUI-libCommon-fixup.patch | 10 ++++++++++ MyGUI.changes | 12 ++++++++++++ MyGUI.spec | 15 +++++++++------ _constraints | 8 ++++++++ 4 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 MyGUI-libCommon-fixup.patch create mode 100644 _constraints diff --git a/MyGUI-libCommon-fixup.patch b/MyGUI-libCommon-fixup.patch new file mode 100644 index 0000000..e612d67 --- /dev/null +++ b/MyGUI-libCommon-fixup.patch @@ -0,0 +1,10 @@ +--- Common/CMakeLists.txt.orig 2016-03-05 07:17:23.175753455 -0600 ++++ Common/CMakeLists.txt 2016-03-05 07:18:03.880751014 -0600 +@@ -89,6 +89,7 @@ + endif() + + add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) ++set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) + + if(MYGUI_RENDERSYSTEM EQUAL 1) + add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) diff --git a/MyGUI.changes b/MyGUI.changes index 31a748d..8df6d6a 100644 --- a/MyGUI.changes +++ b/MyGUI.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 25 09:40:32 UTC 2019 - Guillaume GARDET + +- Add _constraints to avoid OOM errors + +------------------------------------------------------------------- +Fri Jan 25 09:17:46 UTC 2019 - Guillaume GARDET + +- Handle properly libCommon.so* +- Add patch to get a versionned libCommon.so file: + * MyGUI-libCommon-fixup.patch + ------------------------------------------------------------------- Fri Jul 20 14:27:43 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/MyGUI.spec b/MyGUI.spec index 0803d92..fd9e9d2 100644 --- a/MyGUI.spec +++ b/MyGUI.spec @@ -1,7 +1,7 @@ # # spec file for package MyGUI # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -36,6 +36,8 @@ Patch0: %{name}-lib_suffix.patch Patch1: %{name}-gcc47-visibility.patch # PATCH-FIX-OPENSUSE MyGUI-freetype2-include.patch Patch2: MyGUI-freetype2-include.patch +# PATCH-FIX-UPSTREAM MyGUI-libCommon-fixup.patch -- https://github.com/MyGUI/mygui/issues/157 +Patch3: MyGUI-libCommon-fixup.patch BuildRequires: cmake BuildRequires: dejavu BuildRequires: dos2unix @@ -124,6 +126,7 @@ This subpackage contains the development documentation for MyGUI. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p0 dos2unix *.txt COPYING.MIT chmod 644 *.txt COPYING.MIT @@ -158,6 +161,8 @@ popd %install pushd build %make_install +# Install libCommon manually as cmake does not install it +cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ popd # rename demos to avoid duplicate names with other packages @@ -261,6 +266,7 @@ rm Docs/html/installdox || true %{_bindir}/ImageEditor %{_bindir}/LayoutEditor %{_bindir}/SkinEditor +%{_libdir}/libCommon.so.* %dir %{_datadir}/%{capname} %{_datadir}/%{capname}/*.cfg %{_datadir}/%{capname}/*.xml @@ -293,11 +299,8 @@ rm Docs/html/installdox || true %defattr(-,root,root) %dir %{_includedir}/%{capname} %{_includedir}/%{capname}/*.h -%{_libdir}/libMyGUIEngine.so -%{_libdir}/libMyGUI.OgrePlatform.so +%{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/Plugin_StrangeButton.so -%{_libdir}/libEditorFramework.so %{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutTemplate.cpp %{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutTemplate.h diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..75475c3 --- /dev/null +++ b/_constraints @@ -0,0 +1,8 @@ + + + + + 4500 + + +