[kazehakase] Kill xulrunner support

Mamoru Tasaka mtasaka at fedoraproject.org
Wed Jul 13 15:04:42 UTC 2011


commit 90b786c5eb24e2622bc81f526d0b9b6fe16b73d5
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Thu Jul 14 00:04:29 2011 +0900

    Kill xulrunner support

 kazehakase.spec |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/kazehakase.spec b/kazehakase.spec
index cfc89a8..248f12c 100644
--- a/kazehakase.spec
+++ b/kazehakase.spec
@@ -41,7 +41,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define		fedorarel	9
+%define		fedorarel	10
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -58,7 +58,7 @@ Version:	0.5.8
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-Release:	%{_release}%{?dist}.1
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -109,7 +109,11 @@ BuildRequires:	glib2-devel
 
 BuildRequires:	gecko-devel %{?Geckover:>= %{Geckover}}
 BuildRequires:	gecko-devel-unstable
+%if 0%{?fedora} >= 15
+Requires:	%{name}-webkit = %{version}-%{release}
+%else
 Requires:	gecko-libs %{?Geckover:>= %{Geckover}}
+%endif
 
 BuildRequires:	intltool
 %if %{need_autogen}
@@ -121,7 +125,12 @@ BuildRequires:	automake
 Kazehakase is a Web browser which aims to provide 
 a user interface that is truly user-friendly & fully customizable.
 
+%if 0%{?fedora} >= 15
+Note that kazehakase no longer supports Gecko and this
+package will always pulls %{name}-webkit subpackage in.
+%else
 This package uses Gecko for HTML rendering engine.
+%endif
 
 %package	base
 Summary:	Base package of Kazehakase
@@ -241,6 +250,13 @@ EOF
 %define	__find_requires	\
 	%{_builddir}/%{name}-%{version}%{?usesvn:-svn%svnver}/%{name}-filter-requires.sh
 
+# Enable deprecated for now
+find . -name Makefile.am -or -name configure.ac | \
+	xargs sed -i.deprecated -e 's|DISABLE_DEPRECATED|NOTDISABLE_DEPRECATED|'
+
+# Kill xulrunner for F-15+
+sed -i.killxul -e '\@^embed_LTLIBRARIES at d' module/embed/gecko/Makefile.am
+
 %build
 %if %{need_autogen}
 sh autogen.sh
@@ -338,7 +354,9 @@ desktop-file-install \
 
 %files
 %defattr(-,root,root,-)
+%if 0%{?fedora} < 15
 %{_libdir}/%{name}/embed/gecko.so
+%endif
 
 
 %if %{support_webkit}
@@ -348,8 +366,8 @@ desktop-file-install \
 %endif
 
 %changelog
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-9.svn3873_trunk.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Jul 13 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5.8-10.svn3873_trunk
+- Kill xulrunner support
 
 * Thu Sep  9 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-9.svn3873_trunk
 - Patch to compile with GTK >= 2.21.6


More information about the scm-commits mailing list