summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-06-09 13:20:57 -0400
committerB. Stack <bgstack15@gmail.com>2021-06-09 13:20:57 -0400
commit63f8eb90195294f5494d3ff25a5ce15652eed4f8 (patch)
tree9918a3739d1fcf9507ff86b2e54acec25798c181 /scripts
parentv88.0.1-1 (diff)
downloadlibrewolf-fedora-dev.tar.gz
librewolf-fedora-dev.tar.bz2
librewolf-fedora-dev.zip
v89.0 rc1dev
Diffstat (limited to 'scripts')
-rw-r--r--scripts/prep-librewolf-rpm.conf2
-rwxr-xr-xscripts/prep-librewolf-rpm.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/prep-librewolf-rpm.conf b/scripts/prep-librewolf-rpm.conf
index f327058..3f8b9e6 100644
--- a/scripts/prep-librewolf-rpm.conf
+++ b/scripts/prep-librewolf-rpm.conf
@@ -6,7 +6,7 @@ DISTRO=${DISTRO:-'fedora'}
# current release of Firefox package in target distro; just Release and not EVR
distro_firefox_release=${distro_firefox_release:-'1'}
# current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'88.0.1'}
+firefox_version=${firefox_version:-'89.0'}
settings_commit=${settings_commit:-'master'}
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
output_dir=${CI_PROJECT_DIR}/out
diff --git a/scripts/prep-librewolf-rpm.sh b/scripts/prep-librewolf-rpm.sh
index 0024628..4f7a2d3 100755
--- a/scripts/prep-librewolf-rpm.sh
+++ b/scripts/prep-librewolf-rpm.sh
@@ -134,7 +134,7 @@ cp -p "${git_source_dir}"/settings/librewolf.cfg .
# Unfortunately aarch64 is outside of my scope.
# still in script 3, add the relevant patches to the spec
-cp -pf "${git_source_dir}"/linux/megabar.patch "${git_source_dir}"/linux/remove_addons.patch "${git_source_dir}"/linux/mozilla-vpn-ad.patch "${git_source_dir}"/linux/context-menu.patch "${git_source_dir}"/linux/deb_patches/*.patch "${src_rpm_dir}"
+cp -pf "${git_source_dir}"/common/patches/megabar.patch "${git_source_dir}"/common/patches/remove_addons.patch "${git_source_dir}"/common/patches/mozilla-vpn-ad.patch "${git_source_dir}"/common/patches/context-menu.patch "${git_source_dir}"/linux/deb_patches/*.patch "${src_rpm_dir}"
# "cd browser/branding" was added in the previous sed command
sed -r firefox.spec3 \
-e '/^%description\s*$/iPatch900: armhf-reduce-linker-memory-use.patch\' \
bgstack15