- up to 47.0.1

[packages/firefox.git] / firefox.spec

diff --git a/firefox.spec b/firefox.spec
index a7ce175c5e2147e3df479e419b8688a23b7b9589..a5e663ce9067a81a7709eead8889331dd1143c09 100644 (file)
--- a/firefox.spec
+++ b/firefox.spec
@@ -3,7 +3,7 @@
 #
 # Conditional build:
 %bcond_with    tests           # enable tests (whatever they check)
-%bcond_with    gtk3            # GTK+ 3.x instead of 2.x
+%bcond_without gtk3            # GTK+ 3.x instead of 2.x
 %bcond_without kerberos        # disable krb5 support
 %bcond_without official        # official Firefox branding
 %bcond_with    pgo             # PGO-enabled build (requires working $DISPLAY == :100)
@@ -25,32 +25,33 @@ Summary:    Firefox web browser
 Summary(hu.UTF-8):     Firefox web böngésző
 Summary(pl.UTF-8):     Firefox - przeglądarka WWW
 Name:          firefox
-Version:       45.0.2
+Version:       47.0.1
 Release:       1
 License:       MPL v2.0
 Group:         X11/Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
-# Source0-md5: deda5fcd4a41fc63cb8c14102cb8c561
+# Source0-md5: aba4b673b10e3fdcee80f88300829613
 Source3:       %{name}.desktop
 Source4:       %{name}.sh
 Source5:       vendor.js
 Source6:       vendor-ac.js
-Patch1:                idl-parser.patch
-Patch2:                xulrunner-new-libxul.patch
-Patch3:                xulrunner-paths.patch
-Patch4:                xulrunner-pc.patch
-Patch5:                install-pc-files.patch
-Patch6:                %{name}-prefs.patch
-Patch7:                %{name}-pld-bookmarks.patch
-Patch8:                %{name}-no-subshell.patch
-Patch9:                %{name}-middle_click_paste.patch
-Patch11:       %{name}-system-virtualenv.patch
-Patch12:       %{name}-Disable-Firefox-Health-Report.patch
-Patch14:       freetype.patch
+Patch0:                idl-parser.patch
+Patch1:                xulrunner-new-libxul.patch
+Patch2:                xulrunner-paths.patch
+Patch3:                xulrunner-pc.patch
+Patch4:                %{name}-prefs.patch
+Patch5:                %{name}-pld-bookmarks.patch
+Patch6:                %{name}-no-subshell.patch
+Patch7:                %{name}-middle_click_paste.patch
+Patch8:                %{name}-system-virtualenv.patch
+Patch9:                %{name}-Disable-Firefox-Health-Report.patch
+Patch10:       freetype.patch
+Patch11:       firefox-gtk3-20.patch
 URL:           https://www.mozilla.org/firefox/
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: automake
+BuildRequires: autoconf2_13
 BuildRequires: bzip2-devel
 BuildRequires: cairo-devel >= 1.10.2-5
 BuildRequires: dbus-glib-devel >= 0.60
@@ -205,20 +206,18 @@ Pakiet programistyczny Firefoxa.
 # hunspell needed for factory including mozHunspell.h
 echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Makefile.in
 
-%patch1 -p2
-%patch2 -p1
-%patch3 -p2
+%patch0 -p2
+%patch1 -p1
+%patch2 -p2
+%patch3 -p1
 %patch4 -p1
-%patch5 -p2
-%patch6 -p1
+%patch5 -p1
+%patch6 -p2
 %patch7 -p1
 %patch8 -p2
 %patch9 -p1
-%patch11 -p2
-%patch12 -p1
-%patch14 -p2
-
-cp -a xulrunner/installer/*.pc.in browser/installer/
+%patch10 -p2
+%patch11 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
 
@@ -278,7 +277,6 @@ ac_add_options --disable-mochitest
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-crashreporter
 ac_add_options --disable-elf-dynstr-gc
-ac_add_options --disable-elf-hack
 ac_add_options --disable-gconf
 ac_add_options --disable-gnomeui
 ac_add_options --disable-gnomevfs
@@ -333,6 +331,7 @@ XVFB_PID=$!
 [ -n "$XVFB_PID" ] || exit 1
 export DISPLAY=:${D}
 %{__make} -j1 -f client.mk profiledbuild \
+       AUTOCONF=/usr/bin/autoconf2_13 \
        DESTDIR=obj-%{_target_cpu}/dist \
        CC="%{__cc}" \
        CXX="%{__cxx}" \
@@ -340,6 +339,7 @@ export DISPLAY=:${D}
 kill $XVFB_PID
 %else
 %{__make} -j1 -f client.mk build \
+       AUTOCONF=/usr/bin/autoconf2_13 \
        CC="%{__cc}" \
        CXX="%{__cxx}" \
        MOZ_MAKE_FLAGS="%{_smp_mflags}"
@@ -501,6 +501,8 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
 
 %{_libdir}/%{name}/browser/features/loop@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/e10srollout@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/firefox@getpocket.com.xpi
 
 # files created by firefox -register
 %ghost %{_libdir}/%{name}/browser/components/compreg.dat
@@ -521,8 +523,15 @@ fi
 %{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
 %attr(755,root,root) %{_libdir}/%{name}/liblgpllibs.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozavcodec.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozavutil.so
 %{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/omni.ja
+%if %{with gtk3}
+%dir %{_libdir}/%{name}/gtk2
+%attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozgtk.so
+%endif
 
 %files devel
 %defattr(644,root,root,755)