rpms/galeon/F-8 .cvsignore, 1.9, 1.10 galeon-2.0.3-plugin-wrapper.patch, 1.3, 1.4 galeon.spec, 1.41, 1.42 sources, 1.10, 1.11 galeon-2.0.3-flashfix.patch, 1.1, NONE galeon-2.0.3-imgload.patch, 1.1, NONE galeon-2.0.3-printdial.patch, 1.1, NONE

[Denis Leroy (denis)]

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19199

Modified Files:
	.cvsignore galeon-2.0.3-plugin-wrapper.patch galeon.spec 
	sources 
Removed Files:
	galeon-2.0.3-flashfix.patch galeon-2.0.3-imgload.patch 
	galeon-2.0.3-printdial.patch 
Log Message:
Update to upstream 2.0.4, some patches integrated upstream, plugin-wrapper patch ported


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Sep 2006 22:15:18 -0000	1.9
+++ .cvsignore	28 Dec 2007 12:22:09 -0000	1.10
@@ -1 +1 @@
-galeon-2.0.3.tar.bz2
+galeon-2.0.4.tar.bz2

galeon-2.0.3-plugin-wrapper.patch:

Index: galeon-2.0.3-plugin-wrapper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-8/galeon-2.0.3-plugin-wrapper.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- galeon-2.0.3-plugin-wrapper.patch	29 Nov 2007 10:33:09 -0000	1.3
+++ galeon-2.0.3-plugin-wrapper.patch	28 Dec 2007 12:22:09 -0000	1.4
@@ -1,7 +1,6 @@
-diff -up galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.wrapper galeon-2.0.3/mozilla/mozilla-embed-shell.cpp
---- galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.wrapper	2007-11-29 10:39:45.000000000 +0100
-+++ galeon-2.0.3/mozilla/mozilla-embed-shell.cpp	2007-11-29 11:10:44.000000000 +0100
-@@ -211,6 +214,19 @@ mozilla_init_profile (void)
+--- galeon-2.0.4/mozilla/mozilla-embed-shell.cpp.orig	2007-12-28 12:56:10.000000000 +0100
++++ galeon-2.0.4/mozilla/mozilla-embed-shell.cpp	2007-12-28 12:59:39.000000000 +0100
+@@ -210,6 +210,19 @@
          g_free (profile_path);
  }
  
@@ -21,17 +20,17 @@
  static void
  mozilla_init_plugin_path ()
  {
-@@ -229,7 +245,12 @@ mozilla_init_plugin_path ()
- 	g_string_append (new_path, "/.mozilla/plugins");
+@@ -231,7 +244,12 @@
+ 	g_string_append (new_path, ":/usr/lib/mozilla/plugins");
  
- 	/* Add /usr/lib/mozilla/plugins (bug 149812) */
--	g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
+ 	/* Add the current mozilla build's plugins dir */
+-	g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins");
 +	if(mozilla_setup_wrapped_plugin()) {
-+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
++		g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins-wrapped");
 +	}
 +	else {
-+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
++		g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins");
 +	}
  
- 	/* Add the current mozilla build's plugins dir */
- 	g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins");
+ 	g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
+ 


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-8/galeon.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- galeon.spec	29 Nov 2007 10:33:09 -0000	1.41
+++ galeon.spec	28 Dec 2007 12:22:09 -0000	1.42
@@ -2,17 +2,14 @@
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	2.0.3
-Release:	17%{?dist}
+Version:	2.0.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0:		galeon-2.0.3-flashfix.patch
-Patch1:		galeon-2.0.3-plugins.patch
-Patch2:		galeon-2.0.3-imgload.patch
-Patch3:		galeon-2.0.3-printdial.patch
-Patch4:		galeon-2.0.3-plugin-wrapper.patch
+Patch0:		galeon-2.0.3-plugins.patch
+Patch1:		galeon-2.0.3-plugin-wrapper.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -42,11 +39,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1 -b .flashfix
-%patch1 -p1 -b .plugins
-%patch2 -p1 -b .imgload
-%patch3 -p1 -b .printdial
-%patch4 -p1 -b .wrapper
+%patch0 -p1 -b .plugins
+%patch1 -p1 -b .wrapper
 
 
 %build
@@ -121,6 +115,10 @@
 
 
 %changelog
+* Sat Dec 15 2007 Denis Leroy <denis at poolshark.org> - 2.0.4-1
+- Update to upstream 2.0.4
+- Some patches integrated upstream, plugin-wrapper patch ported
+
 * Thu Nov 29 2007 Martin Stransky <stransky at redhat.com> - 2.0.3-17
 - Updated patch for wrapped plugins
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	18 Sep 2006 22:15:18 -0000	1.10
+++ sources	28 Dec 2007 12:22:09 -0000	1.11
@@ -1 +1 @@
-610fe2258e680f68bdf36ce7c1ba2a24  galeon-2.0.3.tar.bz2
+ee960c2d36b9bc7ab61ee77b1e7ee020  galeon-2.0.4.tar.bz2


--- galeon-2.0.3-flashfix.patch DELETED ---


--- galeon-2.0.3-imgload.patch DELETED ---


--- galeon-2.0.3-printdial.patch DELETED ---