rpms/galeon/devel .cvsignore, 1.9, 1.10 galeon-2.0.3-plugin-wrapper.patch, 1.2, 1.3 galeon.spec, 1.43, 1.44 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)
fedora-extras-commits at redhat.com
Sun Jan 6 09:32:07 UTC 2008
- Previous message (by thread): rpms/openvrml/devel .cvsignore, 1.9, 1.10 openvrml.spec, 1.30, 1.31 sources, 1.9, 1.10
- Next message (by thread): rpms/galeon/F-8 galeon-2.0.3-plugin-wrapper.patch, 1.4, 1.5 galeon.spec, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: denis
Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22085
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 upstreamed
- Forward-port of wrapped plugins patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/.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 6 Jan 2008 09:31:30 -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/devel/galeon-2.0.3-plugin-wrapper.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- galeon-2.0.3-plugin-wrapper.patch 29 Nov 2007 10:35:18 -0000 1.2
+++ galeon-2.0.3-plugin-wrapper.patch 6 Jan 2008 09:31:30 -0000 1.3
@@ -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,11 +20,11 @@
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");
+ }
@@ -33,5 +32,5 @@
+ 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");
+ g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
+
Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- galeon.spec 14 Dec 2007 00:51:08 -0000 1.43
+++ galeon.spec 6 Jan 2008 09:31:30 -0000 1.44
@@ -2,18 +2,15 @@
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
-Patch5: galeon-2.0.3-xulrunner.patch
+Patch0: galeon-2.0.3-plugins.patch
+Patch1: galeon-2.0.3-plugin-wrapper.patch
+Patch2: galeon-2.0.3-xulrunner.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
BuildRequires: gettext desktop-file-utils
@@ -43,12 +40,9 @@
%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
-%patch5 -p1 -b .xulrunner
+%patch0 -p1 -b .plugins
+%patch1 -p1 -b .wrapper
+%patch2 -p1 -b .xulrunner
%build
@@ -123,6 +117,11 @@
%changelog
+* Sun Jan 6 2008 Denis Leroy <denis at poolshark.org> - 2.0.4-1
+- Update to upstream 2.0.4
+- Some patches upstreamed
+- Forward-port of wrapped plugins patch
+
* Fri Dec 14 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-17
- Added patch by Martin Stransky to compile against xulrunner
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/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 6 Jan 2008 09:31:30 -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 ---
- Previous message (by thread): rpms/openvrml/devel .cvsignore, 1.9, 1.10 openvrml.spec, 1.30, 1.31 sources, 1.9, 1.10
- Next message (by thread): rpms/galeon/F-8 galeon-2.0.3-plugin-wrapper.patch, 1.4, 1.5 galeon.spec, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list