rpms/yelp/devel yelp-2.20.0-xulrunner.patch, NONE, 1.1 yelp.spec, 1.117, 1.118

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	yelp.spec 
Added Files:
	yelp-2.20.0-xulrunner.patch 
Log Message:
rebuild against xulrunner



yelp-2.20.0-xulrunner.patch:

--- NEW FILE yelp-2.20.0-xulrunner.patch ---
diff -up yelp-2.20.0/src/yelp-gecko-services.cpp.xl yelp-2.20.0/src/yelp-gecko-services.cpp
--- yelp-2.20.0/src/yelp-gecko-services.cpp.xl	2007-09-17 22:49:09.000000000 +0200
+++ yelp-2.20.0/src/yelp-gecko-services.cpp	2007-11-22 11:00:33.000000000 +0100
@@ -298,7 +298,11 @@ PrintListener::SetPrintSettings (YelpPri
   target->SetPrintInColor (gtk_print_settings_get_use_color (settings->config));
 
   target->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
-  target->SetPaperSize (nsIPrintSettings::kPaperSizeDefined);
+#ifdef HAVE_GECKO_1_9 
+  target->SetPaperSizeType(nsIPrintSettings::kPaperSizeDefined);
+#else
+  target->SetPaperSize(nsIPrintSettings::kPaperSizeDefined);
+#endif
 
   GtkPaperSize *paperSize = gtk_page_setup_get_paper_size (settings->setup);
   if (!paperSize) {


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- yelp.spec	17 Nov 2007 03:37:25 -0000	1.117
+++ yelp.spec	22 Nov 2007 11:31:06 -0000	1.118
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.5.0
-%define gecko_version 1.8.1.9
+%define gecko_version 1.9
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.20.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -33,6 +33,7 @@
 Patch5: search-crash.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=497559
 Patch6: hp.patch
+Patch7: yelp-2.20.0-xulrunner.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=431077 
 # XXX Does this no longer apply to yelp >= 2.19.1 ?
@@ -94,12 +95,13 @@
 %patch4 -p1 -b .rarian-crash
 %patch5 -p1 -b .search-crash
 %patch6 -p1 -b .hp
+%patch7 -p1 -b .xl
 #%patch8 -p1 -b .posix-man
 
 %build
 %configure 			\
 	--enable-search		\
-	--with-mozilla=firefox 	\
+	--with-mozilla=xulrunner\
 	--enable-man 		\
 	--enable-info 		\
 	--disable-schemas-install
@@ -158,6 +160,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Thu Nov 22 2007 Martin Stransky <stransky at redhat.com> - 2.20.0-8
+- rebuild against xulrunner
+
 * Fri Nov 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-7
 - Handle .HP tags in man pages