palemoon rpm: add git submodule manual support

3 files changed, 18 insertions, 13 deletions

diff --git a/palemoon/bgstack15-palemoon.patch b/palemoon/bgstack15-palemoon.patch
index 94f9470..f0bd4fa 100644
--- a/palemoon/bgstack15-palemoon.patch
+++ b/palemoon/bgstack15-palemoon.patch
@@ -1,6 +1,6 @@
 diff -Naur 28.4.1-0/application/palemoon/branding/shared/locales/browserconfig.properties 28.4.1-1/application/palemoon/branding/shared/locales/browserconfig.properties
---- 28.4.1-0/application/palemoon/branding/shared/locales/browserconfig.properties	2019-03-26 13:33:15.000000000 -0400
-+++ 28.4.1-1/application/palemoon/branding/shared/locales/browserconfig.properties	2019-03-27 10:44:23.578435642 -0400
+--- 28.4.1-0/palemoon/branding/shared/locales/browserconfig.properties	2019-03-26 13:33:15.000000000 -0400
++++ 28.4.1-1/palemoon/branding/shared/locales/browserconfig.properties	2019-03-27 10:44:23.578435642 -0400
 @@ -3,5 +3,5 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index 40666b0..290c33f 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -1,8 +1,11 @@
-%global tarballdir UXP-PM%{version}_Release
+%global tarballdir Pale-Moon-%{version}_Release
 %global dummy_package   0
 %global appname palemoon
 %global prettyname Pale Moon Web Browser
 %global stackrpms_custom 1
+# derive from inside the full source tree:
+# git submodule | awk -v "name=platform" '$2 == name {gsub("-","",$1); print $1}'
+%global submodule_platform_commit 41e5925b4271c598601fdc77238bbf6497576594
 
 # additional repos to get python27 and devtoolset-7
 # for el6 and el7: Software Collection;, for x86_64 only
@@ -47,11 +50,12 @@ Group:	Networking/Web
 License:	MPLv2.0
 URL:		http://linux.palemoon.org/
 Source0:	https://github.com/MoonchildProductions/Pale-Moon/archive/%{version}_Release.tar.gz
-Source1: palemoon-mozconfig
-Source2: palemoon.desktop
-Source3: palemoon-mimeinfo.xml
+Source1:	https://github.com/MoonchildProductions/UXP/archive/%{submodule_platform_commit}.tar.gz
+Source2: palemoon-mozconfig
+Source3: palemoon.desktop
+Source4: palemoon-mimeinfo.xml
 %if 0%{stackrpms_custom}
-Source4: bgstack15-palemoon-prefs.js
+Source5: bgstack15-palemoon-prefs.js
 Patch0: small-icons.patch
 Patch1: bgstack15-palemoon.patch
 %endif
@@ -108,7 +112,8 @@ and themes to make the browser truly your own.
 
 %prep
 %setup -q -n %{tarballdir}
-%{__cp} %{SOURCE1} ./.mozconfig
+tar -C platform --strip-components=1 -zxf %{SOURCE1} # git submodule
+%{__cp} %{SOURCE2} ./.mozconfig
 %if 0%{?fedora} >= 30
 sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig
 %endif
@@ -166,7 +171,7 @@ EOF
 
 # desktop files
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE3}
 
 %{__sed} -i -r -e "s/@NAME@/%{prettyname}/;" \
    -e "s/@EXEC@/%{appname}/;" \
@@ -180,7 +185,7 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 # none
 
 # mimetypes
-%{__install} -Dm0644 %{SOURCE3} \
+%{__install} -Dm0644 %{SOURCE4} \
    %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
 # icons
@@ -245,7 +250,7 @@ filelist() {
 
 %if 0%{stackrpms_custom}
 %{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
-%{__install} -Dm0644 %{SOURCE4} \
+%{__install} -Dm0644 %{SOURCE5} \
    %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
 %endif
 
diff --git a/palemoon/small-icons.patch b/palemoon/small-icons.patch
index fa6017f..03d364a 100644
--- a/palemoon/small-icons.patch
+++ b/palemoon/small-icons.patch
@@ -1,5 +1,5 @@
---- UXP-PM28.3.0_Release.orig/application/palemoon/base/content/browser.xul	2019-01-08 11:42:01.000000000 -0500
-+++ UXP-PM28.3.0_Release/application/palemoon/base/content/browser.xul	2019-02-04 06:57:38.943983285 -0500
+--- UXP-PM28.3.0_Release.orig/palemoon/base/content/browser.xul	2019-01-08 11:42:01.000000000 -0500
++++ UXP-PM28.3.0_Release/palemoon/base/content/browser.xul	2019-02-04 06:57:38.943983285 -0500
 @@ -355,7 +355,7 @@
  
    <toolbox id="navigator-toolbox"