Accepting request 398794 from home:nemysis:branches:games

Please accept these changes.

OBS-URL: https://build.opensuse.org/request/show/398794
OBS-URL: https://build.opensuse.org/package/show/games/asteroid?expand=0&rev=6

_service

@@ -1,18 +1,16 @@
 <services>
 
-  <service name="tar_scm">
+   <service name="tar_scm" mode="disabled">
-    <param name="scm">git</param>
      <param name="url">git://github.com/chazomaticus/asteroid.git</param>
+     <param name="scm">git</param>
      <param name="version">1.2.1+git-4efc7fc</param>
-    <param name="revision">4efc7fc0a1246f023d6f96b94081678e302ab430</param>
+     <param name="changesgenerate">enable</param>
-    <param name="package-meta">yes</param>
    </service>
 
-  <service name="recompress">
+   <service name="recompress" mode="disabled">
-    <param name="compression">bz2</param>
      <param name="file">*.tar</param>
+     <param name="compression">bz2</param>
    </service>
-
+   <service name="set_version" mode="disabled"/>
-  <service name="download_files" />
 
 </services>

_service:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:657a81fbf1a9e667b85a367f9fb5a389bcdccb92eb0db5497dfbed167f7c2bff
-size 1041347

_servicedata

@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+            <param name="url">git://github.com/chazomaticus/asteroid.git</param>
+          <param name="changesrevision">64869dfe745800f34f1c68248ba2e350dc95a592</param></service></servicedata>

asteroid-1.2.1+git-4efc7fc.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:253ca99c32fe8a510faa60f43a604065e579110e6790f4dafa1c2bd78361448b
+oid sha256:123d2c4e97e5535b4a3b7fb57beac9da564a6924ee308a2a456c2a77f6fcb27c
-size 1025772
+size 291007

asteroid-1.2.1-CMakeLists.txt.patch

@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2014-10-15 02:25:30.000000000 +0200
-+++ CMakeLists.txt	2014-10-20 13:03:19.908402756 +0200
-@@ -31,7 +31,7 @@
- endif(SDL_FOUND AND SDLMIXER_FOUND)
- 
- # Config header
--set(Asteroid_BUILD_RES_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/asteroid")
-+SET(CMAKE_INSTALL_PREFIX "")
- configure_file("${PROJECT_SOURCE_DIR}/src/config.h.in" "${PROJECT_BINARY_DIR}/include/config.h")
- include_directories("${PROJECT_BINARY_DIR}/include")
- 

asteroid.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun May 29 21:00:51 UTC 2016 - nemysis@openSUSE.org
+
+- Use -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} instead of -DCMAKE_INSTALL_PREFIX=/usr
+
+-------------------------------------------------------------------
+Sun May 29 14:07:23 UTC 2016 - nemysis@openSUSE.org
+
+- After discussion with Upstream removed asteroid-1.2.1-CMakeLists.txt.patch
+  and sed for path, use cmake . -DCMAKE_INSTALL_PREFIX=/usr
+- Add AUTHORS to Documentation
+- Change generate-service-file.sh to use <service name="tar_scm" mode="disabled">
+  and more
+- Add _servicedata
+
 -------------------------------------------------------------------
 Wed May 25 21:07:49 UTC 2016 - nemysis@openSUSE.org
 

asteroid.spec

@@ -26,12 +26,8 @@ Summary:        Modern version of the classic arcade Game
 License:        GPL-3.0
 Group:          Amusements/Games/Action/Arcade
 Url:            https://chazomaticus.github.io/asteroid/
-# Downloaded from https://github.com/chazomaticus/asteroid
-# Packed as tar.bz2
 Source0:        %{name}-%{version}+git-4efc7fc.tar.bz2
 Source1:        generate-service-file.sh
-# PATCH-FEATURE-UPSTREAM Asteroid not build in openSUSE #1
-Patch0:         %{name}-%{version}-CMakeLists.txt.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  freeglut-devel
@@ -54,16 +50,13 @@ face-melting sound effects, and infinite playability.
 %prep
 %setup -q -n %{name}-%{version}+git-%{shortcommit}
 
-%patch0
+# fix include
-
-# fix include and path
 sed -i -e 's|${OPENGL_LIBRARIES}|-lm ${OPENGL_LIBRARIES}|' \
-    -i -e 's|CMAKE_INSTALL_PREFIX ""|CMAKE_INSTALL_PREFIX "/usr"|' \
      CMakeLists.txt
 
 %build
 # Not works build with %%cmake
-cmake .
+cmake . -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}
 make %{?_smp_mflags}
 
 %install
@@ -74,7 +67,7 @@ make %{?_smp_mflags}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README.md
+%doc AUTHORS COPYING NEWS README.md
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/

generate-service-file.sh

@@ -8,20 +8,18 @@ echo -n "Creating _service file ..."
 cat << EOF > _service
 <services>
 
-  <service name="tar_scm">
+   <service name="tar_scm" mode="disabled">
-    <param name="scm">git</param>
      <param name="url">git://github.com/chazomaticus/asteroid.git</param>
+     <param name="scm">git</param>
      <param name="version">${version}-${shortcommit}</param>
-    <param name="revision">${commit}</param>
+     <param name="changesgenerate">enable</param>
-    <param name="package-meta">yes</param>
    </service>
 
-  <service name="recompress">
+   <service name="recompress" mode="disabled">
-    <param name="compression">bz2</param>
      <param name="file">*.tar</param>
+     <param name="compression">bz2</param>
    </service>
-
+   <service name="set_version" mode="disabled"/>
-  <service name="download_files" />
 
 </services>
 EOF