diff options
author | B Stack <bgstack15@gmail.com> | 2019-07-10 20:32:45 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2019-07-10 20:32:45 +0000 |
commit | 1ba400ea0dfbc6da83d7db969eb43dd5babfca0c (patch) | |
tree | c2f2e1bef1f62788292ae438db109ba12c635e10 | |
parent | Merge branch 'waterfox-bump' into 'master' (diff) | |
parent | fix %changelog (diff) | |
download | stackrpms-1ba400ea0dfbc6da83d7db969eb43dd5babfca0c.tar.gz stackrpms-1ba400ea0dfbc6da83d7db969eb43dd5babfca0c.tar.bz2 stackrpms-1ba400ea0dfbc6da83d7db969eb43dd5babfca0c.zip |
Merge branch 'palemoon-bump' into 'master'
Fix palemoon custom patches in stock build
See merge request bgstack15/stackrpms!71
-rw-r--r-- | palemoon/palemoon-stackrpms.spec | 8 | ||||
-rw-r--r-- | palemoon/palemoon.spec | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec index 358b7e6..b7bf404 100644 --- a/palemoon/palemoon-stackrpms.spec +++ b/palemoon/palemoon-stackrpms.spec @@ -41,7 +41,7 @@ Name: palemoon Summary: Pale Moon web browser %endif Version: 28.6.0.1 -Release: 1 +Release: 2 Group: Networking/Web License: MPLv2.0 @@ -114,10 +114,11 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig %if 0%{stackrpms_custom} %patch0 -p1 %patch1 -p1 -%endif # Mozilla patches +# this one is needed for fedora rawhide as of 2019-07. %patch100 -p0 +%endif %build %if "%{?scl_env}" != "" @@ -280,6 +281,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog +* Mon Jul 8 2019 B Stack <bgstack15@gmail.com> - 28.6.0.1-2 +- remove custom patches for stock build + * Fri Jul 5 2019 B Stack <bgstack15@gmail.com> - 28.6.0.1-1 - update version diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 53abff1..e7a7526 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -41,7 +41,7 @@ Name: palemoon Summary: Pale Moon web browser %endif Version: 28.6.0.1 -Release: 1 +Release: 2 Group: Networking/Web License: MPLv2.0 @@ -114,10 +114,11 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig %if 0%{stackrpms_custom} %patch0 -p1 %patch1 -p1 -%endif # Mozilla patches +# this one is needed for fedora rawhide as of 2019-07. %patch100 -p0 +%endif %build %if "%{?scl_env}" != "" @@ -280,6 +281,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog +* Mon Jul 8 2019 B Stack <bgstack15@gmail.com> - 28.6.0.1-2 +- remove custom patches for stock build + * Fri Jul 5 2019 B Stack <bgstack15@gmail.com> - 28.6.0.1-1 - update version |