[chmsee] rebuild for xulrunner 9
by Yuan Yijun
commit d324d1e38d142209893a3efe27db2494ed53c035
Author: Yuan Yijun <bbbush.yuan(a)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(a)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(a)gmail.com> - 1.99-0.7.6.git67a1b5f
- update to a snapshot
11Â years, 1Â month
[wine/f15] 1.3.36-1 version upgrade
by Andreas Bierfert
Summary of changes:
d381521... 1.3.36-1 version upgrade (*)
(*) This commit already existed in another branch; no separate mail sent
11Â years, 1Â month
[wine] 1.3.36-1 version upgrade
by Andreas Bierfert
Summary of changes:
d381521... 1.3.36-1 version upgrade (*)
(*) This commit already existed in another branch; no separate mail sent
11Â years, 1Â month
[wine/f16] 1.3.36-1 version upgrade
by Andreas Bierfert
commit d381521eea6f5a796677d33c420564eb145e0961
Author: Andreas Bierfert <andreas.bierfert(a)lowlatency.de>
Date: Sun Jan 1 01:59:31 2012 +0100
1.3.36-1
version upgrade
.gitignore | 2 ++
sources | 4 ++--
wine.spec | 8 +++++++-
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 81925c4..999be66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
/wine-1.3.34.tar.bz2.sign
/wine-1.3.35.tar.bz2
/wine-1.3.35.tar.bz2.sign
+/wine-1.3.36.tar.bz2
+/wine-1.3.36.tar.bz2.sign
diff --git a/sources b/sources
index fb675f0..e31e43a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5833787fcd7fee5a2299fade10a2760d wine-1.3.35.tar.bz2
-8cff2dd91e4d6451b1d8b7420aef8e19 wine-1.3.35.tar.bz2.sign
+51e20231aa72a7b9db89aefdae8e92e3 wine-1.3.36.tar.bz2
+1890221ac30affc8fc151884ee3ed3b0 wine-1.3.36.tar.bz2.sign
diff --git a/wine.spec b/wine.spec
index 01ec03a..46c31e8 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,6 +1,6 @@
%global no64bit 0
Name: wine
-Version: 1.3.35
+Version: 1.3.36
Release: 1%{?dist}
Summary: A Windows 16/32/64 bit emulator
@@ -794,6 +794,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/wine/attrib.exe.so
%{_libdir}/wine/aspnet_regiis.exe.so
%{_libdir}/wine/cacls.exe.so
+%{_libdir}/wine/cscript.exe.so
%{_libdir}/wine/expand.exe.so
%{_libdir}/wine/extrac32.exe.so
%{_libdir}/wine/hostname.exe.so
@@ -875,6 +876,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/wine/ddraw.dll.so
%{_libdir}/wine/ddrawex.dll.so
%{_libdir}/wine/devenum.dll.so
+%{_libdir}/wine/dhcpcsvc.dll.so
%{_libdir}/wine/dinput.dll.so
%{_libdir}/wine/dinput8.dll.so
%{_libdir}/wine/dispex.dll.so
@@ -1389,6 +1391,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
+* Sat Dec 31 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.36-1
+- version upgrade
+
* Mon Dec 19 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.3.35-1
- version upgrade
11Â years, 1Â month