The package rpms/speed-dreams.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/speed-dreams.git/commit/?id=15d41216....
Change: +ExcludeArch: s390x
Thanks.
Full change: ============
commit 15d4121672a8ca389213e7b8d0cdf3f7a0c7fc33 Author: Martin Gansser mgansser@netcom-mail.de Date: Tue May 27 11:15:09 2025 +0200
Update to 2.4.1
diff --git a/.gitignore b/.gitignore index 8c41fa0..843f840 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /speed-dreams-src-hq-cars-and-tracks-2.3.0-r8786.tar.xz /speed-dreams-src-unmaintained-2.3.0-r8786.tar.xz /speed-dreams-src-wip-cars-and-tracks-2.3.0-r8786.tar.xz +/speed-dreams-2.4.1.tar.xz diff --git a/9ae2b6cc83ce5cdaec58cb4d2aed2fb5ae60b7c8.patch b/9ae2b6cc83ce5cdaec58cb4d2aed2fb5ae60b7c8.patch new file mode 100644 index 0000000..37a4678 --- /dev/null +++ b/9ae2b6cc83ce5cdaec58cb4d2aed2fb5ae60b7c8.patch @@ -0,0 +1,166 @@ +From 9ae2b6cc83ce5cdaec58cb4d2aed2fb5ae60b7c8 Mon Sep 17 00:00:00 2001 +From: Xavier Del Campo Romero xavi.dcr@tutanota.com +Date: Wed, 21 May 2025 22:09:44 +0200 +Subject: [PATCH] Revert "CMakeLists.txt: Use CONFIG file for SOLID" + +This commit aimed to remove FindSOLID.cmake for the sake of +mantainability. This required the fork of FreeSOLID the project already +used as a submodule, which would install config .cmake files on its +installation prefix. + +However, this breaks compatibility with distributions already packaging +upstream FreeSOLID. In such distributions, no config .cmake files are +installed by FreeSOLID, and therefore FindSOLID.cmake is the only way +for the project to find the FreeSOLID library. + +This reverts commit 5a5c8e3563c4ea1f7da6bfa6a01efd463d45bcef. +However, it is not a full revert. The following changes have been +introduced: + +- The freesolid submodule remains unchanged. +- Broken tabs are fixed in FindSOLID.cmake. +--- + CMakeLists.txt | 10 +--- + cmake/FindSOLID.cmake | 111 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 113 insertions(+), 8 deletions(-) + create mode 100644 cmake/FindSOLID.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 01df81aa..289d843d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,15 +86,9 @@ else() + message(STATUS "Data directory: ${SD_DATADIR_ABS}") + endif() + +-find_package(SOLID 2.1.2 QUIET) ++find_package(SOLID 2.1.2) + +-if(SOLID_FOUND) +- message(STATUS "Found SOLID: ${SOLID_LIBRARY} " +- "(found version "${SOLID_VERSION}")") +- add_library(solid UNKNOWN IMPORTED) +- set_property(TARGET solid PROPERTY IMPORTED_LOCATION ${SOLID_LIBRARY}) +- target_include_directories(solid INTERFACE ${SOLID_INCLUDE_DIR}) +-else() ++if(NOT SOLID_FOUND) + message(STATUS "SOLID not found. Using in-tree submodule.") + add_subdirectory(freesolid) + endif() +diff --git a/cmake/FindSOLID.cmake b/cmake/FindSOLID.cmake +new file mode 100644 +index 00000000..5564921d +--- /dev/null ++++ b/cmake/FindSOLID.cmake +@@ -0,0 +1,111 @@ ++# Locate SOLID libraries (collision detection for solid bodies) ++# This module defines ++# SOLID_SOLID_LIBRARY, SOLID_BROAD_LIBRARY : name of each lib ++# SOLID_LIBRARY : list of lib names ++# SOLID_FOUND : if false, do not try to link to SOLID ++# SOLID_INCLUDE_DIR : where to find the headers ++# ++# $SOLID_DIR is an environment variable that would ++# correspond to the ./configure --prefix=$SOLID_DIR ++# used in building SOLID. ++# ++# Created by Jean-Philippe Meuret (based on Mart Kelder's FindPLIB.cmake). ++ ++# No use to do all of this twice. ++IF(SOLID_FOUND) ++ RETURN() ++ENDIF(SOLID_FOUND) ++ ++# First, try with PkgConfig if available. ++FIND_PACKAGE(PkgConfig) ++IF(PKGCONFIG_FOUND) ++ ++ PKG_CHECK_MODULES(SOLID FreeSOLID IMPORTED_TARGET) ++ IF(NOT SOLID_FOUND) ++ PKG_CHECK_MODULES(SOLID SOLID IMPORTED_TARGET) ++ ENDIF (NOT SOLID_FOUND) ++ ++ IF(SOLID_FOUND) ++ SET(SOLID_FOUND TRUE) ++ SET(SOLID_INCLUDE_DIR ${SOLID_INCLUDE_DIRS} CACHE STRING "SOLID include paths") ++ SET(SOLID_SOLID_LIBRARY ${SOLID_LIBRARIES} CACHE STRING "SOLID library") ++ SET(SOLID_BROAD_LIBRARY "NOT-FOUND" CACHE STRING "BROAD libraries") ++ SET(SOLID_MOTO_LIBRARY "NOT-FOUND" CACHE STRING "MOTO libraries") ++ SET(SOLID_LIBRARY ${SOLID_SOLID_LIBRARY}) ++ MESSAGE(STATUS "Looking for SOLID --- found using pkg-config (${SOLID_SOLID_LIBRARY})") ++ add_library(solid ALIAS PkgConfig::SOLID) ++ RETURN() ++ ENDIF(SOLID_FOUND) ++ ++ENDIF(PKGCONFIG_FOUND) ++ ++# Then try the good old way for include dirs. ++IF(NOT APPLE) ++ ++ FIND_PATH(SOLID_INCLUDE_DIR SOLID/solid.h ++ HINTS ENV SOLID_DIR ++ PATH_SUFFIXES ++ include/FreeSOLID include/freesolid include/SOLID include ++ PATHS ++ /usr /usr/local ++ DOC "Non-Apple include dir for SOLID") ++ ++ELSE(NOT APPLE) ++ ++ FIND_PATH(SOLID_INCLUDE_DIR solid.h ++ HINTS ENV SOLID_DIR ++ PATH_SUFFIXES ++ Headers include/FreeSOLID include/freesolid include/SOLID include ++ PATHS ++ #Additional MacOS Paths ++ ~/Library/Frameworks/SOLID.framework ++ /Library/Frameworks/SOLID.framework ++ /System/Library/Frameworks/SOLID.framework # Tiger ++ ++ /usr /usr/local ++ DOC "Apple include dir for SOLID") ++ ++ENDIF(NOT APPLE) ++ ++# Then try the good old way for libs. ++FIND_LIBRARY(SOLID_SOLID_LIBRARY ++ NAMES solid2 solid FreeSOLID freesolid ++ HINTS ENV SOLID_DIR ++ PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 ++ PATHS /usr /usr/local) ++ ++#MESSAGE(STATUS "Looking for SOLID --- SOLID_SOLID_LIBRARY = ${SOLID_SOLID_LIBRARY}") ++IF(WIN32) ++ ++ FIND_LIBRARY(SOLID_BROAD_LIBRARY ++ NAMES broad ++ HINTS ENV SOLID_DIR ++ PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 ++ PATHS /usr /usr/local) ++ ++ FIND_LIBRARY(SOLID_MOTO_LIBRARY ++ NAMES moto ++ HINTS ENV SOLID_DIR ++ PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 ++ PATHS /usr /usr/local) ++ ++ENDIF(WIN32) ++ ++IF(SOLID_INCLUDE_DIR AND SOLID_SOLID_LIBRARY) ++ SET(SOLID_FOUND TRUE) ++ENDIF(SOLID_INCLUDE_DIR AND SOLID_SOLID_LIBRARY) ++ ++IF(SOLID_FOUND) ++ MESSAGE(STATUS "Looking for SOLID - found (${SOLID_SOLID_LIBRARY})") ++ SET(SOLID_LIBRARY ${SOLID_SOLID_LIBRARY}) ++ IF(WIN32) ++ IF(SOLID_BROAD_LIBRARY) ++ SET(SOLID_LIBRARY ${SOLID_LIBRARY} ${SOLID_BROAD_LIBRARY}) ++ ENDIF(SOLID_BROAD_LIBRARY) ++ IF(SOLID_MOTO_LIBRARY) ++ SET(SOLID_LIBRARY ${SOLID_LIBRARY} ${SOLID_MOTO_LIBRARY}) ++ ENDIF(SOLID_MOTO_LIBRARY) ++ ENDIF(WIN32) ++ELSE(SOLID_FOUND) ++ MESSAGE(STATUS "Looking for SOLID - NOT found") ++ENDIF(SOLID_FOUND) diff --git a/sources b/sources index d34e297..eaddf97 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -SHA512 (speed-dreams-src-base-2.3.0-r8786.tar.xz) = b678a722a1f9fd62779ab776d5f5777d6fc68ecbb29991bd315319218c1d7e6554ad489c44076b1f0699e9ff72c298373315f1d7c63c87c566a009cae85fad39 -SHA512 (speed-dreams-src-wip-cars-and-tracks-2.3.0-r8786.tar.xz) = 64651237115149ec063fcb11faf64b62005ee590526c5101a5a6a632aeb130b691b2651299eaf4190ddf1fd00ae33007d6f1d62441c672b4808ef33201ef1dbf -SHA512 (speed-dreams-src-hq-cars-and-tracks-2.3.0-r8786.tar.xz) = 4f67539bb7e9b126500426d2323035053d6a9f1bf7b6947fc9fc39fee53551ba652d93c95337d2cd74280455f25d55e2a922bc64380bba5b8ea40163ad9ab7cf -SHA512 (speed-dreams-src-more-hq-cars-and-tracks-2.3.0-r8786.tar.xz) = 8eb252fe38d74dbd8b5a39d027b739484520ac21be928c1c4fb00a3b845ca51b63d2d59d11119c26c998fb859dba0ab711e8da1ea83430f771e1903411eb44c4 -SHA512 (speed-dreams-src-unmaintained-2.3.0-r8786.tar.xz) = 23cb21610a875a258811f52f6d914d41a7fcb3e576147d9503ccdc710b3fc94f0515735a0e40aaa3b51f2f322ec48497259bf71a6e94a63ad5b65d66efea8f12 +SHA512 (speed-dreams-2.4.1.tar.xz) = c990fdadd1988d0c17da4d8f75a8cb9593462bbbee40c74368ac8429992b7a6b378e1020b7d6de191a5220ffad9084f334ac6d4fe538864f86f71522a81641a4 diff --git a/speed-dreams-header-fix.patch b/speed-dreams-header-fix.patch deleted file mode 100644 index c7b2883..0000000 --- a/speed-dreams-header-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/modules/userinterface/legacymenu/confscreens/mouseconfig.cpp.orig 2025-01-23 13:36:39.288533218 +0100 -+++ b/src/modules/userinterface/legacymenu/confscreens/mouseconfig.cpp 2025-01-23 13:37:14.890798242 +0100 -@@ -32,6 +32,7 @@ - - #include "controlconfig.h" - #include "mouseconfig.h" -+#include <math.h> - - - // Constants. ---- a/src/modules/networking/pack.cpp.orig 2025-01-23 13:03:04.397087621 +0100 -+++ b/src/modules/networking/pack.cpp 2025-01-23 13:03:15.995372551 +0100 -@@ -15,6 +15,7 @@ - */ - - #include <string> -+#include <cstring> - - #ifdef _WIN32 - # if defined(_MSC_VER) ---- a/src/modules/userinterface/legacymenu/confscreens/monitorconfig.cpp.orig 2025-01-24 14:08:34.393113506 +0100 -+++ b/src/modules/userinterface/legacymenu/confscreens/monitorconfig.cpp 2025-01-24 14:09:25.626005745 +0100 -@@ -26,6 +26,7 @@ - #include "legacymenu.h" - #include "monitorconfig.h" - #include "graphic.h" -+#include <cstring> - - - // Some consts. diff --git a/speed-dreams-replace_curl_formadd.patch b/speed-dreams-replace_curl_formadd.patch deleted file mode 100644 index c63ae7b..0000000 --- a/speed-dreams-replace_curl_formadd.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/libs/tgfclient/webserver.cpp.orig 2025-01-23 11:26:45.830477196 +0100 -+++ b/src/libs/tgfclient/webserver.cpp 2025-01-23 11:30:22.777107176 +0100 -@@ -634,11 +634,22 @@ - curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-agent/1.0"); - - //prepare the form-post to be sent to the server -- curl_formadd(&formpost, -- &lastptr, -- CURLFORM_COPYNAME, "data", //the field name where the data will be stored -- CURLFORM_COPYCONTENTS, data.c_str(), //the actual data -- CURLFORM_END); -+ // Old code -+ // curl_formadd(&formpost, -+ // &lastptr, -+ // CURLFORM_COPYNAME, "data", //the field name where the data will be stored -+ // CURLFORM_COPYCONTENTS, data.c_str(), //the actual data -+ // CURLFORM_END); -+ -+ // New code using curl_mime -+ curl_mime *mime; -+ curl_mimepart *part; -+ -+ mime = curl_mime_init(curl); // Initialize mime structure -+ part = curl_mime_addpart(mime); // Create a new part -+ curl_mime_name(part, "data"); // Set the name of the part -+ curl_mime_data(part, data.c_str(), CURL_ZERO_TERMINATED); // Add the data -+ curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime); // Set the mimepost - - //inform curl to send the form-post - curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); diff --git a/speed-dreams.desktop b/speed-dreams.desktop deleted file mode 100644 index 73f1019..0000000 --- a/speed-dreams.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Speed Dreams 2 -Comment=The Open Racing Car Simulator -Exec=/usr/bin/speed-dreams-2 -Icon=/usr/share/games/speed-dreams-2/data/icons/icon.png -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Game;Simulation; - diff --git a/speed-dreams.spec b/speed-dreams.spec index 1f1a844..e313171 100644 --- a/speed-dreams.spec +++ b/speed-dreams.spec @@ -1,78 +1,71 @@ -# Set sf_release to 1 to use released sources on sourceforge -%global sf_release 1 -%global svndate 20181104 - -# Versions are like 2.2.2-rc2-r6528. The first part (2.2.2 in this example) -# goes into the Version: field, the rest (rc2-r6528 here) into %%src_release. -%global src_release 8786 - -%global src_version %{version}-r%{src_release} -%if 0%{?sf_release} -%global repo_url http://downloads.sourceforge.net/project/%%7Bname%7D/%%7Bversion%7D/ -%endif - -Summary: The Open Racing Car Simulator -Name: speed-dreams -Version: 2.3.0 -%if 0%{?sf_release} -Release: 7%{?dist} -%else -Release: 0.19.%{svndate}svn%(echo %{src_release} | tr '-' '_').rc1%{?dist} -%endif -Epoch: 1 - # Contains LGPLv2 files also published under GPLv2+ -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: http://speed-dreams.org/ - - # When making a post release (%%sf_release is 0), build - # source using something like: - # svnroot=https://svn.code.sf.net/p - # svn co -r 6528 $svnroot/speed-dreams/code/trunk speed-dreams - # cd speed-dreams - # packaging/sources/build.sh trunk-r6542 - # As of r6542, the download is ~8,8GB. -Source0: %{?repo_url}%{name}-src-base-%{src_version}.tar.xz -Source1: %{?repo_url}%{name}-src-wip-cars-and-tracks-%{src_version}.tar.xz -Source2: %{?repo_url}%{name}-src-hq-cars-and-tracks-%{src_version}.tar.xz -Source3: %{?repo_url}%{name}-src-more-hq-cars-and-tracks-%{src_version}.tar.xz -Source4: %{?repo_url}%{name}-src-unmaintained-%{src_version}.tar.xz -Source5: %{name}.desktop -# Patch0: fix_invalid_ascii_characters.patch -Patch0: speed-dreams-replace_curl_formadd.patch -Patch1: speed-dreams-header-fix.patch - -ExcludeArch: s390x - -Provides: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-robots-base = %{epoch}:%{version} -Requires: opengl-games-utils -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: chrpath -BuildRequires: libcurl-devel -BuildRequires: desktop-file-utils -BuildRequires: enet-devel -BuildRequires: expat-devel -BuildRequires: freealut-devel -BuildRequires: freeglut-devel -BuildRequires: FreeSOLID-devel -BuildRequires: libGL-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libXi-devel -BuildRequires: libXmu-devel -BuildRequires: libXrandr-devel -BuildRequires: plib-devel -BuildRequires: SDL2-devel -BuildRequires: SDL2_mixer-devel -BuildRequires: libogg-devel -BuildRequires: libvorbis-devel -BuildRequires: OpenSceneGraph-devel +Name: speed-dreams +Version: 2.4.1 +Release: 1%{?dist} +Epoch: 1 +Summary: 3D Open Racing Simulation + +# Speed Dreams source is under GPL-2.0-or-later by default +# https://speed-dreams.net/en/about +License: GPL-2.0-or-later AND LAL-1.3 +# Media content: Graphics, sounds, and other artistic works are licensed under LAL-1.3 + +URL: https://www.speed-dreams.net +# ------------------------------------------------------------------------------ +# retrieve sources and create archive: +# +# $ git clone --recursive https://forge.a-lec.org/speed-dreams/speed-dreams-code speed-dreams +# $ cd speed-dreams +# $ git checkout tags/v2.4.1 +# $ git submodule update --init --recursive +# $ cd .. +# $ mv speed-dreams speed-dreams-2.4.1 +# $ tar -cJf speed-dreams-2.4.1.tar.xz speed-dreams-2.4.1 +# ------------------------------------------------------------------------------ +Source0: %{name}-%{version}.tar.xz +# upstream patch to restore FindSOLID.cmake so that the FreeSOLID library can be found again. +# https://forge.a-lec.org/speed-dreams/speed-dreams-code/pulls/173 +Patch0: https://forge.a-lec.org/speed-dreams/speed-dreams-code/commit/9ae2b6cc83ce5c... + +ExcludeArch: s390x + +Provides: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-robots-base = %{epoch}:%{version} +Requires: opengl-games-utils +Requires: bitstream-vera-sans-fonts +Requires: dejavu-lgc-sans-fonts +BuildRequires: bitstream-vera-sans-fonts +BuildRequires: dejavu-lgc-sans-fonts +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: chrpath +BuildRequires: libcurl-devel +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: enet-devel +BuildRequires: expat-devel +BuildRequires: freealut-devel +BuildRequires: freeglut-devel +BuildRequires: FreeSOLID-devel >= 2.1.2 +BuildRequires: libGL-devel +BuildRequires: libjpeg-devel +BuildRequires: zlib-devel +BuildRequires: libpng-devel +BuildRequires: libXi-devel +BuildRequires: libXmu-devel +BuildRequires: libXrandr-devel +BuildRequires: plib-devel +BuildRequires: SDL2-devel +BuildRequires: SDL2_mixer-devel +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: OpenSceneGraph-devel +BuildRequires: cjson-devel +BuildRequires: minizip-devel +BuildRequires: rhash-devel
# Dont provide or require internal libs. Using new rpm builtin filtering, -# see http://www.rpm.org/wiki/PackagerDocs/DependencyGenerator +# see https://docs.fedoraproject.org/en-US/packaging-guidelines/AutoProvidesAndReq... %global __requires_exclude liblearning.so %global __requires_exclude %{__requires_exclude}|libnetworking.so %global __requires_exclude %{__requires_exclude}|libraceengine.so @@ -81,10 +74,10 @@ BuildRequires: OpenSceneGraph-devel %global __requires_exclude %{__requires_exclude}|libtgfclient.so %global __requires_exclude %{__requires_exclude}|libtgfdata.so %global __requires_exclude %{__requires_exclude}|libportability.so +%global __requires_exclude %{__requires_exclude}|libcsnetworking.so
%global __provides_exclude_from %{_libdir}/games/speed-dreams-2/.*\.so
- %description Speed-Dreams is a 3D racing cars simulator using OpenGL. A Fork of TORCS. The goal is to have programmed robots drivers racing against each others. @@ -101,47 +94,46 @@ This package contains additional tracks for the game. %package devel Summary: The Open Racing Car Simulator development files Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - + %description devel This package contains the development files for the game.
- %prep -%setup -q -c -n %{name}-src-base-%{version}-%{release} -a1 -a2 -a3 -a4 -%patch 0 -p1 -%patch 1 -p1 +%autosetup -p1 -n %{name}-%{version}
# delete unused header file on arm achitecture sed -i -e 's|#include "OsgReferenced.h"||g' src/modules/graphic/osggraph/Sky/OsgDome.h
+# remove obsolete encoding key from .desktop file +sed -i '/^Encoding=/d' speed-dreams.desktop.in +sed -i '/^Name=/c\Name=/Speed Dreams 2' speed-dreams.desktop.in +sed -i '/^Icon=/c\Icon=/usr/share/games/speed-dreams-2/data/icons/icon.png' speed-dreams.desktop.in + +# unbundle freesolid +rm -rf freesolid +rm -rf src/tools/trackeditor + # fixes spurious-executable-perm # https://sourceforge.net/p/speed-dreams/tickets/605/ find . -name '*.c' -o -name '*.h' -o -name '*.cpp' -o -name '*.hpp' | \ xargs chmod 644
%build -%cmake -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_SKIP_RPATH:BOOL=OFF \ - -DOPTION_DEBUG:STRING=ON \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \ - -DSD_BINDIR:PATH=bin \ - -DOPTION_3RDPARTY_SOLID:BOOL=ON \ - -DOPTION_TRACKEDITOR:BOOL=OFF \ - -DOPTION_OFFICIAL_ONLY:BOOL=ON +%cmake -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DOPTION_DEBUG:STRING=ON \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \ + -DSD_BINDIR:PATH=bin \ + -DOPTION_3RDPARTY_SOLID:BOOL=ON \ + -DOPTION_TRACKEDITOR:BOOL=OFF \ + -DOPTION_OFFICIAL_ONLY:BOOL=ON %cmake_build
%install -#make DESTDIR=%{buildroot} install >/dev/null %cmake_install find %{buildroot} -type f -name "*.cmake" -delete
-desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - %{SOURCE5} - -# Register as an application to be visible in the software center -mkdir -p %{buildroot}%{_datadir}/appdata -cp packaging/appdata/%{name}-2.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -Dm 0644 packaging/appdata/speed-dreams-2.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
pushd %{buildroot}%{_libdir}/games/%{name}-2 # Change rpath to refer only private lib dir. @@ -151,19 +143,8 @@ pushd %{buildroot}%{_libdir}/games/%{name}-2 chrpath --replace %{_libdir}/games/%{name}-2/lib $lib done
- # https://sourceforge.net/p/speed-dreams/tickets/730/ - cd drivers - for base in usr simplix dandroid; do - for lib in ${base}_*; do - cd $lib - cmp ../$base/$base.so *.so && ln -sf ../$base/$base.so *.so - cd .. - done - done - # Check that %%{buildroot}%%{_libdir}/games/%%{name}-2/lib doesn't # contain unfiltered libs. - cd ../lib excluded=$( echo '%{__requires_exclude}' | tr '|' ':' ) for lib in *.so; do if [ "${excluded/${lib}/}" = "$excluded" ]; then @@ -173,17 +154,45 @@ pushd %{buildroot}%{_libdir}/games/%{name}-2 done popd
-# removed userman and faq documentation, because it's depreciated -# Upstream has been informed http://sourceforge.net/p/speed-dreams/tickets/739 -rm -rf docs; mkdir docs -cp -a %{buildroot}%{_datadir}/games/%{name}-2/*.txt docs -cp -a %{buildroot}%{_datadir}/games/%{name}-2/*.xml docs +# ERROR 0001: file '/usr/bin/speed-dreams-2' contains a standard runpath '/usr/lib64' in [/usr/lib64/games/speed-dreams-2/lib:/usr/lib64] +# ERROR 0001: file '/usr/bin/sd2-accc' contains a standard runpath '/usr/lib64' in [/usr/lib64/games/speed-dreams-2/lib:/usr/lib64] +# ERROR 0001: file '/usr/bin/sd2-nfs2ac' contains a standard runpath '/usr/lib64' in [/usr/lib64/games/speed-dreams-2/lib:/usr/lib64] +# ERROR 0001: file '/usr/bin/sd2-nfsperf' contains a standard runpath '/usr/lib64' in [/usr/lib64/games/speed-dreams-2/lib:/usr/lib64] +# ERROR 0001: file '/usr/bin/sd2-trackgen' contains a standard runpath '/usr/lib64' in [/usr/lib64/games/speed-dreams-2/lib:/usr/lib64] +chrpath -r %{_libdir}/games/speed-dreams-2/lib %{buildroot}%{_bindir}/speed-dreams-2 +chrpath -r %{_libdir}/games/speed-dreams-2/lib %{buildroot}%{_bindir}/sd2-accc +chrpath -r %{_libdir}/games/speed-dreams-2/lib %{buildroot}%{_bindir}/sd2-nfs2ac +chrpath -r %{_libdir}/games/speed-dreams-2/lib %{buildroot}%{_bindir}/sd2-nfsperf +chrpath -r %{_libdir}/games/speed-dreams-2/lib %{buildroot}%{_bindir}/sd2-trackgen + +# Remove obsolete or unnecessary files from the installation directory +rm -f %{buildroot}%{_includedir}/3D/Makefile.am +rm -f %{buildroot}%{_includedir}/SOLID/Makefile.am + +# Replace bundled fonts with symlink to system fonts +ln -sf /usr/share/fonts/dejavu/DejaVuSans.ttf \ + %{buildroot}%{_datadir}/games/speed-dreams-2/data/fonts/DejaVuLGCSans.ttf +ln -sf /usr/share/fonts/bitstream-vera/Vera.ttf \ + %{buildroot}%{_datadir}/games/speed-dreams-2/data/fonts/Vera.ttf +ln -sf /usr/share/fonts/bitstream-vera/VeraBd.ttf \ + %{buildroot}%{_datadir}/games/speed-dreams-2/data/fonts/VeraBd.ttf +ln -sf /usr/share/fonts/bitstream-vera/VeraBI.ttf \ + %{buildroot}%{_datadir}/games/speed-dreams-2/data/fonts/VeraBI.ttf +ln -sf /usr/share/fonts/bitstream-vera/VeraMono.ttf \ + %{buildroot}%{_datadir}/games/speed-dreams-2/data/fonts/VeraMono.ttf +ln -sf ../Vera.ttf \ + %{buildroot}%{_datadir}/games/speed-dreams-2/data/fonts/vera/Vera.ttf + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
# remove zero length files find %{buildroot} -size 0 -delete
%files -%doc docs/*.xml docs/*.txt +%license LICENSE +%doc README.md %{_mandir}/man6/* %{_bindir}/%{name}-2 %{_bindir}/sd2-* @@ -208,24 +217,8 @@ find %{buildroot} -size 0 -delete %{_includedir}/%{name}-2/
%changelog -* Fri Jan 24 2025 Martin Gansser martinkg@fedoraproject.org - 1:2.3.0-7 -- Add speed-dreams-replace_curl_formadd.patch to fix FTBFS #2341372 -- Add speed-dreams-header-fix.patch - -* Sun Jan 19 2025 Fedora Release Engineering releng@fedoraproject.org - 1:2.3.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý msuchy@redhat.com - 1:2.3.0-5 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering releng@fedoraproject.org - 1:2.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 29 2024 Fedora Release Engineering releng@fedoraproject.org - 1:2.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering releng@fedoraproject.org - 1:2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Tue Jul 25 2023 Martin Gansser martinkg@fedoraproject.org - 1:2.4.1-1 +- Update to 2.4.1
* Tue Jul 25 2023 Martin Gansser martinkg@fedoraproject.org - 1:2.3.0-1 - Update to 2.3.0
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org