- updated to 7.0.1

Changed files:
    mozilla-firefox-branding.patch -> 1.5
    mozilla-firefox-install.patch -> 1.5
    mozilla-firefox-nss_cflags.patch -> 1.3
    mozilla-firefox.spec -> 1.275

diff --git a/mozilla-firefox-branding.patch b/mozilla-firefox-branding.patch
index 87ffcee033a1c7939661b2d187e6de9c215baec9..0857640f0f4c1ea79d795202d87c8452470f57d9 100644 (file)
--- a/mozilla-firefox-branding.patch
+++ b/mozilla-firefox-branding.patch
@@ -4,8 +4,8 @@
  
  #filter substitution
  [App]
--Vendor=Mozilla
--Name=Firefox
+-Vendor=@MOZ_APP_VENDOR@
+-Name=@MOZ_APP_BASENAME@
 +Vendor=
 +Name=Firefox Community Edition
  Version=@APP_VERSION@

diff --git a/mozilla-firefox-install.patch b/mozilla-firefox-install.patch
index df6aaadf3a5695c099cab155ee09ddc2b9cc6afb..372896af4da33eefd2e3e513d75faf447e376040 100644 (file)
--- a/mozilla-firefox-install.patch
+++ b/mozilla-firefox-install.patch
@@ -4,8 +4,8 @@
        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
  ifdef LIBXUL_SDK
--      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox-bin
-+      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)-bin
+-      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)
  else
        rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
        rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

diff --git a/mozilla-firefox-nss_cflags.patch b/mozilla-firefox-nss_cflags.patch
index 1e2fbd24dc5b097f1b307c5b98fcbb393687bfbe..ff64329e82fc87f7844d09df84f2b3afbda85539 100644 (file)
--- a/mozilla-firefox-nss_cflags.patch
+++ b/mozilla-firefox-nss_cflags.patch
@@ -27,5 +27,5 @@
 -      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- %: %.c $(GLOBAL_DEPS)
+ %:: %.c $(GLOBAL_DEPS)
        $(REPORT_BUILD)

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index 9c095065cfc6efe43be9cf80b974590598a4d408..53fd1119a1ca05f236649c8be498b03c477aae6c 100644 (file)
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -11,14 +11,12 @@
 # Conditional build:
 %bcond_with    tests           # enable tests (whatever they check)
 %bcond_without gnomeui         # disable gnomeui support
-%bcond_without gnomevfs        # disable GNOME comp. (gconf+libgnome+gnomevfs) and gnomevfs ext.
-%bcond_without gnome           # disable all GNOME components (gnome+gnomeui+gnomevfs)
+%bcond_without gnome           # synonym for gnomeui (gconf, libnotify and gio are still enabled)
 %bcond_without kerberos        # disable krb5 support
 %bcond_without xulrunner       # system xulrunner
 
 %if %{without gnome}
 %undefine      with_gnomeui
-%undefine      with_gnomevfs
 %endif
 
 %if %{without xulrunner}
@@ -29,12 +27,12 @@
 Summary:       Firefox Community Edition web browser
 Summary(pl.UTF-8):     Firefox Community Edition - przeglądarka WWW
 Name:          mozilla-firefox
-Version:       5.0.1
+Version:       7.0.1
 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: 6d1f43e402cec84459a3d7f950bd5192
+# Source0-md5: 5b212db48630ba93bb30ec63cca17f4d
 Source1:       %{name}.desktop
 Source2:       %{name}.sh
 Patch0:                %{name}-install.patch
@@ -47,21 +45,20 @@ Patch6:             %{name}-prefs.patch
 Patch7:                %{name}-nss_cflags.patch
 Patch8:                %{name}-no-subshell.patch
 URL:           http://www.mozilla.org/projects/firefox/
-%{?with_gnomevfs:BuildRequires:        GConf2-devel >= 1.2.1}
+BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: automake
 BuildRequires: bzip2-devel
 BuildRequires: cairo-devel >= 1.10.2-5
 BuildRequires: dbus-glib-devel >= 0.60
