From f35c1ab776eaa36b4224624e0f9181fbd5da8de08b093b249407385f3e729704 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <rpm@fthiessen.de>
Date: Sat, 10 Apr 2021 18:33:39 +0000
Subject: [PATCH] Accepting request 884148 from home:susnux:branches:games

- Install bundled mozjs if needed (boo#1184063)

OBS-URL: https://build.opensuse.org/request/show/884148
OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=105
---
 0ad.changes |  5 +++++
 0ad.spec    | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/0ad.changes b/0ad.changes
index 92562d4..5cb6dd0 100644
--- a/0ad.changes
+++ b/0ad.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr  9 22:29:43 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Install bundled mozjs if needed (boo#1184063)
+
 -------------------------------------------------------------------
 Tue Mar  9 23:04:45 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/0ad.spec b/0ad.spec
index f52b596..0f470e1 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -16,11 +16,10 @@
 #
 
 
-%if 0%{?suse_version} >= 1550
 %bcond_without system_nvtt
+%if 0%{?suse_version} >= 1550
 %bcond_without system_mozjs
 %else
-%bcond_with system_nvtt
 %bcond_with system_mozjs
 %endif
 Name:           0ad
@@ -114,24 +113,26 @@ pushd build/workspaces/gcc
 popd
 
 %install
+mkdir -p %{buildroot}%{_libdir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+# Install binaries and wrapper
 install -Dm 0755 binaries/system/ActorEditor %{buildroot}%{_bindir}/ActorEditor
 install -Dm 0755 binaries/system/pyrogenesis %{buildroot}%{_bindir}/pyrogenesis
-install -Dm 0755 binaries/system/libCollada.so %{buildroot}%{_libdir}/%{name}/libCollada.so
-install -Dm 0755 binaries/system/libAtlasUI.so %{buildroot}%{_libdir}/%{name}/libAtlasUI.so
+install -Dm 0755 build/resources/0ad.sh %{buildroot}%{_bindir}/0ad
+# Install game libraries
+install -m 0644 binaries/system/libCollada.so %{buildroot}%{_libdir}/%{name}/libCollada.so
+install -m 0644 binaries/system/libAtlasUI.so %{buildroot}%{_libdir}/%{name}/libAtlasUI.so
+# If without system mozjs we need to install the bundled one
 %if %{without system_mozjs}
-#install -Dm 0755 binaries/system/libmozjs38-ps-release.so %{buildroot}%{_libdir}/%{name}/libmozjs38-ps-release.so
+install -m 0644 binaries/system/libmozjs*-ps-release.so %{buildroot}%{_libdir}/%{name}/
 %endif
-
+# Install appdata
 install -Dm 0644 build/resources/0ad.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
 install -Dm 0644 build/resources/0ad.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 install -Dm 0644 build/resources/0ad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 %suse_update_desktop_file %{name}
 
-install -Dm 0755 build/resources/0ad.sh %{buildroot}%{_bindir}/0ad
-
-mkdir -p %{buildroot}%{_libdir}/%{name}
-mkdir -p %{buildroot}%{_datadir}/%{name}
 
 %files
 %doc README.txt