rpms/kazehakase/devel .cvsignore, 1.11, 1.12 kazehakase.spec, 1.43, 1.44 sources, 1.11, 1.12

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
F-7,8: 0.5.2 devel: try latest svn


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Oct 2007 16:14:29 -0000	1.11
+++ .cvsignore	30 Jan 2008 11:15:56 -0000	1.12
@@ -1 +1 @@
-kazehakase-0.5.0.tar.gz
+kazehakase-0.5.2-svn3354.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kazehakase.spec	16 Jan 2008 13:08:34 -0000	1.43
+++ kazehakase.spec	30 Jan 2008 11:15:56 -0000	1.44
@@ -1,4 +1,10 @@
-%if 0%{?fedora} >= 9
+# svnroot: http://svn.sourceforge.jp/svnroot/kazehakase/kazehakase/trunk
+# To create svn based tarball, follow:
+# $ svn ro $svnroot
+# $ mv trunk %%name-%%version-svn%%svnver
+# $ tar czf %%name-%%version-svn%%svnver.tar.gz %%name-%%version-svn%%svnver
+
+%if 0%{?fedora} == 9
 %define		Geckover	1.9
 %endif
 %if 0%{?fedora} == 8
@@ -7,31 +13,36 @@
 %if 0%{?fedora} == 7
 %define		Geckover	1.8.1.10
 %endif
-%if 0%{?fedora} == 6
-%define		Geckover	1.8.0.12
-%endif
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		support_anthy	0
-%if 0%{?fedora} >= 6
 %define		support_ruby	1
+%define		rubyabi		1.8
+
+
+%define		repoid		29143
+%define		svnver		3354
+%if 0%{?fedora} == 9
+%define		usesvn		1
 %else
-%define		support_ruby	0
+%define		usesvn		0
 %endif
-%define		rubyabi		1.8
 
-%define		repoid		27774
-%define		svnver		3312
+
+%define		fedorarel	1
+
+
+%define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 Name:		kazehakase
-Version:	0.5.0
-Release:	2%{?dist}
+Version:	0.5.2
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
-Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 %if 0%{?fedora} < 8
 Source1:	gscripttable.h.gz
 Patch0:		kazehakase-svn3235-3237-diff.patch.gz
@@ -70,9 +81,12 @@
 Requires:	glib2 >= %{glib_ver}
 
 BuildRequires:	gecko-devel %{?Geckover:= %{Geckover}}
+%if 0%{?fedora} > 8
+BuildRequires:	gecko-devel-unstable
+%endif
 Requires:	gecko-libs %{?Geckover:= %{Geckover}}
 
-%if 0%{?fedora} < 8
+%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -122,7 +136,7 @@
 %endif	
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
 
 %if 0%{?fedora} < 8
 #%%patch0 -p1 -R
@@ -132,15 +146,22 @@
 cp -p %SOURCE1 .
 %{__gzip} -d *gz
 cd ../..
+%endif
 
+%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
 sh autogen.sh
-%else
-#sh autogen.sh
 %endif
 
-%{__sed} -i.multilib -e \
-	'/gecko/s|mozilla-config.h|mozilla-config*.h|' \
+%if 0%{?fedora} > 8
+%{__sed} -i.xul \
+	-e 's|xulrunner-xpcom|libxul-unstable|' \
+	-e 's|$GECKO-xpcom|libxul-unstable|' \
+	-e 's|$GECKO-gtkmozembed|libxul-unstable|' \
 	configure
+%{__sed} -i.xul \
+	-e '/nsBuildID/d' \
+	module/embed/gecko/mozilla.cpp
+%endif
 
 %if %{support_anthy}
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
@@ -149,7 +170,12 @@
 %build
 %configure \
 	--enable-migemo \
+%if 0%{?fedora} == 9
+	--with-gecko-engine=xulrunner \
+	--disable-gtkmozembed
+%else
 	--with-gecko-engine=firefox
+%endif
 
 %{__make} %{?_smp_mflags}
 
@@ -227,11 +253,11 @@
 %endif
 
 %changelog
-* Wed Jan 16 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.5.0-2
-- Rebuild against xulrunner (gecko 1.9)
+* Wed Jan 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-1.svn3354
+- Try latest svn for xulrunner
 
-* Tue Nov 27 2007 Christopher Aillon <caillon at redhat.com>
-- Rebuild against newer gecko
+* Wed Nov 12 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.0-2
+- Switch to xulrunner for F-9+.
 
 * Tue Nov  6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.0-1.dist.1
 - Rebuild against new gecko engine


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Oct 2007 16:14:29 -0000	1.11
+++ sources	30 Jan 2008 11:15:56 -0000	1.12
@@ -1 +1 @@
-27cb87e89a76a104630bf5838852d80b  kazehakase-0.5.0.tar.gz
+705abe144cde58d8a74336506c454eb5  kazehakase-0.5.2-svn3354.tar.gz