Hello community, here is the log from the commit of package chmsee for openSUSE:12.1:Update:Test checked in at 2012-03-14 17:47:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/chmsee (Old) and /work/SRC/openSUSE:12.1:Update:Test/.chmsee.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chmsee", Maintainer is "PWu@novell.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/chmsee/chmsee.changes 2012-02-07 17:37:45.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.chmsee.new/chmsee.changes 2012-03-14 17:47:56.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Mar 11 19:28:29 UTC 2012 - wr@rosenauer.org + +- Update to version 1.99.08 + * compatibility with Gecko 10 +- increased compatibility to Gecko 11 +- link to major version xulrunner link (bnc#750673) + +------------------------------------------------------------------- +Fri Mar 9 22:11:56 UTC 2012 - zaitor@opensuse.org + +- Change the xulrunner-devel BuildRequires: to pkgconfig(libxul), + fixes build for openSUSE 12.1 + +------------------------------------------------------------------- @@ -5,2 +19,3 @@ -- patch to build against Gecko 10 -- allow xulrunner to be updated even if it breaks chmsee (bnc#745303) +- Update chmsee-newer-firefox.patch to build against Gecko 10. +- Change versioned Requires for xulrunner from = to >=, to allow + xulrunner to be updated even if it breaks chmsee (bnc#745303). Old: ---- jungleji-chmsee-v1.99.07-0-gc2a00db.tar.gz New: ---- jungleji-chmsee-v1.99.08-0-g339d2c3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chmsee.spec ++++++ --- /var/tmp/diff_new_pack.CQRYjj/_old 2012-03-14 17:47:56.000000000 +0100 +++ /var/tmp/diff_new_pack.CQRYjj/_new 2012-03-14 17:47:56.000000000 +0100 @@ -15,14 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: chmsee Summary: A Gtk+2 CHM document viewer License: GPL-2.0+ Group: Productivity/Graphics/Viewers -Version: 1.99.07 +Version: 1.99.08 Release: 0 Url: http://code.google.com/p/chmsee/ -Source0: jungleji-chmsee-v1.99.07-0-gc2a00db.tar.gz +Source0: jungleji-chmsee-v1.99.08-0-g339d2c3.tar.gz Source1: Makefile # PATCH-FIX-UPSTREAM chmsee-newer-firefox.patch vuntz@opensuse.org -- Declare chmsee compatible with Firefox 9 Patch0: chmsee-newer-firefox.patch @@ -32,8 +33,9 @@ BuildRequires: python BuildRequires: shared-mime-info BuildRequires: update-desktop-files -BuildRequires: xulrunner-devel >= 9.0 -%define xulrunner_version %(rpm -q --queryformat '%{VERSION}' xulrunner) +BuildRequires: pkgconfig(libxul) >= 9.0 +%define xulrunner_version %(rpm -q --queryformat '%{VERSION}' xulrunner-devel) +%define xulrunner_base %(pkg-config --variable=libdir libxul) Requires: xulrunner >= %{xulrunner_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +48,7 @@ and several other great people. %prep -%setup -q -n jungleji-chmsee-ccdf6d2 +%setup -q -n jungleji-chmsee-422e522 cp %{SOURCE1} src %patch0 -p1 @@ -65,8 +67,8 @@ cp -r defaults %{buildroot}/%{_libdir}/chmsee/ cp application.ini %{buildroot}/%{_libdir}/chmsee/ cp chrome.manifest %{buildroot}/%{_libdir}/chmsee/ -cp %{_libdir}/xulrunner-%{xulrunner_version}/xulrunner-stub %{buildroot}%{_libdir}/chmsee/chmsee -ln -s %{_libdir}/xulrunner-%{xulrunner_version} %{buildroot}%{_libdir}/chmsee/xulrunner +cp %{xulrunner_base}/xulrunner-stub %{buildroot}%{_libdir}/chmsee/chmsee +ln -s %{xulrunner_base} %{buildroot}%{_libdir}/chmsee/xulrunner mkdir -p %{buildroot}%{_bindir} # because of bmo#690679 a link is not sufficient currently #ln -s %{_libdir}/chmsee/chmsee %{buildroot}/%{_bindir}/chmsee ++++++ chmsee-newer-firefox.patch ++++++ --- /var/tmp/diff_new_pack.CQRYjj/_old 2012-03-14 17:47:56.000000000 +0100 +++ /var/tmp/diff_new_pack.CQRYjj/_new 2012-03-14 17:47:56.000000000 +0100 @@ -5,21 +5,6 @@ @@ -25,4 +25,4 @@ ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] - MinVersion=6.0 --MaxVersion=9.0.* -+MaxVersion=10.0.* -diff --git a/src/common.mk b/src/common.mk -index 43a6302..b0174bd 100644 ---- a/src/common.mk -+++ b/src/common.mk -@@ -45,8 +45,8 @@ LDFLAGS += ${DEFINES} \ - all: ${TARGET} - - ${XPT}: ${IDL} -- ${XPIDL_HEADER} -o ${INTERFACE}.h -I ${SDK_IDL} ${IDL} -- ${XPIDL_TYPELIB} -o ${INTERFACE}.xpt -I ${SDK_IDL} ${IDL} -+ ${XPIDL_HEADER} -o ${INTERFACE}.h -I ${SDK_IDL} --cachedir=. ${IDL} -+ ${XPIDL_TYPELIB} -o ${INTERFACE}.xpt -I ${SDK_IDL} --cachedir=. ${IDL} - ${XPT_LINK} ${XPT} ${INTERFACE}.xpt - - ${TARGET}: ${XPT} ${OBJS} + MinVersion=9.0 +-MaxVersion=10.* ++MaxVersion=11.* ++++++ jungleji-chmsee-v1.99.07-0-gc2a00db.tar.gz -> jungleji-chmsee-v1.99.08-0-g339d2c3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-ccdf6d2/application.ini new/jungleji-chmsee-422e522/application.ini --- old/jungleji-chmsee-ccdf6d2/application.ini 2012-01-01 11:32:58.000000000 +0100 +++ new/jungleji-chmsee-422e522/application.ini 2012-02-19 15:38:07.000000000 +0100 @@ -19,10 +19,10 @@ [App] Name=ChmSee -Version=1.99.07 +Version=1.99.08 BuildID=2011040511 ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] -MinVersion=6.0 -MaxVersion=9.0.* +MinVersion=9.0 +MaxVersion=10.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-ccdf6d2/src/common.mk new/jungleji-chmsee-422e522/src/common.mk --- old/jungleji-chmsee-ccdf6d2/src/common.mk 2012-01-01 11:32:58.000000000 +0100 +++ new/jungleji-chmsee-422e522/src/common.mk 2012-02-19 15:38:07.000000000 +0100 @@ -11,10 +11,10 @@ XPT = ${COMPONENTSDIR}/xpcomchm.xpt SDK_IDL = ${LIBXUL_SDK}/idl -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 +XPIDL = python2 ${LIBXUL_SDK}/sdk/bin/xpidl.py +XPIDL_HEADER = python2 ${LIBXUL_SDK}/sdk/bin/header.py +XPIDL_TYPELIB = python2 ${LIBXUL_SDK}/sdk/bin/typelib.py +XPT_LINK = python2 ${LIBXUL_SDK}/sdk/bin/xpt.py link MOZ_DEBUG_DISABLE_DEFS = -DNDEBUG -DTRIMMED @@ -45,8 +45,8 @@ all: ${TARGET} ${XPT}: ${IDL} - ${XPIDL_HEADER} -o ${INTERFACE}.h -I ${SDK_IDL} ${IDL} - ${XPIDL_TYPELIB} -o ${INTERFACE}.xpt -I ${SDK_IDL} ${IDL} + ${XPIDL_HEADER} -o ${INTERFACE}.h -I ${SDK_IDL} --cachedir=. ${IDL} + ${XPIDL_TYPELIB} -o ${INTERFACE}.xpt -I ${SDK_IDL} --cachedir=. ${IDL} ${XPT_LINK} ${XPT} ${INTERFACE}.xpt ${TARGET}: ${XPT} ${OBJS} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org