From e0d4e40845edbeec2a21a8a05c038145c23da631 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 4 Feb 2019 22:12:43 -0500 Subject: palemoon dpkg with customizations Experimentation with dpkg that bundles in my prefs.js on system level as well as no search bar by default (which is a source patch). --- palemoon/debian/bgstack15-prefs.js | 24 ++++++++++++++++++++++++ palemoon/debian/install | 1 + palemoon/debian/patches/series | 1 + palemoon/debian/patches/small-icons.patch | 22 ++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 palemoon/debian/bgstack15-prefs.js create mode 100644 palemoon/debian/patches/series create mode 100644 palemoon/debian/patches/small-icons.patch (limited to 'palemoon') diff --git a/palemoon/debian/bgstack15-prefs.js b/palemoon/debian/bgstack15-prefs.js new file mode 100644 index 0000000..ec7ab94 --- /dev/null +++ b/palemoon/debian/bgstack15-prefs.js @@ -0,0 +1,24 @@ +// file: /usr/lib/palemoon/browser/defaults/preferences/bgstack15-prefs.js +// reference: +// https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig +pref("browser.backspace_action", 0); +pref("browser.allTabs.previews", false); +pref("browser.ctrlTab.previews", false); +pref("browser.download.useDownloadDir", true); +pref("browser.newtab.choice", 1); +pref("browser.newtabpage.storageVersion", 1); +pref("browser.search.update", false); +pref("browser.startup.page", 3); +pref("browser.tabs.closeWindowWithLastTab", false); +pref("captivedetect.canonicalURL", "http://127.0.0.1:9980"); +pref("extensions.enabledAddons", "%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:28.3.0"); +pref("extensions.shownSelectionUI", true); +pref("extensions.update.autoUpdateDefault", false); +pref("general.warnOnAboutConfig", false); +pref("network.cookie.prefsMigrated", true); +pref("network.stricttransportsecurity.preloadlist", false); +pref("privacy.sanitize.migrateFx3Prefs", true); +pref("security.cert_pinning.enforcement_level", 0); +pref("services.sync.declinedEngines", ""); +pref("toolkit.telemetry.reportingpolicy.firstRun", false); +pref("xpinstall.whitelist.add", ""); diff --git a/palemoon/debian/install b/palemoon/debian/install index 9b5aebc..e04cc8f 100644 --- a/palemoon/debian/install +++ b/palemoon/debian/install @@ -1 +1,2 @@ application/palemoon/branding/official/palemoon.desktop usr/share/applications +debian/bgstack15-prefs.js /usr/lib/palemoon/browser/defaults/preferences/ diff --git a/palemoon/debian/patches/series b/palemoon/debian/patches/series new file mode 100644 index 0000000..0ed32c3 --- /dev/null +++ b/palemoon/debian/patches/series @@ -0,0 +1 @@ +small-icons.patch diff --git a/palemoon/debian/patches/small-icons.patch b/palemoon/debian/patches/small-icons.patch new file mode 100644 index 0000000..fa6017f --- /dev/null +++ b/palemoon/debian/patches/small-icons.patch @@ -0,0 +1,22 @@ +--- 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 +@@ -355,7 +355,7 @@ + + ++ iconsize="small"> + + + + Date: Tue, 5 Feb 2019 07:20:36 -0500 Subject: add bgstack15 customizations to rpm spec part 1 --- palemoon/bgstack15-prefs.js | 24 ++++++++++++++++++++++++ palemoon/palemoon.spec | 17 +++++++++++++++++ palemoon/small-icons.patch | 22 ++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 palemoon/bgstack15-prefs.js create mode 100644 palemoon/small-icons.patch (limited to 'palemoon') diff --git a/palemoon/bgstack15-prefs.js b/palemoon/bgstack15-prefs.js new file mode 100644 index 0000000..ec7ab94 --- /dev/null +++ b/palemoon/bgstack15-prefs.js @@ -0,0 +1,24 @@ +// file: /usr/lib/palemoon/browser/defaults/preferences/bgstack15-prefs.js +// reference: +// https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig +pref("browser.backspace_action", 0); +pref("browser.allTabs.previews", false); +pref("browser.ctrlTab.previews", false); +pref("browser.download.useDownloadDir", true); +pref("browser.newtab.choice", 1); +pref("browser.newtabpage.storageVersion", 1); +pref("browser.search.update", false); +pref("browser.startup.page", 3); +pref("browser.tabs.closeWindowWithLastTab", false); +pref("captivedetect.canonicalURL", "http://127.0.0.1:9980"); +pref("extensions.enabledAddons", "%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:28.3.0"); +pref("extensions.shownSelectionUI", true); +pref("extensions.update.autoUpdateDefault", false); +pref("general.warnOnAboutConfig", false); +pref("network.cookie.prefsMigrated", true); +pref("network.stricttransportsecurity.preloadlist", false); +pref("privacy.sanitize.migrateFx3Prefs", true); +pref("security.cert_pinning.enforcement_level", 0); +pref("services.sync.declinedEngines", ""); +pref("toolkit.telemetry.reportingpolicy.firstRun", false); +pref("xpinstall.whitelist.add", ""); diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 59a0c69..0a8208b 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -2,6 +2,7 @@ %global dummy_package 0 %global pkgname palemoon %global prettyname Pale Moon Web Browser +%global stackrpms_custom 1 # additional repos to get python27 and devtoolset-7 # for el6 and el7: Software Collection;, for x86_64 only @@ -38,6 +39,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 %if "%{?scl_env}" != "" @@ -84,6 +89,12 @@ and themes to make the browser truly your own. %setup -q -n %{tarballdir} %{__cp} %{SOURCE1} ./.mozconfig +%if 0%{stackrpms_custom} +echo please find file browser.xul for the patch -pNUM +/bin/bash +%patch0 +%endif + %build %if "%{?scl_env}" != "" thispwd=$( pwd ) @@ -204,6 +215,12 @@ filelist() { popd } +%if 0%{stackrpms_custom} +# use /usr/lib hardcoded because that is how palemoon uses it +%{__install} -Dm0644 %{SOURCE4} \ + %{buildroot}%{_prefix}/lib/%{pkgname}/browser/defaults/preferences/ +%endif + filelist file.lst %{pkgname} usr langpack %clean diff --git a/palemoon/small-icons.patch b/palemoon/small-icons.patch new file mode 100644 index 0000000..fa6017f --- /dev/null +++ b/palemoon/small-icons.patch @@ -0,0 +1,22 @@ +--- 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 +@@ -355,7 +355,7 @@ + + ++ iconsize="small"> + + + + Date: Tue, 5 Feb 2019 20:40:38 -0500 Subject: palemoon custom part 2 --- palemoon/palemoon.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'palemoon') diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 0a8208b..f596464 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -90,9 +90,7 @@ and themes to make the browser truly your own. %{__cp} %{SOURCE1} ./.mozconfig %if 0%{stackrpms_custom} -echo please find file browser.xul for the patch -pNUM -/bin/bash -%patch0 +%patch0 -p1 %endif %build -- cgit From 1f8d7f469fa941934bc4beee0fed02192f69741d Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 5 Feb 2019 21:32:07 -0500 Subject: palemoon dpkg fix version number --- palemoon/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'palemoon') diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog index 6866558..1536ba0 100644 --- a/palemoon/debian/changelog +++ b/palemoon/debian/changelog @@ -1,4 +1,4 @@ -palemoon (28.3.0-devuan) obs; urgency=medium +palemoon (28.3.1-1devuan) manual; urgency=medium * Initial build for devuan -- cgit From 4a79d733bb86c102600b19a3037ad7079e26b90e Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 6 Feb 2019 07:00:28 -0500 Subject: rpm spec mkdir for prefs.js --- palemoon/palemoon.spec | 1 + 1 file changed, 1 insertion(+) (limited to 'palemoon') diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index f596464..0ecfa89 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -215,6 +215,7 @@ filelist() { %if 0%{stackrpms_custom} # use /usr/lib hardcoded because that is how palemoon uses it +%{__install} -d %{buildroot}%{_prefix}/lib/%{pkgname}/browser/defaults/preferences/ %{__install} -Dm0644 %{SOURCE4} \ %{buildroot}%{_prefix}/lib/%{pkgname}/browser/defaults/preferences/ %endif -- cgit From aa56e2dfa3c19d106de3f6d49d897ca02509bbdd Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 6 Feb 2019 22:34:58 -0500 Subject: palemoon spec use _libdir for prefs.js --- palemoon/palemoon.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'palemoon') diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 0ecfa89..46ce8c1 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -214,10 +214,9 @@ filelist() { } %if 0%{stackrpms_custom} -# use /usr/lib hardcoded because that is how palemoon uses it -%{__install} -d %{buildroot}%{_prefix}/lib/%{pkgname}/browser/defaults/preferences/ +%{__install} -d %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/ %{__install} -Dm0644 %{SOURCE4} \ - %{buildroot}%{_prefix}/lib/%{pkgname}/browser/defaults/preferences/ + %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/ %endif filelist file.lst %{pkgname} usr langpack -- cgit From f4c85cb8a7847f3a9b4580c35d1ccb5bccc44dfa Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 14 Feb 2019 17:21:18 -0500 Subject: split palemoon spec into normal and custom The actual spec files are the same except the stackrpms_custom variable. The logic is the same in each one for consistency. If stackrpms_custom is set, it will add my custom patches and prefs.js file. Otherwise, build the officially-endorsed build for Fedora. --- palemoon/palemoon-stackrpms.spec | 280 +++++++++++++++++++++++++++++++++++++++ palemoon/palemoon.spec | 19 ++- 2 files changed, 295 insertions(+), 4 deletions(-) create mode 100644 palemoon/palemoon-stackrpms.spec (limited to 'palemoon') diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec new file mode 100644 index 0000000..2493c1b --- /dev/null +++ b/palemoon/palemoon-stackrpms.spec @@ -0,0 +1,280 @@ +%global tarballdir UXP-PM%{version}_Release +%global dummy_package 0 +%global pkgname palemoon +%global prettyname Pale Moon Web Browser +%global stackrpms_custom 1 + +# additional repos to get python27 and devtoolset-7 +# for el6 and el7: Software Collection;, for x86_64 only +# http://mirror.centos.org/centos/6/sclo/x86_64/rh/ +# http://mirror.centos.org/centos/6/sclo/x86_64/sclo/ +# for el6.i386: +# https://copr-be.cloud.fedoraproject.org/results/ewdurbin/pythons-el6/epel-6-$basearch/ +# https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-$basearch/ +%define scl_env %{nil} +%define scl_buildreq coreutils +%if 0%{?el6} + %define scl_buildreq python27, devtoolset-7-toolchain + %ifarch x86_64 + %define scl_env python27 devtoolset-7 + %endif + %ifarch i386 || i686 || i586 + %define scl_env devtoolset-7 + %endif +%endif +%if 0%{?el7} + %define scl_env devtoolset-7 + %define scl_buildreq devtoolset-7-toolchain +%endif + +%if 0%{stackrpms_custom} +Name: palemoon-stackrpms +Summary: Pale Moon web browser with stackrpm customization +%else +Name: palemoon +Summary: Pale Moon web browser +%endif +Version: 28.3.1 +Release: 2 + +Group: Networking/Web +License: MPLv2.0 +URL: http://linux.palemoon.org/ +Source0: https://github.com/MoonchildProductions/UXP/archive/PM%{version}_Release.tar.gz +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 + +%if "%{?scl_env}" != "" +BuildRequires: %{scl_buildreq} +%endif +BuildRequires: alsa-lib-devel +BuildRequires: autoconf213 +BuildRequires: bzip2-devel +BuildRequires: dbus-glib-devel +BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: GConf2-devel +BuildRequires: glib2-devel +BuildRequires: gtk2-devel +BuildRequires: libXt-devel +BuildRequires: mesa-libGL-devel +BuildRequires: notification-daemon +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pulseaudio-libs-devel +BuildRequires: sqlite-devel +BuildRequires: unzip +BuildRequires: yasm +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 +from its own, independently developed source that has been forked off from +Firefox/Mozilla code, with carefully selected features and optimizations to +improve the browser's speed*, resource use, stability and user experience, +while offering full customization and a growing collection of extensions +and themes to make the browser truly your own. + +%global debug_package %{nil} +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') + +%prep +%setup -q -n %{tarballdir} +%{__cp} %{SOURCE1} ./.mozconfig + +%if 0%{stackrpms_custom} +%patch0 -p1 +%endif + +%build +%if "%{?scl_env}" != "" + thispwd=$( pwd ) + scl enable %{scl_env} /bin/bash << EOF + pushd $thispwd +%endif +%if !%{dummy_package} + ./mach build +%endif +%if "%{?scl_env}" != "" + popd || : +EOF +%endif + +%install +rm -rf %{buildroot} + +%if "%{?scl_env}" != "" + thispwd=$( pwd ) + scl enable %{scl_env} /bin/bash << EOF + pushd $thispwd +%endif +%if !%{dummy_package} + make -f client.mk \ + DESTDIR=%{buildroot} \ + idldir=%{_datadir}/idl/%{name} \ + includedir=%{_includedir}/%{name} \ + installdir=%{_libdir}/%{name} \ + sdkdir=%{_libdir}/%{name}-devel \ + install +%endif +%if "%{?scl_env}" != "" + popd || : +EOF +%endif + +# cleanup +%{__rm} -rf %{buildroot}%{_datadir}/idl/%{pkgname} \ + %{buildroot}%{_includedir}/%{pkgname} \ + %{buildroot}%{_libdir}/%{pkgname}-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 + +# application start script +# none + +# man pages +# none + +# mimetypes +%{__install} -Dm0644 %{SOURCE3} \ + %{buildroot}%{_datadir}/mime/packages/%{pkgname}.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 +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 < + + + %{pkgname}.desktop + CC0-1.0 + +

