diff --git a/.gitignore b/.gitignore index 4dcb60d..086475b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /openclonk-8.1.tar.gz /openclonk-570ba7a8adc7973327ae612a3d535fd8621c41dd.zip /openclonk-570ba7a8adc7973327ae612a3d535fd8621c41dd.tar.gz +/openclonk-701bcf38c9f3c4877e1b4a8651b9ce922b15969e.tar.gz diff --git a/openclonk-bin-path.patch b/openclonk-bin-path.patch new file mode 100644 index 0000000..4261bd8 --- /dev/null +++ b/openclonk-bin-path.patch @@ -0,0 +1,11 @@ +--- a/config.h.cmake.orig 2022-11-04 11:48:52.235540654 +0100 ++++ b/config.h.cmake 2022-11-04 11:49:34.018674547 +0100 +@@ -103,7 +103,7 @@ + + /* Path to data directory */ + #ifdef WITH_APPDIR_INSTALLATION +-#define OC_SYSTEM_DATA_DIR "../share/games/openclonk" ++#define OC_SYSTEM_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/openclonk" + #else + #define OC_SYSTEM_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/games/openclonk" + #endif diff --git a/openclonk.spec b/openclonk.spec index df755c6..bfd0e64 100644 --- a/openclonk.spec +++ b/openclonk.spec @@ -1,7 +1,7 @@ %global __cmake_in_source_build 1 -%global commit 570ba7a8adc7973327ae612a3d535fd8621c41dd -%global date 20180321 +%global commit 701bcf38c9f3c4877e1b4a8651b9ce922b15969e +%global date 20210103 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # For building documentation, it needed Python2 @@ -11,7 +11,7 @@ Name: openclonk Summary: Multiplayer action, tactics and skill game Version: 8.1 -Release: 18.%{date}git%{shortcommit}%{?dist} +Release: 19.%{date}git%{shortcommit}%{?dist} URL: http://www.openclonk.org/ Source0: https://github.com/openclonk/openclonk/archive/%{commit}/%{name}-%{commit}.tar.gz License: ISC and CC-BY-SA @@ -19,6 +19,7 @@ License: ISC and CC-BY-SA Source1: %{name}-html.desktop Source2: %{name}-docs.png Patch0: %{name}-gcc11.patch +Patch1: %{name}-bin-path.patch BuildRequires: make BuildRequires: boost-devel @@ -135,6 +136,7 @@ SETOPT_FLAGS=$(echo "%{optflags}" | sed -e 's/-Werror=format-security/-Wno-error -DCMAKE_SKIP_RPATH:BOOL=NO -DWITH_AUTOMATIC_UPDATE:BOOL=OFF \ -DUSE_X11:BOOL=ON -DUSE_GTK:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=OFF \ -DUSE_STATIC_BOOST=OFF -DUSE_SYSTEM_TINYXML=ON \ + -DWITH_APPDIR_INSTALLATION=ON \ -DUSE_GCC_STYLE_LTCG:BOOL=OFF .. %make_build @@ -148,8 +150,8 @@ popd %install %make_install -C build -install -pm 755 $RPM_BUILD_ROOT%{_prefix}/games/openclonk $RPM_BUILD_ROOT%{_bindir}/ -rm -rf $RPM_BUILD_ROOT%{_prefix}/games +#install -pm 755 $RPM_BUILD_ROOT%{_prefix}/games/openclonk $RPM_BUILD_ROOT%{_bindir}/ +#rm -rf $RPM_BUILD_ROOT%{_prefix}/games # Move upstream appdata file to metainfo/ directory mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo @@ -184,6 +186,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop %doc Version.txt README TRADEMARK Credits.txt %license COPYING COPYING-planet %{_bindir}/openclonk +%{_bindir}/openclonk-server %{_bindir}/c4group %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/applications/%{name}.desktop @@ -201,6 +204,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop %endif %changelog +* Fri Nov 04 2022 Martin Gansser - 8.1-19.20210103git701bcf3 +- Update to 8.1-19.20210103git701bcf3 +- Add openclonk-bin-path.patch +- Change location of pathfix.py + * Fri Jul 22 2022 Fedora Release Engineering - 8.1-18.20180321git570ba7a - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index e354397..215a334 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openclonk-570ba7a8adc7973327ae612a3d535fd8621c41dd.tar.gz) = df63ca385fc4e01f17b5f3f9a1f68608db387b72d778681fa7fec3468f545d4263277be779bd380f1d45feee6f845671a096d5ad490e8c59ee3e07a01a5456da +SHA512 (openclonk-701bcf38c9f3c4877e1b4a8651b9ce922b15969e.tar.gz) = 827d362aeb3c0657689daaaa07b3e8cd5a6dadb9e39b0cd080e2fccf8f3f08430d3876994ba194e11d63d7adb30d3e9ae26332c0b544c8f1447e2378583254d6