[EmptyEpsilon] Rebase to 2024.12.08

commit e0e34345b6b94843f49b584dd7082b288a60a2d8 Author: Michal Schorm <mschorm(a)redhat.com&gt; Date: Thu Jan 2 15:03:11 2025 +0100 Rebase to 2024.12.08 - use %{name} macro more extensively - use the upstream desktop file, instead of writing our own .gitignore | 2 ++ EmptyEpsilon-avoid_basis_libs_downloading.patch | 8 +++--- EmptyEpsilon-avoid_glm_libs_downloading.patch | 4 +-- EmptyEpsilon.spec | 33 +++++++++---------------- sources | 4 +-- 5 files changed, 21 insertions(+), 30 deletions(-) --- diff --git a/.gitignore b/.gitignore index a9deaa3..f1e0027 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /EmptyEpsilon-EE-2024.08.09.tar.gz /SeriousProton-EE-2024.08.09.tar.gz /0.9.9.8.tar.gz +/EmptyEpsilon-EE-2024.12.08.tar.gz +/SeriousProton-EE-2024.12.08.tar.gz diff --git a/EmptyEpsilon-avoid_basis_libs_downloading.patch b/EmptyEpsilon-avoid_basis_libs_downloading.patch index 5a1f944..b62004c 100644 --- a/EmptyEpsilon-avoid_basis_libs_downloading.patch +++ b/EmptyEpsilon-avoid_basis_libs_downloading.patch @@ -1,5 +1,5 @@ ---- a/SeriousProton-EE-2024.08.09/libs/basis_universal/CMakeLists.orig.txt 2023-06-09 10:35:14.000000000 +0200 -+++ b/SeriousProton-EE-2024.08.09/libs/basis_universal/CMakeLists.txt 2024-03-10 19:04:39.372885921 +0100 +--- a/SeriousProton-EE-2024.12.08/libs/basis_universal/CMakeLists.orig.txt 2023-06-09 10:35:14.000000000 +0200 ++++ b/SeriousProton-EE-2024.12.08/libs/basis_universal/CMakeLists.txt 2024-03-10 19:04:39.372885921 +0100 @@ -3,35 +3,8 @@ find_package(Threads REQUIRED) @@ -43,8 +43,8 @@ target_include_directories(basisu-transcoder INTERFACE "${basis_SOURCE_DIR}") -endif() \ No newline at end of file ---- a/SeriousProton-EE-2024.08.09/CMakeLists.orig.txt 2023-06-09 10:35:14.000000000 +0200 -+++ b/SeriousProton-EE-2024.08.09/CMakeLists.txt 2024-03-10 20:05:58.833718666 +0100 +--- a/SeriousProton-EE-2024.12.08/CMakeLists.orig.txt 2023-06-09 10:35:14.000000000 +0200 ++++ b/SeriousProton-EE-2024.12.08/CMakeLists.txt 2024-03-10 20:05:58.833718666 +0100 @@ -132,7 +132,7 @@ endif() diff --git a/EmptyEpsilon-avoid_glm_libs_downloading.patch b/EmptyEpsilon-avoid_glm_libs_downloading.patch index dc68bd8..b79dcab 100644 --- a/EmptyEpsilon-avoid_glm_libs_downloading.patch +++ b/EmptyEpsilon-avoid_glm_libs_downloading.patch @@ -1,5 +1,5 @@ ---- a/SeriousProton-EE-2024.08.09/CMakeLists.txt.backup_basis 2023-06-09 10:35:14.000000000 +0200 -+++ b/SeriousProton-EE-2024.08.09/CMakeLists.txt 2024-03-12 18:50:31.811860098 +0100 +--- a/SeriousProton-EE-2024.12.08/CMakeLists.txt.backup_basis 2023-06-09 10:35:14.000000000 +0200 ++++ b/SeriousProton-EE-2024.12.08/CMakeLists.txt 2024-03-12 18:50:31.811860098 +0100 @@ -55,23 +55,8 @@ # * 'auto', if we failed to find a suitable system package, # * 'bundled' diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec index fa8e43f..8b1cb05 100644 --- a/EmptyEpsilon.spec +++ b/EmptyEpsilon.spec @@ -1,6 +1,6 @@ %global version_major 2024 -%global version_minor 08 -%global version_patch 09 +%global version_minor 12 +%global version_patch 08 Name: EmptyEpsilon Summary: Spaceship bridge simulator game @@ -111,26 +111,11 @@ export LDFLAGS="%{__global_ldflags} -L../SeriousProton-EE-%{version}/libs/basis_ rm -f %{buildroot}%{_datadir}/emptyepsilon/scripts/.gitignore -install -pm 644 README.md CHANGELOG.md %{buildroot}%{_docdir}/EmptyEpsilon/ +install -pm 644 README.md CHANGELOG.md %{buildroot}%{_docdir}/%{name}/ # icon to pixmaps mkdir -p %{buildroot}%{_datadir}/pixmaps -install -p -m 644 ./logo.png %{buildroot}%{_datadir}/pixmaps/EmptyEpsilon.png - -# .desktop file -mkdir -p %{buildroot}%{_datadir}/applications -cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<'EOF' -[Desktop Entry] -Name=%{name} -GenericName=EmptyEpsilon -Comment=Spaceship bridge simulator game -Exec=EmptyEpsilon -Icon=EmptyEpsilon -Terminal=false -Type=Application -Categories=Game;Simulation; -EOF -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +install -p -m 644 ./logo.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %files %license LICENSE meshoptimizer/meshoptimizer-LICENSE.md @@ -141,11 +126,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %{_datadir}/emptyepsilon %{_datadir}/pixmaps/%{name}.png -%{_datadir}/icons/hicolor/1024x1024/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop -%{_docdir}/EmptyEpsilon/ +%{_datadir}/metainfo/io.github.daid.%{name}.metainfo.xml +%{_datadir}/icons/hicolor/512x512/apps/io.github.daid.%{name}.png +%{_datadir}/applications/io.github.daid.%{name}.desktop +%{_docdir}/%{name} %changelog +* Thu Jan 02 2025 Michal Schorm <mschorm(a)redhat.com&gt; - 2024.12.08-1 +- Rebase to 2024.12.08 + * Sun Aug 11 2024 Michal Schorm <mschorm(a)redhat.com&gt; - 2024.08.09-1 - Rebase to 2024.08.09 diff --git a/sources b/sources index fb53218..981f053 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (EmptyEpsilon-EE-2024.08.09.tar.gz) = 06f2845f0fae506508f923d3f401ba1f4525b6b85fe95c9fda2673102b7c5f179815afcfa677eb06601b6d3150ca97148cfbeb0256c373648c028429e822cc42 -SHA512 (SeriousProton-EE-2024.08.09.tar.gz) = 510848573e1784e6b627b70635dea713e81fbb65d3504c01101f815e2619b1fef23a232347678d7568455d9352fdce78f39a022471ac931fb4142eac707ad330 +SHA512 (EmptyEpsilon-EE-2024.12.08.tar.gz) = e272674818105ae86924546887f7c035e9909fad7444ceb9da02b89114ea2c7a2ca6904f6fc7c7e15cba055ade41bf8c0a5d93bf7992ce0b895e0ff9b582ec1e +SHA512 (SeriousProton-EE-2024.12.08.tar.gz) = 45c1aeae79aae380e7272b7fe399a4e56d738cb5ae45f1528cde89fab6bb11590b8fec27010c285a7945e38f5a53fbe366c9c252c4ae14e0ac11989a45cf6b70 SHA512 (basis_universal-1_15_update2.tar.gz) = a898a057b57ac64f6c0bf5fce0b599e23421ccdd015ea7bb668bce8b9292ef55b098f3d05854a2fb5363959932b75cd0a842664ae7d4f71f3537dc11301c1b32 SHA512 (0.9.9.8.tar.gz) = 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8 SHA512 (meshoptimizer-0.16.tar.gz) = cc6d28359fb99a615e1046a4af1b247cbc6ea0266d9e7f41ea0516c1fc09fa1e67376071daf138a126c77bca3baf9d565636ed0e3adf045f1a08498c38b7a7e7