rpms/galeon/devel galeon-2.0.6-plugins.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 galeon-2.0.5-xulrunner.patch, 1.1, 1.2 galeon.spec, 1.50, 1.51 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

Denis Leroy (denis) fedora-extras-commits at redhat.com
Thu Jul 10 21:14:53 UTC 2008 

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6470

Modified Files:
	.cvsignore galeon-2.0.5-xulrunner.patch galeon.spec sources 
Added Files:
	galeon-2.0.6-plugins.patch 
Removed Files:
	galeon-2.0.3-plugin-wrapper.patch galeon-2.0.3-plugins.patch 
	galeon-2.0.5-build-fix.patch 
Log Message:
- Update to upstraem 2.0.6
- Reworked configure patch for libxul-embedding
- Plugin patch update


galeon-2.0.6-plugins.patch:

--- NEW FILE galeon-2.0.6-plugins.patch ---
--- galeon-2.0.6/mozilla/mozilla-embed-shell.cpp~	2008-07-05 18:18:24.000000000 +0200
+++ galeon-2.0.6/mozilla/mozilla-embed-shell.cpp	2008-07-07 12:11:57.000000000 +0200
@@ -232,12 +232,7 @@
 	g_string_append (new_path, g_get_home_dir());
 	g_string_append (new_path, "/.mozilla/plugins");
 
-	/* Add /usr/lib/mozilla/plugins (bug 149812) */
-	g_string_append (new_path, ":/usr/lib/mozilla/plugins");
-
-#ifdef GALEON_MOZILLA_HOME
 	/* Add the current mozilla build's plugins dir */
-	g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins");
+	g_string_append (new_path, ":" LIB_DIR "/mozilla/plugins");
-#endif
 
 	g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
--- galeon-2.0.6/mozilla/Makefile.in~	2008-07-06 02:58:30.000000000 +0200
+++ galeon-2.0.6/mozilla/Makefile.in	2008-07-10 19:03:36.000000000 +0200
@@ -391,7 +391,7 @@
 	-I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \
 	-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
 	-I$(MOZILLA_INCLUDE_ROOT)/xpconnect $(GCONF_CFLAGS) \
