rpms/openmw/devel openmw.spec, 1.18, 1.19 openmw.use_position_independent_for_library.patch, 1.2, 1.3

[Alexandre Moine]

Author: nobrakal

Update of /cvs/free/rpms/openmw/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3526

Modified Files:
	openmw.spec openmw.use_position_independent_for_library.patch 
Log Message:
* Thu Aug 13 2015 Alexandre Moine <nobrakal at gmail.com> 0.36.1-4
- Update the use of -fPIC



Index: openmw.spec
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/openmw.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openmw.spec	5 Aug 2015 13:06:01 -0000	1.18
+++ openmw.spec	13 Aug 2015 09:54:45 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           openmw
 Version:        0.36.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Unofficial open source engine re-implementation of the game Morrowind
 
 License:        GPLv3 and MIT and zlib
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Aug 13 2015 Alexandre Moine <nobrakal at gmail.com> 0.36.1-4
+- Update the use of -fPIC
+
 * Wed Aug 05 2015 Alexandre Moine <nobrakal at gmail.com> 0.36.1-3
 - Use a more generic option to force independent code position for the library.
 

openmw.use_position_independent_for_library.patch:
 CMakeLists.txt |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Index: openmw.use_position_independent_for_library.patch
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/openmw.use_position_independent_for_library.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openmw.use_position_independent_for_library.patch	5 Aug 2015 13:12:49 -0000	1.2
+++ openmw.use_position_independent_for_library.patch	13 Aug 2015 09:54:45 -0000	1.3
@@ -1,11 +1,14 @@
---- plugins/mygui_resource_plugin/CMakeLists.txt	2015-05-31 14:21:21.000000000 +0200
-+++ plugins/mygui_resource_plugin/CMakeLists.txt	2015-08-05 15:10:06.322731668 +0200
-@@ -15,6 +15,8 @@
-     ${MYGUI_RESOURCE_PLUGIN_SOURCES}
-     )
+diff -ru openmw-openmw-0.36.1.orig/components/CMakeLists.txt openmw-openmw-0.36.1/components/CMakeLists.txt
+--- components/CMakeLists.txt	2015-05-31 14:21:21.000000000 +0200
++++ components/CMakeLists.txt	2015-08-13 11:43:54.402765895 +0200
+@@ -151,9 +151,7 @@
+ endif(QT_QTGUI_LIBRARY AND QT_QTCORE_LIBRARY)
  
-+set_target_properties(${MYGUI_RESOURCE_PLUGIN_LIBRARY} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-+
- if(WIN32)
-   if(MSVC)
-      # from top-level CMakelists.txt:
+ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
+-        add_definitions(-fPIC)
+-    endif()
++    add_definitions(-fPIC)
+ endif ()
+ 
+ include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})