-%{?with_gnomevfs:BuildRequires:        gnome-vfs2-devel >= 2.0}
+BuildRequires: glib2-devel >= 1:2.18
 BuildRequires: gtk+2-devel >= 2:2.10
 %{?with_kerberos:BuildRequires:        heimdal-devel >= 0.7.1}
 BuildRequires: hunspell-devel
 BuildRequires: libIDL-devel >= 0.8.0
 BuildRequires: libdnet-devel
 BuildRequires: libevent-devel >= 1.4.7
-%{?with_gnomevfs:BuildRequires:        libgnome-devel >= 2.0}
 %{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
 BuildRequires: libiw-devel
 BuildRequires: libjpeg-devel >= 6b
@@ -70,21 +67,20 @@ BuildRequires:      libpng(APNG)-devel >= 0.10
 BuildRequires: libpng-devel >= 1.4.1
 BuildRequires: libstdc++-devel
 BuildRequires: libvpx-devel
-BuildRequires: nspr-devel >= 1:4.8.7
-BuildRequires: nss-devel >= 1:3.12.9
+BuildRequires: nspr-devel >= 1:4.8.8
+BuildRequires: nss-devel >= 1:3.12.10
 BuildRequires: pango-devel >= 1:1.14.0
 BuildRequires: perl-modules >= 5.004
 BuildRequires: pkgconfig
 BuildRequires: python-modules
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.453
+BuildRequires: rpmbuild(macros) >= 1.601
 BuildRequires: sqlite3-devel >= 3.7.5-2
 BuildRequires: startup-notification-devel >= 0.8
 BuildRequires: xorg-lib-libXScrnSaver-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXft-devel >= 2.1
 BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXp-devel
 BuildRequires: xorg-lib-libXt-devel
 %if %{with xulrunner}
 BuildRequires: xulrunner-devel >= 2:%{version}
@@ -102,8 +98,8 @@ Requires:    gtk+2 >= 2:2.18
 Requires:      libpng >= 1.4.1
 Requires:      libpng(APNG) >= 0.10
 Requires:      myspell-common
-Requires:      nspr >= 1:4.8.7
-Requires:      nss >= 1:3.12.9
+Requires:      nspr >= 1:4.8.8
+Requires:      nss >= 1:3.12.10
 Requires:      pango >= 1:1.14.0
 Requires:      sqlite3 >= %{sqlite_build_version}
 Requires:      startup-notification >= 0.8
@@ -408,6 +404,7 @@ fi
 %{_libdir}/%{name}/components/GPSDGeolocationProvider.js
 %{_libdir}/%{name}/components/NetworkGeolocationProvider.js
 %{_libdir}/%{name}/components/PlacesCategoriesStarter.js
+%{_libdir}/%{name}/components/TelemetryPing.js
 %{_libdir}/%{name}/components/addonManager.js
 %{_libdir}/%{name}/components/amContentHandler.js
 %{_libdir}/%{name}/components/amWebInstallListener.js
@@ -432,7 +429,6 @@ fi
 %{_libdir}/%{name}/components/nsLoginInfo.js
 %{_libdir}/%{name}/components/nsLoginManager.js
 %{_libdir}/%{name}/components/nsLoginManagerPrompter.js
-%{_libdir}/%{name}/components/nsMicrosummaryService.js
 %{_libdir}/%{name}/components/nsPlacesAutoComplete.js
 %{_libdir}/%{name}/components/nsPlacesExpiration.js
 %{_libdir}/%{name}/components/nsPrompter.js
@@ -443,6 +439,7 @@ fi
 %{_libdir}/%{name}/components/nsTryToClose.js
 %{_libdir}/%{name}/components/nsURLFormatter.js
 %{_libdir}/%{name}/components/nsUpdateTimerManager.js
+%{_libdir}/%{name}/components/nsUrlClassifierHashCompleter.js
 %{_libdir}/%{name}/components/nsUrlClassifierLib.js
 %{_libdir}/%{name}/components/nsUrlClassifierListManager.js
 %{_libdir}/%{name}/components/nsWebHandlerApp.js
@@ -456,7 +453,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
 %endif
 
-%if %{with gnomevfs} && %{without xulrunner}
+%if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
 %endif