diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index 2c78ce2..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: trigger-rally-0.6.5/src/GNUmakefile -=================================================================== ---- trigger-rally-0.6.5.orig/src/GNUmakefile -+++ trigger-rally-0.6.5/src/GNUmakefile -@@ -17,7 +17,7 @@ TR_CFGFILE := $(TR_BINDIR)/$(TR_CFG - TR_DATAFILES := $(shell cd $(TR_DATADIR); find * -type f) - TR_DOCFILES := $(shell cd $(TR_DOCDIR); find * -type f) - PROJDIRS := PEngine PSim TinyXML2 Trigger --SRCFILES := $(shell find $(PROJDIRS) -type f -name "*.cpp") -+SRCFILES := $(sort $(shell find $(PROJDIRS) -type f -name "*.cpp")) - OBJFILES := $(patsubst %.cpp, %.o, $(SRCFILES)) - DEPFILES := $(patsubst %.cpp, %.d, $(SRCFILES)) - WARNINGS ?= -Wall -Wextra -pedantic -Index: trigger-rally-0.6.5/src/GNUmakefile.MSYS -=================================================================== ---- trigger-rally-0.6.5.orig/src/GNUmakefile.MSYS -+++ trigger-rally-0.6.5/src/GNUmakefile.MSYS -@@ -27,7 +27,7 @@ TR_DLLFILES := \ - $(TR_BINDIR)/zlib1.dll - FMODAPIDIR := /c/Program Files (x86)/FMOD SoundSystem/FMOD Studio API Windows/api/lowlevel - PROJDIRS := PEngine PSim TinyXML2 Trigger --SRCFILES := $(shell find $(PROJDIRS) -type f -name "*.cpp") -+SRCFILES := $(sort $(shell find $(PROJDIRS) -type f -name "*.cpp")) - OBJFILES := $(patsubst %.cpp, %.o, $(SRCFILES)) - DEPFILES := $(patsubst %.cpp, %.d, $(SRCFILES)) - WARNINGS ?= -Wall -Wextra -pedantic -Index: trigger-rally-0.6.5/src/GNUmakefile.MSYS64 -=================================================================== ---- trigger-rally-0.6.5.orig/src/GNUmakefile.MSYS64 -+++ trigger-rally-0.6.5/src/GNUmakefile.MSYS64 -@@ -26,7 +26,7 @@ TR_DLLFILES := \ - $(TR_BINDIR)/zlib1.dll - FMODAPIDIR := /c/Program Files (x86)/FMOD SoundSystem/FMOD Studio API Windows/api/lowlevel - PROJDIRS := PEngine PSim TinyXML2 Trigger --SRCFILES := $(shell find $(PROJDIRS) -type f -name "*.cpp") -+SRCFILES := $(sort $(shell find $(PROJDIRS) -type f -name "*.cpp")) - OBJFILES := $(patsubst %.cpp, %.o, $(SRCFILES)) - DEPFILES := $(patsubst %.cpp, %.d, $(SRCFILES)) - WARNINGS ?= -Wall -Wextra -pedantic diff --git a/trigger-rally-0.6.5.tar.gz b/trigger-rally-0.6.5.tar.gz deleted file mode 100644 index 2771033..0000000 --- a/trigger-rally-0.6.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2db8784d8c0dd51c7a2812a9d294db05bb2e9df992038b3a232060dba26ba24 -size 82290843 diff --git a/trigger-rally-0.6.6.1.tar.gz b/trigger-rally-0.6.6.1.tar.gz new file mode 100644 index 0000000..8529136 --- /dev/null +++ b/trigger-rally-0.6.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f086e13d142b8bb07e808ab9111e5553309c1413532f56c754ce3cfa060cb04 +size 120707584 diff --git a/trigger-rally.changes b/trigger-rally.changes index 123a64f..bc308d5 100644 --- a/trigger-rally.changes +++ b/trigger-rally.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat Mar 16 18:42:00 UTC 2019 - fschaefer.oss@googlemail.com + +- Update to v0.6.6.1: + * Optimized data for release + * Removed internal TinyXML-2 source from Trigger code tree + * Documented and reorganized physic engine code + * Different tuning: Fox offroad, Evo circuit, Cordo in between + * Wheel sinking on the different types of terrain + * New freely licensed font + * Wheel-ground contact is now computed along wheel plane, not just straight down + * Vehicle selection screen shows real values of the car + * Vehicles can have different friction of wheels defined in the .vehicle file + * Optimized .obj mesh loader + * Updated libPhysfs code + * Other fixes + * Added 2 new events and 20 new single races (36 new maps) + * Added many new vegetation sprites +- Drop patch reproducible.patch (merged upstream) +- Add dependency for tinyXML2 +- Refactor data package creation +- Add dependency for data package +- Use pkgconfig(physfs) + ------------------------------------------------------------------- Tue Jul 10 19:13:23 UTC 2018 - bwiedemann@suse.com diff --git a/trigger-rally.spec b/trigger-rally.spec index 164d88b..5bf06fa 100644 --- a/trigger-rally.spec +++ b/trigger-rally.spec @@ -1,7 +1,7 @@ # # spec file for package trigger-rally # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: trigger-rally -Version: 0.6.5 +Version: 0.6.6.1 Release: 0 Summary: Fast-paced single-player rally racing game -License: GPL-2.0 +License: GPL-2.0-only Group: Amusements/Games/Action/Race Url: http://trigger-rally.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/trigger-rally/trigger-%{version}/trigger-rally-%{version}.tar.gz @@ -29,8 +29,6 @@ Source1: %{name}.desktop # PATCH-FEATURE-UPSTREAM https://sourceforge.net/p/trigger-rally/patches/15/ Source2: %{name}.appdata.xml Source99: %{name}.changes -# PATCH-FIX-UPSTREAM https://sourceforge.net/p/trigger-rally/patches/18/ -Patch0: reproducible.patch BuildRequires: dos2unix BuildRequires: fdupes %if %{?suse_version} > 1320 @@ -39,7 +37,6 @@ BuildRequires: gcc-c++ >= 5.0 BuildRequires: gcc5-c++ %endif BuildRequires: hicolor-icon-theme -BuildRequires: physfs-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(SDL2_image) BuildRequires: pkgconfig(freealut) @@ -47,7 +44,10 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(physfs) >= 2.1 BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(tinyxml2) >= 6 +Requires: %{name}-data == %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,9 +56,20 @@ different terrain materials like dirt, asphalt, sand, ice etc. and various weather, light and fog conditions. Most maps are equipped with spoken co-driver notes and co-driver icons. +%package data +Summary: Data files for trigger-rally +Group: Amusements/Games/Action/Race +Requires: trigger-rally == %{version} +BuildArch: noarch + +%description data +This package provides the data files for trigger-rally, a 3D rally simulation +with a physics engine for drifting, over 100 maps, different terrain materials +like dirt, asphalt, sand, ice etc. and various weather, light and fog conditions. +Most maps are equipped with spoken co-driver notes and co-driver icons. + %prep %setup -q -%patch0 -p1 dos2unix doc/*.txt bin/*.defs modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" @@ -71,9 +82,11 @@ sed -i "s|-march=native||; s|-mtune=native||" src/GNUmakefile* export CXX=g++-5 CC=gcc-5 %endif make --directory=src prefix=%{_prefix} exec_prefix=%{_prefix} bindir=%{_bindir} +# NOTE: don't use datadir=...: program currently (v0.6.6.1) uses hardcoded search paths %install %make_install --directory=src prefix=%{_prefix} exec_prefix=%{_prefix} bindir=%{_bindir} +# NOTE: don't use datadir=...: program currently (v0.6.6.1) uses hardcoded search paths %suse_update_desktop_file -i %{name} @@ -96,11 +109,16 @@ install -Dm0644 %{S:2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %files %defattr(-,root,root) %{_bindir}/* -%{_datadir}/games/trigger-rally +%{_datadir}/games/trigger-rally/icon %{_datadir}/applications/trigger-rally.desktop %{_datadir}/icons/hicolor/scalable/apps/trigger-rally.svg %{_datadir}/doc/trigger-rally/ %dir %{_datadir}/appdata/ %{_datadir}/appdata/%{name}.appdata.xml +%files data +%defattr(-,root,root) +%dir %{_datadir}/games/trigger-rally/ +%{_datadir}/games/trigger-rally/data.* + %changelog