rpms/blam/devel blam-xulrunner.patch,NONE,1.1 blam.spec,1.19,1.20

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	blam.spec 
Added Files:
	blam-xulrunner.patch 
Log Message:
* Tue Nov 27 2007 Martin Stransky <stransky at redhat.com> - 1.8.3-13
- rebuild agains XUL Runner (gecko-libs 1.9)



blam-xulrunner.patch:

--- NEW FILE blam-xulrunner.patch ---
diff -up blam-1.8.3/libblam/blam-gecko-utils.cpp.old blam-1.8.3/libblam/blam-gecko-utils.cpp
--- blam-1.8.3/libblam/blam-gecko-utils.cpp.old	2006-11-17 01:06:40.000000000 +0100
+++ blam-1.8.3/libblam/blam-gecko-utils.cpp	2007-11-27 15:58:21.000000000 +0100
@@ -188,7 +188,7 @@ blam_gecko_utils_init_services (void)
 {
 	gchar *profile_dir;
 	
-	gtk_moz_embed_set_comp_path (MOZILLA_HOME);
+	gtk_moz_embed_set_path (MOZILLA_HOME);
 	
 	profile_dir = g_build_filename (g_getenv ("HOME"), 
 					".gnome2",


Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- blam.spec	27 Nov 2007 10:12:47 -0000	1.19
+++ blam.spec	27 Nov 2007 16:26:57 -0000	1.20
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.8.1.10
+%define	gecko_version		1.9
 
 Name:		blam
 Version:	1.8.3
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -18,7 +18,8 @@
 Patch1:		%{name}-fedora-people-in-default-collection.patch
 Patch2:		%{name}-fix-THEME_DIR-path.patch
 Patch3:		%{name}-CVE-2005-4790.patch
-
+Patch4:		%{name}-xulrunner.patch
+ 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## Various Mono dependencies are not available for ppc64; see bug 241850.
 ExcludeArch:	ppc64
@@ -29,7 +30,7 @@
 BuildRequires:	dbus-sharp-devel >= %{dbus_sharp_min_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gecko-devel = %{gecko_version}
-BuildRequires:	gecko-sharp2-devel
+BuildRequires:	gecko-sharp2-devel >= 0.12-6
 BuildRequires:	gettext
 BuildRequires:	gnome-sharp-devel
 BuildRequires:	gtk-sharp2-devel
@@ -66,7 +67,7 @@
 %patch1 -p0 -b .add-fedora-people-feed-to-default-collection.xml
 %patch2 -p0 -b .fix-THEME_DIR-path
 %patch3 -p1 -b .CVE-2005-4790
-
+%patch4 -p1 -b .xl
 
 %build
 export CFLAGS="%{optflags} -debug"
@@ -129,6 +130,9 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Tue Nov 27 2007 Martin Stransky <stransky at redhat.com> - 1.8.3-13
+- rebuild agains XUL Runner (gecko-libs 1.9)
+
 * Tue Nov 27 2007 Christopher Aillon <caillon at redhat.com> - 1.8.3-12
 - Rebuild against newer gecko