[chmsee/f17] rebuild for xulrunner 22

Yuan Yijun bbbush at fedoraproject.org
Wed Jun 26 03:03:09 UTC 2013


commit 16a0100c98ca6946f3982c58dfa4c15b776e997f
Author: Yuan Yijun <bbbush.yuan at gmail.com>
Date:   Tue Jun 25 21:43:49 2013 -0500

    rebuild for xulrunner 22

 chmsee-xulrunner22.patch |   13 +++++++++++++
 chmsee.spec              |    6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/chmsee-xulrunner22.patch b/chmsee-xulrunner22.patch
new file mode 100644
index 0000000..cb4da42
--- /dev/null
+++ b/chmsee-xulrunner22.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common.mk b/src/common.mk
+index e5fae67..3c95fce 100644
+--- a/src/common.mk
++++ b/src/common.mk
+@@ -33,7 +33,7 @@ LDFLAGS            += ${DEFINES} \
+ 	              ${INCLUDES} \
+ 		      ${MOZ_DEBUG_DISABLE_DEFS} \
+ 		      ${LIBXUL_SDK}/lib/libxpcomglue_s.a \
+-		      -shared -lxpcom -lmozalloc \
++		      -shared -lmozalloc \
+ 		      ${NSPR_LIBS} \
+ 		      ${CHMLIB_LIBS}
+ 
diff --git a/chmsee.spec b/chmsee.spec
index 3869d76..972fe78 100644
--- a/chmsee.spec
+++ b/chmsee.spec
@@ -4,7 +4,7 @@
 
 Name:		chmsee
 Version:	2.0.1
-Release:	2.%{checkout}%{?dist}
+Release:	3.%{checkout}%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 XULRunner
 Summary:	HTML Help viewer for Unix/Linux
 Group:		Applications/Publishing
@@ -12,6 +12,7 @@ License:	GPLv2
 URL:		http://code.google.com/p/chmsee
 # with `git describe HEAD`.git`git rev-parse HEAD`
 Source0:	%{name}-v%{version}%{uvt}.tar.gz
+Patch0:		chmsee-xulrunner22.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -70,6 +71,7 @@ case `uname -m` in
 esac
 exec xulrunner $XUL_LIB_DIR/%{name}/application.ini "$@"
 END
+%patch0 -p1 -b .xpcom
 
 %build
 cd src
@@ -125,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/mimetypes/chm.svg
 
 %changelog
-* Sat Jun 22 2013 bbbush <bbbush.yuan at gmail.com> - 2.0.1-2.gitde57c427
+* Tue Jun 25 2013 bbbush <bbbush.yuan at gmail.com> - 2.0.1-3.gitde57c427
 - rebuild for xulrunner 22
 
 * Sun May 12 2013 bbbush <bbbush.yuan at gmail.com> - 2.0.1-1.gitde57c427


More information about the scm-commits mailing list