- updated to 10.0.2

Changed files:
    mozilla-firefox-install.patch -> 1.6
    mozilla-firefox.spec -> 1.278

diff --git a/mozilla-firefox-install.patch b/mozilla-firefox-install.patch
index 372896af4da33eefd2e3e513d75faf447e376040..6cf6002124adf96ab456e080e66b26f672306660 100644 (file)
--- a/mozilla-firefox-install.patch
+++ b/mozilla-firefox-install.patch
@@ -1,11 +1,11 @@
 --- mozilla/browser/app/Makefile.in    2008-06-22 22:54:03.000000000 +0200
 +++ mozilla/browser/app/Makefile.in    2008-06-23 10:34:59.000000000 +0200
 @@ -397,7 +397,7 @@
-       rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
-       $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
+       rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
+       $(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign
  ifdef LIBXUL_SDK
--      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox
-+      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)
+-      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/firefox
++      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)
  else
        rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
        rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index 8b8a66c2ffbfe0b9780f825b17310477737ccd5e..c5a00c217778a3d8a31bd9b1db435a06d7577b9c 100644 (file)
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -1,9 +1,6 @@
 # NOTE: PLD distributes iceweasel instead
 #
 # TODO:
-# - handle locales differently (runtime, since it's possible to do)
-# - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
-#   for hints how to make locales
 # - (12:22:58)  patrys:  can you also move _libdir/mozilla-firefox to just _libdir/firefox?
 #   (12:23:25)  patrys:  it's not like we ship official firefox
 # - fix wrapper script to allow playing with profiles (must not use -remote)
@@ -27,12 +24,12 @@
 Summary:       Firefox Community Edition web browser
 Summary(pl.UTF-8):     Firefox Community Edition - przeglądarka WWW
 Name:          mozilla-firefox
-Version:       9.0.1
+Version:       10.0.2
 Release:       1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 7cf2bd379792a9b232267c6a79680566
+# Source0-md5: 5ce038d591964f72c534fa33b75a62f5
 Source1:       %{name}.desktop
 Source2:       %{name}.sh
 Patch0:                %{name}-install.patch
@@ -53,7 +50,7 @@ BuildRequires:        bzip2-devel
 BuildRequires: cairo-devel >= 1.10.2-5
 BuildRequires: dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 1:2.18
-BuildRequires: gtk+2-devel >= 2:2.10
+BuildRequires: gtk+2-devel >= 2:2.14
 %{?with_kerberos:BuildRequires:        heimdal-devel >= 0.7.1}
 BuildRequires: hunspell-devel
 BuildRequires: libIDL-devel >= 0.8.0
@@ -66,12 +63,13 @@ BuildRequires:      libnotify-devel >= 0.4
 BuildRequires: libpng(APNG)-devel >= 0.10
 BuildRequires: libpng-devel >= 1.4.1
 BuildRequires: libstdc++-devel
-BuildRequires: libvpx-devel
+BuildRequires: libvpx-devel >= 1.0.0
 BuildRequires: nspr-devel >= 1:4.8.9
 BuildRequires: nss-devel >= 1:3.13.1
 BuildRequires: pango-devel >= 1:1.14.0
 BuildRequires: perl-modules >= 5.004
 BuildRequires: pkgconfig
+BuildRequires: pkgconfig(libffi) >= 3.0.9
 BuildRequires: python-modules
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.601
@@ -93,7 +91,8 @@ Requires(post):       mktemp >= 1.5-18
 Requires:      browser-plugins >= 2.0
 Requires:      cairo >= 1.10.2-5
 Requires:      dbus-glib >= 0.60
-Requires:      gtk+2 >= 2:2.18
+Requires:      glib2 >= 1:2.18
+Requires:      gtk+2 >= 2:2.14
 Requires:      libpng >= 1.4.1
 Requires:      libpng(APNG) >= 0.10
 Requires:      myspell-common
@@ -134,6 +133,9 @@ o zgodności ze standardami, wydajnością i przenośnością.
 mv -f mozilla-release mozilla
 cd mozilla
 
+# libvpx fix
+grep -q VPX_CODEC_USE_INPUT_PARTITION configure.in && sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure || exit 1
+
 %patch0 -p1
 
 %if "%{cc_version}" < "3.4"
@@ -227,6 +229,7 @@ ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
 %endif
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
+ac_add_options --with-system-ffi
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx