rpms/kazehakase/F-8 .cvsignore, 1.14, 1.15 kazehakase.spec, 1.58, 1.59 sources, 1.14, 1.15

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25292/F-8

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Wed Jul 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.5-1
- 0.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	29 Mar 2008 15:32:57 -0000	1.14
+++ .cvsignore	29 Jul 2008 16:33:30 -0000	1.15
@@ -1 +1 @@
-kazehakase-0.5.4.tar.gz
+kazehakase-0.5.5.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kazehakase.spec	16 Jul 2008 01:28:10 -0000	1.58
+++ kazehakase.spec	29 Jul 2008 16:33:30 -0000	1.59
@@ -12,18 +12,12 @@
 %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.16
 %endif
-%if 0%{?fedora} == 7
-%define		Geckover	1.8.1.16
-%define		need_autogen	1
-%endif
 
 %if 0%{?use_svn} > 0
 %define		need_autogen	1
@@ -31,28 +25,25 @@
 
 %define		obsolete_plugin_ver	0.4.5-1
 
-%define		repoid		30219
-%define		svnver		3501_trunk
+%define		repoid		32341
+%define		svnver		3506_trunk
 
 
-%define		fedorarel	2
+%define		fedorarel	1
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 
 Name:		kazehakase
-Version:	0.5.4
-Release:	%{_release}%{?dist}.3
+Version:	0.5.5
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
-%if 0%{?fedora} < 8
-Patch0:		kazehakase-svn3235-3237-diff.patch.gz
-%endif
 %if 0%{?fedora} >= 9
-Patch10:	kazehakase-0.5.4-compile.patch
+Patch11:	kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch
 %endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -90,13 +81,17 @@
 # bogus value wont make it into a real package
 %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 || echo -n "999")
 BuildRequires:	glib2-devel
-Requires:	glib2 >= %{glib_ver}
+# drop this for now
+# Requires:	glib2 >= %{glib_ver}
 
+%if 0%{?fedora} < 9
 BuildRequires:	gecko-devel %{?Geckover:= %{Geckover}}
-%if 0%{?fedora} > 8
+Requires:	gecko-libs %{?Geckover:= %{Geckover}}
+%else
+BuildRequires:	gecko-devel %{?Geckover:>= %{Geckover}}
 BuildRequires:	gecko-devel-unstable
+Requires:	gecko-libs %{?Geckover:>= %{Geckover}}
 %endif
-Requires:	gecko-libs %{?Geckover:= %{Geckover}}
 
 %if %{need_autogen}
 BuildRequires:	intltool
@@ -109,8 +104,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
@@ -176,23 +169,15 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
-%if 0%{?fedora} >= 9
-%patch10 -p1 -b .compile
-%endif
 
-%if 0%{?fedora} < 8
-%{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \
-	( for f in `find . -name \*.rej | sort` ; do cat $f ; done )
+%if 0%{?fedora} >= 9
+%patch11 -p0 -b .rhbug
 %endif
 
 %if %{need_autogen}
 sh autogen.sh
 %endif
 
-%if 0%{?fedora} == 9
-sed -i.gcc43 -e 's|-Werror||' configure
-%endif
-
 %if %{support_anthy}
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
@@ -204,21 +189,25 @@
 done
 
 %build
+%if 0%{?fedora} >= 10
+export CFLAGS="%optflags -UGTK_DISABLE_DEPRECATED"
+export CXXFLAGS="%optflags -UGTK_DISABLE_DEPRECATED"
+%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
@@ -243,14 +232,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
 
@@ -312,14 +293,39 @@
 %endif
 
 %changelog
-* Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com> - 0.5.4-2.3
-- Rebuild against newer gecko
+* Wed Jul 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.5-1
+- 0.5.5
 
-* Wed Jul 02 2008 Christopher Aillon <caillon at redhat.com> - 0.5.4-2.2
-- Rebuild against newer gecko
+* Sat Jul 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-7.svn3506_trunk
+- F-9+: relax gecko libs dependency (as GRE_GetGREPathWithProperties properly
+  finds out GRE)
+- F-10+: add -UGTK_DISABLE_DEPRECATED temporarily
+
+* Tue Jul 15 2008 Christopher Aillon <caillon at redhat.com>
+- Rebuild against newer gecko (F-8)
+
+* Wed Jul 02 2008 Christopher Aillon <caillon at redhat.com>
+- Rebuild against newer gecko (F-8)
+
+* Sat Jun 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-6.svn3506_trunk
+- Try rev 3506
+- Workaround for bug 447444 (xulrunner vs hunspell conflict) (F-9+)
+
+* 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
+- 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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	29 Mar 2008 15:32:57 -0000	1.14
+++ sources	29 Jul 2008 16:33:30 -0000	1.15
@@ -1 +1 @@
-75f8afb9ddf4493c3a1fb4eb38a044df  kazehakase-0.5.4.tar.gz
+a140695fca0782372763480bd8bad8e7  kazehakase-0.5.5.tar.gz