rpms/kazehakase/F-9 .cvsignore, 1.16, 1.17 kazehakase.spec, 1.58, 1.59 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/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20650/F-9

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/F-9/.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:28 -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/F-9/kazehakase.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kazehakase.spec	29 Apr 2008 03:43:13 -0000	1.58
+++ kazehakase.spec	25 Jun 2008 14:34:28 -0000	1.59
@@ -12,7 +12,7 @@
 %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
@@ -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)
 
@@ -82,10 +82,6 @@
 BuildRequires:	gettext
 
 Requires:	%{name}-base 	= %{version}-%{release}
-%if 0%{?fedora} == 9
-# force to install WebKit-based kazehakase
-Requires:	%{name}-webkit	= %{version}-%{release}
-%endif
 
 # GLib version dependency
 # Borrowed from pidgin spec file
@@ -180,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
@@ -213,20 +221,19 @@
 
 %build
 %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 0
+%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
@@ -312,6 +319,11 @@
 %endif
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-9/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:28 -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 ---