rpms/kazehakase/F-10 kazehakase-0.5.6-rev3769-crash-no_module_installed.patch, NONE, 1.1 kazehakase-0.5.6-rev3769-embed-vendor-version.patch, NONE, 1.1 kazehakase.spec, 1.75, 1.76

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21762/F-10

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch 
	kazehakase-0.5.6-rev3769-embed-vendor-version.patch 
Log Message:
import 2 patches from devel

kazehakase-0.5.6-rev3769-crash-no_module_installed.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-crash-no_module_installed.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/kz-window.c.debug	2009-04-12 15:31:16.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/kz-window.c	2009-04-12 15:41:27.000000000 +0900
@@ -859,6 +859,7 @@
 	if (url) g_return_val_if_fail(g_utf8_validate(url, strlen(url), NULL), NULL);
 
 	kzembed = kz_window_create_embed(kz);
+	g_return_val_if_fail(kzembed, NULL);
 	kztab = KZ_TAB_LABEL(kz_tab_label_new(kz, kzembed));
 
 	gtk_widget_show_all(GTK_WIDGET(kzembed));

kazehakase-0.5.6-rev3769-embed-vendor-version.patch:

--- NEW FILE kazehakase-0.5.6-rev3769-embed-vendor-version.patch ---
--- kazehakase-0.5.6-svn3769_trunk/src/dialogs/kz-about-dialog.c.version	2009-01-28 04:25:07.000000000 +0900
+++ kazehakase-0.5.6-svn3769_trunk/src/dialogs/kz-about-dialog.c	2009-04-12 18:01:15.000000000 +0900
@@ -95,7 +95,12 @@
 			GDK_RGB_DITHER_NORMAL,
 			0, 0);
 	/* Draw version and backends under the logo */
-	version = g_strdup_printf (_("Version %s"), VERSION);
+	version = g_strdup_printf (_("Version %s"), 
+#ifdef VERSION_VENDOR
+		VERSION_VENDOR);
+#else
+		VERSION);
+#endif
 	backends = backend_names();
 	if (backends)
 	{


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kazehakase.spec	11 Apr 2009 19:12:37 -0000	1.75
+++ kazehakase.spec	16 Apr 2009 18:10:12 -0000	1.76
@@ -29,7 +29,7 @@
 %define		svnver		3509_trunk
 
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -53,6 +53,8 @@
 # kazehakase crashed when only kazehakase-webkit is installed
 # (bug 444569)
 Patch12:	kazehakase-0.5.6-crash-only_webkit_installed.patch
+Patch13:	kazehakase-0.5.6-rev3769-crash-no_module_installed.patch
+Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -73,13 +75,13 @@
 BuildRequires:	ruby
 %endif
 %if %{support_webkit}
-BuildRequires:	WebKit-gtk-devel
-%endif 	
+BuildRequires:	WebKit-gtk-devel %{?min_webkit_EVR:>= %{min_webkit_EVR}}
+%endif
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-Requires:	%{name}-base 	= %{version}-%{release}
+Requires:	%{name}-base	= %{version}-%{release}
 
 # GLib version dependency
 # Borrowed from pidgin spec file
@@ -182,6 +184,8 @@
 %patch11 -p0 -b .rhbug
 %endif
 %patch12 -p1 -b .onlywebkit
+%patch13 -p1 -b .nomodule
+%patch14 -p1 -b .evr
 
 %if %{need_autogen}
 sh autogen.sh
@@ -198,6 +202,8 @@
 done
 
 %build
+export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
+
 %configure \
 %if 0%{?fedora} >= 9
 	CC="%{__cc} `nspr-config --cflags`" \
@@ -297,6 +303,10 @@
 %endif
 
 %changelog
+* Fri Apr 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-4
+- Prevent crash even if no modules are installed (related to bug 444569)
+- Embed Vendor version information
+
 * Sun Apr 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-3
 - Fix crash when kazehakase-webkit only is installed (bug 444569)
 - Fix Group tag (bug 486452)