rpms/gnome-web-photo/devel gnome-web-photo-detect-xulrunner.patch, NONE, 1.1 gnome-web-photo.spec, 1.4, 1.5

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22151

Modified Files:
	gnome-web-photo.spec 
Added Files:
	gnome-web-photo-detect-xulrunner.patch 
Log Message:
Add patch for xulrunner detection


gnome-web-photo-detect-xulrunner.patch:

--- NEW FILE gnome-web-photo-detect-xulrunner.patch ---
Index: m4/gecko.m4
===================================================================
--- m4/gecko.m4	(revision 103)
+++ m4/gecko.m4	(working copy)
@@ -183,7 +183,7 @@
 		[[#include <mozilla-config.h>
 		  #include <string.h>
                   int main(void) {
-		    return strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") != 0;
+		    return strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") != 0 || strcmp (MOZ_DEFAULT_TOOLKIT, "cairo-gtk2") != 0;
 		  } ]]
 	)],
 	[result=yes],


Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-web-photo.spec	16 Nov 2007 18:21:17 -0000	1.4
+++ gnome-web-photo.spec	18 Nov 2007 22:14:33 -0000	1.5
@@ -20,12 +20,21 @@
 BuildRequires: libjpeg-devel
 BuildRequires: gettext perl(XML::Parser)
 
+# For the xulrunner detection patch
+BuildRequires: intltool autoconf automake libtool gettext check-devel
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=387371
+Patch0: gnome-web-photo-detect-xulrunner.patch
+
 %description
 gnome-web-photo contains a thumbnailer that will be used by GNOME applications,
 including the file manager, to generate screenshots of web pages.
 
 %prep
 %setup -q
+%patch0 -p0 -b .xulrunner
+
+autoreconf
 
 %build
 %configure --with-gecko=xulrunner