rpms/kazehakase/devel .cvsignore, 1.16, 1.17 kazehakase.spec, 1.57, 1.58 sources, 1.16, 1.17 kazehakase-0.5.4-compile.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20650/devel

Modified Files:
	.cvsignore kazehakase.spec sources 
Removed Files:
	kazehakase-0.5.4-compile.patch 
Log Message:
* Wed Jun 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-5
- Apply xulrunner related patches from debian by Mike Hommey
  (debian bug 480796, rh bug 402641)
  This time kazehakase actually works with xulrunner!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	29 Mar 2008 15:33:20 -0000	1.16
+++ .cvsignore	25 Jun 2008 14:34:48 -0000	1.17
@@ -1 +1,2 @@
 kazehakase-0.5.4.tar.gz
+kazehakase_0.5.4-2.1.diff.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kazehakase.spec	25 Jun 2008 09:24:59 -0000	1.57
+++ kazehakase.spec	25 Jun 2008 14:34:49 -0000	1.58
@@ -12,16 +12,16 @@
 %undefine	usesvn
 %define		need_autogen	0
 
-%if 0%{?fedora} == 9
+%if 0%{?fedora} >= 9
 %define		Geckover	1.9
 #%%define		usesvn		1
 %define		need_autogen	1
 %endif
 %if 0%{?fedora} == 8
-%define		Geckover	1.8.1.13
+%define		Geckover	1.8.1.14
 %endif
 %if 0%{?fedora} == 7
-%define		Geckover	1.8.1.13
+%define		Geckover	1.8.1.14
 %define		need_autogen	1
 %endif
 
@@ -35,7 +35,7 @@
 %define		svnver		3501_trunk
 
 
-%define		fedorarel	4
+%define		fedorarel	5
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 
@@ -53,7 +53,7 @@
 Patch0:		kazehakase-svn3235-3237-diff.patch.gz
 %endif
 %if 0%{?fedora} >= 9
-Patch10:	kazehakase-0.5.4-compile.patch
+Patch10:	http://ftp.debian.org/debian/pool/main/k/%{name}/%{name}_0.5.4-2.1.diff.gz
 %endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,8 +75,7 @@
 BuildRequires:	ruby
 %endif
 %if %{support_webkit}
-# Bug 435562
-BuildRequires:	WebKit-gtk-devel >= 1.0.0-0.6.svn30667
+BuildRequires:	WebKit-gtk-devel
 %endif 	
 
 BuildRequires:	desktop-file-utils
@@ -100,7 +99,7 @@
 %endif
 Requires:	gecko-libs %{?Geckover:= %{Geckover}}
 
-%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
+%if %{need_autogen}
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -111,8 +110,6 @@
 a user interface that is truly user-friendly & fully customizable.
 
 This package uses Gecko for HTML rendering engine.
-If you want to use WebKit for HTML rendering engine, install
-"kazehakase-webkit" rpm instead.
 
 %package	base
 Summary:	Base package of Kazehakase
@@ -179,7 +176,19 @@
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
 %if 0%{?fedora} >= 9
-%patch10 -p1 -b .compile
+
+# debian forks patches
+gzip -dc %PATCH10 | %{__sed} -n -e '\@debian/patches/.*dpatch$@,$p' \
+	> %{name}-from-debian.patch.patch
+%{__patch} -p1 -Z -s < %{name}-from-debian.patch.patch
+
+for patches in \
+	50_passwordmgr.dpatch \
+	90_xulrunner_1.9.dpatch
+	do
+	%{__patch} -p1 -Z -s -b --suffix .$patches < \
+		debian/patches/$patches
+done
 %endif
 
 %if 0%{?fedora} < 8
@@ -204,10 +213,6 @@
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
 
-%if %{support_webkit}
-%{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure
-%endif
-
 for f in README.ja TODO.ja ; do
 	iconv -f EUCJP -t UTF8 $f > ${f}.tmp && \
 		( touch -r ${f} ${f}.tmp ; %{__mv} -f ${f}.tmp ${f} ) || \
@@ -215,28 +220,20 @@
 done
 
 %build
-# Bugs for WebKit-gtk
-%if %{support_webkit} && ( 0%{?fedora} <= 8 )
-CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`"
-CXXFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`"
-LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`"
-%endif
-
 %configure \
-%if 0%{?fedora} == 9
+%if 0%{?fedora} >= 9
 	CC="%{__cc} `nspr-config --cflags`" \
 	CXX="%{__cxx} `nspr-config --cflags`" \
 %endif
 	--enable-migemo \
-%if 0%{?fedora} == 9
-%if 1
+%if 0%{?fedora} >= 9
+	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
-%endif
 %else
 	--with-gecko-engine=firefox
 %endif
 
-%if 0%{?fedora} == 9
+%if 0%{?fedora} >= 9
 sed -i.bool -e \
 	's|#define \(MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_\) 1|#undef \1|' \
 	config.h
@@ -261,14 +258,6 @@
 
 %{find_lang} %{name}
 
-%if 1
-%if 0%{?fedora} == 9
-: This package builds, but does not work at all!!
-: Disabling build intentionally
-exit 1
-%endif
-%endif
-
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -330,8 +319,24 @@
 %endif
 
 %changelog
-* Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.4-4
-- rebuild with new gnutls
+* Wed Jun 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-5
+- Apply xulrunner related patches from debian by Mike Hommey
+  (debian bug 480796, rh bug 402641)
+  This time kazehakase actually works with xulrunner!
+
+* Tue Apr 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-4
+- Remove redundant description per rel-eng team request
+
+* Wed Apr 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-3
+- F-9: temporizing fix for xulrunner
+  * Enable gtk-mozembed - don't work at all, however does not crash
+  * force to install WebKit version
+
+* Wed Apr 16 2008 Christopher Aillon <caillon at redhat.com> - 0.5.4-2.1
+- Rebuild against newer gecko (F-8/9)
+
+* Mon Apr 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-2
+- Rebuild for new WebKit (F-7/8: bug 438531)
 
 * Sun Mar 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-1
 - 0.5.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	29 Mar 2008 15:33:20 -0000	1.16
+++ sources	25 Jun 2008 14:34:49 -0000	1.17
@@ -1 +1,2 @@
 75f8afb9ddf4493c3a1fb4eb38a044df  kazehakase-0.5.4.tar.gz
+ff749e865a3332abba46bf650faed07a  kazehakase_0.5.4-2.1.diff.gz


--- kazehakase-0.5.4-compile.patch DELETED ---