rpms/galeon/F-9 galeon-2.0.7-plugins.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 galeon.spec, 1.51, 1.52 sources, 1.12, 1.13 galeon-2.0.3-plugin-wrapper.patch, 1.3, NONE galeon-2.0.3-plugins.patch, 1.1, NONE galeon-2.0.5-build-fix.patch, 1.1, NONE galeon-2.0.5-xulrunner.patch, 1.1, NONE

[Denis Leroy]

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25636

Modified Files:
	.cvsignore galeon.spec sources 
Added Files:
	galeon-2.0.7-plugins.patch 
Removed Files:
	galeon-2.0.3-plugin-wrapper.patch galeon-2.0.3-plugins.patch 
	galeon-2.0.5-build-fix.patch galeon-2.0.5-xulrunner.patch 
Log Message:
Update to upstream 2.0.7, plugin patch cleanup, other patches upstreamed

galeon-2.0.7-plugins.patch:

--- NEW FILE galeon-2.0.7-plugins.patch ---
--- galeon-2.0.7/mozilla/Makefile.in.orig	2008-09-27 15:08:28.000000000 +0200
+++ galeon-2.0.7/mozilla/Makefile.in	2008-09-27 15:08:43.000000000 +0200
@@ -401,7 +401,7 @@
 	-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
 	-I$(MOZILLA_INCLUDE_ROOT)/xpconnect \
 	-I$(MOZILLA_INCLUDE_ROOT)/xulapp $(GCONF_CFLAGS) \
-	$(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(pkglibdir)\" \
+	$(GALEON_DEPENDENCY_CFLAGS) -DTOP_LIB_DIR=\"$(libdir)\" -DLIB_DIR=\"$(pkglibdir)\" \
 	-DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \
 	mozilla-config.h $(am__append_1)
 noinst_LTLIBRARIES = libmozillaembed.la
--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp.orig	2008-09-03 06:58:17.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2008-09-27 15:11:01.000000000 +0200
@@ -230,6 +230,19 @@
 #endif
 }
 
+static int
+mozilla_setup_wrapped_plugin (void)
+{
+	char 	*p_viewer = "/usr/bin/mozilla-plugin-config";
+	gboolean  ret;
+
+	if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
+		return(FALSE);
+
+	ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
+	return(ret); 
+}
+
 static void
 mozilla_init_plugin_path ()
 {
@@ -248,7 +261,12 @@
 	g_string_append (new_path, "/.mozilla/plugins");
 
 	/* Add /usr/lib/mozilla/plugins (bug 149812) */
-	g_string_append (new_path, ":/usr/lib/mozilla/plugins");
+	if(mozilla_setup_wrapped_plugin()) {
+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
+	}
+	else {
+		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
+	}
 
 #ifdef GALEON_MOZILLA_HOME
 	/* Add the current mozilla build's plugins dir */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Apr 2008 23:23:49 -0000	1.11
+++ .cvsignore	27 Sep 2008 13:24:26 -0000	1.12
@@ -1 +1 @@
-galeon-2.0.5.tar.bz2
+galeon-2.0.7.tar.bz2


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-9/galeon.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- galeon.spec	24 Sep 2008 06:11:35 -0000	1.51
+++ galeon.spec	27 Sep 2008 13:24:27 -0000	1.52
@@ -2,16 +2,14 @@
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	2.0.5
-Release:	3%{?dist}
+Version:	2.0.7
+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-plugins.patch
-Patch1:		galeon-2.0.3-plugin-wrapper.patch
-Patch2:		galeon-2.0.5-xulrunner.patch
-Patch3:		galeon-2.0.5-build-fix.patch
+Patch0:		galeon-2.0.7-plugins.patch
+Patch4:		galeon-2.0.7-confignspr.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -42,9 +40,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .plugins
-%patch1 -p1 -b .wrapper
-%patch2 -p1 -b .xulrunner
-%patch3 -p1 -b .buildfix
+%patch4 -p1 -b .confignspr
 
 
 %build
@@ -53,7 +49,7 @@
 	--disable-werror                        \
 	--disable-schemas-install		\
 	--disable-dependency-tracking		\
-	--with-mozilla=xulrunner
+	--with-mozilla=libxul-embedding-unstable
 make %{?_smp_mflags}
 
 
@@ -119,6 +115,11 @@
 
 
 %changelog
+* Sat Sep 27 2008 Denis Leroy <denis at poolshark.org> - 2.0.7-1
+- Update to upstream 2.0.7, support for libxul-unstable
+- Plugin patch cleanup
+- Other patches upstreamed
+
 * Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 2.0.5-3
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Apr 2008 23:23:49 -0000	1.12
+++ sources	27 Sep 2008 13:24:27 -0000	1.13
@@ -1 +1 @@
-bbddb89ad1ba08a62e03bceab5a38d93  galeon-2.0.5.tar.bz2
+2eede1f43e3f6f2ac4ce7d4db99b15b2  galeon-2.0.7.tar.bz2


--- galeon-2.0.3-plugin-wrapper.patch DELETED ---


--- galeon-2.0.3-plugins.patch DELETED ---


--- galeon-2.0.5-build-fix.patch DELETED ---


--- galeon-2.0.5-xulrunner.patch DELETED ---