rpms/openmw/devel openmw.appdata.xml, NONE, 1.1 openmw.use_fpic_flag.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 openmw.spec, 1.15, 1.16 sources, 1.10, 1.11

Wed Aug 5 14:30:45 CEST 2015

Author: nobrakal

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

Modified Files:
	.cvsignore openmw.spec sources 
Added Files:
	openmw.appdata.xml openmw.use_fpic_flag.patch 
Log Message:
* Tue Aug 04 2015 Alexandre Moine <nobrakal at gmail.com> 0.36.1-1
- New maintenance update.
- Add appdata file for openmw.
- Add use of -fPIC flag for the compilation.

--- NEW FILE openmw.appdata.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2015 Alexandre Moine <nobrakal at gmail.com> -->
<application>
 <id type="desktop">openmw.desktop</id>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license> GPL-3.0 and MIT and zlib</project_license>
 <name>OpenMW</name>
 <summary>Unofficial open source engine re-implementation of the game Morrowind</summary>
 <description>
  <p>
  OpenMW is a recreation of the engine for the popular role-playing game Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
  </p>
  <p>
  The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare).
  </p>
  <p>
  Pre-existing modifications created for the original Morrowind engine can be hit-and-miss, but a mod created for Morrowind may not necessarily run in OpenMW.
  </p>
 </description>

 <screenshots>
  <screenshot type="default">
   <image>http://wiki.openmw.org/images/b/b2/Openmw_0.11.1_launcher_1.png</image>
   <caption>The OpenMW launcher</caption>
  </screenshot>
  <screenshot>
   <image>http://wiki.openmw.org/images/f/f1/Screenshot_mournhold_plaza_0.35.png</image>
   <caption>The Mournhold's plaza on OpenMW</caption>
  </screenshot>
  <screenshot>
   <image>http://wiki.openmw.org/images/5/5b/Screenshot_Vivec_seen_from_Ebonheart_0.35.png</image>
   <caption>Vivec seen from Ebonheart on OpenMW</caption>
  </screenshot>
 </screenshots>
<updatecontact>nobrakal at gmail.com</updatecontact>
 <url type="homepage">https://openmw.org</url>
 <url type="bugtracker">https://bugs.openmw.org/</url>
 <url type="faq">https://openmw.org/faq/</url>
</application>

openmw.use_fpic_flag.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openmw.use_fpic_flag.patch ---
diff -ru openmw-openmw-0.36.1.orig/CMakeLists.txt openmw-openmw-0.36.1/CMakeLists.txt
--- CMakeLists.txt	2015-05-31 14:21:21.000000000 +0200
+++ CMakeLists.txt	2015-08-05 13:47:24.150616896 +0200
@@ -351,7 +351,7 @@
 
 # CXX Compiler settings
 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++98 -pedantic -Wno-long-long")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++98 -pedantic -Wno-long-long -fPIC")
 
     if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
         execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE CLANG_VERSION)


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 May 2015 10:42:01 -0000	1.10
+++ .cvsignore	5 Aug 2015 12:30:45 -0000	1.11
@@ -1 +1 @@
-openmw-0.36.0.tar.gz
+openmw-0.36.1.tar.gz


Index: openmw.spec
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/openmw.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openmw.spec	30 May 2015 10:42:01 -0000	1.15
+++ openmw.spec	5 Aug 2015 12:30:45 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           openmw
-Version:        0.36.0
+Version:        0.36.1
 Release:        1%{?dist}
 Summary:        Unofficial open source engine re-implementation of the game Morrowind
 
@@ -7,9 +7,10 @@
 URL:            https://openmw.org
 # If you use a classic internet browser, Github renames the archive (openmw-%%{version}.tar.gz) into openmw-openmw-%%{version}.tar.gz. So, If you want the sources, use for example wget.
 Source0:        https://github.com/OpenMW/openmw/archive/%{name}-%{version}.tar.gz
+Source1:        %{name}.appdata.xml
 
-# Fix data path from /usr/share/games/openmw to /usr/share/openmw/data
-# Patch0:         openmw-datapath.patch
+# Use the -fPIC option to build the library
+Patch0:         openmw.use_fpic_flag.patch
 
 BuildRequires:  cmake
 BuildRequires:  boost-devel       
@@ -30,6 +31,7 @@
 BuildRequires:  ffmpeg-devel
 # New requirement as of 0.26.0
 BuildRequires:  unshield-devel
+BuildRequires:  libappstream-glib
 
 # Version in openmw is modified.
 Provides:       bundled(ocis)
@@ -53,6 +55,8 @@
 # Remove bundled tinyxml files
 rm -f extern/oics/tiny*.*
 
+%patch0
+
 
 %build
 rm -rf build && mkdir build && pushd build
@@ -78,6 +82,11 @@
 desktop-file-validate %{buildroot}/%{_datadir}/applications/openmw-cs.desktop
 desktop-file-validate %{buildroot}/%{_datadir}/applications/openmw.desktop
 
+#Test and install appdata file
+mkdir %{buildroot}%{_datadir}/appdata/
+install -pDm644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
 # Move license files back so they can be packaged by %%doc
 mkdir _tmpdoc
 mv %{buildroot}%{_datadir}/licenses/openmw/* _tmpdoc/
@@ -102,10 +111,16 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/openmw-cs.png
 %{_datadir}/pixmaps/openmw.png
+%{_datadir}/appdata/%{name}.appdata.xml
 %config(noreplace) %{_sysconfdir}/openmw/
 
 
 %changelog
+* Tue Aug 04 2015 Alexandre Moine <nobrakal at gmail.com> 0.36.1-1
+- New maintenance update.
+- Add appdata file for openmw.
+- Add use of -fPIC flag for the compilation.
+
 * Sat May 30 2015 Alexandre Moine <nobrakal at gmail.com> 0.36.0-1
 - Update to new upstream.
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 May 2015 10:42:01 -0000	1.10
+++ sources	5 Aug 2015 12:30:45 -0000	1.11
@@ -1 +1 @@
-4d5e039029f0b95e9109a763434536cc  openmw-0.36.0.tar.gz
+927f944ebe5523dec6f88c5dd5abd879  openmw-0.36.1.tar.gz
