diff --git a/_service b/_service
index 05d65ce..e64037c 100644
--- a/_service
+++ b/_service
@@ -1,18 +1,16 @@
-
- git
- git://github.com/chazomaticus/asteroid.git
- 1.2.1+git-4efc7fc
- 4efc7fc0a1246f023d6f96b94081678e302ab430
- yes
-
+
+ git://github.com/chazomaticus/asteroid.git
+ git
+ 1.2.1+git-4efc7fc
+ enable
+
-
- bz2
- *.tar
-
-
-
+
+ *.tar
+ bz2
+
+
diff --git a/_service:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2 b/_service:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2
deleted file mode 100644
index 0cbe918..0000000
--- a/_service:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:657a81fbf1a9e667b85a367f9fb5a389bcdccb92eb0db5497dfbed167f7c2bff
-size 1041347
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..b4460a8
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+
+
+ git://github.com/chazomaticus/asteroid.git
+ 64869dfe745800f34f1c68248ba2e350dc95a592
\ No newline at end of file
diff --git a/asteroid-1.2.1+git-4efc7fc.tar.bz2 b/asteroid-1.2.1+git-4efc7fc.tar.bz2
index 846216c..915721e 100644
--- a/asteroid-1.2.1+git-4efc7fc.tar.bz2
+++ b/asteroid-1.2.1+git-4efc7fc.tar.bz2
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:253ca99c32fe8a510faa60f43a604065e579110e6790f4dafa1c2bd78361448b
-size 1025772
+oid sha256:123d2c4e97e5535b4a3b7fb57beac9da564a6924ee308a2a456c2a77f6fcb27c
+size 291007
diff --git a/asteroid-1.2.1-CMakeLists.txt.patch b/asteroid-1.2.1-CMakeLists.txt.patch
deleted file mode 100644
index 0076fa4..0000000
--- a/asteroid-1.2.1-CMakeLists.txt.patch
+++ /dev/null
@@ -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")
-
diff --git a/asteroid.changes b/asteroid.changes
index 183db54..4b36361 100644
--- a/asteroid.changes
+++ b/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
+ and more
+- Add _servicedata
+
-------------------------------------------------------------------
Wed May 25 21:07:49 UTC 2016 - nemysis@openSUSE.org
diff --git a/asteroid.spec b/asteroid.spec
index a032403..2a00072 100644
--- a/asteroid.spec
+++ b/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 and path
+# fix include
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/
diff --git a/generate-service-file.sh b/generate-service-file.sh
index 2df9d02..e90b487 100644
--- a/generate-service-file.sh
+++ b/generate-service-file.sh
@@ -8,20 +8,18 @@ echo -n "Creating _service file ..."
cat << EOF > _service
-
- git
- git://github.com/chazomaticus/asteroid.git
- ${version}-${shortcommit}
- ${commit}
- yes
-
+
+ git://github.com/chazomaticus/asteroid.git
+ git
+ ${version}-${shortcommit}
+ enable
+
-
- bz2
- *.tar
-
-
-
+
+ *.tar
+ bz2
+
+
EOF