rpms/openmw/devel openmw-bund_libs.patch, NONE, 1.1 openmw-datapath.patch, NONE, 1.1 openmw.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sun Oct 13 19:00:57 CEST 2013

Author: nobrakal

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

Modified Files:
	.cvsignore sources 
Added Files:
	openmw-bund_libs.patch openmw-datapath.patch openmw.spec 
Log Message:


openmw-bund_libs.patch:
 CMakeLists.txt             |   13 +++++++++++++
 extern/oics/CMakeLists.txt |   15 +++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

--- NEW FILE openmw-bund_libs.patch ---
diff -Naur openmw-0.25.0.orig/CMakeLists.txt openmw-0.25.0/CMakeLists.txt
--- openmw-0.25.0.orig/CMakeLists.txt	2013-09-10 13:47:37.216378534 -0500
+++ openmw-0.25.0/CMakeLists.txt	2013-09-10 15:42:05.760450935 -0500
@@ -166,6 +166,19 @@
     message(WARNING "--------------------")
 endif (NOT FFMPEG_FOUND)
 
+# TinyXML
+option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF)
+if(USE_SYSTEM_TINYXML)
+    find_library(TINYXML_LIBRARIES tinyxml)
+    find_path(TINYXML_INCLUDE_DIR tinyxml.h)
+    message(STATUS "Found TinyXML: ${TINYXML_LIBRARIES} ${TINYXML_INCLUDE_DIR}")
+    if(TINYXML_LIBRARIES AND TINYXML_INCLUDE_DIR)
+        include_directories(${TINYXML_INCLUDE_DIR})
+        message(STATUS "Using system TinyXML library.")
+    else()
+        message(FATAL_ERROR "Detection of system TinyXML incomplete.")
+    endif()
+endif()
 
 # Platform specific
 if (WIN32)
diff -Naur openmw-0.25.0.orig/extern/oics/CMakeLists.txt openmw-0.25.0/extern/oics/CMakeLists.txt
--- openmw-0.25.0.orig/extern/oics/CMakeLists.txt	2013-07-26 07:02:41.000000000 -0500
+++ openmw-0.25.0/extern/oics/CMakeLists.txt	2013-09-10 15:18:15.652360189 -0500
@@ -9,12 +9,23 @@
 	ICSInputControlSystem_keyboard.cpp
 	ICSInputControlSystem_mouse.cpp
 	ICSInputControlSystem_joystick.cpp
+)
+
+set(TINYXML_SOURCE_FILES
 	tinyxml.cpp
 	tinyxmlparser.cpp
 	tinyxmlerror.cpp
-    tinystr.cpp
+	tinystr.cpp	
 )
 
-add_library(${OICS_LIBRARY} STATIC ${OICS_SOURCE_FILES})
+if(USE_SYSTEM_TINYXML)
+    add_library(${OICS_LIBRARY} STATIC ${OICS_SOURCE_FILES})
+    target_link_libraries(${OICS_LIBRARY} ${TINYXML_LIBRARIES})
+else()
+    add_library(${OICS_LIBRARY} STATIC
+    ${OICS_SOURCE_FILES}
+    ${TINYXML_SOURCE_FILES})
+endif()
 
+# Does this do anything?
 link_directories(${CMAKE_CURRENT_BINARY_DIR})

openmw-datapath.patch:
 linuxpath.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openmw-datapath.patch ---
diff -Naur openmw-0.26.0.orig/components/files/linuxpath.cpp openmw-0.26.0/components/files/linuxpath.cpp
--- openmw-0.26.0.orig/components/files/linuxpath.cpp	2013-09-06 03:49:35.000000000 -0500
+++ openmw-0.26.0/components/files/linuxpath.cpp	2013-09-15 08:00:41.674024032 -0500
@@ -76,7 +76,7 @@
 
 boost::filesystem::path LinuxPath::getGlobalDataPath() const
 {
-    boost::filesystem::path globalDataPath("/usr/share/games/");
+    boost::filesystem::path globalDataPath("/usr/share/");
     return globalDataPath / mName;
 }
 


--- NEW FILE openmw.spec ---
Name:           openmw
Version:        0.26.0
Release:        6%{?dist}
Summary:        Unofficial open source engine re-implementation of the game Morrowind

License:        GPLv3 and MIT and zlib
URL:            https://openmw.org/
Source0:        https://openmw.googlecode.com/files/%{name}-%{version}-source.tar.gz

# Unbundle tinyxml
Patch0:         openmw-bund_libs.patch
# Fix data path from /usr/share/games/openmw to /usr/share/openmw/data
Patch1:         openmw-datapath.patch

BuildRequires:  cmake
BuildRequires:  boost-devel       
BuildRequires:  bullet-devel
BuildRequires:  desktop-file-utils 
BuildRequires:  libblkid-devel
BuildRequires:  libmpg123-devel
BuildRequires:  libsndfile-devel
BuildRequires:  libXt-devel
BuildRequires:  mygui-devel
BuildRequires:  ogre-devel
BuildRequires:  openal-soft-devel
BuildRequires:  openexr-devel
BuildRequires:  qt-devel
BuildRequires:  SDL2-devel
BuildRequires:  tinyxml-devel
BuildRequires:  ffmpeg-devel
# New requirement as of 0.26.0
BuildRequires:  unshield-devel

