rpms/galeon/FC-6 galeon-2.0.3-plugins.patch, NONE, 1.1 galeon.spec, 1.27, 1.28

[Denis Leroy (denis)]

Author: denis

Update of /cvs/extras/rpms/galeon/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24357

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-plugins.patch 
Log Message:
Added patch to fix x86_64 plugin path (#223964)

galeon-2.0.3-plugins.patch:

--- NEW FILE galeon-2.0.3-plugins.patch ---
--- galeon-2.0.3/mozilla/Makefile.in~	2006-09-18 08:18:56.000000000 -0700
+++ galeon-2.0.3/mozilla/Makefile.in	2007-01-27 12:06:59.000000000 -0800
@@ -378,6 +378,7 @@
 	-I$(MOZILLA_INCLUDE_ROOT)/xpconnect \
 	$(GCONF_CFLAGS) \
 	$(GALEON_DEPENDENCY_CFLAGS) \
+	-DTOP_LIB_DIR=\"$(libdir)\" \
 	-DLIB_DIR=\"$(pkglibdir)\" \
 	-DSHARE_DIR=\"$(pkgdatadir)\"	\
 	-DGALEON_MOZILLA_HOME=\"$(MOZILLA_HOME)\" \
--- galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.orig	2007-01-27 12:18:11.000000000 -0800
+++ galeon-2.0.3/mozilla/mozilla-embed-shell.cpp	2007-01-27 12:19:16.000000000 -0800
@@ -229,7 +229,7 @@
 	g_string_append (new_path, "/.mozilla/plugins");
 
 	/* Add /usr/lib/mozilla/plugins (bug 149812) */
-	g_string_append (new_path, ":/usr/lib/mozilla/plugins");
+	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");


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-6/galeon.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- galeon.spec	21 Dec 2006 11:13:54 -0000	1.27
+++ galeon.spec	27 Jan 2007 22:22:55 -0000	1.28
@@ -3,12 +3,13 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	4%{?dist}.1
+Release:	5%{?dist}
 License:	GPL
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -39,6 +40,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .flashfix
+%patch1 -p1 -b .plugins
 
 
 %build
@@ -115,6 +117,9 @@
 
 
 %changelog
+* Sat Jan 27 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-5
+- Added patch to fix x86_64 plugin path (#223964)
+
 * Thu Dec 21 2006 Denis Leroy <denis at poolshark.org> - 2.0.3-4.1
 - Rebuild for firefox 1.5.0.9, gecko 1.8.0.9