rpms/epiphany/devel epiphany-xulrunner19.patch, 1.3, 1.4 epiphany.spec, 1.183, 1.184

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17068

Modified Files:
	epiphany-xulrunner19.patch epiphany.spec 
Log Message:
* Fri Mar  7 2008 Christopher Aillon <caillon at redhat.com> - 2.21.92-3
- Update the xulrunner patch and tweak the useragent


epiphany-xulrunner19.patch:

Index: epiphany-xulrunner19.patch
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany-xulrunner19.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epiphany-xulrunner19.patch	26 Feb 2008 05:37:11 -0000	1.3
+++ epiphany-xulrunner19.patch	8 Mar 2008 01:47:20 -0000	1.4
@@ -573,3 +573,46 @@
  endif
  
  # We set GPATH here; this gives us semantics for GNU make
+--- epiphany-2.21.92/embed/mozilla/FilePicker.cpp.xulrunner19	2008-02-18 08:41:03.000000000 -0500
++++ epiphany-2.21.92/embed/mozilla/FilePicker.cpp	2008-03-07 18:50:46.000000000 -0500
+@@ -32,12 +32,11 @@
+ 
+ #include <nsCOMPtr.h>
+ #include <nsIDOMWindow.h>
+-#include <nsIFileURL.h>
+ #include <nsILocalFile.h>
+ #include <nsIPromptService.h>
+ #include <nsIServiceManager.h>
+ #include <nsIURI.h>
+-#include <nsNetCID.h>
++#include <nsNetUtil.h>
+ #include <nsComponentManagerUtils.h>
+ #include <nsServiceManagerUtils.h>
+ #include <nsXPCOMCID.h>
+@@ -357,22 +356,18 @@
+ 	return NS_OK;
+ }
+ 
+-/* readonly attribute nsIFileURL fileURL; */
+-NS_IMETHODIMP GFilePicker::GetFileURL(nsIFileURL **aFileURL)
++/* readonly attribute nsIURI fileURL; */
++NS_IMETHODIMP GFilePicker::GetFileURL(nsIURI **aFileURL)
+ {
+ 	NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);
+ 
+-	LOG ("GFilePicker::GetFileURL");
++	LOG ("GFilePicker::GetFileURI");
+ 
+ 	nsCOMPtr<nsILocalFile> file;
+ 	GetFile (getter_AddRefs(file));
+ 	NS_ENSURE_TRUE (file, NS_ERROR_FAILURE);
+ 
+-	nsCOMPtr<nsIFileURL> fileURL = do_CreateInstance (NS_STANDARDURL_CONTRACTID);
+-	fileURL->SetFile(file);
+-	NS_IF_ADDREF(*aFileURL = fileURL);
+-
+-	return NS_OK;
++	return NS_NewFileURI(aFileURL, file);
+ }
+ 
+ /* readonly attribute nsISimpleEnumerator files; */


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- epiphany.spec	26 Feb 2008 20:34:14 -0000	1.183
+++ epiphany.spec	8 Mar 2008 01:47:20 -0000	1.184
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.21.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -96,10 +96,13 @@
 %patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
 %patch3 -p1 -b .wrapped-plugins
-
-# In order to build the tarball, this patch is already applied in the tarball
 %patch4 -p1 -b .xulrunner19
 autoreconf
+# Fedora Epiphany version
+cat >> data/default-prefs-common.js << EOF
+pref("general.useragent.vendor", "Fedora");
+pref("general.useragent.vendorSub", "%{version}-%{release}");
+EOF
 
 %build
 # Build with -Os as it helps the browser; also, don't override mozilla's warning
@@ -214,6 +217,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Fri Mar  7 2008 Christopher Aillon <caillon at redhat.com> - 2.21.92-3
+- Update the xulrunner patch and tweak the useragent
+
 * Tue Feb 26 2008 Christopher Aillon <caillon at redhat.com> - 2.21.92-2
 - Stop shipping LowContrastLargePrint icons