# Version in openmw is modified.
Provides:       bundled(ocis)
# Shiny is designed to be copied in rather than a separate library.
# https://github.com/scrawl/shiny
Provides:       bundled(shiny) = 0.2


%description
OpenMW is a new engine for 2002's Game of the Year,
The Elder Scrolls 3: Morrowind.

It aims to be a fully playable (and improved!), open source implementation of
the game's engine and functionality. You will still need the original game data
to play OpenMW.


%prep
%setup -q -c %{name}-%{version}
%patch0 -p1 -b .bund_libs
%patch1 -p1 -b .datapath

# Remove bundled tinyxml files
rm -f extern/oics/tiny*.*


%build
rm -rf build && mkdir build && pushd build
%cmake -DDATADIR:PATH=%{_datadir}/%{name} \
       -DBINDIR=%{_bindir} \
       -DDATAROOTDIR:PATH=%{_datadir} \
       -DICONDIR=%{_datadir}/pixmaps \
       -DMORROWIND_RESOURCE_FILES=%{_datadir}/%{name}/resources \
       -DUSE_SYSTEM_TINYXML=TRUE \
       ../

make %{?_smp_mflags}


%install
pushd build
%make_install
popd
desktop-file-validate %{buildroot}/%{_datadir}/applications/opencs.desktop
desktop-file-validate %{buildroot}/%{_datadir}/applications/openmw.desktop

# Move license files back so they can be packaged by %%doc
mkdir _tmpdoc
mv %{buildroot}%{_datadir}/licenses/openmw/* _tmpdoc/
rm -rf %{buildroot}%{_datadir}/licenses

# Create data directory
mkdir -p %{buildroot}%{_datadir}/%{name}/data


%files
%doc GPL3.txt readme.txt _tmpdoc/*
%{_bindir}/esmtool
%{_bindir}/mwiniimport
%{_bindir}/omwlauncher
%{_bindir}/opencs
%{_bindir}/openmw
%{_datadir}/applications/opencs.desktop
%{_datadir}/applications/openmw.desktop
%{_datadir}/%{name}/
%{_datadir}/pixmaps/opencs.png
%{_datadir}/pixmaps/openmw.png
%config(noreplace) %{_sysconfdir}/openmw/


%changelog
* Wed Sep 18 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.26.0-6
- Change Licenses Tag

* Tue Sep 17 2013 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-5
- Add patch for data path and add empty data directory.

* Sun Sep 15 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.26.0-4
- Change, in the %%file section, %%{_datadir}/%%{name}/resources/* to %%{_datadir}/%%{name}/

* Fri Sep 13 2013 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-3
- Update to latest upstream release.
- Add patch to unbundle tinyxml.
- Update BuildRequires: per true build requirements.
- Change to out-of-source build which is preferred for cmake projects.
- Remove group tag as it is no longer required.
- Other misc spec cleanup.

* Fri Sep 13 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.26.0-2
- Add unshield-devel to the BuildRequires

* Wed Sep 11 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.26.0-1
- Update to the 0.26 release
- Change name of license files
- Remove install of licenses for the %%doc section

* Mon Sep 2 2013 Richard Shaw <hobbes1069 at gmail.com> 0.25.0-7
- Remove unused requires

* Sat Aug 31 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.25.0-6
- Change BuildRquires tbb to tbb-devel.
- Change make install to the equivalent rpmmacro.
- Put one BuildRequires per line.

* Sun Aug 18 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.25.0-5
- Replace %%{_datadir}/games/%%{name}/resources/ to %%{_datadir}/%%{name}/resources/

* Sat Aug 17 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.25.0-4
- Remove "rm -rf $RPM-BUILD-ROOT" from the install part.
- Add a doc entry.
- Add the 'desktop-file-validate' for the .desktop.
- Add desktop-file-utils to the build requieres.

* Fri Aug 16 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.25.0-3
- Add a good link to the sources.
- Change the name of patch.
- Add a comment to the patch.
- Change the description.
- Add rpm macro in files part and in cmake part.

* Sat Aug 10 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.25.0-2
- Update to the 0.25.

* Wed Jul 03 2013 Alexandre Moine <nobrakal at fedoraproject.org> 0.24.0-1
- Add the changelog in the SPEC file.


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Oct 2013 13:43:33 -0000	1.1
+++ .cvsignore	13 Oct 2013 17:00:57 -0000	1.2
@@ -0,0 +1 @@
+openmw-0.26.0-source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Oct 2013 13:43:34 -0000	1.1
+++ sources	13 Oct 2013 17:00:57 -0000	1.2
@@ -0,0 +1 @@
+4b2084c5f6711a00c73018091a6f11ca  openmw-0.26.0-source.tar.gz