-	$(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(pkglibdir)\" \
+	$(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(libdir)\" \
 	-DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \
 	mozilla-config.h $(am__append_1)
 noinst_LTLIBRARIES = libmozillaembed.la


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/.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	10 Jul 2008 21:13:57 -0000	1.12
@@ -1 +1 @@
-galeon-2.0.5.tar.bz2
+galeon-2.0.6.tar.bz2

galeon-2.0.5-xulrunner.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 galeon-2.0.5-xulrunner.patch
Index: galeon-2.0.5-xulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-2.0.5-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- galeon-2.0.5-xulrunner.patch	4 Apr 2008 23:12:21 -0000	1.1
+++ galeon-2.0.5-xulrunner.patch	10 Jul 2008 21:13:57 -0000	1.2
@@ -1,272 +1,117 @@
---- galeon-2.0.5/mozilla/ExternalProtocolService.cpp~	2008-02-03 00:10:51.000000000 +0100
-+++ galeon-2.0.5/mozilla/ExternalProtocolService.cpp	2008-04-04 21:16:46.000000000 +0200
-@@ -192,3 +192,13 @@
- 	return NS_ERROR_NOT_IMPLEMENTED;
- }
- #endif
-+
-+NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfoFromOS(const nsACString & aProtocolScheme, PRBool *aFound, nsIHandlerInfo **_retval)
-+{
-+	return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+
-+NS_IMETHODIMP GExternalProtocolService::SetProtocolHandlerDefaults(nsIHandlerInfo *aHandlerInfo, PRBool aOSHandlerExists)
-+{
-+	return NS_ERROR_NOT_IMPLEMENTED;
-+}
---- galeon-2.0.5/mozilla/JSConsoleListener.cpp~	2007-12-15 07:10:37.000000000 +0100
-+++ galeon-2.0.5/mozilla/JSConsoleListener.cpp	2008-04-04 21:12:35.000000000 +0200
-@@ -50,7 +50,7 @@
- {
- 	PRUnichar *message;
- 
--	aMessage->GetMessage (&message);
-+	aMessage->GetMessageMoz (&message);
- 
- 	GaleonJSConsole * js_console;
- 	js_console = galeon_embed_shell_get_js_console (embed_shell);
---- galeon-2.0.5/mozilla/GaleonWrapper.cpp~	2008-01-11 00:04:01.000000000 +0100
-+++ galeon-2.0.5/mozilla/GaleonWrapper.cpp	2008-04-04 21:12:31.000000000 +0200
-@@ -1644,7 +1644,7 @@
- 
-     NS_DECL_ISUPPORTS
- 
--    NS_IMETHODIMP GetMessage(PRUnichar **result)
-+    NS_IMETHODIMP GetMessageMoz(PRUnichar **result)
-     {
- 	    *result = NS_StringCloneData (mMessage);
- 	    return NS_OK;
---- galeon-2.0.5/mozilla/FilePicker.cpp~	2007-12-15 07:53:22.000000000 +0100
-+++ galeon-2.0.5/mozilla/FilePicker.cpp	2008-04-04 21:10:05.000000000 +0200
-@@ -355,7 +355,7 @@
- }
- 
- /* readonly attribute nsIFileURL fileURL; */
--NS_IMETHODIMP GFilePicker::GetFileURL(nsIFileURL **aFileURL)
-+NS_IMETHODIMP GFilePicker::GetFileURL(nsIURI **aFileURL)
- {
- 	LOG ("GFilePicker::GetFileURL");
- 
---- galeon-2.0.5/mozilla/MozillaPrivate.cpp~	2008-02-03 01:05:22.000000000 +0100
-+++ galeon-2.0.5/mozilla/MozillaPrivate.cpp	2008-04-04 21:11:04.000000000 +0200
-@@ -163,7 +163,7 @@
- 	nsIDocument *doc = presShell->GetDocument();
- #else
- 	nsCOMPtr<nsIDocument> doc;
--	presShell->GetDocument(getter_AddRefs(doc));
-+	doc = presShell->GetDocument();
- #endif
- 	NS_ENSURE_TRUE (doc, NS_ERROR_FAILURE);
- 
---- galeon-2.0.5/configure	2008-02-10 18:44:07.000000000 +0100
-+++ galeon-2.0.5.new/configure	2008-04-04 21:26:31.000000000 +0200
-@@ -809,6 +809,7 @@
- INSTALL_PROGRAM
- INSTALL_SCRIPT
- INSTALL_DATA
-+am__isrc
- CYGPATH_W
- PACKAGE
- VERSION
-@@ -1575,7 +1576,6 @@
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
-   --disable-libtool-lock  avoid locking (might break parallel builds)
--  --enable-debug          turn on debugging
-   --enable-nautilus-view  (auto,yes,no)
- 			  Enable Nautilus View Galeon Component
-   --enable-gtkhtml        Enable GtkHTML renderer
-@@ -2064,7 +2064,8 @@
+--- galeon-2.0.6.orig/configure.in	2008-07-06 02:58:17.000000000 +0200
++++ galeon-2.0.6/configure.in	2008-07-07 13:30:24.000000000 +0200
+@@ -212,10 +212,10 @@
+ AC_MSG_CHECKING([which mozilla engine to use])
+ 
+ AC_ARG_WITH([mozilla],
+-        AC_HELP_STRING([--with-mozilla@<:@=libxul-embedding-unstable|seamonkey|firefox|xulrunner|thunderbird@:>@],
++        AC_HELP_STRING([--with-mozilla@<:@=libxul-embedding-unstable|libxul-embedding|seamonkey|firefox|xulrunner|thunderbird@:>@],
+                        [Which gecko engine to use (default: autodetect)]))
+ 
+-GECKOS="libxul-embedding-unstable firefox mozilla-firefox seamonkey xulrunner thunderbird mozilla-thunderbird"
++GECKOS="libxul-embedding-unstable libxul-embedding firefox mozilla-firefox seamonkey xulrunner thunderbird mozilla-thunderbird"
+ gecko=$with_mozilla
+ autodetect=
  
+@@ -240,6 +240,7 @@
  
+ case "$gecko" in
+ libxul-embedding-unstable) min_version=1.9 flavour=toolkit ;;
++libxul-embedding) min_version=1.9 flavour=toolkit ;;
+ seamonkey) min_version=2.0 flavour=toolkit ;;
+ *firefox) min_version=2.0 flavour=toolkit ;;
+ *thunderbird) min_version=2.0 flavour=toolkit ;;
+@@ -249,27 +250,28 @@
+ MOZILLA=$gecko
+ AC_SUBST([MOZILLA])
  
