rpms/kazehakase/F-8 .cvsignore, 1.12, 1.13 kazehakase.spec, 1.45, 1.46 sources, 1.12, 1.13
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Fri Feb 29 15:50:31 UTC 2008
- Previous message (by thread): rpms/kazehakase/F-7 .cvsignore, 1.9, 1.10 kazehakase.spec, 1.28, 1.29 sources, 1.9, 1.10
- Next message (by thread): rpms/kazehakase/devel kazehakase-0.5.2-svn3410_trunk-verup.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 kazehakase.spec, 1.47, 1.48 sources, 1.14, 1.15 kazehakase-0.5.2-svn3391_trunk-no-MOZILLA-internal-API.patch, 1.1, NONE kazehakase-0.5.2-svn3391_trunk-no-NS-New.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/kazehakase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17533/F-8
Modified Files:
.cvsignore kazehakase.spec sources
Log Message:
* Sat Mar 1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.3-1
- 0.5.3
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 30 Jan 2008 11:15:47 -0000 1.12
+++ .cvsignore 29 Feb 2008 15:49:53 -0000 1.13
@@ -1 +1 @@
-kazehakase-0.5.2.tar.gz
+kazehakase-0.5.3.tar.gz
Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kazehakase.spec 8 Feb 2008 17:46:47 -0000 1.45
+++ kazehakase.spec 29 Feb 2008 15:49:53 -0000 1.46
@@ -1,3 +1,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
@@ -12,14 +18,16 @@
%define support_anthy 0
%define support_ruby 1
%define rubyabi 1.8
+# WebKitWebSettings not implemented on Fedora yet
+%define support_webkit 0
-%define repoid 29143
-%define svnver 3354
-%if 0%{?fedora} == 9
-%define usesvn 1
+%define repoid 29695
+%define svnver 3410_trunk
+%if 0%{?fedora} == 9 || 0%{?fedora} == 8
+%undefine usesvn
%else
-%undefine usesvn
+%undefine usesvn
%endif
@@ -29,8 +37,8 @@
%define _release %{fedorarel}%{?usesvn:.svn%svnver}
Name: kazehakase
-Version: 0.5.2
-Release: %{_release}%{?dist}.2
+Version: 0.5.3
+Release: %{_release}%{?dist}
Summary: Kazehakase browser
Group: Applications/Internet
@@ -41,6 +49,9 @@
Source1: gscripttable.h.gz
Patch0: kazehakase-svn3235-3237-diff.patch.gz
%endif
+%if 0%{?fedora} >= 9
+Patch15: kazehakase-0.5.2-svn3410_trunk-verup.patch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel
@@ -60,6 +71,9 @@
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby
%endif
+%if %{support_webkit}
+BuildRequires: WebKit-gtk-devel
+%endif
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -133,45 +147,62 @@
%setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
%if 0%{?fedora} < 8
-#%%patch0 -p1 -R
-%{__gzip} -d < %PATCH0 | %{__patch} -p1 -R -s || :
+%{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \
+ ( for f in `find . -name \*.rej | sort` ; do cat $f ; done )
cd src/utils
cp -p %SOURCE1 .
%{__gzip} -d *gz
cd ../..
%endif
+%if 0%{?fedora} == 9
+%{__patch} -p1 -s -Z -b --suffix .ver < %PATCH15
+%endif
%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
sh autogen.sh
%endif
-%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
+%if 0%{?fedora} == 9
+sed -i.gcc43 -e 's|-Werror||' configure
%endif
%if %{support_anthy}
%{__sed} -i.anthy -e '/^anthy_available/d' configure
%endif
+%if %{support_webkit}
+%{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure
+%{__sed} -i.WebKit -e 's|webkit/webkit.h|webkit.h|' \
+ module/embed/webkit-gtk/kz-webkit-gtk.h
+%endif
%build
+# ??? perhaps bugs for WebKit-gtk
+%if %{support_webkit}
+CFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`"
+CXXFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`"
+LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`"
+%endif
+
%configure \
+%if 0%{?fedora} == 9
+ CC="%{__cc} `nspr-config --cflags`" \
+ CXX="%{__cxx} `nspr-config --cflags`" \
+%endif
--enable-migemo \
%if 0%{?fedora} == 9
- --with-gecko-engine=xulrunner \
--disable-gtkmozembed
%else
--with-gecko-engine=firefox
%endif
-%{__make} %{?_smp_mflags}
+%if 0%{?fedora} == 9
+sed -i.bool -e \
+ 's|#define \(MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_\) 1|#undef \1|' \
+ config.h
+%endif
+
+%{__make} %{?_smp_mflags} -k
%install
%{__rm} -rf $RPM_BUILD_ROOT
@@ -196,6 +227,14 @@
%{__rm} -f ${f}.tmp
done
+%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
@@ -247,6 +286,29 @@
%endif
%changelog
+* Sat Mar 1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.3-1
+- 0.5.3
+
+* Fri Feb 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-8.svn3410_trunk
+- More try to use xulrunner
+ * GRE version fix
+ * Remove seemingly undesirable linking
+
+* Sun Feb 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-7.svn3391_trunk
+- More try to use xulrunner
+ * Fix linkage for gecko.so
+ * Don't use MOZILLA_INTERNAL_API anymore
+ * NS_NewStorageStream should be changed to use xpcom
+ http://developer.mozilla.org/en/docs/Migrating_from_Internal_Linkage_to_Frozen_Linkage
+
+* Sat Feb 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-2.svn3391_trunk
+- F-9: Try latest svn for xulrunner
+
+* Fri Feb 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-1.2.svn3358
+- F-9: Try latest svn for xulrunner
+ (Still build explicitly disabled. Now it builds, does not crash
+ but hangs eternally...)
+
* Sat Feb 9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Rebuild for new gecko engine (F-7/F-8)
@@ -254,7 +316,10 @@
- 0.5.2
* Tue Nov 27 2007 Christopher Aillon <caillon at redhat.com>
-- Rebuild against newer gecko
+- F-7/8: Rebuild against newer gecko
+
+* Wed Nov 12 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.0-2
+- F-9: try to switch to xulrunner
* 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/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 30 Jan 2008 11:15:47 -0000 1.12
+++ sources 29 Feb 2008 15:49:53 -0000 1.13
@@ -1 +1 @@
-9cf9ce4d69ed18f6e220d3218088b2e2 kazehakase-0.5.2.tar.gz
+1635cc357f1a65c8fdcad56cdcd8bb9c kazehakase-0.5.3.tar.gz
- Previous message (by thread): rpms/kazehakase/F-7 .cvsignore, 1.9, 1.10 kazehakase.spec, 1.28, 1.29 sources, 1.9, 1.10
- Next message (by thread): rpms/kazehakase/devel kazehakase-0.5.2-svn3410_trunk-verup.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 kazehakase.spec, 1.47, 1.48 sources, 1.14, 1.15 kazehakase-0.5.2-svn3391_trunk-no-MOZILLA-internal-API.patch, 1.1, NONE kazehakase-0.5.2-svn3391_trunk-no-NS-New.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list