Merge branch 'palemoon-custom' into 'master'

Multiple palemoon builds

Split palemoon into official package, and my custom -stackrpms package.
Also split palemoon-ublock-origin in same way.
Update palemoon to 28.4.0.

See merge request bgstack15/stackrpms!39

1 files changed, 46 insertions, 16 deletions

diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index 59a0c69..a0b97f5 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -1,7 +1,8 @@
 %global tarballdir UXP-PM%{version}_Release
 %global dummy_package   0
-%global pkgname palemoon
+%global appname palemoon
 %global prettyname Pale Moon Web Browser
+%global stackrpms_custom 0
 
 # additional repos to get python27 and devtoolset-7
 # for el6 and el7: Software Collection;, for x86_64 only
@@ -26,10 +27,16 @@
    %define scl_buildreq devtoolset-7-toolchain
 %endif
 
-Name:		palemoon
-Version:	28.3.1
-Release:	1
+%if 0%{stackrpms_custom}
+Name:		palemoon-stackrpms
+Summary:	Pale Moon web browser with stackrpms prefs
+%global prettyname Pale Moon with stackrpms prefs
+%else
+Name:    palemoon
 Summary:	Pale Moon web browser
+%endif
+Version:	28.4.0
+Release:	1
 
 Group:	Networking/Web
 License:	MPLv2.0
@@ -38,6 +45,10 @@ Source0:	https://github.com/MoonchildProductions/UXP/archive/PM%{version}_Releas
 Source1: palemoon-mozconfig
 Source2: palemoon.desktop
 Source3: palemoon-mimeinfo.xml
+%if 0%{stackrpms_custom}
+Source4: bgstack15-prefs.js
+Patch0: small-icons.patch
+%endif
 Packager:	Bgstack15 <bgstack15@gmail.com>
 
 %if "%{?scl_env}" != ""
@@ -67,7 +78,13 @@ BuildRequires:	zip
 BuildRequires:	zlib-devel
 BuildRoot:     %{_tmppath}/%{name}-%{version}
 Provides:      mimehandler(application/x-xpinstall)
+Provides:      palemoon
 Provides:      webclient
+%if 0%{stackrpms_custom}
+Conflicts:     palemoon
+%else
+Conflicts:     palemoon-stackrpms
+%endif
 
 %description
 Pale Moon offers you a browsing experience in a browser completely built
@@ -84,6 +101,10 @@ and themes to make the browser truly your own.
 %setup -q -n %{tarballdir}
 %{__cp} %{SOURCE1} ./.mozconfig
 
+%if 0%{stackrpms_custom}
+%patch0 -p1
+%endif
+
 %build
 %if "%{?scl_env}" != ""
    thispwd=$( pwd )
@@ -121,18 +142,18 @@ EOF
 %endif
 
 # cleanup
-%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{pkgname} \
-   %{buildroot}%{_includedir}/%{pkgname} \
-   %{buildroot}%{_libdir}/%{pkgname}-devel
+%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{appname} \
+   %{buildroot}%{_includedir}/%{appname} \
+   %{buildroot}%{_libdir}/%{appname}-devel
 
 # desktop files
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 %{__sed} -i -r -e "s/@NAME@/%{prettyname}/;" \
-   -e "s/@EXEC@/%{pkgname}/;" \
-   -e "s/@ICON@/%{pkgname}/;" \
-   %{buildroot}%{_datadir}/applications/%{pkgname}.desktop
+   -e "s/@EXEC@/%{appname}/;" \
+   -e "s/@ICON@/%{appname}/;" \
+   %{buildroot}%{_datadir}/applications/%{appname}.desktop
 
 # application start script
 # none
@@ -142,25 +163,25 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 # mimetypes
 %{__install} -Dm0644 %{SOURCE3} \
-   %{buildroot}%{_datadir}/mime/packages/%{pkgname}.xml
+   %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
 # icons
 %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
 for s in 16 22 24 32 48 256 ;
 do
    %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
-   %{__cp} -p application/%{pkgname}/branding/official/default${s}.png \
-   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{pkgname}.png
+   %{__cp} -p application/%{appname}/branding/official/default${s}.png \
+   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{appname}.png
 done
 
 # Register as an application to be visible in the software center
 # EXPERIMENTAL
 mkdir -p %{buildroot}%{_datadir}/appdata
-cat > %{buildroot}%{_datadir}/appdata/%{pkgname}.appdata.xml <<EOF
+cat > %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Adapted from content by Richard Hughes <richard-at-hughsie-dot-com> -->
 <application>
-  <id type="desktop">%{pkgname}.desktop</id>
+  <id type="desktop">%{appname}.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <description>
     <p>
@@ -204,7 +225,13 @@ filelist() {
   popd
 }
 
-filelist file.lst %{pkgname} usr langpack
+%if 0%{stackrpms_custom}
+%{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
+%{__install} -Dm0644 %{SOURCE4} \
+   %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
+%endif
+
+filelist file.lst %{appname} usr langpack
 
 %clean
 %{__rm} -rf %{buildroot} || :
@@ -235,6 +262,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc AUTHORS LICENSE
 
 %changelog
+* Tue Feb 19 2019 B Stack <bgstack15@gmail.com> 28.4.0-1
+- update version
+
 * Wed Jan 23 2019 B Stack <bgstack15@gmail.com> 28.3.1-1
 - update version