--am__api_version="1.9"
-+am__api_version='1.10'
-+
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-   if test -f "$ac_dir/install-sh"; then
-@@ -2247,38 +2248,53 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+-if test $MOZILLA = libxul-embedding-unstable; then
++if test $MOZILLA = libxul-embedding-unstable || test $MOZILLA = libxul-embedding; then
+     MOZILLA_XPCOM=$MOZILLA
+-    MOZILLA_GTKMOZEMBED=$MOZILLA
++    MOZILLA_GTKMOZEMBED=$MOZILLA-gtkmozembed
+ else
+     MOZILLA_XPCOM=$MOZILLA-xpcom
+     MOZILLA_XPCOM=$MOZILLA-gtkmozembed
  fi
+ PKG_CHECK_MODULES(XPCOM_COMPONENT, $MOZILLA_XPCOM >= $min_version)
  
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-+if test -z "$MKDIR_P"; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in mkdir gmkdir; do
-+	 for ac_exec_ext in '' $ac_executable_extensions; do
-+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+	     'mkdir (GNU coreutils) '* | \
-+	     'mkdir (coreutils) '* | \
-+	     'mkdir (fileutils) '4.1*)
-+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+	       break 3;;
-+	   esac
-+	 done
-+       done
-+done
-+IFS=$as_save_IFS
-+
++if test $MOZILLA = libxul-embedding; then
++    MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `pkg-config --cflags nspr`"
++    MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS `pkg-config --libs nspr`"
 +fi
 +
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+    MKDIR_P="$ac_cv_path_mkdir -p"
-   else
--    mkdir_p='$(install_sh) -d'
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for MKDIR_P within a source directory, because that will
-+    # break other packages using the cache if that directory is
[...2570 lines suppressed...]
+ #  MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS -lxul"
+@@ -23527,9 +23474,7 @@
+ { echo "$as_me:$LINENO: result: $gecko_cv_have_xpcom_glue" >&5
+ echo "${ECHO_T}$gecko_cv_have_xpcom_glue" >&6; }
+ CPPFLAGS="$_SAVE_CPPFLAGS"
+-
+-
+-if test "$gecko_cv_have_xpcom_glue" = "yes"; then
++ if test "$gecko_cv_have_xpcom_glue" = "yes"; then
+   HAVE_XPCOM_GLUE_TRUE=
+   HAVE_XPCOM_GLUE_FALSE='#'
+ else
+@@ -23651,12 +23596,12 @@
+ #CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS $GALEON_DEPENDENCY_CFLAGS"
+ #CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS"
+ #LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS $MOZILLA_COMPONENT_LIBS"
 -CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` $GALEON_DEPENDENCY_CFLAGS"
 -CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
 -LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom`"
 +CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA` $GALEON_DEPENDENCY_CFLAGS"
-+CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA` `pkg-config --cflags $MOZILLA`-unstable "
-+LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA` `pkg-config --libs $MOZILLA`-unstable"
++CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA nspr`"
++LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA nspr`"
+ 
  
 -TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
-+TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content xpcom js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
++TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content xpcom system_wrappers js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
  for i in $TEST_MOZILLA_INCLUDE_DIRS ; do
     CXXFLAGS="$CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/$i"
  done
+@@ -23764,9 +23709,7 @@
+ 
+ { echo "$as_me:$LINENO: result: $result" >&5
+ echo "${ECHO_T}$result" >&6; }
+-
+-
+-if test "$result" = "yes"; then
++ if test "$result" = "yes"; then
+   HAVE_NSSTRING_INTERNAL_TRUE=
+   HAVE_NSSTRING_INTERNAL_FALSE='#'
+ else
+@@ -24188,9 +24131,7 @@
+   result=no
+ fi
+ 
+-
+-
+-if test "$result" = "yes"; then
++ if test "$result" = "yes"; then
+   HAVE_NSIJSCONSOLESERVICE_H_TRUE=
+   HAVE_NSIJSCONSOLESERVICE_H_FALSE='#'
+ else
+@@ -24754,9 +24695,7 @@
+   result=no
+ fi
+ 
+-
+-
+-if test "$result" = "yes"; then
++ if test "$result" = "yes"; then
+   HAVE_NSITOOLKITCHROMEREGISTRY_H_TRUE=
+   HAVE_NSITOOLKITCHROMEREGISTRY_H_FALSE='#'
+ else
+@@ -25340,9 +25279,7 @@
+       esac
+ fi
+ 
+-
+-
+-if test "$enable_schemas_install" != no; then
++   if test "$enable_schemas_install" != no; then
+   GCONF_SCHEMAS_INSTALL_TRUE=
+   GCONF_SCHEMAS_INSTALL_FALSE='#'
+ else
+@@ -27678,6 +27615,7 @@
+ ac_pwd='$ac_pwd'
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
++MKDIR_P='$MKDIR_P'
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -27915,6 +27853,7 @@
+ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+ INSTALL_DATA!$INSTALL_DATA$ac_delim
++am__isrc!$am__isrc$ac_delim
+ CYGPATH_W!$CYGPATH_W$ac_delim
+ PACKAGE!$PACKAGE$ac_delim
+ VERSION!$VERSION$ac_delim
+@@ -27971,7 +27910,6 @@
+ AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+ CCDEPMODE!$CCDEPMODE$ac_delim
+-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -28013,6 +27951,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+ SED!$SED$ac_delim
+ GREP!$GREP$ac_delim
+@@ -28109,7 +28048,6 @@
+ POFILES!$POFILES$ac_delim
+ POSUB!$POSUB$ac_delim
+ MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+-LIBOBJS!$LIBOBJS$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -28151,10 +28089,11 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -28381,6 +28320,11 @@
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+   esac
++  ac_MKDIR_P=$MKDIR_P
++  case $MKDIR_P in
++  [\\/$]* | ?:[\\/]* ) ;;
++  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
++  esac
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -28434,6 +28378,7 @@
+ s&@abs_builddir@&$ac_abs_builddir&;t t
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
++s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+ 
+@@ -28549,21 +28494,22 @@
+   fi
+   rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
++_am_arg=$ac_file
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+   case $_am_header in
+-    $ac_file | $ac_file:* )
++    $_am_arg | $_am_arg:* )
+       break ;;
+     * )
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X$ac_file : 'X\(//\)[^/]' \| \
+-	 X$ac_file : 'X\(//\)$' \| \
+-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+-echo X$ac_file |
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$_am_arg" : 'X\(//\)[^/]' \| \
++	 X"$_am_arg" : 'X\(//\)$' \| \
++	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$_am_arg" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -28598,8 +28544,9 @@
+   # some people rename them; so instead we look at the file content.
+   # Grep'ing the first line is not enough: some people post-process
+   # each Makefile.in and add a new line on top of each file to say so.
+-  # So let's grep whole file.
+-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+     dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+@@ -28791,7 +28738,7 @@
+ 
+ 
+ 
+-if test "$gecko" == "xulrunner" || test "$gecko" == "libxul-embedding-unstable"; then
++if test "$gecko" == "xulrunner" || test "$gecko" == "libxul-embedding-unstable" || test "$gecko" == "libxul-embedding"; then
+ 	echo ""
+ 	echo "Note that Galeon has a runtime dependency on the 'cookie' and 'permission'"
+ 	echo "mozilla extensions. These are not built as part of the default xulrunner"


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- galeon.spec	6 Jun 2008 11:54:48 -0000	1.50
+++ galeon.spec	10 Jul 2008 21:13:57 -0000	1.51
@@ -2,16 +2,14 @@
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	2.0.5
-Release:	3%{?dist}
+Version:	2.0.6
+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
+Patch0:		galeon-2.0.6-plugins.patch
 Patch2:		galeon-2.0.5-xulrunner.patch
-Patch3:		galeon-2.0.5-build-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -21,6 +19,7 @@
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
+BuildRequires:  nspr-devel
 
 Requires: gecko-libs >= %{gecko_ver}
 
@@ -42,9 +41,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .plugins
-%patch1 -p1 -b .wrapper
 %patch2 -p1 -b .xulrunner
-%patch3 -p1 -b .build-fix
 
 
 %build
@@ -53,7 +50,7 @@
 	--disable-werror                        \
 	--disable-schemas-install		\
 	--disable-dependency-tracking		\
-	--with-mozilla=xulrunner
+	--with-mozilla=libxul-embedding
 make %{?_smp_mflags}
 
 
@@ -119,6 +116,11 @@
 
 
 %changelog
+* Thu Jul 10 2008 Denis Leroy <denis at poolshark.org> - 2.0.6-1
+- Update to upstraem 2.0.6
+- Reworked configure patch for libxul-embedding
+- Plugin patch update
+
 * Fri Jun  6 2008 Caolán McNamara <caolanm at redhat.com> - 2.0.5-3
 - add galeon-2.0.5-build-fix.patch like epiphany build-fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/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	10 Jul 2008 21:13:57 -0000	1.13
@@ -1 +1 @@
-bbddb89ad1ba08a62e03bceab5a38d93  galeon-2.0.5.tar.bz2
+7723816d29edac94945e5fd9a2a402f8  galeon-2.0.6.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 ---

More information about the fedora-extras-commits mailing list