From 32de879756342f9d7f984357542a18283a9d8a77a804f0aa717a6e0a8f5adb03 Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Wed, 25 May 2016 07:55:52 +0000 Subject: [PATCH 1/4] Accepting request 397791 from home:nemysis:branches:games Please accept these changes. OBS-URL: https://build.opensuse.org/request/show/397791 OBS-URL: https://build.opensuse.org/package/show/games/asteroid?expand=0&rev=3 --- _service | 18 ++++++++++++ ...tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2 | 3 ++ asteroid-1.2.1+git0e37197.tar.bz2 | 3 -- asteroid.changes | 8 ++++++ asteroid.spec | 24 ++++++++-------- generate-service-file.sh | 28 +++++++++++++++++++ 6 files changed, 69 insertions(+), 15 deletions(-) create mode 100644 _service create mode 100644 _service:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2 delete mode 100644 asteroid-1.2.1+git0e37197.tar.bz2 create mode 100644 generate-service-file.sh diff --git a/_service b/_service new file mode 100644 index 0000000..05d65ce --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + + git + git://github.com/chazomaticus/asteroid.git + 1.2.1+git-4efc7fc + 4efc7fc0a1246f023d6f96b94081678e302ab430 + yes + + + + bz2 + *.tar + + + + + 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 new file mode 100644 index 0000000..1e13ff3 --- /dev/null +++ b/_service:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:491f2bf0c6c7f4448feb0e589498ba43df6a38e1d4ffe630a7b6923d93523d3c +size 1041350 diff --git a/asteroid-1.2.1+git0e37197.tar.bz2 b/asteroid-1.2.1+git0e37197.tar.bz2 deleted file mode 100644 index d1ecd5e..0000000 --- a/asteroid-1.2.1+git0e37197.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f97bfbc59fc52426fbe4ead3bff45cdd62625157eef198e678772cce239c259 -size 998884 diff --git a/asteroid.changes b/asteroid.changes index d4cf729..497044e 100644 --- a/asteroid.changes +++ b/asteroid.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 24 20:48:43 UTC 2016 - nemysis@openSUSE.org + +- Rerolled tarball +- Add %global commit and %global shortcommit +- Add _service and generate-service-file.sh +- Remove check %if 0%{?suse_version}, because is only for openSUSE + ------------------------------------------------------------------- Thu Oct 30 15:23:11 UTC 2014 - nemysis@gmx.ch diff --git a/asteroid.spec b/asteroid.spec index 73e44e5..a032403 100644 --- a/asteroid.spec +++ b/asteroid.spec @@ -1,7 +1,7 @@ # # spec file for package asteroid # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,9 @@ # +%global commit 4efc7fc0a1246f023d6f96b94081678e302ab430 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: asteroid Version: 1.2.1 Release: 0 @@ -25,23 +28,22 @@ 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}+git0e37197.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 -%if 0%{?suse_version} -BuildRequires: fdupes -BuildRequires: update-desktop-files -%endif BuildRequires: cmake +BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: gtk2-devel BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files BuildRequires: pkgconfig(SDL_mixer) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(sdl) %description Asteroid (just one!) is a modern version of the arcade classic Asteroids, @@ -50,7 +52,7 @@ It features a variety of powerups, taunting aliens, 3D textured asteroids, face-melting sound effects, and infinite playability. %prep -%setup -q -n %{name} +%setup -q -n %{name}-%{version}+git-%{shortcommit} %patch0 @@ -67,10 +69,8 @@ make %{?_smp_mflags} %install %make_install -%if 0%{?suse_version} - %suse_update_desktop_file %{name} - %fdupes -s %{buildroot}%{_prefix} -%endif +%suse_update_desktop_file %{name} +%fdupes -s %{buildroot}%{_prefix} %files %defattr(-,root,root,-) diff --git a/generate-service-file.sh b/generate-service-file.sh new file mode 100644 index 0000000..2df9d02 --- /dev/null +++ b/generate-service-file.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +commit=4efc7fc0a1246f023d6f96b94081678e302ab430 +shortcommit=$(c=${commit}; echo ${c:0:7}) +version=1.2.1+git + +echo -n "Creating _service file ..." +cat << EOF > _service + + + + git + git://github.com/chazomaticus/asteroid.git + ${version}-${shortcommit} + ${commit} + yes + + + + bz2 + *.tar + + + + + +EOF +echo done From a07d560d47f3ef519633c7d735e6a41a53fff1dfbf2d6281ebaf84596aa4ff1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 25 May 2016 18:29:23 +0000 Subject: [PATCH 2/4] Accepting request 398034 from home:nemysis:branches:games Please accept these changes. OBS-URL: https://build.opensuse.org/request/show/398034 OBS-URL: https://build.opensuse.org/package/show/games/asteroid?expand=0&rev=4 --- ...ce:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2 | 4 ++-- asteroid-1.2.1+git-4efc7fc.tar.bz2 | 3 +++ asteroid.changes | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 asteroid-1.2.1+git-4efc7fc.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 index 1e13ff3..dd836d8 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:491f2bf0c6c7f4448feb0e589498ba43df6a38e1d4ffe630a7b6923d93523d3c -size 1041350 +oid sha256:3d9ba58ef19ab0ace82b1dff22ff655c330a076bcb349f6ad65ce52efc8357da +size 1041246 diff --git a/asteroid-1.2.1+git-4efc7fc.tar.bz2 b/asteroid-1.2.1+git-4efc7fc.tar.bz2 new file mode 100644 index 0000000..b999222 --- /dev/null +++ b/asteroid-1.2.1+git-4efc7fc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93371cdd20afbeb75ac23a4fbceee21239fe1ca9b565b294ad3ddb6e0064c933 +size 1025855 diff --git a/asteroid.changes b/asteroid.changes index 497044e..01b2643 100644 --- a/asteroid.changes +++ b/asteroid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 25 15:43:42 UTC 2016 - nemysis@openSUSE.org + +- Add asteroid-1.2.1+git-4efc7fc.tar.bz2 that works + "osc service localrun source_validator" + ------------------------------------------------------------------- Tue May 24 20:48:43 UTC 2016 - nemysis@openSUSE.org From 76b9ec5c7ef7635953de510c2ad0684aafd620e2c9a141a530216e54241ce7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rusmir=20Du=C5=A1ko?= Date: Wed, 25 May 2016 21:13:12 +0000 Subject: [PATCH 3/4] Accepting request 398101 from home:nemysis:branches:games Please accept these changes. OBS-URL: https://build.opensuse.org/request/show/398101 OBS-URL: https://build.opensuse.org/package/show/games/asteroid?expand=0&rev=5 --- ...ice:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2 | 4 ++-- asteroid-1.2.1+git-4efc7fc.tar.bz2 | 4 ++-- asteroid.changes | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) 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 index dd836d8..0cbe918 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d9ba58ef19ab0ace82b1dff22ff655c330a076bcb349f6ad65ce52efc8357da -size 1041246 +oid sha256:657a81fbf1a9e667b85a367f9fb5a389bcdccb92eb0db5497dfbed167f7c2bff +size 1041347 diff --git a/asteroid-1.2.1+git-4efc7fc.tar.bz2 b/asteroid-1.2.1+git-4efc7fc.tar.bz2 index b999222..846216c 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:93371cdd20afbeb75ac23a4fbceee21239fe1ca9b565b294ad3ddb6e0064c933 -size 1025855 +oid sha256:253ca99c32fe8a510faa60f43a604065e579110e6790f4dafa1c2bd78361448b +size 1025772 diff --git a/asteroid.changes b/asteroid.changes index 01b2643..183db54 100644 --- a/asteroid.changes +++ b/asteroid.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 25 21:07:49 UTC 2016 - nemysis@openSUSE.org + +- Used "osc service localrun" that works check script + ------------------------------------------------------------------- Wed May 25 15:43:42 UTC 2016 - nemysis@openSUSE.org From 540ba6cba6eddec05274e2d0f927668043b5c72631052104305578f07c657bd4 Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Mon, 30 May 2016 03:08:57 +0000 Subject: [PATCH 4/4] 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 | 24 +++++++++---------- ...tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2 | 3 --- _servicedata | 4 ++++ asteroid-1.2.1+git-4efc7fc.tar.bz2 | 4 ++-- asteroid-1.2.1-CMakeLists.txt.patch | 11 --------- asteroid.changes | 15 ++++++++++++ asteroid.spec | 13 +++------- generate-service-file.sh | 24 +++++++++---------- 8 files changed, 46 insertions(+), 52 deletions(-) delete mode 100644 _service:recompress:tar_scm:asteroid-1.2.1+git-4efc7fc.tar.bz2 create mode 100644 _servicedata delete mode 100644 asteroid-1.2.1-CMakeLists.txt.patch 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