|
@@ -1,14 +1,17 @@
|
|
|
+%bcond_without clang
|
|
|
+
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 54.0
|
|
|
-%global geckomajor 54.0
|
|
|
-%global ffminor 1
|
|
|
+%global ffmajor 60.3
|
|
|
+%global geckomajor 60.3
|
|
|
+%global ffminor 0
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
-%global langpackdir %{ffdir}/langpacks
|
|
|
%define tarballdir firefox-%{ffversion}
|
|
|
+%global mozappdir %{_libdir}/%{name}
|
|
|
+%global langpackdir %{mozappdir}/distribution/extensions
|
|
|
|
|
|
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
|
|
-%define homepage http://vinelinux.org/
|
|
|
+%define homepage https://vinelinux.org/
|
|
|
|
|
|
%define build_vine7 0
|
|
|
%define build_vine6 0
|
|
@@ -31,13 +34,6 @@
|
|
|
|
|
|
ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc
|
|
|
|
|
|
-# Separated plugins are supported on x86(64) only
|
|
|
-%ifarch %{ix86} x86_64
|
|
|
-%define separated_plugins 1
|
|
|
-%else
|
|
|
-%define separated_plugins 0
|
|
|
-%endif
|
|
|
-
|
|
|
Summary: Fx Browser
|
|
|
Summary(ja): Fx ウェブブラウザ
|
|
|
Name: firefox
|
|
@@ -46,13 +42,13 @@ Release: %{ffrelease}
|
|
|
URL: http://www.mozilla.org/projects/firefox/
|
|
|
License: MPL/LGPL
|
|
|
Group: Applications/Internet
|
|
|
-Source0: firefox-%{version}.source.tar.xz
|
|
|
+Source0: firefox-%{version}esr.source.tar.xz
|
|
|
|
|
|
Source230: mozconfig-firefox-vine6
|
|
|
Source240: mozconfig-firefox-vine7
|
|
|
|
|
|
Source11: firefox-vine-default-bookmarks.html
|
|
|
-Source12: firefox-vine-default-prefs.js
|
|
|
+#Source12: firefox-vine-default-prefs.js
|
|
|
Source21: firefox.vine.sh.in
|
|
|
Source22: firefox.png
|
|
|
Source23: fx-about.png
|
|
@@ -66,47 +62,32 @@ Source100: find-external-requires
|
|
|
|
|
|
# locale sources
|
|
|
%define MOZ_BUILD_LOCALES "ja"
|
|
|
-Source1000: firefox-%{ffversion}-langpacks.tar.xz
|
|
|
-Source1010: firefox-unofficial-branding-fx.tar.bz2
|
|
|
+Source1000: firefox-%{ffversion}esr-langpacks.tar.xz
|
|
|
+Source1010: firefox-unofficial-branding-fx.tar.xz
|
|
|
#
|
|
|
Source2000: firefox-searchplugins-6.0-ja.tar.bz2
|
|
|
|
|
|
# build patches
|
|
|
-Patch0: firefox-26.0-install-dir.patch
|
|
|
-Patch1: firefox-build.patch
|
|
|
-# buildfix
|
|
|
-Patch3: firefox-12.0-gcc41-nosse2.patch
|
|
|
-#Patch4: firefox-26.0-gcc47.patch
|
|
|
-
|
|
|
-# to build on vine6
|
|
|
-#Patch5: firefox-46.0.1-vine6.patch
|
|
|
-
|
|
|
-# bugfix
|
|
|
-#Patch14: firefox-5.0-asciidel.patch
|
|
|
-#
|
|
|
-#Patch15: firefox-46.0.1-enable-addons.patch
|
|
|
+Patch4: build-mozconfig-fix.patch
|
|
|
+# Always feel lucky for unsupported platforms:
|
|
|
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
|
|
|
+Patch37: build-jit-atomic-always-lucky.patch
|
|
|
|
|
|
# patches from fedora
|
|
|
-Patch21: rhbz-911314.patch
|
|
|
-Patch22: rhbz-928353.patch
|
|
|
-Patch23: rhbz-966424.patch
|
|
|
-Patch24: firefox-enable-addons.patch
|
|
|
-Patch25: rhbz-1173156.patch
|
|
|
-Patch26: rhbz-1291190-appchooser-crash.patch
|
|
|
+Patch215: firefox-enable-addons.patch
|
|
|
+Patch219: rhbz-1173156.patch
|
|
|
+Patch224: mozilla-1170092.patch
|
|
|
+Patch225: mozilla-1005640-accept-lang.patch
|
|
|
+Patch230: rhbz-1503632-nss.patch
|
|
|
|
|
|
# upstream patch
|
|
|
-#Patch100: mozilla-837563.patch
|
|
|
-Patch101: mozilla-938730.patch
|
|
|
-Patch102: mozilla-1170092.patch
|
|
|
-# to fix --prefix and --libdir
|
|
|
-Patch103: mozilla-1282843.patch
|
|
|
-Patch104: mozilla-1253216.patch
|
|
|
-Patch105: mozilla-1196777.patch
|
|
|
-Patch106: mozilla-1270046.patch
|
|
|
-# Remove when mozbz#1269319 lands - Firefox 49
|
|
|
-Patch107: mozilla-1245783.patch
|
|
|
-Patch108: mozilla-256180.patch
|
|
|
-Patch111: mozilla-440908.patch
|
|
|
+Patch402: mozilla-1196777.patch
|
|
|
+Patch406: mozilla-256180.patch
|
|
|
+Patch413: mozilla-1353817.patch
|
|
|
+Patch415: mozilla-1436242.patch
|
|
|
+# Removing this patch could lead to deletion of passwords from user profile!
|
|
|
+Patch416: mozilla-1475775-key3-revert.patch
|
|
|
+
|
|
|
|
|
|
# customization patches
|
|
|
|
|
@@ -118,31 +99,32 @@ Patch2000: firefox-47.0.1-vine.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
-BuildRequires: libpng-devel
|
|
|
-BuildRequires: zlib-devel, zip
|
|
|
-BuildRequires: libIDL-devel
|
|
|
+BuildRequires: alsa-lib-devel
|
|
|
+BuildRequires: autoconf213
|
|
|
+BuildRequires: bzip2-devel
|
|
|
+%if %{with clang}
|
|
|
+BuildRequires: clang-devel, lld, llvm-devel
|
|
|
+%endif
|
|
|
+BuildRequires: curl-devel
|
|
|
BuildRequires: desktop-file-utils
|
|
|
+BuildRequires: freetype2-devel
|
|
|
+BuildRequires: gstreamer-devel
|
|
|
+BuildRequires: gstreamer-plugins-base-devel
|
|
|
BuildRequires: gtk3-devel
|
|
|
-BuildRequires: gnome-vfs2-devel
|
|
|
-BuildRequires: libgnome-devel
|
|
|
-BuildRequires: pango-devel
|
|
|
-BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: lcms-devel
|
|
|
-BuildRequires: libpng-devel
|
|
|
+BuildRequires: libffi-devel
|
|
|
+BuildRequires: libgnome-devel
|
|
|
+BuildRequires: libIDL-devel
|
|
|
%if %{build_vine7}
|
|
|
BuildRequires: libjpeg-turbo-devel >= %{libjpeg_turbo_version}
|
|
|
%endif
|
|
|
BuildRequires: libnotify-devel
|
|
|
+BuildRequires: libpng-devel
|
|
|
BuildRequires: libXt-devel
|
|
|
BuildRequires: libXrender-devel
|
|
|
BuildRequires: libXScrnSaver-devel
|
|
|
-BuildRequires: startup-notification-devel
|
|
|
-BuildRequires: autoconf213
|
|
|
-BuildRequires: freetype2-devel
|
|
|
-BuildRequires: yasm
|
|
|
-BuildRequires: unzip
|
|
|
-BuildRequires: zip
|
|
|
-BuildRequires: bzip2-devel
|
|
|
+BuildRequires: pango-devel
|
|
|
+BuildRequires: pulseaudio-libs-devel
|
|
|
%if %{build_vine7}
|
|
|
BuildRequires: python-devel
|
|
|
BuildRequires: python
|
|
@@ -150,15 +132,17 @@ BuildRequires: python
|
|
|
BuildRequires: python27-devel >= 2.7.3
|
|
|
BuildRequires: python27 >= 2.7.3
|
|
|
%endif
|
|
|
-BuildRequires: curl-devel
|
|
|
+BuildRequires: rust, cargo
|
|
|
+BuildRequires: startup-notification-devel
|
|
|
+BuildRequires: unzip
|
|
|
BuildRequires: wget
|
|
|
-#
|
|
|
-BuildRequires: gstreamer-devel
|
|
|
-BuildRequires: gstreamer-plugins-base-devel
|
|
|
-BuildRequires: pulseaudio-libs-devel
|
|
|
+BuildRequires: yasm
|
|
|
+BuildRequires: zip
|
|
|
+BuildRequires: zlib-devel
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
|
|
|
+
|
|
|
Obsoletes: phoenix, mozilla-firebird, MozillaFirebird
|
|
|
Obsoletes: firefox3
|
|
|
Conflicts: firefox-esr
|
|
@@ -190,36 +174,48 @@ FX ウェブブラウザは Mozilla テクノロジーをベースとしたオ
|
|
|
%setup -q -n %{name}-%{version} -c
|
|
|
cd %{tarballdir}
|
|
|
|
|
|
-%patch0 -p1 -b .install-dir
|
|
|
+%patch37 -p1 -b .jit-atomic-lucky
|
|
|
|
|
|
-#%if "%{?_dist_release}" >= "vl7"
|
|
|
-#%patch4 -p1 -b .gcc47
|
|
|
-#%endif
|
|
|
+%patch4 -p1 -b .build-mozconfig-fix
|
|
|
|
|
|
-#%if "%{?_dist_release}" >= "vl6"
|
|
|
-#%patch5 -p1 -b .vl6
|
|
|
-#%endif
|
|
|
+# Fedora patches
|
|
|
+%patch215 -p1 -b .addons
|
|
|
+%patch219 -p2 -b .rhbz-1173156
|
|
|
+%patch224 -p1 -b .1170092
|
|
|
+%patch225 -p1 -b .1005640-accept-lang
|
|
|
|
|
|
-#%patch14 -p1 -b .asciidel
|
|
|
-#%patch15 -p1 -b .enable-addons
|
|
|
+# This ensures no migration of certdb to sqlite on the RHEL6 and RHEL7.
|
|
|
+# This needs to stay for the future releases
|
|
|
+%if 0%{?rhel} < 8
|
|
|
+%patch230 -p1 -b .1503632-nss
|
|
|
+%patch416 -R -p1 -b .1475775-key3-revert
|
|
|
+%endif
|
|
|
|
|
|
-%patch23 -p2 -b .rhbz-966424
|
|
|
-%patch24 -p1 -b .enable-addons
|
|
|
-%patch25 -p2 -b .rhbz-1173156
|
|
|
-%patch26 -p1 -b .rhbz-1291190
|
|
|
+%patch402 -p1 -b .1196777
|
|
|
+%patch406 -p1 -b .256180
|
|
|
+%patch413 -p1 -b .1353817
|
|
|
+%patch415 -p1 -b .1436242
|
|
|
|
|
|
-%patch102 -p1 -b .1170092
|
|
|
-%patch104 -p1 -b .1253216
|
|
|
-%patch105 -p1 -b .1196777
|
|
|
|
|
|
-%patch107 -p1 -b .1245783
|
|
|
-%patch108 -p1 -b .256180
|
|
|
-%patch111 -p1 -b .440908
|
|
|
+#patch2000 -p1 -b .vine
|
|
|
+perl -pi \
|
|
|
+-e 's|pref\("extensions.langpacks.signatures.required".*$|pref("extensions.langpacks.signatures.required", false);|' \
|
|
|
+browser/app/profile/firefox.js
|
|
|
+perl -pi \
|
|
|
+-e 's|pref\("layout.spellcheckDefault".*$|pref("layout.spellcheckDefault", 0);|' \
|
|
|
+browser/app/profile/firefox.js
|
|
|
|
|
|
+perl -pi \
|
|
|
+-e 's|browser.startup.homepage=.*$|browser.startup.homepage=https://vinelinux.org/|' \
|
|
|
+browser/branding/unofficial/locales/browserconfig.properties
|
|
|
+
|
|
|
+perl -pi \
|
|
|
+-e 's|pref\("startup.homepage_override_url".*$|pref("startup.homepage_override_url", "https://vinelinux.org/");|' \
|
|
|
+browser/branding/unofficial/locales/browserconfig.properties
|
|
|
+perl -pi \
|
|
|
+-e 's|pref\("startup.homepage_welcome_url".*$|pref("startup.homepage_welcome_url", "https://vinelinux.org/");|' \
|
|
|
+browser/branding/unofficial/locales/browserconfig.properties
|
|
|
|
|
|
-#
|
|
|
-#patch1000 -p1 -b .disable-pdfjs
|
|
|
-%patch2000 -p1 -b .vine
|
|
|
|
|
|
%{__rm} -f .mozconfig
|
|
|
|
|
@@ -229,27 +225,28 @@ cd %{tarballdir}
|
|
|
%{__cp} -f %{SOURCE230} .mozconfig
|
|
|
%endif
|
|
|
|
|
|
-#%if %build_vine7
|
|
|
-#%ifarch %ix86
|
|
|
#sed -i -e 's/enable-optimize/disable-optimize/g' .mozconfig
|
|
|
-#%endif
|
|
|
-#%endif
|
|
|
-sed -i -e 's/enable-optimize/disable-optimize/g' .mozconfig
|
|
|
-
|
|
|
-#echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
|
|
|
-
|
|
|
-echo "ac_add_options --with-default-mozilla-five-home=%{ffdir}" >> .mozconfig
|
|
|
+%global optimize_flags "-O3"
|
|
|
+echo 'ac_add_options --enable-optimize=%{?optimize_flags}' >> .mozconfig
|
|
|
+echo "ac_add_options --disable-debug-symbols" >> .mozconfig
|
|
|
+echo "ac_add_options --disable-debug" >> .mozconfig
|
|
|
|
|
|
-%if !%{?separated_plugins}
|
|
|
-echo "ac_add_options --disable-ipc" >> .mozconfig
|
|
|
+%if %{with clang}
|
|
|
+echo "ac_add_options --enable-linker=lld" >> .mozconfig
|
|
|
%endif
|
|
|
|
|
|
+#ifarch %{ix86}
|
|
|
+#echo "ac_add_options --disable-stylo" >> .mozconfig
|
|
|
+#endif
|
|
|
+
|
|
|
+# Remove executable bit to make brp-mangle-shebangs happy.
|
|
|
+chmod -x third_party/rust/itertools/src/lib.rs
|
|
|
|
|
|
# update searchplugins
|
|
|
-%{__tar} xjvf %{SOURCE2000} -C browser/locales/en-US/
|
|
|
+#%{__tar} xjvf %{SOURCE2000} -C browser/locales/en-US/
|
|
|
|
|
|
# setup unofficial branding logos
|
|
|
-%{__tar} xjvf %{SOURCE1010}
|
|
|
+%{__tar} xvf %{SOURCE1010}
|
|
|
%{__cp} %{SOURCE23} browser/branding/unofficial/content/about.png
|
|
|
%{__cp} %{SOURCE24} browser/branding/unofficial/content/about-wordmark.svg
|
|
|
%{__cp} browser/branding/unofficial/locales/en-US/brand.* browser/branding/nightly/locales/en-US/
|
|
@@ -273,6 +270,15 @@ export MOZ_APP_DISPLAYNAME="Fx Browser"
|
|
|
export PREFIX='%{_prefix}'
|
|
|
export LIBDIR='%{_libdir}'
|
|
|
|
|
|
+%if %{with clang}
|
|
|
+export CC=clang
|
|
|
+export CXX=clang++
|
|
|
+export LLVM_PROFDATA="llvm-profdata"
|
|
|
+export AR="llvm-ar"
|
|
|
+export NM="llvm-nm"
|
|
|
+export RANLIB="llvm-ranlib"
|
|
|
+%endif
|
|
|
+
|
|
|
MOZ_SMP_FLAGS=-j1
|
|
|
# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
|
|
|
# however builds tend to fail on other arches when building in parallel.
|
|
@@ -287,6 +293,7 @@ MOZ_SMP_FLAGS=-j1
|
|
|
sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
|
|
|
browser/installer/Makefile.in &&
|
|
|
|
|
|
+%if 0
|
|
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=824381
|
|
|
mkdir -p js/src/.deps
|
|
|
|
|
@@ -296,9 +303,15 @@ do
|
|
|
grep -v ';-' $i.orig | \
|
|
|
sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $i
|
|
|
done
|
|
|
+%endif
|
|
|
|
|
|
-export LDFLAGS="-Wl,-rpath,%{ffdir}"
|
|
|
-%__make -f client.mk build MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
|
|
+export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
|
|
+#export MOZ_SERVICES_SYNC="1"
|
|
|
+#export STRIP=/bin/true
|
|
|
+./mach build -v
|
|
|
+
|
|
|
+#export LDFLAGS="-Wl,-rpath,%{ffdir}"
|
|
|
+#%__make -f client.mk build MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
|
|
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
@@ -306,29 +319,18 @@ export LDFLAGS="-Wl,-rpath,%{ffdir}"
|
|
|
cd %{tarballdir}
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
-# set up our prefs and add it to the package manifest file, so it gets pulled in
|
|
|
-# to omni.jar which gets created during make install
|
|
|
-%global MOZ_PREF_DIR browser/defaults/preferences
|
|
|
-%{__cat} %{SOURCE12} | \
|
|
|
- sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > objdir/dist/bin/%{MOZ_PREF_DIR}/all-vine.js
|
|
|
-# This sed call "replaces" firefox.js with all-vine.js, newline, and itself (&)
|
|
|
-# having the net effect of prepending all-vine.js above firefox.js
|
|
|
-%{__sed} -i -e\
|
|
|
- 's|@BINPATH@/browser/@PREF_DIR@/firefox.js|@BINPATH@/browser/@PREF_DIR@/all-vine.js\n&|' \
|
|
|
- browser/installer/package-manifest.in
|
|
|
-
|
|
|
# set up our default bookmarks
|
|
|
-%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/browser/defaults/profile/US/bookmarks.html
|
|
|
-%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/browser/defaults/profile/bookmarks.html
|
|
|
-%{__cp} -p %{SOURCE11} objdir/dist/bin/browser/defaults/profile/bookmarks.html
|
|
|
+%{__cp} -p %{SOURCE11} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html
|
|
|
|
|
|
# Make sure locale works for langpacks
|
|
|
-%{__cat} > objdir/dist/bin/%{MOZ_PREF_DIR}/firefox-l10n.js << EOF
|
|
|
+%{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF
|
|
|
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
|
|
|
+pref("intl.locale.requested", "ja");
|
|
|
EOF
|
|
|
|
|
|
export MOZ_APP_DISPLAYNAME="Fx Browser"
|
|
|
-%{__make} -C objdir install DESTDIR=$RPM_BUILD_ROOT
|
|
|
+
|
|
|
+DESTDIR=$RPM_BUILD_ROOT %{__make} -C objdir install
|
|
|
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
|
|
|
|
|
@@ -350,41 +352,63 @@ do
|
|
|
$desktopfiles
|
|
|
done
|
|
|
|
|
|
-# set up the firefox start script
|
|
|
-%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
-XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,g"`
|
|
|
-%{__cat} %{SOURCE21} | %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g" > \
|
|
|
- $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
-%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
+# Register as an application to be visible in the software center
|
|
|
+#
|
|
|
+# NOTE: It would be *awesome* if this file was maintained by the upstream
|
|
|
+# project, translated and installed into the right place during `make install`.
|
|
|
+#
|
|
|
+# See http://www.freedesktop.org/software/appstream/docs/ for more details.
|
|
|
+#
|
|
|
+%{__mkdir_p} %{buildroot}%{_datadir}/appdata
|
|
|
+cat > %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml <<EOF
|
|
|
+<?xml version="1.0" encoding="UTF-8"?>
|
|
|
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
|
|
|
+<!--
|
|
|
+BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071061
|
|
|
+SentUpstream: 2014-09-22
|
|
|
+-->
|
|
|
+<application>
|
|
|
+ <id type="desktop">firefox.desktop</id>
|
|
|
+ <metadata_license>CC0-1.0</metadata_license>
|
|
|
+ <description>
|
|
|
+ <p>
|
|
|
+ Bringing together all kinds of awesomeness to make browsing better for you.
|
|
|
+ Get to your favorite sites quickly – even if you don’t remember the URLs.
|
|
|
+ Type your term into the location bar (aka the Awesome Bar) and the autocomplete
|
|
|
+ function will include possible matches from your browsing history, bookmarked
|
|
|
+ sites and open tabs.
|
|
|
+ </p>
|
|
|
+ <!-- FIXME: Needs another couple of paragraphs -->
|
|
|
+ </description>
|
|
|
+ <url type="homepage">http://www.mozilla.org/</url>
|
|
|
+ <screenshots>
|
|
|
+ <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/a.png</screenshot>
|
|
|
+ <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/b.png</screenshot>
|
|
|
+ <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/c.png</screenshot>
|
|
|
+ </screenshots>
|
|
|
+ <!-- FIXME: change this to an upstream email address for spec updates
|
|
|
+ <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
|
|
|
+ -->
|
|
|
+</application>
|
|
|
+EOF
|
|
|
|
|
|
+%{__install} -p -m 755 %{SOURCE21} $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
%{__install} -p -m 755 %{SOURCE27} $RPM_BUILD_ROOT%{_bindir}/firefox-safe-mode
|
|
|
|
|
|
-%{__cat} %{SOURCE50} | sed -e 's,FFDIR,%{ffdir},g' -e 's,LIBDIR,%{_libdir},g' > \
|
|
|
- $RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client
|
|
|
-
|
|
|
-# Remove binary stub from xulrunner
|
|
|
-#%{__rm} -rf $RPM_BUILD_ROOT/%{ffdir}/firefox
|
|
|
-
|
|
|
-#%{__chmod} 755 $RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client
|
|
|
%{__install} -p -D -m 664 %{SOURCE30} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
|
|
|
|
|
|
-
|
|
|
-%{__rm} -f $RPM_BUILD_ROOT%{ffdir}/firefox-config
|
|
|
-
|
|
|
-cd $RPM_BUILD_ROOT%{ffdir}/chrome
|
|
|
-find . -maxdepth 1 -mindepth 1 -name "*" -type d -exec %{__rm} -rf {} \;
|
|
|
-cd -
|
|
|
-
|
|
|
+%{__rm} -f %{buildroot}/%{mozappdir}/firefox-config
|
|
|
+%{__rm} -f %{buildroot}/%{mozappdir}/update-settings.ini
|
|
|
|
|
|
echo > ../%{name}.lang
|
|
|
# Extract langpacks, make any mods needed, repack the langpack, and install it.
|
|
|
-%{__mkdir_p} $RPM_BUILD_ROOT%{langpackdir}
|
|
|
+%{__mkdir_p} %{buildroot}%{langpackdir}
|
|
|
%{__tar} xf %{SOURCE1000}
|
|
|
for langpack in `ls firefox-langpacks/*.xpi`; do
|
|
|
language=`basename $langpack .xpi`
|
|
|
extensionID=langpack-$language@firefox.mozilla.org
|
|
|
%{__mkdir_p} $extensionID
|
|
|
- unzip $langpack -d $extensionID
|
|
|
+ unzip -qq $langpack -d $extensionID
|
|
|
find $extensionID -type f | xargs chmod 644
|
|
|
|
|
|
sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
|
|
@@ -400,12 +424,12 @@ for langpack in `ls firefox-langpacks/*.xpi`; do
|
|
|
%{__cp} -p %{SOURCE11} $extensionID/browser/chrome/$language/locale/browser/bookmarks.html
|
|
|
|
|
|
cd $extensionID
|
|
|
- zip -r9mX ../${extensionID}.xpi *
|
|
|
+ zip -qq -r9mX ../${extensionID}.xpi *
|
|
|
cd -
|
|
|
|
|
|
- %{__install} -m 644 ${extensionID}.xpi $RPM_BUILD_ROOT%{langpackdir}
|
|
|
+ %{__install} -m 644 ${extensionID}.xpi %{buildroot}%{langpackdir}
|
|
|
language=`echo $language | sed -e 's/-/_/g'`
|
|
|
- echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> ../%{name}.lang
|
|
|
+ echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> %{name}.lang
|
|
|
done
|
|
|
%{__rm} -rf firefox-langpacks
|
|
|
|
|
@@ -424,20 +448,28 @@ ln -s %{ffdir}/defaults/preferences $RPM_BUILD_ROOT/%{ffdir}/browser/defaults/pr
|
|
|
|
|
|
# another bug fixed by looking at the debian package
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/
|
|
|
-for i in default16.png default32.png default48.png
|
|
|
+for i in default{16,32,48,64,128}.png
|
|
|
do
|
|
|
%{__cp} -f browser/branding/unofficial/$i $RPM_BUILD_ROOT%{ffdir}/browser/chrome/icons/default/
|
|
|
done
|
|
|
-for i in default16.png default32.png default48.png background.png \
|
|
|
- mozicon128.png document.ico firefox.ico
|
|
|
-do
|
|
|
- %{__cp} -f browser/branding/unofficial/$i $RPM_BUILD_ROOT%{ffdir}/browser/icons/
|
|
|
-done
|
|
|
|
|
|
-
|
|
|
# own mozilla plugin dir (#135050)
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
|
|
|
|
|
|
+# System extensions
|
|
|
+%{__mkdir_p} %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_app_id}
|
|
|
+%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_app_id}
|
|
|
+
|
|
|
+# Copy over the LICENSE
|
|
|
+%{__install} -p -c -m 644 LICENSE %{buildroot}/%{mozappdir}
|
|
|
+
|
|
|
+# Copy over run-mozilla.sh
|
|
|
+%{__cp} build/unix/run-mozilla.sh %{buildroot}%{mozappdir}
|
|
|
+
|
|
|
+# Remove copied libraries to speed up build
|
|
|
+rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozjs.so
|
|
|
+rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozalloc.so
|
|
|
+rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libxul.so
|
|
|
|
|
|
# cleanup unpackaged files
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT%{_includedir}/*
|
|
@@ -476,12 +508,18 @@ fi
|
|
|
%{_datadir}/applications/vine-%{name}.desktop
|
|
|
%{_datadir}/applications/vine-%{name}-safe-mode.desktop
|
|
|
%{_datadir}/pixmaps/firefox.png
|
|
|
+%{_datadir}/appdata/firefox.appdata.xml
|
|
|
%{ffdir}
|
|
|
%{_libdir}/mozilla
|
|
|
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Dec 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 60.3.0-1
|
|
|
+- updated to 60.3.0.
|
|
|
+- dropped patches.
|
|
|
+- imported patches from rawhide.
|
|
|
+
|
|
|
* Fri Jul 28 2017 Daisuke SUZUKI <daisuke@vinelinux.org> 54.0.1-1
|
|
|
- update to 54.0.1
|
|
|
|