packages: mozilla-firefox/mozilla-firefox-branding.patch, mozilla-firefox/m...

qboosh qboosh at pld-linux.org
Mon Oct 17 18:29:11 CEST 2011 

Author: qboosh                       Date: Mon Oct 17 16:29:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 7.0.1

---- Files affected:
packages/mozilla-firefox:
   mozilla-firefox-branding.patch (1.4 -> 1.5) , mozilla-firefox-install.patch (1.4 -> 1.5) , mozilla-firefox-nss_cflags.patch (1.2 -> 1.3) , mozilla-firefox.spec (1.274 -> 1.275) 

---- Diffs:

================================================================
Index: packages/mozilla-firefox/mozilla-firefox-branding.patch
diff -u packages/mozilla-firefox/mozilla-firefox-branding.patch:1.4 packages/mozilla-firefox/mozilla-firefox-branding.patch:1.5
--- packages/mozilla-firefox/mozilla-firefox-branding.patch:1.4	Wed May 26 09:05:02 2010
+++ packages/mozilla-firefox/mozilla-firefox-branding.patch	Mon Oct 17 18:29:05 2011
@@ -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@

================================================================
Index: packages/mozilla-firefox/mozilla-firefox-install.patch
diff -u packages/mozilla-firefox/mozilla-firefox-install.patch:1.4 packages/mozilla-firefox/mozilla-firefox-install.patch:1.5
--- packages/mozilla-firefox/mozilla-firefox-install.patch:1.4	Fri Aug 19 20:02:02 2011
+++ packages/mozilla-firefox/mozilla-firefox-install.patch	Mon Oct 17 18:29:05 2011
@@ -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

================================================================
Index: packages/mozilla-firefox/mozilla-firefox-nss_cflags.patch
diff -u packages/mozilla-firefox/mozilla-firefox-nss_cflags.patch:1.2 packages/mozilla-firefox/mozilla-firefox-nss_cflags.patch:1.3
--- packages/mozilla-firefox/mozilla-firefox-nss_cflags.patch:1.2	Wed May 26 09:05:02 2010
+++ packages/mozilla-firefox/mozilla-firefox-nss_cflags.patch	Mon Oct 17 18:29:05 2011
@@ -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)

================================================================
Index: packages/mozilla-firefox/mozilla-firefox.spec
diff -u packages/mozilla-firefox/mozilla-firefox.spec:1.274 packages/mozilla-firefox/mozilla-firefox.spec:1.275
--- packages/mozilla-firefox/mozilla-firefox.spec:1.274	Fri Aug 19 20:02:02 2011
+++ packages/mozilla-firefox/mozilla-firefox.spec	Mon Oct 17 18:29:05 2011
@@ -12,14 +12,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}
@@ -30,12 +28,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
@@ -48,21 +46,20 @@
 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
@@ -71,21 +68,20 @@
 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}
@@ -103,8 +99,8 @@
 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
@@ -409,6 +405,7 @@
 %{_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
@@ -433,7 +430,6 @@
 %{_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
@@ -444,6 +440,7 @@
 %{_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
@@ -457,7 +454,7 @@
 %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
 
@@ -515,6 +512,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.275  2011/10/17 16:29:05  qboosh
+- updated to 7.0.1
+
 Revision 1.274  2011/08/19 18:02:02  qboosh
 - updated to 5.0.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-branding.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-install.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-nss_cflags.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox.spec?r1=1.274&r2=1.275&f=u

More information about the pld-cvs-commit mailing list