Hello community, here is the log from the commit of package asteroid for openSUSE:Factory checked in at 2016-05-30 09:59:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/asteroid (Old) and /work/SRC/openSUSE:Factory/.asteroid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asteroid" Changes: -------- --- /work/SRC/openSUSE:Factory/asteroid/asteroid.changes 2014-11-04 17:28:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.asteroid.new/asteroid.changes 2016-05-30 09:59:31.000000000 +0200 @@ -1,0 +2,34 @@ +Sun May 29 21:00:51 UTC 2016 - [email protected] + +- Use -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} instead of -DCMAKE_INSTALL_PREFIX=/usr + +------------------------------------------------------------------- +Sun May 29 14:07:23 UTC 2016 - [email protected] + +- 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 - [email protected] + +- Used "osc service localrun" that works check script + +------------------------------------------------------------------- +Wed May 25 15:43:42 UTC 2016 - [email protected] + +- Add asteroid-1.2.1+git-4efc7fc.tar.bz2 that works + "osc service localrun source_validator" + +------------------------------------------------------------------- +Tue May 24 20:48:43 UTC 2016 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- asteroid-1.2.1+git0e37197.tar.bz2 asteroid-1.2.1-CMakeLists.txt.patch New: ---- _service _servicedata asteroid-1.2.1+git-4efc7fc.tar.bz2 generate-service-file.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asteroid.spec ++++++ --- /var/tmp/diff_new_pack.y4ncDO/_old 2016-05-30 09:59:32.000000000 +0200 +++ /var/tmp/diff_new_pack.y4ncDO/_new 2016-05-30 09:59:32.000000000 +0200 @@ -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 @@ -23,25 +26,20 @@ 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}+git0e37197.tar.bz2 -# 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 +Source0: %{name}-%{version}+git-4efc7fc.tar.bz2 +Source1: generate-service-file.sh 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,31 +48,26 @@ face-melting sound effects, and infinite playability. %prep -%setup -q -n %{name} - -%patch0 +%setup -q -n %{name}-%{version}+git-%{shortcommit} -# 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 %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,-) -%doc COPYING NEWS README.md +%doc AUTHORS COPYING NEWS README.md %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/ ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <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="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">bz2</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/chazomaticus/asteroid.git</param> <param name="changesrevision">64869dfe745800f34f1c68248ba2e350dc95a592</param></service></servicedata>++++++ generate-service-file.sh ++++++ #!/bin/sh commit=4efc7fc0a1246f023d6f96b94081678e302ab430 shortcommit=$(c=${commit}; echo ${c:0:7}) version=1.2.1+git echo -n "Creating _service file ..." cat << EOF > _service <services> <service name="tar_scm" mode="disabled"> <param name="url">git://github.com/chazomaticus/asteroid.git</param> <param name="scm">git</param> <param name="version">${version}-${shortcommit}</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">bz2</param> </service> <service name="set_version" mode="disabled"/> </services> EOF echo done