+ Pale Moon offers you a browsing experience in a browser completely built from its own, independently developed source that has been forked off from Firefox/Mozilla code a number of years ago, with carefully selected features and optimizations to improve the browser stability and user experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own. +

+ + http://www.palemoon.org/ + + http://www.palemoon.org/images/screenshots/Win10-start-portal.png + + + +EOF + +# Add distribution.ini +# skipped + +# filelist lifted straight from https://build.opensuse.org/package/view_file/network/palemoon/palemoon.spec?expand=1 +# get a list of files +# $2 - dirlist +# $3 - dir of fileslist +# $4 - excludelist +filelist() { + filelist=$PWD/$1 + pushd %{buildroot} + find ./ | while read list; do + if [ -n "$4" ]; then + ! echo $list | grep "$4" || continue + fi + _file=$(echo $list | sed 's/[^/]//') + _dir=$(dirname $_file) + if echo $_dir | grep "$2"; then + grep -xqs "\%dir\ $_dir" $filelist || echo "%dir $_dir" >> $filelist + fi + if echo $_file | grep "$3"; then + [ -d "$list" ] || echo $_file >> $filelist + fi + done + popd +} + +%if 0%{stackrpms_custom} +%{__install} -d %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/ +%{__install} -Dm0644 %{SOURCE4} \ + %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/ +%endif + +filelist file.lst %{pkgname} usr langpack + +%clean +%{__rm} -rf %{buildroot} || : + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +update-desktop-database &> /dev/null || : + +%preun +# is it a final removal? +#if test "$1" = "0" ; +#then +#fi + +%postun +update-desktop-database &> /dev/null || : +if test "$1" = "0" ; +then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + +%files -f file.lst +%defattr(-,root,root) +%doc AUTHORS LICENSE + +%changelog +* Wed Jan 23 2019 B Stack 28.3.1-1 +- update version + +* Tue Jan 15 2019 B Stack 28.3.0-1 +- update version + +* Mon Dec 10 2018 B Stack 28.2.2-1 +- update version + +* Thu Sep 20 2018 B Stack 28.1.0-1 +- update version + +* Thu Sep 13 2018 B Stack 28.0.1-1 +- update version + +* Wed Sep 05 2018 B Stack 28.0.0-1 +- rpm spec updated diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 46ce8c1..52040d1 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -2,7 +2,7 @@ %global dummy_package 0 %global pkgname palemoon %global prettyname Pale Moon Web Browser -%global stackrpms_custom 1 +%global stackrpms_custom 0 # additional repos to get python27 and devtoolset-7 # for el6 and el7: Software Collection;, for x86_64 only @@ -27,10 +27,15 @@ %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 stackrpm customization +%else +Name: palemoon Summary: Pale Moon web browser +%endif +Version: 28.3.1 +Release: 2 Group: Networking/Web License: MPLv2.0 @@ -72,7 +77,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 -- cgit From 82a7112ab782890de2f954f3e8a7e5ed76118f0a Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 15 Feb 2019 15:09:27 -0500 Subject: WIP: pm custom rpm for prefs --- palemoon/palemoon-stackrpms.spec | 33 +++++++++++++++++---------------- palemoon/palemoon.spec | 33 +++++++++++++++++---------------- 2 files changed, 34 insertions(+), 32 deletions(-) (limited to 'palemoon') diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec index 2493c1b..09326da 100644 --- a/palemoon/palemoon-stackrpms.spec +++ b/palemoon/palemoon-stackrpms.spec @@ -1,6 +1,6 @@ %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 1 @@ -29,7 +29,8 @@ %if 0%{stackrpms_custom} Name: palemoon-stackrpms -Summary: Pale Moon web browser with stackrpm customization +Summary: Pale Moon web browser with stackrpms prefs +%global prettyname Pale Moon with stackrpms prefs %else Name: palemoon Summary: Pale Moon web browser @@ -141,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 @@ -162,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 < %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml < - %{pkgname}.desktop + %{appname}.desktop CC0-1.0

