diff --git a/EmptyEpsilon-2020.08.07.tar.gz b/EmptyEpsilon-2020.08.07.tar.gz deleted file mode 100644 index b3a6013..0000000 --- a/EmptyEpsilon-2020.08.07.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0964edf59b12b3b4a2c3c0e2ab659b654b49b3f2d7d5c9aad5dfcf4d51c2082b -size 270858781 diff --git a/EmptyEpsilon-2021.06.23.tar.gz b/EmptyEpsilon-2021.06.23.tar.gz new file mode 100644 index 0000000..b37c12c --- /dev/null +++ b/EmptyEpsilon-2021.06.23.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:878f36330a95a76039671a980a2fd680e7ddbdc5e22ff6ca046010b03d3efd01 +size 285211647 diff --git a/SeriousProton-2020.08.07.tar.gz b/SeriousProton-2020.08.07.tar.gz deleted file mode 100644 index d0a8b36..0000000 --- a/SeriousProton-2020.08.07.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9247e61c6c7f01bcdd5b7588d25db6647623038178b7812fb241d0d73c9352d7 -size 1172263 diff --git a/SeriousProton-2021.06.23.tar.gz b/SeriousProton-2021.06.23.tar.gz new file mode 100644 index 0000000..9cd0453 --- /dev/null +++ b/SeriousProton-2021.06.23.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c79b358ad310c773dd0db265393fba829df10a6f284240acbb383288d4f33d5 +size 1181117 diff --git a/download.sh b/download.sh index d0293a6..320849b 100644 --- a/download.sh +++ b/download.sh @@ -1,6 +1,15 @@ #!/bin/bash -version="$1" +#version="$1" +version=$(grep Version: emptyepsilon.spec | awk '{print $NF}') wget https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz -O SeriousProton-${version}.tar.gz wget https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz -O EmptyEpsilon-${version}.tar.gz + +tmp=$(mktemp -d) + +tar xzvf EmptyEpsilon-${version}.tar.gz -C "$tmp" EmptyEpsilon-EE-${version}/CMakeLists.txt +glm_url=$(grep -A1 glm.zip "${tmp}/EmptyEpsilon-EE-${version}/CMakeLists.txt" | grep "https://" | awk -F '"' '{print $2}') +wget "$glm_url" -O glm.zip + +rm -r "$tmp" diff --git a/emptyepsilon.changes b/emptyepsilon.changes index e3653c9..0d9e45a 100644 --- a/emptyepsilon.changes +++ b/emptyepsilon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 20 13:03:24 UTC 2021 - Dominik Heidler + +- Version 2021.06.23 + ------------------------------------------------------------------- Thu Aug 13 15:50:43 UTC 2020 - Dominik Heidler diff --git a/emptyepsilon.spec b/emptyepsilon.spec index 929a6eb..f59a661 100644 --- a/emptyepsilon.spec +++ b/emptyepsilon.spec @@ -1,7 +1,7 @@ # # spec file for package emptyepsilon # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: emptyepsilon -Version: 2020.08.07 +Version: 2021.06.23 Release: 0 Summary: Open source spaceship bridge simulator License: GPL-2.0-only @@ -25,6 +25,9 @@ Group: Amusements/Games/Other URL: https://daid.github.io/EmptyEpsilon/ Source: EmptyEpsilon-%{version}.tar.gz Source1: SeriousProton-%{version}.tar.gz +Source2: glm.zip +Source3: download.sh +BuildRequires: bsdtar BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ @@ -40,9 +43,10 @@ Each officer fills a unique role: Captain, Helms, Weapons, Relay, Science, and E cd $RPM_SOURCE_DIR tar xf SeriousProton-%{version}.tar.gz tar xf EmptyEpsilon-%{version}.tar.gz -sed 's|new Engine();|chdir(RESOURCE_BASE_DIR); new Engine();|' -i EmptyEpsilon-EE-%{version}/src/main.cpp %build +mkdir externals +bsdtar xvf $RPM_SOURCE_DIR/glm.zip -C externals cmake -DSERIOUS_PROTON_DIR="$RPM_SOURCE_DIR/SeriousProton-EE-%{version}" \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=Release \ @@ -55,13 +59,12 @@ cmake -DSERIOUS_PROTON_DIR="$RPM_SOURCE_DIR/SeriousProton-EE-%{version}" \ %install %make_install -install -Dvm 644 $RPM_SOURCE_DIR/EmptyEpsilon-EE-%{version}/README.md -t "%{buildroot}%{_datadir}/doc/emptyepsilon" -mv -v "%{buildroot}%{_prefix}/script_reference.html" "%{buildroot}%{_datadir}/doc/emptyepsilon" +install -Dvm 644 $RPM_SOURCE_DIR/EmptyEpsilon-EE-%{version}/README.md -t "%{buildroot}%{_datadir}/doc/EmptyEpsilon" %files # You may have to add additional files here (documentation and binaries mostly) %{_bindir}/EmptyEpsilon -%{_datadir}/doc/emptyepsilon/ +%{_datadir}/doc/EmptyEpsilon/ %{_datadir}/emptyepsilon/ %changelog diff --git a/glm.zip b/glm.zip new file mode 100644 index 0000000..2fc8a22 --- /dev/null +++ b/glm.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c +size 5670692