Hello community, here is the log from the commit of package mozilla-bonobo checked in at Sat Sep 13 05:51:34 CEST 2008. -------- --- GNOME/mozilla-bonobo/mozilla-bonobo.changes 2007-08-08 00:07:49.000000000 +0200 +++ mozilla-bonobo/mozilla-bonobo.changes 2008-08-30 23:45:48.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Aug 30 23:28:45 CEST 2008 - wr@opensuse.org + +- Build against XULRunner 1.9 on 11.0 and above (bnc#420641) +- Cleanup conditionals for older distributions which were + already unsupported by the spec (<= 10.2) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-bonobo.spec ++++++ --- /var/tmp/diff_new_pack.w19220/_old 2008-09-13 05:50:30.000000000 +0200 +++ /var/tmp/diff_new_pack.w19220/_new 2008-09-13 05:50:30.000000000 +0200 @@ -1,34 +1,40 @@ # # spec file for package mozilla-bonobo (Version 0.4.2.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: mozilla-bonobo -%define xulrunner_version 181 BuildRequires: fdupes libgnomeprint-devel libgnomeui-devel -License: GPL v2 or later, MOZILLA PUBLIC LICENSE (MPL/NPL) +License: GPL v2 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Group: System/GUI/GNOME Version: 0.4.2.1 -Release: 120 +Release: 289 Summary: Mozilla Plug-In for Using Bonobo Components Source: %{name}-%{version}.tar.bz2 Patch: %{name}-xulrunner.patch -URL: http://www.nongnu.org/moz-bonobo/ -%if %suse_version > 1010 || 0%{?opensuse_bs} -BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel +Url: http://www.nongnu.org/moz-bonobo/ +%if %suse_version >= 1100 +BuildRequires: mozilla-xulrunner190-devel %else -BuildRequires: gecko-sdk +BuildRequires: mozilla-xulrunner181-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -Autoreqprov: on - +AutoReqProv: on %gconf_schemas_prereq %description @@ -62,14 +68,12 @@ touch %{name}.lang %find_gconf_schemas cat %{name}.lang %{name}.schemas_list >%{name}.lst - %fdupes $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre - %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -81,36 +85,40 @@ %{_libdir}/browser-plugins/libmozilla_bonobo.so %changelog -* Tue Aug 07 2007 - maw@suse.de +* Sun Aug 31 2008 wr@opensuse.org +- Build against XULRunner 1.9 on 11.0 and above (bnc#420641) +- Cleanup conditionals for older distributions which were + already unsupported by the spec (<= 10.2) +* Wed Aug 08 2007 maw@suse.de - Use %%fdupes. -* Fri Jan 19 2007 - sbrabec@suse.cz +* Fri Jan 19 2007 sbrabec@suse.cz - Spec file cleanup. -* Thu Jan 18 2007 - maw@suse.de +* Thu Jan 18 2007 maw@suse.de - Gnome is now in /usr, so remove references to /opt/gnome. -* Fri Dec 08 2006 - sbrabec@suse.cz +* Fri Dec 08 2006 sbrabec@suse.cz - Do not require xulrunner by runtime (#226945). -* Thu Nov 30 2006 - sbrabec@suse.cz +* Thu Nov 30 2006 sbrabec@suse.cz - Fixed xulrunner dependencies for older products. -* Mon Nov 13 2006 - sbrabec@suse.cz +* Mon Nov 13 2006 sbrabec@suse.cz - Use exact xulrunner version 181 (#218792, #216100). -* Sat Oct 07 2006 - aj@suse.de +* Sat Oct 07 2006 aj@suse.de - Cleanup BuildRequires. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Nov 02 2005 - dmueller@suse.de +* Thu Nov 03 2005 dmueller@suse.de - don't build as root -* Fri Oct 14 2005 - ro@suse.de +* Fri Oct 14 2005 ro@suse.de - replace mozilla-devel by mozilla-devel-packages in nfb - use xulrunner if mozilla not found -* Fri Jul 15 2005 - sbrabec@suse.cz +* Fri Jul 15 2005 sbrabec@suse.cz - Updated to version 0.4.2.1 (#95168). -* Wed Oct 20 2004 - sbrabec@suse.cz +* Wed Oct 20 2004 sbrabec@suse.cz - Updated to version 0.4.1. -* Wed Mar 10 2004 - sbrabec@suse.cz +* Wed Mar 10 2004 sbrabec@suse.cz - Fixed gconf schemas installation (#33114). -* Tue Feb 24 2004 - sbrabec@suse.cz +* Tue Feb 24 2004 sbrabec@suse.cz - Use gconftool-2 scriptlets correctly. -* Fri Feb 20 2004 - sbrabec@suse.cz +* Fri Feb 20 2004 sbrabec@suse.cz - Updated to version 0.4.0. -* Thu Aug 21 2003 - sbrabec@suse.cz +* Thu Aug 21 2003 sbrabec@suse.cz - Initial SuSE version 0.3.0. ++++++ mozilla-bonobo-xulrunner.patch ++++++ --- /var/tmp/diff_new_pack.w19220/_old 2008-09-13 05:50:30.000000000 +0200 +++ /var/tmp/diff_new_pack.w19220/_new 2008-09-13 05:50:30.000000000 +0200 @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- configure.in.orig 2005-07-09 19:24:48.000000000 +0200 ++++ configure.in 2008-08-30 23:35:09.000000000 +0200 @@ -24,11 +24,15 @@ dnl Checks for programs. @@ -7,12 +7,13 @@ - + moz_name=mozilla echo -n "Checking if mozilla is in pkg-config..." - if pkg-config --exists mozilla-plugin mozilla-nspr; then - echo yes; - mozilla_in_pkgconfig=yes; -+ elif pkg-config --exists xulrunner-plugin xulrunner-nspr; then +- if pkg-config --exists mozilla-plugin mozilla-nspr; then ++ if pkg-config --exists mozilla-plugin nspr; then + echo yes; + mozilla_in_pkgconfig=yes; ++ elif pkg-config --exists xulrunner-plugin nspr; then + echo yes; + mozilla_in_pkgconfig=yes; + moz_name=xulrunner; else echo no; @@ -22,7 +23,7 @@ PLUGIN_CFLAGS=$(mozilla-config --cflags java plugin) else - PLUGIN_CFLAGS=$(pkg-config --cflags mozilla-plugin mozilla-nspr) -+ PLUGIN_CFLAGS=$(pkg-config --cflags $moz_name-plugin $moz_name-nspr) ++ PLUGIN_CFLAGS=$(pkg-config --cflags $moz_name-plugin nspr) fi else PLUGIN_CFLAGS="-I$MOZILLA_INCLUDE_DIR/java -I$MOZILLA_INCLUDE_DIR/plugin -I$MOZILLA_INCLUDE_DIR/nspr" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org