@@ -225,12 +226,12 @@ filelist() { } %if 0%{stackrpms_custom} -%{__install} -d %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/ +%{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/ %{__install} -Dm0644 %{SOURCE4} \ - %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/ + %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/ %endif -filelist file.lst %{pkgname} usr langpack +filelist file.lst %{appname} usr langpack %clean %{__rm} -rf %{buildroot} || : diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 52040d1..fea1009 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -1,6 +1,6 @@ %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 @@ -29,7 +29,8 @@ %if 0%{stackrpms_custom} Name: palemoon-stackrpms -Summary: Pale Moon web browser with stackrpm customization +Summary: Pale Moon web browser with stackrpms prefs +%global prettyname Pale Moon with stackrpms prefs %else Name: palemoon Summary: Pale Moon web browser @@ -141,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 @@ -162,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 < %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml < - %{pkgname}.desktop + %{appname}.desktop CC0-1.0

@@ -225,12 +226,12 @@ filelist() { } %if 0%{stackrpms_custom} -%{__install} -d %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/ +%{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/ %{__install} -Dm0644 %{SOURCE4} \ - %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/ + %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/ %endif -filelist file.lst %{pkgname} usr langpack +filelist file.lst %{appname} usr langpack %clean %{__rm} -rf %{buildroot} || : -- cgit From 01601d2d484b6e797fe52e6148cc81f4a5b32507 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 19 Feb 2019 11:12:24 -0500 Subject: pm 28.4.0 --- palemoon/palemoon-stackrpms.spec | 7 +++++-- palemoon/palemoon.spec | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'palemoon') diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec index 09326da..33058ba 100644 --- a/palemoon/palemoon-stackrpms.spec +++ b/palemoon/palemoon-stackrpms.spec @@ -35,8 +35,8 @@ Summary: Pale Moon web browser with stackrpms prefs Name: palemoon Summary: Pale Moon web browser %endif -Version: 28.3.1 -Release: 2 +Version: 28.4.0 +Release: 1 Group: Networking/Web License: MPLv2.0 @@ -262,6 +262,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc AUTHORS LICENSE %changelog +* Tue Feb 19 2019 B Stack 28.4.0-1 +- update version + * Wed Jan 23 2019 B Stack 28.3.1-1 - update version diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index fea1009..a0b97f5 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -35,8 +35,8 @@ Summary: Pale Moon web browser with stackrpms prefs Name: palemoon Summary: Pale Moon web browser %endif -Version: 28.3.1 -Release: 2 +Version: 28.4.0 +Release: 1 Group: Networking/Web License: MPLv2.0 @@ -262,6 +262,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc AUTHORS LICENSE %changelog +* Tue Feb 19 2019 B Stack 28.4.0-1 +- update version + * Wed Jan 23 2019 B Stack 28.3.1-1 - update version -- cgit