Cleanup specfile

OBS-URL: https://build.opensuse.org/package/show/games/emptyepsilon?expand=0&rev=8
This commit is contained in:
Dominik Heidler 2023-12-10 23:51:09 +00:00 committed by Git OBS Bridge
parent 00458a70f0
commit 51a601466c
2 changed files with 17 additions and 28 deletions

View File

@ -25,12 +25,11 @@ Group: Amusements/Games/Other
URL: https://daid.github.io/EmptyEpsilon/ URL: https://daid.github.io/EmptyEpsilon/
Source: EmptyEpsilon-%{version}.tar.gz Source: EmptyEpsilon-%{version}.tar.gz
Source1: SeriousProton-%{version}.tar.gz Source1: SeriousProton-%{version}.tar.gz
Source3: download.sh Source2: download.sh
Source4: basis_universal.zip Source3: basis_universal.zip
Source5: use_bundled_basis_universal.patch Source5: meshoptimizer.zip
Source6: meshoptimizer.zip Patch0: use_bundled_basis_universal.patch
Source7: use_bundled_meshoptimizer.patch Patch1: use_bundled_meshoptimizer.patch
Source8: fix_unique_ptr_in_namespace_std_does_not_name_a_template_type.patch
BuildRequires: SDL2-devel BuildRequires: SDL2-devel
BuildRequires: bsdtar BuildRequires: bsdtar
BuildRequires: cmake BuildRequires: cmake
@ -50,40 +49,40 @@ EmptyEpsilon places you in the roles of a spaceship's bridge officers, like thos
Each officer fills a unique role: Captain, Helms, Weapons, Relay, Science, and Engineering. Except for the Captain, each officer operates part of the ship through a specialized screen. The Captain relies on their trusty crew to report information and follow orders. Each officer fills a unique role: Captain, Helms, Weapons, Relay, Science, and Engineering. Except for the Captain, each officer operates part of the ship through a specialized screen. The Captain relies on their trusty crew to report information and follow orders.
%prep %prep
cd $RPM_SOURCE_DIR # extract EE and SP inside the EE dir
tar xf SeriousProton-%{version}.tar.gz %setup -q -a1 -n EmptyEpsilon-EE-%{version}
tar xf EmptyEpsilon-%{version}.tar.gz
find -name .gitignore | xargs rm find -name .gitignore | xargs rm
patch -p0 < use_bundled_basis_universal.patch pushd SeriousProton-EE-%{version}
patch -p0 < use_bundled_meshoptimizer.patch %patch0 -p1
patch -p0 < fix_unique_ptr_in_namespace_std_does_not_name_a_template_type.patch popd
%patch1 -p1
%build # extract bundled dependencies
mkdir -p SeriousProton/externals/basis mkdir -p SeriousProton/externals/basis
bsdtar xvf $RPM_SOURCE_DIR/basis_universal.zip --strip-components=1 -C SeriousProton/externals/basis bsdtar xvf $RPM_SOURCE_DIR/basis_universal.zip --strip-components=1 -C SeriousProton/externals/basis
mkdir -p externals/meshoptimizer mkdir -p externals/meshoptimizer
bsdtar xvf $RPM_SOURCE_DIR/meshoptimizer.zip --strip-components=1 -C externals/meshoptimizer bsdtar xvf $RPM_SOURCE_DIR/meshoptimizer.zip --strip-components=1 -C externals/meshoptimizer
%build
%if 0%{?sle_version:1} %if 0%{?sle_version:1}
# if sle_version is defined, this is not tumbleweed # if sle_version is defined, this is not tumbleweed
export CC=gcc-10 export CC=gcc-10
export CXX=g++-10 export CXX=g++-10
%endif %endif
cmake -DSERIOUS_PROTON_DIR="$RPM_SOURCE_DIR/SeriousProton-EE-%{version}" \ cmake -DSERIOUS_PROTON_DIR="SeriousProton-EE-%{version}" \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCPACK_PACKAGE_VERSION_MAJOR="$(echo %{version} | cut -d. -f1)" \ -DCPACK_PACKAGE_VERSION_MAJOR="$(echo %{version} | cut -d. -f1)" \
-DCPACK_PACKAGE_VERSION_MINOR="$(echo %{version} | cut -d. -f2)" \ -DCPACK_PACKAGE_VERSION_MINOR="$(echo %{version} | cut -d. -f2)" \
-DCPACK_PACKAGE_VERSION_PATCH="$(echo %{version} | cut -d. -f3)" \ -DCPACK_PACKAGE_VERSION_PATCH="$(echo %{version} | cut -d. -f3)" \
-DOpenGL_GL_PREFERENCE=GLVND \ -DOpenGL_GL_PREFERENCE=GLVND \
$RPM_SOURCE_DIR/EmptyEpsilon-EE-%{version} .
%make_build -j 8 %make_build -j 8
%install %install
%make_install %make_install
install -Dvm 644 $RPM_SOURCE_DIR/EmptyEpsilon-EE-%{version}/README.md -t "%{buildroot}%{_datadir}/doc/EmptyEpsilon"
%files %files
# You may have to add additional files here (documentation and binaries mostly) %doc README.md
%{_bindir}/EmptyEpsilon %{_bindir}/EmptyEpsilon
%{_datadir}/doc/EmptyEpsilon/ %{_datadir}/doc/EmptyEpsilon/
%{_datadir}/emptyepsilon/ %{_datadir}/emptyepsilon/

View File

@ -1,10 +0,0 @@
--- SeriousProton-EE-2023.06.17/src/io/http/websocket.h 2022-03-15 23:05:53.000000000 +0100
+++ /var/tmp/build-root/openSUSE_Tumbleweed-x86_64/home/abuild/rpmbuild/SOURCES/SeriousProton-EE-2022.03.16/src/io/http/websocket.h 2022-09-14 17:02:50.866384537 +0200
@@ -4,6 +4,7 @@
#include <nonCopyable.h>
#include <io/network/tcpSocket.h>
#include <unordered_map>
+#include <memory>
namespace sp {