[chmsee] rebuild for xulrunner 9

[Yuan Yijun]

commit d324d1e38d142209893a3efe27db2494ed53c035
Author: Yuan Yijun <bbbush.yuan at gmail.com>
Date:   Sun Jan 1 09:16:45 2012 +0800

    rebuild for xulrunner 9

 ...=> chmsee-1.99.05.git7fb12b8-fix-makefile.patch |   33 ++++++++++++++++++--
 chmsee.spec                                        |   10 ++++--
 2 files changed, 37 insertions(+), 6 deletions(-)
---
diff --git a/git-1.99.05.git7fb12b8-fix-makefile.patch b/chmsee-1.99.05.git7fb12b8-fix-makefile.patch
similarity index 62%
rename from git-1.99.05.git7fb12b8-fix-makefile.patch
rename to chmsee-1.99.05.git7fb12b8-fix-makefile.patch
index 1bc7187..e3f4a7c 100644
--- a/git-1.99.05.git7fb12b8-fix-makefile.patch
+++ b/chmsee-1.99.05.git7fb12b8-fix-makefile.patch
@@ -20,6 +20,18 @@ index d60c31a..623b625 100644
  
  
  Also add information on how to contact you by electronic and paper mail.
+diff --git a/application.ini b/application.ini
+index 2019445..7dbf4cc 100644
+--- a/application.ini
++++ b/application.ini
+@@ -24,5 +24,5 @@ BuildID=2011040511
+ ID={f48601d0-39a1-11e0-a013-00241d8cf371}
+ 
+ [Gecko]
+-MinVersion=6.0
+-MaxVersion=8.0.*
++MinVersion=
++MaxVersion=
 diff --git a/src/Makefile.fedora b/src/Makefile.fedora
 index f5a7d65..9b6ef48 100644
 --- a/src/Makefile.fedora
@@ -32,15 +44,30 @@ index f5a7d65..9b6ef48 100644
  NSPR_INCLUDES = -I/usr/include/nspr4
  NSPR_LIBS = -lplds4 -lplc4 -lnspr4 -lpthread -ldl
 diff --git a/src/common.mk b/src/common.mk
-index b23eb54..4c093d5 100644
+index c0af241..43a6302 100644
 --- a/src/common.mk
 +++ b/src/common.mk
-@@ -12,7 +12,7 @@ XPT = ${COMPONENTSDIR}/xpcomchm.xpt
+@@ -11,8 +11,10 @@ IDL = ${INTERFACE}.idl
+ XPT = ${COMPONENTSDIR}/xpcomchm.xpt
  
  SDK_IDL = ${LIBXUL_SDK}/idl
- XPIDL = ${LIBXUL_SDK}/bin/xpidl
+-XPIDL = ${LIBXUL_SDK}/bin/xpidl
 -XPT_LINK = ${LIBXUL_SDK}/sdk/bin/xpt.py link
++XPIDL = python ${LIBXUL_SDK}/sdk/bin/xpidl.py
++XPIDL_HEADER = python ${LIBXUL_SDK}/sdk/bin/header.py
++XPIDL_TYPELIB = python ${LIBXUL_SDK}/sdk/bin/typelib.py
 +XPT_LINK = python ${LIBXUL_SDK}/sdk/bin/xpt.py link
  
  MOZ_DEBUG_DISABLE_DEFS	= -DNDEBUG -DTRIMMED
  
+@@ -43,8 +45,8 @@ LDFLAGS            += ${DEFINES} \
+ all: ${TARGET}
+ 
+ ${XPT}: ${IDL}
+-	${XPIDL} -w -v -m header -I ${SDK_IDL} ${IDL}
+-	${XPIDL} -w -v -m typelib -I ${SDK_IDL} ${IDL}
++	${XPIDL_HEADER} -o ${INTERFACE}.h -I ${SDK_IDL} ${IDL}
++	${XPIDL_TYPELIB} -o ${INTERFACE}.xpt -I ${SDK_IDL} ${IDL}
+ 	${XPT_LINK} ${XPT} ${INTERFACE}.xpt
+ 
+ ${TARGET}: ${XPT} ${OBJS}
diff --git a/chmsee.spec b/chmsee.spec
index e3de3e9..f3b0364 100644
--- a/chmsee.spec
+++ b/chmsee.spec
@@ -4,7 +4,7 @@
 
 Name:		chmsee
 Version:	1.99
-Release:	0.7.%{alphatag}.%{checkout}%{?dist}
+Release:	0.8.%{alphatag}.%{checkout}%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 XULRunner
 Summary:	HTML Help viewer for Unix/Linux
 Group:		Applications/Publishing
@@ -12,10 +12,10 @@ License:	GPLv2
 URL:		http://code.google.com/p/chmsee
 Source0:	%{name}-%{version}%{uvt}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:		git-1.99.05.git7fb12b8-fix-makefile.patch
+Patch1:		chmsee-1.99.05.git7fb12b8-fix-makefile.patch
 
 BuildRequires:	desktop-file-utils
-BuildRequires:	xulrunner-devel >= 8.0 chmlib-devel cmake
+BuildRequires:	xulrunner-devel >= 9.0 chmlib-devel cmake
 
 %description
 ChmSee is an HTML Help viewer for Unix/Linux. It is based on CHMLIB
@@ -135,6 +135,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/mimetypes/chm.svg
 
 %changelog
+* Sun Jan 01 2012 bbbush <bbbush.yuan at gmail.com> - 1.99-0.8.6.git67a1b5f
+- rebuild for xulrunner
+- disable xulrunner version checking, RPM/YUM should handle that
+
 * Sat Dec 10 2011 bbbush <bbbush.yuan at gmail.com> - 1.99-0.7.6.git67a1b5f
 - update to a snapshot