From 32de879756342f9d7f984357542a18283a9d8a77a804f0aa717a6e0a8f5adb03 Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Wed, 25 May 2016 07:55:52 +0000 Subject: [PATCH] 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