diff --git a/ftbfs.patch b/ftbfs.patch new file mode 100644 index 0000000..31f93fe --- /dev/null +++ b/ftbfs.patch @@ -0,0 +1,15 @@ +# regex_search does not allow temporary strings +Index: trigger-rally-0.6.3/src/Trigger/main.cpp +=================================================================== +--- trigger-rally-0.6.3.orig/src/Trigger/main.cpp 2016-01-27 13:11:52.000000000 +0100 ++++ trigger-rally-0.6.3/src/Trigger/main.cpp 2016-03-21 21:48:29.265950421 +0100 +@@ -890,7 +890,8 @@ + std::smatch mr; // Match Results + std::regex pat(R"(^(\w+)(\..+)$)"); // Pattern + +- if (!std::regex_search(std::string(*fname), mr, pat)) ++ std::string tmps=std::string(*fname); ++ if (!std::regex_search(tmps, mr, pat)) + continue; + + std::string basefname = mr[1]; diff --git a/trigger-rally-0.6.3.tar.gz b/trigger-rally-0.6.3.tar.gz new file mode 100644 index 0000000..24d8967 --- /dev/null +++ b/trigger-rally-0.6.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7edf0fa19162e7639228aadc58d6d0ed60665d860ad2ff6aae650c7c37d97580 +size 114776691 diff --git a/trigger-rally-src-0.6.0.tar.bz2 b/trigger-rally-src-0.6.0.tar.bz2 deleted file mode 100644 index 68d75c2..0000000 --- a/trigger-rally-src-0.6.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42bcce13fe92e1316254c46108a6770eae555348813094297195e8201ee3ee21 -size 340628 diff --git a/trigger-rally.changes b/trigger-rally.changes index 264d74a..11a3a56 100644 --- a/trigger-rally.changes +++ b/trigger-rally.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Mar 25 10:34:07 UTC 2016 - mailaender@opensuse.org + +- Update to v0.6.3 + - Improve menu and in-race OSD + - Add codriver for 75% of maps + - Tweak terrain physics + - Add many new maps + - Change vehicle skins and presets + - Made various minor code improvements + - Fix compilation warnings + - Add support for .obj textures + - Include new .obj textures (disabled by default) + - Add 6 new events and 23 new single races courtesy of Onsemeliot + - Add several new textures + - Replace most media content (textures, audio, fonts, etc.) with + FOSS equivalents + - New FOSS Trigger Rally icon + - Many other changes (check SVN logs from about r48) + ------------------------------------------------------------------- Sat Jan 5 14:18:26 UTC 2013 - joop.boonen@opensuse.org diff --git a/trigger-rally.desktop b/trigger-rally.desktop index 6753320..a8d82da 100644 --- a/trigger-rally.desktop +++ b/trigger-rally.desktop @@ -2,7 +2,7 @@ Name=Trigger Name[de]=Trigger GenericName=Rally Racing Game -GenericName[de]=Rallye-Racing-Spiel +GenericName[de]=Rally Rennspiel Type=Application Exec=trigger-rally Icon=trigger-rally diff --git a/trigger-rally.spec b/trigger-rally.spec index 49ccb49..a739e0d 100644 --- a/trigger-rally.spec +++ b/trigger-rally.spec @@ -1,7 +1,7 @@ # # spec file for package trigger-rally # -# Copyright (c) 2012 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 @@ -17,63 +17,64 @@ Name: trigger-rally -Version: 0.6.0 +Version: 0.6.3 Release: 0 -License: GPL-2.0 Summary: Fast-paced open source rally racing game -Url: http://sourceforge.net/projects/trigger-rally +License: GPL-2.0 Group: Amusements/Games/Action/Race -Source0: trigger-rally-src-%{version}.tar.bz2 +Url: http://trigger-rally.sourceforge.net/ +Source0: http://downloads.sourceforge.net/project/trigger-rally/trigger-0.6.3/trigger-rally-%{version}.tar.gz Source1: %{name}.desktop -Source2: %{name}32.png -Source3: %{name}64.png -BuildRequires: SDL-devel -BuildRequires: SDL_image-devel -BuildRequires: boost-jam -BuildRequires: freealut-devel -BuildRequires: gcc-c++ -BuildRequires: glew-devel +# PATCH-FIX-OPENSUSE Fix compilation errors with C++5. +Patch1: ftbfs.patch +BuildRequires: fdupes +BuildRequires: gcc-c++ >= 5 +BuildRequires: hicolor-icon-theme BuildRequires: physfs-devel BuildRequires: update-desktop-files -Requires: trigger-rally-data = %{version} +BuildRequires: pkgconfig(SDL_image) +BuildRequires: pkgconfig(freealut) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glew) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(sdl) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Trigger is a fast-paced open source rally racing game. - -Copyright (C) 2004-2006 Jasmine Langridge, Richard Langridge +Trigger Rally is a fast-paced open source rally racing game. %prep -%setup -q -n %{name}-src-%{version} -# set attributes -chmod u+x configure +%setup -q +%patch1 -p1 %build -%configure --datadir=%{_datadir}/trigger-rally -jam -# Data directory for program execution is set during compilation ! -# We only use jam for compilation, NOT FOR INSTALLATION (only datadir must be specified) -# See ./configure --help for directory options +make --directory=src prefix=%{_prefix} exec_prefix=%{_prefix} bindir=%{_bindir} %install -# Program: -install -D -m 755 trigger %{buildroot}%{_bindir}/trigger-rally -# Icons: -install -D -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/trigger-rally.png -install -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/trigger-rally.png -# Desktop menu entry: +%make_install --directory=src prefix=%{_prefix} exec_prefix=%{_prefix} bindir=%{_bindir} + %suse_update_desktop_file -i %{name} Game SportsGame +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +ln -sf %{_datadir}/games/trigger-rally/icon/trigger-rally-icons.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/trigger-rally.svg + +%fdupes %{buildroot}%{_datadir} + +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun + %files %defattr(-,root,root) -%doc doc/* -%{_bindir}/trigger-rally -%{_datadir}/applications/*.desktop -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/32x32 -%dir %{_datadir}/icons/hicolor/32x32/apps -%dir %{_datadir}/icons/hicolor/64x64 -%dir %{_datadir}/icons/hicolor/64x64/apps -%{_datadir}/icons/hicolor/*/apps/*.png +%{_bindir}/* +%{_datadir}/games/trigger-rally +%{_datadir}/applications/trigger-rally.desktop +%{_datadir}/icons/hicolor/scalable/apps/trigger-rally.svg +%{_datadir}/doc/trigger-rally/ %changelog diff --git a/trigger-rally32.png b/trigger-rally32.png deleted file mode 100644 index 1fbed46..0000000 --- a/trigger-rally32.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfa8113e0535118604b2afe465c55c73bb41a262edd3d2f0bac005bb1eb9f713 -size 3230 diff --git a/trigger-rally64.png b/trigger-rally64.png deleted file mode 100644 index 9e33b2b..0000000 --- a/trigger-rally64.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:749e537c58ba3dff8231f7110e1378376c624af6e05817d7b1ec287dce84a4bd -size 9148