March 2012 - openSUSE Commits - openSUSE Mailing Lists

commit rubygem-ci_reporter for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package rubygem-ci_reporter for openSUSE:Factory checked in at 2012-03-16 13:24:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-ci_reporter (Old) and /work/SRC/openSUSE:Factory/.rubygem-ci_reporter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-ci_reporter", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-ci_reporter/rubygem-ci_reporter.changes 2011-09-23 12:44:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-ci_reporter.new/rubygem-ci_reporter.changes 2012-03-16 13:24:39.000000000 +0100 @@ -1,0 +2,25 @@ +Wed Feb 29 15:01:20 UTC 2012 - saschpe(a)suse.de + +- Update to version 1.7.0: + * #49: fix nil to_xs with CI_CAPTURE=off (thanks Sean Walbran) + * #47: Fix regression - don't pull test/unit in unnecessarily + +------------------------------------------------------------------- +Mon Feb 13 10:54:46 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Thu Oct 20 19:32:52 UTC 2011 - saschpe(a)suse.de + +- Spec file cleanup: + * Remove outdated stuff + * Added RPM group for base package + +------------------------------------------------------------------- +Wed Jul 27 14:17:18 UTC 2011 - fcastelli(a)novell.com + +- Update to verion 1.6.5 +- Force usage of rubygem-build-2_1 + +------------------------------------------------------------------- Old: ---- ci_reporter-1.6.4.gem New: ---- ci_reporter-1.7.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-ci_reporter.spec ++++++ --- /var/tmp/diff_new_pack.gGX1kb/_old 2012-03-16 13:24:40.000000000 +0100 +++ /var/tmp/diff_new_pack.gGX1kb/_new 2012-03-16 13:24:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-ci_reporter # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,27 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: rubygem-ci_reporter -Version: 1.6.4 -Release: 1 -%define mod_name ci_reporter -# -Group: Development/Languages/Ruby +Version: 1.7.0 +Release: 0 +Summary: CI::Reporter allows you to generate reams of XML for use with continuous integration systems License: MIT -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Group: Development/Languages/Ruby +Url: http://caldersphere.rubyforge.org/ci_reporter +%define mod_name ci_reporter +%define mod_full_name %{mod_name}-%{version} +Source: %{mod_full_name}.gem +BuildRequires: rubygem-builder-3_0 >= 2.1.2 +BuildRequires: rubygem-rdoc BuildRequires: rubygems_with_buildroot_patch +Requires: rubygem-builder-3_0 >= 2.1.2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %rubygems_requires -BuildRequires: rubygem-builder >= 2.1.2 -Requires: rubygem-builder >= 2.1.2 -# -Url: http://caldersphere.rubyforge.org/ci_reporter -Source: %{mod_name}-%{version}.gem -# -Summary: CI::Reporter allows you to generate reams of XML for use with continuous integration systems %description CI::Reporter is an add-on to Test::Unit, RSpec and Cucumber that allows you to generate XML reports of your test, spec and/or feature runs. The resulting files can be read by a continuous integration system that understands Ant's JUnit report XML format, thus allowing your CI system to track test/spec successes and failures. @@ -43,47 +39,38 @@ %package doc Summary: RDoc documentation for %{mod_name} Group: Development/Languages/Ruby -License: GPLv2+ or Ruby Requires: %{name} = %{version} %description doc Documentation generated at gem installation time. Usually in RDoc and RI formats. - %package testsuite Summary: Test suite for %{mod_name} Group: Development/Languages/Ruby -License: GPLv2+ or Ruby Requires: %{name} = %{version} %description testsuite Test::Unit or RSpec files, useful for developers. - %prep - %build - %install -%gem_install %{S:0} - -%clean -%{__rm} -rf %{buildroot} +%gem_install %{SOURCE0} %files %defattr(-,root,root,-) -%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_name}-%{version}.gem -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/ -%exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/spec -%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_name}-%{version}.gemspec +%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem +%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ +%exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/spec +%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec %files doc %defattr(-,root,root,-) -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_name}-%{version}/ +%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ %files testsuite %defattr(-,root,root,-) -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/spec +%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/spec %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2012-03-16 13:24:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2012-03-01 17:27:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2012-03-16 13:24:27.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 15:14:07 CET 2012 - dmueller(a)suse.de + +- block .swp files as well (they are usually vi(m) backup files) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CheckFilelist.py ++++++ --- /var/tmp/diff_new_pack.g7Fp2A/_old 2012-03-16 13:24:31.000000000 +0100 +++ /var/tmp/diff_new_pack.g7Fp2A/_new 2012-03-16 13:24:31.000000000 +0100 @@ -135,10 +135,11 @@ }, { 'error': 'suse-filelist-forbidden-backup-file', - 'details': 'backup files (e.g. files ending in ~ or .bak) are not allowed', + 'details': 'backup files (e.g. files ending in ~, .swp or .bak) are not allowed', 'bad': [ '*~', '*.bak', + '*.swp', ], 'ignorefileif': ghostfile, }, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rhythmbox for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package rhythmbox for openSUSE:Factory checked in at 2012-03-16 13:24:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rhythmbox (Old) and /work/SRC/openSUSE:Factory/.rhythmbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rhythmbox", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/rhythmbox/rhythmbox.changes 2012-02-28 14:15:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rhythmbox.new/rhythmbox.changes 2012-03-16 13:24:16.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Mar 11 10:15:34 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 2.96: + + Revived Magnatune plugin. + + Better handling of non-media files. + + Dbus media server plugin improved again. + + Bugs fixed: bgo#454247, bgo#622874, bgo#644045, bgo#654637, + bgo#661957, bgo#663353, bgo#667971, bgo#668864, bgo#670666, + bgo#670772, bgo#671379. + + Updated translations. +- Remove xz BuildRequires, since it comes for free in the + buildsystem now. + +------------------------------------------------------------------- Old: ---- rhythmbox-2.95.tar.xz New: ---- rhythmbox-2.96.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhythmbox.spec ++++++ --- /var/tmp/diff_new_pack.ibizRF/_old 2012-03-16 13:24:18.000000000 +0100 +++ /var/tmp/diff_new_pack.ibizRF/_new 2012-03-16 13:24:18.000000000 +0100 @@ -17,13 +17,13 @@ Name: rhythmbox -Version: 2.95 +Version: 2.96 Release: 0 Summary: GNOME Music Management Application License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.gnome.org/projects/rhythmbox/ -Source: http://download.gnome.org/sources/rhythmbox/2.95/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/rhythmbox/2.96/%{name}-%{version}.tar.xz BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -34,8 +34,6 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: vala -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(avahi-glib) BuildRequires: pkgconfig(clutter-1.0) >= 1.2 BuildRequires: pkgconfig(clutter-gst-1.0) >= 1.0 @@ -48,7 +46,7 @@ BuildRequires: pkgconfig(gstreamer-interfaces-0.10) >= 0.10.32 BuildRequires: pkgconfig(gstreamer-pbutils-0.10) >= 0.10.32 BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.32 -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.2.0 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(json-glib-1.0) @@ -176,6 +174,7 @@ %{_libdir}/rhythmbox/plugins/ipod/ %{_libdir}/rhythmbox/plugins/iradio/ %{_libdir}/rhythmbox/plugins/lyrics/ +%{_libdir}/rhythmbox/plugins/magnatune/ %{_libdir}/rhythmbox/plugins/mmkeys/ %{_libdir}/rhythmbox/plugins/mpris/ %{_libdir}/rhythmbox/plugins/mtpdevice/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-zc_buildout for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-zc_buildout for openSUSE:Factory checked in at 2012-03-16 13:24:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-zc_buildout (Old) and /work/SRC/openSUSE:Factory/.python-zc_buildout.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-zc_buildout", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-zc_buildout/python-zc_buildout.changes 2011-09-23 12:43:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-zc_buildout.new/python-zc_buildout.changes 2012-03-16 13:24:08.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Mar 13 14:11:41 UTC 2012 - alexandre(a)exatati.com.br + +- Regenerate spec file with py2pack. + +------------------------------------------------------------------- +Mon Feb 13 10:54:18 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-zc_buildout.spec ++++++ --- /var/tmp/diff_new_pack.opBfD1/_old 2012-03-16 13:24:09.000000000 +0100 +++ /var/tmp/diff_new_pack.opBfD1/_new 2012-03-16 13:24:09.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-zc_buildout +# spec file for package python-zc.buildout # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -11,47 +11,47 @@ # 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/ # - +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-zc_buildout Version: 1.5.2 -Release: 1 -License: ZPL 2.1 -Summary: System for managing development buildouts +Release: 0 Url: http://pypi.python.org/pypi/zc.buildout -Group: Development/Libraries/Python +Summary: System for managing development buildouts +License: ZPL-2.1 +Group: Development/Languages/Python Source: zc.buildout-%{version}.tar.bz2 -BuildRequires: python-devel -BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildRequires: python-devel +BuildRequires: python-distribute +%if 0%{?suse_version} +%py_requires +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif +%endif %description System for managing development buildouts. -Author: --------- - Jim Fulton <jim(a)zope.com> - %prep %setup -q -n zc.buildout-%{version} %build -%{__python} setup.py build +python setup.py build %install -%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%files -f INSTALLED_FILES -%defattr(-,root,root) -%exclude %dir %{_prefix} +%files +%defattr(-,root,root,-) +%{python_sitelib}/* +%{_bindir}/buildout %exclude %{_prefix}/README.txt %doc README.txt -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-WebError for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-WebError for openSUSE:Factory checked in at 2012-03-16 13:23:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-WebError (Old) and /work/SRC/openSUSE:Factory/.python-WebError.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-WebError", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-WebError.new/python-WebError.changes 2012-03-16 13:24:01.000000000 +0100 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Mon Mar 12 21:34:07 UTC 2012 - saschpe(a)gmx.de + +- Simplify macro usage +- Re-enable testsuite + +------------------------------------------------------------------- +Fri Sep 2 07:41:45 UTC 2011 - saschpe(a)suse.de + +- Disabled %check section to fix SLE build + +------------------------------------------------------------------- +Thu Sep 1 14:48:15 UTC 2011 - saschpe(a)suse.de + +- Initial version + New: ---- WebError-0.10.3.tar.gz python-WebError.changes python-WebError.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-WebError.spec ++++++ # # spec file for package python-WebError # # Copyright (c) 2011 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/ # Name: python-WebError Version: 0.10.3 Release: 0 URL: http://pypi.python.org/pypi/WebError Summary: Web Error handling and exception catching License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/W/WebError/WebError-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-Paste BuildRequires: python-Pygments BuildRequires: python-Tempita BuildRequires: python-WebOb BuildRequires: python-simplejson BuildRequires: python-xml Requires: python-Paste Requires: python-Pygments Requires: python-Tempita Requires: python-WebOb Requires: python-simplejson Requires: python-xml Provides: python-weberror = %{version} Obsoletes: python-weberror < %{version} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description A web error handling and exception catching module for Paste applications. %prep %setup -q -n WebError-%{version} chmod 644 WebError.egg-info/{top_level.txt,SOURCES.txt,PKG-INFO,not-zip-safe,dependency_links.txt,requires.txt,entry_points.txt,paster_plugins.txt} # Fix wrong permissions %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check python setup.py test %files %defattr(-,root,root,-) %doc CHANGELOG LICENSE README %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-virtinst for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-virtinst for openSUSE:Factory checked in at 2012-03-16 13:23:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-virtinst (Old) and /work/SRC/openSUSE:Factory/.python-virtinst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-virtinst", Maintainer is "CARNOLD(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-virtinst/python-virtinst.changes 2012-03-06 13:41:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-virtinst.new/python-virtinst.changes 2012-03-16 13:23:51.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 14 10:19:58 MDT 2012 - carnold(a)novell.com + +- bnc#752138 - python-virtinst causes virt-manager uninstall + python-virtinst.spec +- SUSE URL installs want install= rather than method= + virtinst-git-suse-url.diff + +------------------------------------------------------------------- New: ---- virtinst-git-suse-url.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-virtinst.spec ++++++ --- /var/tmp/diff_new_pack.xcgjaG/_old 2012-03-16 13:23:53.000000000 +0100 +++ /var/tmp/diff_new_pack.xcgjaG/_new 2012-03-16 13:23:53.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # This macro is used for the continuous automated builds. It just @@ -40,6 +39,7 @@ Version: 0.600.1 Release: 0 Source0: %{appname}-%{version}.tar.bz2 +Patch0: virtinst-git-suse-url.diff Patch10: virtinst-cdrom.diff Patch12: virtinst-storage-ocfs2.diff Patch13: virtinst-qed.diff @@ -53,7 +53,7 @@ Provides: virt-image Provides: virt-pack Provides: virt-convert -Requires: libvirt-python >= 0.4.5-2.fc10 +Requires: libvirt-python >= 0.4.5 Requires: libxml2-python Requires: python-urlgrabber %if 0%{suse_version} == 0 @@ -62,7 +62,7 @@ %endif BuildRequires: gettext BuildRequires: python-devel -Obsoletes: virt-manager <= 0.9.0 +Conflicts: virt-manager <= 0.9.0 %description pyhon-virtinst contains python modules and tools (virt-install, @@ -75,6 +75,7 @@ %prep %setup -q -n %{appname}-%{version} +%patch0 -p1 %patch10 -p1 %patch12 -p1 %patch13 -p1 ++++++ virtinst-git-suse-url.diff ++++++ Subject: SUSE URL installs want install= rather than method= From: Cole Robinson crobinso(a)redhat.com Thu Feb 9 10:41:18 2012 -0500 Date: Thu Feb 9 10:41:18 2012 -0500: Git: 8f02eecd41130dd8b20a80f589d0f67f718484d2 Index: virtinst-0.600.1/virtinst/OSDistro.py =================================================================== --- virtinst-0.600.1.orig/virtinst/OSDistro.py +++ virtinst-0.600.1/virtinst/OSDistro.py @@ -240,6 +240,7 @@ class Distro: _hvm_kernel_paths = [] _xen_kernel_paths = [] uses_treeinfo = False + method_arg = "method" def __init__(self, uri, arch, vmtype=None, scratchdir=None): self.uri = uri @@ -373,7 +374,7 @@ class Distro: args = '' if not fetcher.location.startswith("/"): - args += "method=" + fetcher.location + args += "%s=%s" % (self.method_arg, fetcher.location) if guest.extraargs: args += " " + guest.extraargs @@ -655,6 +656,7 @@ class SuseDistro(Distro): name = "SUSE" os_type = "linux" + method_arg = "install" _boot_iso_paths = [ "boot/boot.iso" ] def __init__(self, uri, arch, vmtype=None, scratchdir=None): -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-rope for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-rope for openSUSE:Factory checked in at 2012-03-16 13:23:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rope (Old) and /work/SRC/openSUSE:Factory/.python-rope.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-rope", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-rope.new/python-rope.changes 2012-03-16 13:23:42.000000000 +0100 @@ -0,0 +1,23 @@ +------------------------------------------------------------------- +Tue Jan 31 10:37:36 UTC 2012 - saschpe(a)suse.de + +- Spec file cleanup + +------------------------------------------------------------------- +Mon Dec 5 13:14:57 UTC 2011 - toddrme2178(a)gmail.com + +- Cleaned up spec file formatting + +------------------------------------------------------------------- +Tue Jan 25 14:01:04 UTC 2011 - saschpe(a)suse.de + +- Update to version 0.9.3 +- Added COPYING to documentation +- Recompressed tarbal with bzip2 + +------------------------------------------------------------------- +Wed Aug 5 16:03:28 CEST 2009 - hpj(a)urpla.net + +- Initial creation of package python-rope-0.9.2 + +------------------------------------------------------------------- New: ---- python-rope.changes python-rope.spec rope-0.9.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rope.spec ++++++ # # spec file for package python-rope # # Copyright (c) 2012 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/ # Name: python-rope Version: 0.9.3 Release: 0 License: GPL-2.0+ Summary: A python refactoring library Url: http://rope.sf.net/ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/r/rope/rope-%{version}.tar.gz BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Rope is a python refactoring library. %prep %setup -q -n rope-%{version} %build python2 setup.py build %install python2 setup.py install --prefix=%{_prefix} --root=%{buildroot} rm -rf %{buildroot}/%{py_sitedir}/python-rope/ropetest/ %files %defattr(-,root,root,-) %doc COPYING README.txt docs/ %python_sitelib/ %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-requests for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-requests for openSUSE:Factory checked in at 2012-03-16 13:23:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-requests (Old) and /work/SRC/openSUSE:Factory/.python-requests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-requests", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-requests.new/python-requests.changes 2012-03-16 13:23:32.000000000 +0100 @@ -0,0 +1,223 @@ +------------------------------------------------------------------- +Sat Mar 10 14:11:23 UTC 2012 - saschpe(a)gmx.de + +- Update to version 0.10.8: + * Generate chunked ValueError fix + * Proxy configuration by environment variables + * Simplification of iter_lines. + * New trust_env configuration for disabling system/environment hints. + * Suppress cookie errors. +- Changes from version 0.10.7: + * encode_uri = False + +------------------------------------------------------------------- +Tue Feb 28 18:06:45 UTC 2012 - jfunk(a)funktronics.ca + +- Update to 0.10.6 + * Allow '=' in cookies. +- 0.10.5 (2012-02-25) + * Response body with 0 content-length fix. + * New async.imap. + * Don't fail on netrc. + +------------------------------------------------------------------- +Tue Feb 21 19:52:04 UTC 2012 - jfunk(a)funktronics.ca + +- Update to 0.10.4 + * Honor netrc. +- 0.10.3 (2012-02-20) + * HEAD requests don't follow redirects anymore. + * raise_for_status() doesn't raise for 3xx anymore. + * Make Session objects picklable. + * ValueError for invalid schema URLs. +- 0.10.2 (2012-01-15) + * Vastly improved URL quoting. + * Additional allowed cookie key values. + * Attempted fix for "Too many open files" Error + * Replace unicode errors on first pass, no need for second pass. + * Append '/' to bare-domain urls before query insertion. + * Exceptions now inherit from RuntimeError. + * Binary uploads + auth fix. + * Bugfixes. + +------------------------------------------------------------------- +Mon Feb 6 13:41:55 UTC 2012 - saschpe(a)suse.de + +- Add dependency on python-certifi + +------------------------------------------------------------------- +Tue Jan 24 21:31:14 UTC 2012 - jfunk(a)funktronics.ca + +- Update to 0.10.1: + * PYTHON 3 SUPPORT! + * Dropped 2.5 Support. (Backwards Incompatible) +- 0.10.0 (2012-01-21) + * Response.content is now bytes-only. (Backwards Incompatible) + * New Response.text is unicode-only. + * If no Response.encoding is specified and chardet is available, + Respoonse.text will guess an encoding. + * Default to ISO-8859-1 (Western) encoding for "text" subtypes. + * Removal of decode_unicode. (Backwards Incompatible) + * New multiple-hooks system. + * New Response.register_hook for registering hooks within the pipeline. + * Response.url is now Unicode. + +------------------------------------------------------------------- +Thu Jan 19 19:33:21 UTC 2012 - jfunk(a)funktronics.ca + +- Update to 0.9.3: + * SSL verify=False bugfix (apparent on windows machines). +- 0.9.2 (2012-01-18) + * Asyncronous async.send method. + * Support for proper chunk streams with boundaries. + * session argument for Session classes. + * Print entire hook tracebacks, not just exception instance. + * Fix response.iter_lines from pending next line. + * Fix but in HTTP-digest auth w/ URI having query strings. + * Fix in Event Hooks section. + * Urllib3 update. + +------------------------------------------------------------------- +Thu Jan 12 22:05:35 UTC 2012 - jfunk(a)funktronics.ca + +- Update to 0.9.1: + * danger_mode for automatic Response.raise_for_status() + * Response.iter_lines refator +- 0.9.0 (2011-12-28) + * verify ssl is default. +- 0.8.9 (2011-12-28) + * Packaging fix. +- 0.8.8 (2011-12-28) + * SSL CERT VERIFICATION! + * Release of Cerifi: Mozilla's cert list. + * New 'verify' argument for SSL requests. + * Urllib3 update. +- 0.8.7 (2011-12-24) + * iter_lines last-line truncation fix + * Force safe_mode for async requests + * Handle safe_mode exceptions more consistently + * Fix iteration on null responses in safe_mode +- 0.8.6 (2011-12-18) + * Socket timeout fixes. + * Proxy Authorization support. +- 0.8.5 (2011-12-14) + * Response.iter_lines! + +------------------------------------------------------------------- +Sun Dec 11 20:45:14 UTC 2011 - jfunk(a)funktronics.ca + +- Update to 0.8.4: + * Prefetch bugfix. + * Added license to installed version. + +------------------------------------------------------------------- +Sun Nov 27 20:38:47 UTC 2011 - jfunk(a)funktronics.ca + +- Update to 0.8.3 + * Converted auth system to use simpler callable objects. + * New session parameter to API methods. + * Display full URL while logging. + +------------------------------------------------------------------- +Sun Nov 27 08:54:32 UTC 2011 - jfunk(a)funktronics.ca + +- Update to 0.8.2 + * New unicode decoding system, based on overridable Response.encoding. + * Proper URL slash-quote handling. + * Cookies with [, ], and _ allowed. +- 0.8.1 (2011-11-15) + * URL Request path fix + * Proxy fix. + * Timeouts fix. +- 0.8.0 (2011-11-13) + * Keep-alive support! + * Complete removal of Urllib2 + * Complete removal of Poster + * Complete removal of CookieJars + * New ConnectionError raising + * Safe_mode for error catching + * prefetch parameter for request methods + * OPTION method + * Async pool size throttling + * File uploads send real names +- 0.7.6 (2011-11-07) + * Digest authentication bugfix (attach query data to path) +- 0.7.5 (2011-11-04) + * Response.content = None if there was an invalid repsonse. + * Redirection auth handling. +- 0.7.4 (2011-10-26) + * Sesion Hooks fix. +- 0.7.3 (2011-10-23) + * Digest Auth fix. +- 0.7.2 (2011-10-23) + * PATCH Fix. +- 0.7.1 (2011-10-23) + * Move away from urllib2 authentication handling. + * Fully Remove AuthManager, AuthObject, &c. + * New tuple-based auth system with handler callbacks. +- 0.7.0 (2011-10-22) + * Sessions are now the primary interface. + * Deprecated InvalidMethodException. + * PATCH fix. + * New config system (no more global settings). +- 0.6.6 (2011-10-19) + * Session parameter bugfix (params merging). +- 0.6.5 (2011-10-18) + * Offline (fast) test suite. + * Session dictionary argument merging. +- 0.6.4 (2011-10-13) + * Automatic decoding of unicode, based on HTTP Headers. + * New decode_unicode setting. + * Removal of r.read/close methods. + * New r.faw interface for advanced response usage.* + * Automatic expansion of parameterized headers. +- 0.6.3 (2011-10-13) + * Beautiful requests.async module, for making async requests w/ gevent. +- 0.6.2 (2011-10-09) + * GET/HEAD obeys allow_redirects=False. + +------------------------------------------------------------------- +Fri Sep 23 12:08:32 UTC 2011 - saschpe(a)suse.de + +- Update to version 0.6.1: + * Enhanced status codes experience ``\o/`` + * Set a maximum number of redirects (``settings.max_redirects``) + * Full Unicode URL support + * Support for protocol-less redirects. + * Allow for arbitrary request types. + * Bugfixes +- Changes from version 0.6.0: + * New callback hook system + * New persistient sessions object and context manager + * Transparent Dict-cookie handling + * Status code reference object + * Removed Response.cached + * Added Response.request + * All args are kwargs + * Relative redirect support ++++ 26 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.python-requests.new/python-requests.changes New: ---- python-requests.changes python-requests.spec requests-0.10.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-requests.spec ++++++ # # spec file for package python-requests # # Copyright (c) 2011 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/ # Name: python-requests Version: 0.10.8 Release: 0 Url: http://python-requests.org Summary: Awesome Python HTTP Library That's Actually Usable License: ISC Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python BuildRequires: python-devel Requires: python Requires: python-certifi %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Requests is an ISC Licensed HTTP library, written in Python, for human beings. Most existing Python modules for sending HTTP requests are extremely verbose and cumbersome. Python's builtin urllib2 module provides most of the HTTP capabilities you should need, but the api is thoroughly broken. It requires an enormous amount of work (even method overrides) to perform the simplest of tasks. Features: - Extremely simple GET, HEAD, POST, PUT, DELETE Requests + Simple HTTP Header Request Attachment + Simple Data/Params Request Attachment + Simple Multipart File Uploads + CookieJar Support + Redirection History + Redirection Recursion Urllib Fix + Auto Decompression of GZipped Content + Unicode URL Support - Simple Authentication + Simple URL + HTTP Auth Registry %prep %setup -q -n requests-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root) %doc README.rst HISTORY.rst LICENSE NOTICE %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-odict for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-odict for openSUSE:Factory checked in at 2012-03-16 13:23:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-odict (Old) and /work/SRC/openSUSE:Factory/.python-odict.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-odict", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-odict.new/python-odict.changes 2012-03-16 13:23:23.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Mar 12 08:47:21 UTC 2012 - saschpe(a)suse.de + +- Initial version + New: ---- odict-1.4.4.tar.gz python-odict.changes python-odict.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-odict.spec ++++++ # # spec file for package python-odict # # Copyright (c) 2012 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/ # Name: python-odict Version: 1.4.4 Release: 0 Url: https://github.com/bluedynamics/odict Summary: Ordered dictionary License: BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/o/odict/odict-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute #BuildRequires: python-interlude %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Dictionary in which the *insertion* order of items is preserved (using an internal double linked list). In this implementation replacing an existing item keeps it at its original position. Internal representation: values of the dict:: [pred_key, val, succ_key] The sequence of elements uses as a double linked list. The ``links`` are dict keys. ``self.lh`` and ``self.lt`` are the keys of first and last element inseted in the odict. In a C reimplementation of this data structure, things can be simplified (and speed up) a lot if given a value you can at the same time find its key. With that, you can use normal C pointers. %prep %setup -q -n odict-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} #%%check #python setup.py test %files %defattr(-,root,root,-) %doc LICENSE.rst README.rst %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-django-piston for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-django-piston for openSUSE:Factory checked in at 2012-03-16 13:22:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-piston (Old) and /work/SRC/openSUSE:Factory/.python-django-piston.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-piston", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-piston.new/python-django-piston.changes 2012-03-16 13:22:57.000000000 +0100 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Fri Jan 6 09:17:39 UTC 2012 - mcihar(a)suse.cz + +- add django-piston-9d71eda5395f.diff to fix Django admin interface + see https://bitbucket.org/jespern/django-piston/issue/173/ + +------------------------------------------------------------------- +Tue Nov 1 17:24:53 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 0.2.3: + - Sorry, no changelog atm. + +------------------------------------------------------------------- +Thu Jan 7 15:58:03 UTC 2010 - alexandre(a)exatati.com.br + +- Initial package (0.2.2) for openSUSE. New: ---- django-piston-0.2.3.tar.bz2 django-piston-9d71eda5395f.diff python-django-piston.changes python-django-piston.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-piston.spec ++++++ # # spec file for package python-django-piston # # Copyright (c) 2011 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/ # %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-django-piston Version: 0.2.3 Release: 0 Url: http://bitbucket.org/jespern/django-piston Summary: Piston is a Django mini-framework creating APIs License: BSD Group: Development/Languages/Python Source: django-piston-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute Requires: python-django %if 0%{?suse_version} %py_requires %if 0%{?suse_version} > 1110 BuildArch: noarch %endif %endif Patch1: django-piston-9d71eda5395f.diff %description A mini-framework for Django for creating RESTful APIs. %prep %setup -q -n django-piston-%{version} %patch1 -p1 %build CFLAGS="%{optflags}" python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %{python_sitelib}/* %changelog ++++++ django-piston-9d71eda5395f.diff ++++++ # HG changeset patch # User dfdeshom <dfdeshom(a)gmail.com> # Date 1297985830 21600 # Node ID 9d71eda5395f2374fd656f7e5f549dd0490696db # Parent c4b2d21db51a531b069dd7f0d7fc10996c9c70c8 remove option to make it possible to install using pip. See #173 diff -r c4b2d21db51a531b069dd7f0d7fc10996c9c70c8 -r 9d71eda5395f2374fd656f7e5f549dd0490696db setup.py --- a/setup.py Thu Sep 02 16:23:38 2010 +1000 +++ b/setup.py Thu Feb 17 17:37:10 2011 -0600 @@ -20,7 +20,6 @@ author = 'Jesper Noehr', author_email = 'jesper(a)noehr.org', packages = find_packages(), - namespace_packages = ['piston'], include_package_data = True, zip_safe = False, classifiers = [ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-django-guardian for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-django-guardian for openSUSE:Factory checked in at 2012-03-16 13:22:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-guardian (Old) and /work/SRC/openSUSE:Factory/.python-django-guardian.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-guardian", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-guardian/python-django-guardian.changes 2012-02-16 10:09:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-guardian.new/python-django-guardian.changes 2012-03-16 13:22:45.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 12 14:55:35 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 1.0.4: + * Added accept_global_perms flag for decorators + * Added missing *fieldset* closing tag at template + * Fixed misleading comments at docstrings + * Fixed broken grappelli tests + * Fixed issue disallowing creation of RPM package + * Started using tox for tests + * Expanded orphaned object permissions documentation + * Expanded configuration settings documentation + +------------------------------------------------------------------- Old: ---- django-guardian-1.0.3.tar.bz2 New: ---- django-guardian-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-guardian.spec ++++++ --- /var/tmp/diff_new_pack.HnD8Pk/_old 2012-03-16 13:22:46.000000000 +0100 +++ /var/tmp/diff_new_pack.HnD8Pk/_new 2012-03-16 13:22:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-django-guardian # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -19,7 +19,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-django-guardian -Version: 1.0.3 +Version: 1.0.4 Release: 0 Url: http://github.com/lukaszb/django-guardian Summary: Implementation of per object permissions for Django 1.2 ++++++ django-guardian-1.0.3.tar.bz2 -> django-guardian-1.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/CHANGES new/django-guardian-1.0.4/CHANGES --- old/django-guardian-1.0.3/CHANGES 2011-07-25 11:53:27.000000000 +0200 +++ new/django-guardian-1.0.4/CHANGES 2012-03-12 13:45:12.000000000 +0100 @@ -1,5 +1,17 @@ +Release 1.0.4 (Mar 12, 2012) +============================ + +* Added ``accept_global_perms`` flag for decorators +* Added missing *fieldset* closing tag at template +* Fixed misleading comments at docstrings +* Fixed broken grappelli tests +* Fixed issue disallowing creation of RPM package +* Started using tox for tests +* Expanded orphaned object permissions documentation +* Expanded configuration settings documentation + Release 1.0.3 (Jul 25, 2011) -================================== +============================ * added ``get_objects_for_group`` shortcut (thanks to Rafael Ponieman) * added ``user_can_access_owned_objects_only`` flag to ``GuardedModelAdmin`` @@ -8,7 +20,7 @@ * included ADC theme for documentation Release 1.0.2 (Apr 12, 2011) -================================== +============================ * ``get_users_with_perms`` now accepts ``with_group_users`` flag * Fixed ``group_id`` issue at admin templates @@ -17,14 +29,14 @@ Release 1.0.1 (Mar 25, 2011) -================================== +============================ * ``get_users_with_perms`` now accepts ``with_superusers`` flag * Small fix for documentation building process Release 1.0.0 (Jan 27, 2011) -================================== +============================ * A final v1.0 release! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/PKG-INFO new/django-guardian-1.0.4/PKG-INFO --- old/django-guardian-1.0.3/PKG-INFO 2011-07-25 11:57:51.000000000 +0200 +++ new/django-guardian-1.0.4/PKG-INFO 2012-03-12 13:45:45.000000000 +0100 @@ -1,9 +1,7 @@ Metadata-Version: 1.0 Name: django-guardian -Version: 1.0.3 -Summary: -Implementation of per object permissions for Django 1.2. - +Version: 1.0.4 +Summary: Implementation of per object permissions for Django 1.2 or later. Home-page: http://github.com/lukaszb/django-guardian Author: Lukasz Balcerzak Author-email: lukaszbalcerzak(a)gmail.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/django_guardian.egg-info/PKG-INFO new/django-guardian-1.0.4/django_guardian.egg-info/PKG-INFO --- old/django-guardian-1.0.3/django_guardian.egg-info/PKG-INFO 2011-07-25 11:57:50.000000000 +0200 +++ new/django-guardian-1.0.4/django_guardian.egg-info/PKG-INFO 2012-03-12 13:45:43.000000000 +0100 @@ -1,9 +1,7 @@ Metadata-Version: 1.0 Name: django-guardian -Version: 1.0.3 -Summary: -Implementation of per object permissions for Django 1.2. - +Version: 1.0.4 +Summary: Implementation of per object permissions for Django 1.2 or later. Home-page: http://github.com/lukaszb/django-guardian Author: Lukasz Balcerzak Author-email: lukaszbalcerzak(a)gmail.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/django_guardian.egg-info/SOURCES.txt new/django-guardian-1.0.4/django_guardian.egg-info/SOURCES.txt --- old/django-guardian-1.0.3/django_guardian.egg-info/SOURCES.txt 2011-07-25 11:57:50.000000000 +0200 +++ new/django-guardian-1.0.4/django_guardian.egg-info/SOURCES.txt 2012-03-12 13:45:45.000000000 +0100 @@ -37,6 +37,7 @@ docs/develop/changes.rst docs/develop/example_project.rst docs/develop/index.rst +docs/develop/supported-versions.rst docs/develop/testing.rst docs/theme/ADCtheme/LICENSE docs/theme/ADCtheme/layout.html @@ -90,6 +91,7 @@ guardian/templates/admin/guardian/contrib/grappelli/obj_perms_manage.html guardian/templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html guardian/templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html +guardian/templates/admin/guardian/model/action_add_obj_perms.html guardian/templates/admin/guardian/model/change_form.html guardian/templates/admin/guardian/model/field.html guardian/templates/admin/guardian/model/obj_perms_manage.html @@ -99,6 +101,7 @@ guardian/templatetags/guardian_tags.py guardian/tests/__init__.py guardian/tests/admin_test.py +guardian/tests/conf_test.py guardian/tests/core_test.py guardian/tests/custompkmodel_test.py guardian/tests/decorators_test.py @@ -110,4 +113,5 @@ guardian/tests/urls.py guardian/tests/utils_test.py guardian/tests/templates/404.html -guardian/tests/templates/500.html \ No newline at end of file +guardian/tests/templates/500.html +guardian/tests/templates/dummy403.html \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/docs/api/guardian.decorators.rst new/django-guardian-1.0.4/docs/api/guardian.decorators.rst --- old/django-guardian-1.0.3/docs/api/guardian.decorators.rst 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/docs/api/guardian.decorators.rst 2011-11-16 15:10:19.000000000 +0100 @@ -6,12 +6,16 @@ .. automodule:: guardian.decorators +.. _api-decorators-permission_required: + permission_required ------------------- .. autofunction:: guardian.decorators.permission_required +.. _api-decorators-permission_required_or_403: + permission_required_or_403 -------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/docs/configuration.rst new/django-guardian-1.0.4/docs/configuration.rst --- old/django-guardian-1.0.3/docs/configuration.rst 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/docs/configuration.rst 2011-11-19 23:18:18.000000000 +0100 @@ -32,3 +32,59 @@ We can change id to whatever we like. Project should be now ready to use object permissions. + +Optional settings +================= + +In addition to requried ``ANONYMOUS_USER_ID`` setting, guardian has following, +optional configuration variables: + + +.. setting:: GUARDIAN_RAISE_403 + +GUARDIAN_RAISE_403 +------------------ + +.. versionadded:: 1.0.4 + +If set to ``True``, guardian would raise +``django.core.exceptions.PermissionDenied`` error instead of returning empty +``django.http.HttpResponseForbidden``. + +.. warning:: + + Remember that you cannot use both :setting:`GUARDIAN_RENDER_403` **AND** + :setting:`GUARDIAN_RAISE_403` - if both are set to ``True``, + ``django.core.exceptions.ImproperlyConfigured`` would be raised. + + + +.. setting:: GUARDIAN_RENDER_403 + +GUARDIAN_RENDER_403 +------------------- + +.. versionadded:: 1.0.4 + +If set to ``True``, guardian would try to render 403 response rather than +return contentless ``django.http.HttpResponseForbidden``. Would use template +pointed by :setting:`GUARDIAN_TEMPLATE_403` to do that. Default is ``False``. + +.. warning:: + + Remember that you cannot use both :setting:`GUARDIAN_RENDER_403` **AND** + :setting:`GUARDIAN_RAISE_403` - if both are set to ``True``, + ``django.core.exceptions.ImproperlyConfigured`` would be raised. + + +.. setting:: GUARDIAN_TEMPLATE_403 + +GUARDIAN_TEMPLATE_403 +--------------------- + +.. versionadded:: 1.0.4 + +Tells parts of guardian what template to use for responses with status code +``403`` (i.e. :ref:`api-decorators-permission_required`). Defaults to +``403.html``. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/docs/develop/index.rst new/django-guardian-1.0.4/docs/develop/index.rst --- old/django-guardian-1.0.3/docs/develop/index.rst 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/docs/develop/index.rst 2011-11-19 22:28:06.000000000 +0100 @@ -7,5 +7,6 @@ example_project testing + supported-versions changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/docs/develop/supported-versions.rst new/django-guardian-1.0.4/docs/develop/supported-versions.rst --- old/django-guardian-1.0.3/docs/develop/supported-versions.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/django-guardian-1.0.4/docs/develop/supported-versions.rst 2011-11-19 23:27:12.000000000 +0100 @@ -0,0 +1,19 @@ +.. _supported-versions: + +Supported versions +================== + +``django-guardian`` supports Python 2.6/2.7 and Django 1.2+. Also, we support +``django-grappelli`` 2.3.5. + +Rules +----- + +1. We would support both Python 2.7 and Python 2.6 (until Django drops support + for 2.6, if ever). +2. We would support **two latest Django stable versions**. In example: once + Django 1.4 would become final, we are dropping support for Django 1.2 as + two last stable versions would be 1.3 and 1.4. +3. Support for ``django-grappelli`` is somewhat experimental. Nevertheless, + our intention is **to support django-grappelli last stable version**. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/docs/develop/testing.rst new/django-guardian-1.0.4/docs/develop/testing.rst --- old/django-guardian-1.0.3/docs/develop/testing.rst 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/docs/develop/testing.rst 2011-11-19 22:29:42.000000000 +0100 @@ -17,6 +17,10 @@ Having this on mind we tried to build small set of necessary functions and created a lot of testing scenarios. Neverteless, if anyone would found a bug in this application, please take a minute and file it at `issue-tracker`_. +Moreover, if someone would spot a *security hole* (a bug that might affect +security of systems that use ``django-guardian`` as permission management +library), please **DO NOT** create a public issue but contact me directly +(lukaszbalcerzak(a)gmail.com). Running tests ------------- @@ -71,7 +75,26 @@ ------------------------------------------------------------------- TOTAL 231 231 100% +Tox +--- + +.. versionadded:: 1.0.4 + +We also started using tox_ to ensure ``django-guardian``'s tests would pass on +all supported Python and Django versions (see :ref:`supported-versions`). To +use it, simply install ``tox``:: + + pip install tox + +and run it within ``django-guardian`` checkout directory:: + + tox + +First time should take some time (it needs to create separate virtual +environments and pull dependencies) but would ensure everything is fine. + + .. _owasp: http://www.owasp.org/ .. _issue-tracker: http://github.com/lukaszb/django-guardian .. _coverage: http://nedbatchelder.com/code/coverage/ - +.. _tox: http://pypi.python.org/pypi/tox Files old/django-guardian-1.0.3/docs/exts.pyc and new/django-guardian-1.0.4/docs/exts.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/docs/theme/ADCtheme/static/adctheme.css new/django-guardian-1.0.4/docs/theme/ADCtheme/static/adctheme.css --- old/django-guardian-1.0.3/docs/theme/ADCtheme/static/adctheme.css 2011-07-25 11:00:47.000000000 +0200 +++ new/django-guardian-1.0.4/docs/theme/ADCtheme/static/adctheme.css 2011-11-16 15:09:08.000000000 +0100 @@ -391,9 +391,7 @@ table.docutils { border-collapse: collapse; - border-top: 1px solid #919699; - border-left: 1px solid #919699; - border-right: 1px solid #919699; + border: 1px solid #919699; font-size:12px; padding:8px; text-align:left; @@ -754,4 +752,4 @@ } li p { margin-top:8px; -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/docs/userguide/caveats.rst new/django-guardian-1.0.4/docs/userguide/caveats.rst --- old/django-guardian-1.0.3/docs/userguide/caveats.rst 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/docs/userguide/caveats.rst 2011-10-10 10:34:42.000000000 +0200 @@ -20,11 +20,11 @@ another user creates account with *joe* as username. The problem is that if we haven't removed object permissions explicitly in the process of first *joe* account removal, *jane* still has read permissions for *joe's* configuration -file - but this is another user. +file - but this is another user. There is no easy way to deal with orphaned permissions as they are not foreign keyed with objects directly. Even if they would, there are some database engines -- or *ON DELETE* rules - which restricts removal of related objects. +- or *ON DELETE* rules - which restricts removal of related objects. .. important:: @@ -34,10 +34,46 @@ Guardian comes with utility function which tries to help to remove orphaned object permissions. Remember - those are only helpers. Applications should -remove those object permissions explicitly. +remove those object permissions explicitly by itself. + +Taking our previous example, our application should remove user object for +*joe*, however, permisions for *joe* user assigned to *jane* would **NOT** +be removed. In this case, it would be very easy to remove user/group object +permissions if we connect proper action with proper signal. This could be +achieved by following snippet:: + + from django.contrib.auth.models import User + from django.contrib.contenttypes.models import ContentType + from django.db.models import Q + from django.db.models.signals import pre_delete + from guardian.models import UserObjectPermission + from guardian.models import GroupObjectPermission + + + def remove_obj_perms_connected_with_user(sender, instance, **kwargs): + filters = Q(content_type=ContentType.objects.get_for_model(instance), + object_pk=instance.pk) + UserObjectPermission.objects.filter(filters).delete() + GroupObjectPermission.objects.filter(filters).delete() + + pre_delete.connect(remove_obj_perms_connected_with_user, sender=User) + + +This signal handler would remove all object permissions connected with user +just before user is actually removed. + +If we forgot to add such handlers, we may still remove orphaned object +permissions by using :command:`clean_orphan_obj_perms` command. If our +application uses celery_, it is also very easy to remove orphaned permissions +periodically with :func:`guardian.utils.clean_orphan_obj_perms` function. +We would still **strongly** advise to remove orphaned object permissions +explicitly (i.e. at view that confirms object removal or using signals as +described above). .. seealso:: - :func:`guardian.utils.clean_orphan_obj_perms` - :command:`clean_orphan_obj_perms` +.. _celery: http://www.celeryproject.org/ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/__init__.py new/django-guardian-1.0.4/guardian/__init__.py --- old/django-guardian-1.0.3/guardian/__init__.py 2011-07-25 11:52:07.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/__init__.py 2012-03-12 13:38:54.000000000 +0100 @@ -1,7 +1,7 @@ """ -Implementation of per object permissions for Django 1.2. +Implementation of per object permissions for Django 1.2 or later. """ -VERSION = (1, 0, 3) +VERSION = (1, 0, 4) __version__ = '.'.join((str(each) for each in VERSION[:4])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/admin.py new/django-guardian-1.0.4/guardian/admin.py --- old/django-guardian-1.0.3/guardian/admin.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/admin.py 2011-12-02 16:52:39.000000000 +0100 @@ -151,6 +151,7 @@ related content. """ context = { + 'adminform': {'model_admin': self}, 'object': obj, 'app_label': self.model._meta.app_label, 'opts': self.model._meta, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/backends.py new/django-guardian-1.0.4/guardian/backends.py --- old/django-guardian-1.0.3/guardian/backends.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/backends.py 2012-01-27 17:16:14.000000000 +0100 @@ -46,7 +46,7 @@ user_obj = User.objects.get(pk=settings.ANONYMOUS_USER_ID) # Do not check any further if user is not active - if user_obj.is_active is not True: + if not user_obj.is_active: return False if len(perm.split('.')) > 1: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/conf/settings.py new/django-guardian-1.0.4/guardian/conf/settings.py --- old/django-guardian-1.0.3/guardian/conf/settings.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/conf/settings.py 2011-10-02 00:14:36.000000000 +0200 @@ -7,3 +7,14 @@ "ObjectPermissionBackend authorization backend you have to configure " "ANONYMOUS_USER_ID at your settings module") +RENDER_403 = getattr(settings, 'GUARDIAN_RENDER_403', False) +TEMPLATE_403 = getattr(settings, 'GUARDIAN_TEMPLATE_403', '403.html') +RAISE_403 = getattr(settings, 'GUARDIAN_RAISE_403', False) + +def check_configuration(): + if RENDER_403 and RAISE_403: + raise ImproperlyConfigured("Cannot use both GUARDIAN_RENDER_403 AND " + "GUARDIAN_RAISE_403 - only one of this config may be True") + +check_configuration() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/decorators.py new/django-guardian-1.0.4/guardian/decorators.py --- old/django-guardian-1.0.3/guardian/decorators.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/decorators.py 2012-01-27 17:16:14.000000000 +0100 @@ -1,16 +1,18 @@ - from django.conf import settings from django.contrib.auth import REDIRECT_FIELD_NAME +from django.core.exceptions import PermissionDenied from django.http import HttpResponseForbidden, HttpResponseRedirect from django.utils.functional import wraps from django.utils.http import urlquote from django.db.models import Model, get_model from django.db.models.base import ModelBase from django.db.models.query import QuerySet -from django.shortcuts import get_object_or_404 - +from django.shortcuts import get_object_or_404, render_to_response +from django.template import RequestContext, TemplateDoesNotExist +from guardian.conf import settings as guardian_settings from guardian.exceptions import GuardianError + def permission_required(perm, lookup_variables=None, **kwargs): """ Decorator for views that checks whether a user has a particular permission @@ -26,7 +28,14 @@ Defaults to ``django.contrib.auth.REDIRECT_FIELD_NAME``. :param return_403: if set to ``True`` then instead of redirecting to the login page, response with status code 403 is returned ( - ``django.http.HttpResponseForbidden`` instance). Defaults to ``False``. + ``django.http.HttpResponseForbidden`` instance or rendered template - + see :setting:`GUARDIAN_RENDER_403`). Defaults to ``False``. + :param accept_global_perms: if set to ``True``, then *object level + permission* would be required **only if user does NOT have global + permission** for target *model*. If turned on, makes this decorator + like an extension over standard + ``django.contrib.admin.decorators.permission_required`` as it would + check for global permissions first. Defaults to ``False``. Examples:: @@ -50,6 +59,7 @@ login_url = kwargs.pop('login_url', settings.LOGIN_URL) redirect_field_name = kwargs.pop('redirect_field_name', REDIRECT_FIELD_NAME) return_403 = kwargs.pop('return_403', False) + accept_global_perms = kwargs.pop('accept_global_perms', False) # Check if perm is given as string in order not to decorate # view function itself which makes debugging harder @@ -92,8 +102,21 @@ # Handles both original and with object provided permission check # as ``obj`` defaults to None - if not request.user.has_perm(perm, obj): + has_perm = accept_global_perms and request.user.has_perm(perm) + if not has_perm and not request.user.has_perm(perm, obj): if return_403: + if guardian_settings.RENDER_403: + try: + response = render_to_response( + guardian_settings.TEMPLATE_403, {}, + RequestContext(request)) + response.status_code = 403 + return response + except TemplateDoesNotExist, e: + if settings.DEBUG: + raise e + elif guardian_settings.RAISE_403: + raise PermissionDenied return HttpResponseForbidden() else: path = urlquote(request.get_full_path()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/fixtures/tests.json new/django-guardian-1.0.4/guardian/fixtures/tests.json --- old/django-guardian-1.0.3/guardian/fixtures/tests.json 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/fixtures/tests.json 2012-03-12 13:15:11.000000000 +0100 @@ -1,5 +1,21 @@ [ { + "pk": 1, + "model": "auth.group", + "fields": { + "name": "admins", + "permissions": [] + } + }, + { + "pk": 2, + "model": "auth.group", + "fields": { + "name": "jackGroup", + "permissions": [] + } + }, + { "pk": -1, "model": "auth.user", "fields": { @@ -34,21 +50,5 @@ "email": "", "date_joined": "2010-05-28 04:02:34" } - }, - { - "pk": 1, - "model": "auth.group", - "fields": { - "name": "admins", - "permissions": [] - } - }, - { - "pk": 2, - "model": "auth.group", - "fields": { - "name": "jackGroup", - "permissions": [] - } } ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/shortcuts.py new/django-guardian-1.0.4/guardian/shortcuts.py --- old/django-guardian-1.0.3/guardian/shortcuts.py 2011-07-25 11:41:17.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/shortcuts.py 2012-03-12 13:15:11.000000000 +0100 @@ -246,7 +246,7 @@ groups[group] = get_perms(group, obj) return groups -def get_objects_for_user(user, perms, klass=None, use_groups=True): +def get_objects_for_user(user, perms, klass=None, use_groups=True, any_perm=False): """ Returns queryset of objects for which a given ``user`` has *all* permissions present at ``perms``. @@ -262,6 +262,7 @@ this parameter would be computed based on given ``params``. :param use_groups: if ``False``, wouldn't check user's groups object permissions. Default is ``True``. + :param any_perm: if True, any of permission in sequence is accepted :raises MixedContentTypeError: when computed content type for ``perms`` and/or ``klass`` clashes. @@ -282,8 +283,10 @@ The permission string can also be an iterable. Continuing with the previous example: - >>> get_objects_for_user(joe, ['auth.change_group', 'auth.delete_group'], 'auth.delete_group']) + >>> get_objects_for_user(joe, ['auth.change_group', 'auth.delete_group']) [] + >>> get_objects_for_user(joe, ['auth.change_group', 'auth.delete_group'], any_perm=True) + [<Group some group>] >>> assign('auth.delete_group', joe, group) >>> get_objects_for_user(joe, ['auth.change_group', 'auth.delete_group']) [<Group some group>] @@ -357,7 +360,7 @@ pk_list = [] for pk, group in groupby(data, keyfunc): obj_codenames = set((e[1] for e in group)) - if codenames.issubset(obj_codenames): + if any_perm or codenames.issubset(obj_codenames): pk_list.append(pk) objects = queryset.filter(pk__in=pk_list) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/templates/admin/guardian/model/action_add_obj_perms.html new/django-guardian-1.0.4/guardian/templates/admin/guardian/model/action_add_obj_perms.html --- old/django-guardian-1.0.3/guardian/templates/admin/guardian/model/action_add_obj_perms.html 1970-01-01 01:00:00.000000000 +0100 +++ new/django-guardian-1.0.4/guardian/templates/admin/guardian/model/action_add_obj_perms.html 2011-11-20 00:49:10.000000000 +0100 @@ -0,0 +1,17 @@ +{% extends "admin/change_form.html" %} + +{% block extrahead %}{{ block.super }} +{{ form.media }} +{% endblock %} + +{% block content %} + +<div id="content-main"> + +<form action="." method="post"> + {% csrf_token %} + {{ form }} +</form> +</div> + +{% endblock %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/templates/admin/guardian/model/obj_perms_manage.html new/django-guardian-1.0.4/guardian/templates/admin/guardian/model/obj_perms_manage.html --- old/django-guardian-1.0.3/guardian/templates/admin/guardian/model/obj_perms_manage.html 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/templates/admin/guardian/model/obj_perms_manage.html 2012-03-12 13:17:08.000000000 +0100 @@ -125,6 +125,7 @@ <div> <input name="submit_manage_group" type="submit" value="{% trans "Manage group" %}"/> </div> + </fieldset> </form> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/templatetags/guardian_tags.py new/django-guardian-1.0.4/guardian/templatetags/guardian_tags.py --- old/django-guardian-1.0.3/guardian/templatetags/guardian_tags.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/templatetags/guardian_tags.py 2011-10-02 00:14:36.000000000 +0200 @@ -60,6 +60,10 @@ <a href="/pages/delete?target={{ flatpage.url }}">Remove page</a> {% endif %} + .. note:: + Please remember that superusers would always get full list of permissions + for a given object. + """ bits = token.split_contents() format = '{% get_obj_perms user/group for obj as "context_var" %}' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/tests/__init__.py new/django-guardian-1.0.4/guardian/tests/__init__.py --- old/django-guardian-1.0.3/guardian/tests/__init__.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/tests/__init__.py 2011-10-10 10:39:53.000000000 +0200 @@ -1,4 +1,5 @@ from admin_test import * +from conf_test import * from core_test import * from custompkmodel_test import * from decorators_test import * @@ -8,4 +9,3 @@ from utils_test import * from shortcuts_test import * from tags_test import * - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/tests/admin_test.py new/django-guardian-1.0.4/guardian/tests/admin_test.py --- old/django-guardian-1.0.3/guardian/tests/admin_test.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/tests/admin_test.py 2012-01-27 17:16:14.000000000 +0100 @@ -347,12 +347,13 @@ request = HttpRequest() request.user = joe qs = gma.queryset(request) - self.assertItemsEqual([e.pk for e in qs], [joe_entry.pk, jane_entry.pk]) + self.assertEqual(sorted([e.pk for e in qs]), + sorted([joe_entry.pk, jane_entry.pk])) class GrappelliGuardedModelAdminTests(TestCase): - org_settings = copy.copy(settings) + org_installed_apps = copy.copy(settings.INSTALLED_APPS) def _get_gma(self, attrs=None, name=None, model=None): """ @@ -369,7 +370,7 @@ settings.INSTALLED_APPS = ['grappelli'] + list(settings.INSTALLED_APPS) def tearDown(self): - globals()['settings'] = copy.copy(self.org_settings) + settings.INSTALLED_APPS = self.org_installed_apps def test_get_obj_perms_manage_template(self): gma = self._get_gma() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/tests/conf_test.py new/django-guardian-1.0.4/guardian/tests/conf_test.py --- old/django-guardian-1.0.3/guardian/tests/conf_test.py 1970-01-01 01:00:00.000000000 +0100 +++ new/django-guardian-1.0.4/guardian/tests/conf_test.py 2011-10-02 00:14:36.000000000 +0200 @@ -0,0 +1,15 @@ +import mock +from django.core.exceptions import ImproperlyConfigured +from django.test import TestCase +from guardian.conf import settings as guardian_settings + + +class TestConfiguration(TestCase): + + def test_check_configuration(self): + + with mock.patch('guardian.conf.settings.RENDER_403', True): + with mock.patch('guardian.conf.settings.RAISE_403', True): + self.assertRaises(ImproperlyConfigured, + guardian_settings.check_configuration) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/tests/decorators_test.py new/django-guardian-1.0.4/guardian/tests/decorators_test.py --- old/django-guardian-1.0.3/guardian/tests/decorators_test.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/tests/decorators_test.py 2012-01-27 17:16:14.000000000 +0100 @@ -1,11 +1,14 @@ +import mock from django.test import TestCase +from django.conf import settings from django.contrib.auth.models import User, Group, AnonymousUser +from django.core.exceptions import PermissionDenied from django.http import HttpRequest from django.http import HttpResponse from django.http import HttpResponseForbidden from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 - +from django.template import TemplateDoesNotExist from guardian.decorators import permission_required, permission_required_or_403 from guardian.exceptions import GuardianError from guardian.shortcuts import assign @@ -17,8 +20,8 @@ def setUp(self): self.anon = AnonymousUser() - self.user = User.objects.get(username='jack') - self.group = Group.objects.get(name='jackGroup') + self.user = User.objects.get_or_create(username='jack')[0] + self.group = Group.objects.get_or_create(name='jackGroup')[0] def _get_request(self, user=None): if user is None: @@ -39,6 +42,68 @@ self.fail("Trying to decorate using permission_required without " "permission as first argument should raise exception") + def test_RENDER_403_is_false(self): + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + + with mock.patch('guardian.conf.settings.RENDER_403', False): + response = dummy_view(request) + self.assertEqual(response.content, '') + self.assertTrue(isinstance(response, HttpResponseForbidden)) + + @mock.patch('guardian.conf.settings.RENDER_403', True) + def test_TEMPLATE_403_setting(self): + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + + with mock.patch('guardian.conf.settings.TEMPLATE_403', 'dummy403.html'): + response = dummy_view(request) + self.assertEqual(response.content, 'foobar403\n') + + @mock.patch('guardian.conf.settings.RENDER_403', True) + def test_403_response_is_empty_if_template_cannot_be_found(self): + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + with mock.patch('guardian.conf.settings.TEMPLATE_403', + '_non-exisitng-403.html'): + response = dummy_view(request) + self.assertEqual(response.status_code, 403) + self.assertEqual(response.content, '') + + @mock.patch('guardian.conf.settings.RENDER_403', True) + def test_403_response_raises_error_if_debug_is_turned_on(self): + org_DEBUG = settings.DEBUG + settings.DEBUG = True + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + with mock.patch('guardian.conf.settings.TEMPLATE_403', + '_non-exisitng-403.html'): + self.assertRaises(TemplateDoesNotExist, dummy_view, request) + settings.DEBUG = org_DEBUG + + @mock.patch('guardian.conf.settings.RENDER_403', False) + @mock.patch('guardian.conf.settings.RAISE_403', True) + def test_RAISE_403_setting_is_true(self): + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + + self.assertRaises(PermissionDenied, dummy_view, request) + def test_anonymous_user_wrong_app(self): request = self._get_request(self.anon) @@ -46,7 +111,7 @@ @permission_required_or_403('not_installed_app.change_user') def dummy_view(request): return HttpResponse('dummy_view') - self.assertTrue(isinstance(dummy_view(request), HttpResponseForbidden)) + self.assertEqual(dummy_view(request).status_code, 403) def test_anonymous_user_wrong_codename(self): @@ -55,7 +120,7 @@ @permission_required_or_403('auth.wrong_codename') def dummy_view(request): return HttpResponse('dummy_view') - self.assertTrue(isinstance(dummy_view(request), HttpResponseForbidden)) + self.assertEqual(dummy_view(request).status_code, 403) def test_anonymous_user(self): @@ -64,7 +129,7 @@ @permission_required_or_403('auth.change_user') def dummy_view(request): return HttpResponse('dummy_view') - self.assertTrue(isinstance(dummy_view(request), HttpResponseForbidden)) + self.assertEqual(dummy_view(request).status_code, 403) def test_wrong_lookup_variables_number(self): @@ -104,6 +169,92 @@ else: self.fail("Wrong arguments given but GuardianError not raised") + def test_user_has_no_access(self): + + request = self._get_request() + + @permission_required_or_403('auth.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + self.assertEqual(dummy_view(request).status_code, 403) + + def test_user_has_access(self): + + perm = 'auth.change_user' + joe, created = User.objects.get_or_create(username='joe') + assign(perm, self.user, obj=joe) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + 'auth.User', 'username', 'username')) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, 'dummy_view') + + def test_user_has_obj_access_even_if_we_also_check_for_global(self): + + perm = 'auth.change_user' + joe, created = User.objects.get_or_create(username='joe') + assign(perm, self.user, obj=joe) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + 'auth.User', 'username', 'username'), accept_global_perms=True) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, 'dummy_view') + + def test_user_has_no_obj_perm_access(self): + + perm = 'auth.change_user' + joe, created = User.objects.get_or_create(username='joe') + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + 'auth.User', 'username', 'username')) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 403) + + def test_user_has_global_perm_access_but_flag_not_set(self): + + perm = 'auth.change_user' + joe, created = User.objects.get_or_create(username='joe') + assign(perm, self.user) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + 'auth.User', 'username', 'username')) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 403) + + def test_user_has_global_perm_access(self): + + perm = 'auth.change_user' + joe, created = User.objects.get_or_create(username='joe') + assign(perm, self.user) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + 'auth.User', 'username', 'username'), accept_global_perms=True) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, 'dummy_view') + def test_model_lookup(self): request = self._get_request(self.user) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/tests/shortcuts_test.py new/django-guardian-1.0.4/guardian/tests/shortcuts_test.py --- old/django-guardian-1.0.3/guardian/tests/shortcuts_test.py 2011-07-25 11:41:17.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/tests/shortcuts_test.py 2012-03-12 13:15:11.000000000 +0100 @@ -481,6 +481,20 @@ set(objects.values_list('name', flat=True)), set([groups[1].name])) + def test_any_of_multiple_perms_to_check(self): + group_names = ['group1', 'group2', 'group3'] + groups = [Group.objects.create(name=name) for name in group_names] + assign('auth.change_group', self.user, groups[0]) + assign('auth.delete_group', self.user, groups[2]) + + objects = get_objects_for_user(self.user, ['auth.change_group', + 'auth.delete_group'], any_perm=True) + self.assertEqual(len(objects), 2) + self.assertTrue(isinstance(objects, QuerySet)) + self.assertEqual( + set(objects.values_list('name', flat=True)), + set([groups[0].name, groups[2].name])) + def test_groups_perms(self): group1 = Group.objects.create(name='group1') group2 = Group.objects.create(name='group2') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/tests/templates/dummy403.html new/django-guardian-1.0.4/guardian/tests/templates/dummy403.html --- old/django-guardian-1.0.3/guardian/tests/templates/dummy403.html 1970-01-01 01:00:00.000000000 +0100 +++ new/django-guardian-1.0.4/guardian/tests/templates/dummy403.html 2011-10-02 00:14:36.000000000 +0200 @@ -0,0 +1 @@ +foobar403 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/guardian/testsettings.py new/django-guardian-1.0.4/guardian/testsettings.py --- old/django-guardian-1.0.3/guardian/testsettings.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/guardian/testsettings.py 2012-01-27 17:16:14.000000000 +0100 @@ -35,5 +35,18 @@ TEMPLATE_DIRS = ( os.path.join(os.path.dirname(__file__), 'tests', 'templates'), ) -print TEMPLATE_DIRS + +# Database specific + +if os.environ.get('GUARDIAN_TEST_DB_BACKEND') == 'mysql': + DATABASES['default']['ENGINE'] = 'django.db.backends.mysql' + DATABASES['default']['NAME'] = 'guardian_test' + DATABASES['default']['TEST_NAME'] = 'guardian_test' + DATABASES['default']['USER'] = os.environ.get('USER', 'root') + +if os.environ.get('GUARDIAN_TEST_DB_BACKEND') == 'postgresql': + DATABASES['default']['ENGINE'] = 'django.db.backends.postgresql_psycopg2' + DATABASES['default']['NAME'] = 'guardian' + DATABASES['default']['TEST_NAME'] = 'guardian_test' + DATABASES['default']['USER'] = os.environ.get('USER', 'postgres') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-guardian-1.0.3/setup.py new/django-guardian-1.0.4/setup.py --- old/django-guardian-1.0.3/setup.py 2011-07-25 10:11:25.000000000 +0200 +++ new/django-guardian-1.0.4/setup.py 2011-10-02 00:14:36.000000000 +0200 @@ -18,7 +18,7 @@ author = 'Lukasz Balcerzak', author_email = 'lukaszbalcerzak(a)gmail.com', download_url='http://github.com/lukaszb/django-guardian/downloads', - description = guardian.__doc__, + description = guardian.__doc__.strip(), long_description = long_description, zip_safe = False, packages = find_packages(), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-django-debug-toolbar for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-django-debug-toolbar for openSUSE:Factory checked in at 2012-03-16 13:22:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-debug-toolbar (Old) and /work/SRC/openSUSE:Factory/.python-django-debug-toolbar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-debug-toolbar", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-debug-toolbar.new/python-django-debug-toolbar.changes 2012-03-16 13:22:40.000000000 +0100 @@ -0,0 +1,76 @@ +------------------------------------------------------------------- +Tue Mar 13 09:47:13 UTC 2012 - cfarrell(a)suse.com + +- license update: BSD-3-Clause + Most of the license references point to the BSD-2-Clause on + opensource.org but the COPYING file is BSD-3-Clause + +------------------------------------------------------------------- +Mon Mar 12 20:37:11 UTC 2012 - saschpe(a)gmx.de + +- Fix typo, it's README.rst, not README.rs1 + +------------------------------------------------------------------- +Sat Mar 10 18:23:59 UTC 2012 - saschpe(a)gmx.de + +- Use upstream tarball +- Simplify macro usage + +------------------------------------------------------------------- +Tue Jan 17 12:11:10 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 0.9.4: + - Sorry, no changelog. + +------------------------------------------------------------------- +Fri Jan 13 03:58:12 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 0.9.2: + - Sorry,, no changelog. + +------------------------------------------------------------------- +Wed Jan 4 00:55:11 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 0.9.1: + - Sorry, no changelog atm. + +------------------------------------------------------------------- +Mon Apr 25 21:28:33 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 0.8.5: + - Sorry, no changelog. +- Regenerate spec file with py2pack. + +------------------------------------------------------------------- +Tue Nov 9 10:47:43 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.8.4; +- Bzip2 source file; +- Spec file cleaned with spec-cleaner. + +------------------------------------------------------------------- +Wed Mar 3 22:45:44 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.8.3. + +------------------------------------------------------------------- +Tue Mar 2 23:33:26 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.8.2. + +------------------------------------------------------------------- +Wed Nov 4 13:04:58 UTC 2009 - alexandre(a)exatati.com.br + +- Update to 0.8.1; +- Building as noarch for openSUSE >= 11.2. + +------------------------------------------------------------------- +Mon Sep 14 11:07:47 UTC 2009 - alexandre(a)exatati.com.br + +- Update to 0.8.0. + +------------------------------------------------------------------- +Tue Aug 18 00:50:56 UTC 2009 - alexandre(a)exatati.com.br + +- Initial package (0.7.0) for openSUSE. + New: ---- django-debug-toolbar-0.9.4.tar.gz python-django-debug-toolbar.changes python-django-debug-toolbar.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-debug-toolbar.spec ++++++ # # spec file for package python-django-debug-toolbar # # Copyright (c) 2012 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/ # Name: python-django-debug-toolbar Version: 0.9.4 Release: 0 Url: http://robhudson.github.com/django-debug-toolbar/ Summary: A configurable set of panels that display various debug information License: BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/d/django-debug-toolbar/django-debug-… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel #BuildRequires: python-dingus BuildRequires: python-distribute #BuildRequires: python-django Requires: python-django %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description The Django Debug Toolbar is a configurable set of panels that display various debug information about the current request/response and when clicked, display more details about the panel's content. Currently, the following panels have been written and are working: - Django version - Request timer - A list of settings in settings.py - Common HTTP headers - GET/POST/cookie/session variable display - Templates and context used, and their template paths - SQL queries including time to execute and links to EXPLAIN each query - List of signals, their args and receivers - Logging output via Python's built-in logging, or via the logbook module There is also one Django management command currently: - debugsqlshell: Outputs the SQL that gets executed as you work in the Python interactive shell. %prep %setup -q -n django-debug-toolbar-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} #%%check #python setup.py test %files %defattr(-,root,root,-) %doc AUTHORS LICENSE README.rst %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-django-avatar for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-django-avatar for openSUSE:Factory checked in at 2012-03-16 13:22:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-avatar (Old) and /work/SRC/openSUSE:Factory/.python-django-avatar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-avatar", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-avatar.new/python-django-avatar.changes 2012-03-16 13:22:16.000000000 +0100 @@ -0,0 +1,30 @@ +------------------------------------------------------------------- +Tue Mar 13 08:15:21 UTC 2012 - saschpe(a)suse.de + +- Add %changelog line + +------------------------------------------------------------------- +Mon Mar 12 21:48:49 UTC 2012 - saschpe(a)gmx.de + +- Spec file cleanup + +------------------------------------------------------------------- +Mon Jul 5 19:23:48 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.0.5. + +------------------------------------------------------------------- +Tue Mar 16 00:56:43 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.0.4. + +------------------------------------------------------------------- +Mon Nov 9 00:52:42 UTC 2009 - alexandre(a)exatati.com.br + +- Update to 1.0.3; +- Building as noarch for openSUSE >= 11.2. + +------------------------------------------------------------------- +Thu Aug 13 21:12:46 UTC 2009 - alexandre(a)exatati.com.br + +- Initial version (1.0.1) for openSUSE. New: ---- django-avatar-1.0.5.tar.gz python-django-avatar.changes python-django-avatar.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-avatar.spec ++++++ # # spec file for package python-django-avatar (Version 1.0.5) # # Copyright (c) 2012 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/ # Name: python-django-avatar Version: 1.0.5 Release: 0 License: BSD-3-Clause Summary: Django-avatar package Url: http://github.com/ericflo/django-avatar Group: Development/Libraries/Python Source: django-avatar-%{version}.tar.gz BuildRequires: python-devel BuildRequires: python-distribute Requires: python-django BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Django-avatar is a reusable application for handling user avatars. It has the ability to default to Gravatar_ if no avatar is found for a certain user. Django-avatar automatically generates thumbnails and stores them to your default file storage backend for retrieval later. %prep %setup -q -n django-avatar-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root) %doc LICENSE.txt %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-bottle for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-bottle for openSUSE:Factory checked in at 2012-03-16 13:21:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-bottle (Old) and /work/SRC/openSUSE:Factory/.python-bottle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-bottle", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-bottle.new/python-bottle.changes 2012-03-16 13:21:35.000000000 +0100 @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Mon Mar 12 20:46:22 UTC 2012 - saschpe(a)gmx.de + +- update to version 0.10.9 + +------------------------------------------------------------------- +Fri Sep 23 13:53:20 UTC 2011 - saschpe(a)suse.de + +- Update to version 0.9.6 +- Removed file LICENSE, upstream now has LICENSE.txt + +------------------------------------------------------------------- +Fri Nov 19 10:38:29 UTC 2010 - cfarrell(a)novell.com + +- Added LICENSE and bottle-docs.pdf. +- Removed dead symlink README + +------------------------------------------------------------------- +Fri Nov 19 09:21:46 UTC 2010 - cfarrell(a)novell.com + +- Initial build + New: ---- bottle-0.10.9.tar.gz bottle-docs.pdf python-bottle.changes python-bottle.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-bottle.spec ++++++ # # spec file for package python-bottle # # Copyright (c) 2011 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/ # Name: python-bottle Version: 0.10.9 Release: 0 Url: http://bottlepy.org/ Summary: Fast and simple WSGI-framework for small web-applications License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/b/bottle/bottle-%{version}.tar.gz Source1: bottle-docs.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Bottle is a fast and simple micro-framework for small web-applications. It offers request dispatching (Routes) with url parameter support, Templates, a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and template engines. All in a single file and with no dependencies other than the Python Standard Library. %prep %setup -q -n bottle-%{version} cp %{SOURCE1} . %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README.rst bottle-docs.pdf %{_bindir}/bottle.py %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-atspi for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package python-atspi for openSUSE:Factory checked in at 2012-03-16 13:21:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-atspi (Old) and /work/SRC/openSUSE:Factory/.python-atspi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-atspi", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-atspi/python-atspi.changes 2012-02-16 12:26:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-atspi.new/python-atspi.changes 2012-03-16 13:21:29.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 08:38:09 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.3.91: + + Fix --enable-tests. + +------------------------------------------------------------------- Old: ---- pyatspi-2.3.5.tar.xz New: ---- pyatspi-2.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-atspi.spec ++++++ --- /var/tmp/diff_new_pack.l910Ab/_old 2012-03-16 13:21:31.000000000 +0100 +++ /var/tmp/diff_new_pack.l910Ab/_new 2012-03-16 13:21:31.000000000 +0100 @@ -15,9 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-atspi %define _name pyatspi -Version: 2.3.5 +Version: 2.3.91 Release: 0 Summary: Assistive Technology Service Provider Interface - Python bindings License: LGPL-2.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plasmoid-cwp for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2012-03-16 13:21:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasmoid-cwp (Old) and /work/SRC/openSUSE:Factory/.plasmoid-cwp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasmoid-cwp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/plasmoid-cwp/plasmoid-cwp.changes 2012-03-05 18:01:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2012-03-16 13:21:03.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 12 20:50:43 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to version 1.5.12: + * xml: www.wetter.com: complete rewrite + * xml: www.weather.com: current weather description fixed + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.5.11.tar.bz2 New: ---- 98925-cwp-1.5.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.FPe3Gf/_old 2012-03-16 13:21:06.000000000 +0100 +++ /var/tmp/diff_new_pack.FPe3Gf/_new 2012-03-16 13:21:06.000000000 +0100 @@ -18,7 +18,7 @@ Name: plasmoid-cwp -Version: 1.5.11 +Version: 1.5.12 Release: 0 Summary: Customizable Weather Plasmoid License: GPL-3.0+ ++++++ 98925-cwp-1.5.11.tar.bz2 -> 98925-cwp-1.5.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/ChangeLog new/cwp-1.5.12/ChangeLog --- old/cwp-1.5.11/ChangeLog 2012-02-28 21:32:30.000000000 +0100 +++ new/cwp-1.5.12/ChangeLog 2012-03-12 20:58:00.000000000 +0100 @@ -1,3 +1,8 @@ +1.5.12 +====== +- xml: www.wetter.com: complete rewrite +- xml: www.weather.com: current weather description fixed + 1.5.11 ====== - xml: gismeteo.com: fixed (thanks to Dreid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/README new/cwp-1.5.12/README --- old/cwp-1.5.11/README 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/README 2012-03-12 20:58:00.000000000 +0100 @@ -1,5 +1,5 @@ ========================================== -Customizable Weather Plasmoid (CWP) 1.5.11 +Customizable Weather Plasmoid (CWP) 1.5.12 ========================================== This is another weather plasmoid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/br_weather_com.xml new/cwp-1.5.12/data/br_weather_com.xml --- old/cwp-1.5.11/data/br_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/br_weather_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="br.weather.com" search_page="http://br.weather.com" example_zip="BRXX0043" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="br.weather.com" search_page="http://br.weather.com" example_zip="BRXX0043" unit="C" /> <locale_settings locale="pt" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/de_weather_com.xml new/cwp-1.5.12/data/de_weather_com.xml --- old/cwp-1.5.11/data/de_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/de_weather_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="de.weather.com" search_page="http://de.weather.com" example_zip="80331" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="de.weather.com" search_page="http://de.weather.com" example_zip="80331" unit="C" /> <locale_settings locale="de" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/espanol_weather_com.xml new/cwp-1.5.12/data/espanol_weather_com.xml --- old/cwp-1.5.11/data/espanol_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/espanol_weather_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="espanol.weather.com" search_page="http://espanol.weather.com" example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="espanol.weather.com" search_page="http://espanol.weather.com" example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/fr_weather_com.xml new/cwp-1.5.12/data/fr_weather_com.xml --- old/cwp-1.5.11/data/fr_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/fr_weather_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="fr.weather.com" search_page="http://fr.weather.com" example_zip="Paris-FRXX0076" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="fr.weather.com" search_page="http://fr.weather.com" example_zip="Paris-FRXX0076" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/freemeteo_com_celsius.xml new/cwp-1.5.12/data/freemeteo_com_celsius.xml --- old/cwp-1.5.11/data/freemeteo_com_celsius.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/freemeteo_com_celsius.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/freemeteo_com_fahrenheit.xml new/cwp-1.5.12/data/freemeteo_com_fahrenheit.xml --- old/cwp-1.5.11/data/freemeteo_com_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/freemeteo_com_fahrenheit.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="F" /> + <xml_file_version type="cwp" version="2012-03-12" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/ilmeteo_it.xml new/cwp-1.5.12/data/ilmeteo_it.xml --- old/cwp-1.5.11/data/ilmeteo_it.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/ilmeteo_it.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="ilmeteo.it" search_page="http://www.ilmeteo.it" example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="ilmeteo.it" search_page="http://www.ilmeteo.it" example_zip="Roma" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/in_weather_com.xml new/cwp-1.5.12/data/in_weather_com.xml --- old/cwp-1.5.11/data/in_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/in_weather_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="in.weather.com" search_page="http://in.weather.com" example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="in.weather.com" search_page="http://in.weather.com" example_zip="New-Delhi-INXX0096" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/myforecast_com_celsius.xml new/cwp-1.5.12/data/myforecast_com_celsius.xml --- old/cwp-1.5.11/data/myforecast_com_celsius.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/myforecast_com_celsius.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="C" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/myforecast_com_fahrenheit.xml new/cwp-1.5.12/data/myforecast_com_fahrenheit.xml --- old/cwp-1.5.11/data/myforecast_com_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/myforecast_com_fahrenheit.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="F" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/pogodynka_pl.xml new/cwp-1.5.12/data/pogodynka_pl.xml --- old/cwp-1.5.11/data/pogodynka_pl.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/pogodynka_pl.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="pogodynka.pl" search_page="http://www.pogodynka.pl" example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="pogodynka.pl" search_page="http://www.pogodynka.pl" example_zip="polska/warszawa_warszawa" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/satellite_images.xml new/cwp-1.5.12/data/satellite_images.xml --- old/cwp-1.5.11/data/satellite_images.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/satellite_images.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp_satellite_images" version="2012-02-28" /> + <xml_file_version type="cwp_satellite_images" version="2012-03-12" />  <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/uk_weather_com.xml new/cwp-1.5.12/data/uk_weather_com.xml --- old/cwp-1.5.11/data/uk_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/uk_weather_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="uk.weather.com" search_page="http://uk.weather.com" example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="uk.weather.com" search_page="http://uk.weather.com" example_zip="London-UKXX0085" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/wetter_com.xml new/cwp-1.5.12/data/wetter_com.xml --- old/cwp-1.5.11/data/wetter_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/wetter_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.wetter.com" search_page="http://www.wetter.com" example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.wetter.com" search_page="http://www.wetter.com" example_zip="DE0006515" unit="C" /> - <locale_settings locale="de" encoding="latin1" /> + <locale_settings locale="utf-8" encoding="utf8" /> <urlc urlc_prefix="http://www.wetter.com/wetter_aktuell/aktuell/?id=" urlc_suffix="" urlc_follow="" /> @@ -22,97 +22,103 @@ <url7 url7_prefix="" url7_suffix="" url7_follow="" /> <data_location url="urlc" - location="grep \<title\> | sed -e "s/.*title>Wetter $[^,]*$,.*/\1/"" - country="grep \<title\> | sed -e "s/.*title>Wetter $[^,]*$,$[^,]*$.*/\2/"" + location="grep \<title\> | sed -e "s/.*title>.*Wetter in $[^,]*$,.*/\1/"" + country="grep \<title\> | sed -e "s/.*title>.*Wetter in $[^,]*$,$[^,]*$.*/\2/"" /> <data_sun url="urlc" - sunrise="grep -A 3 Sonnenaufgang | tail -n 1 | sed -e "s/\s//g"" - sunset="grep -A 3 Sonnenuntergang | tail -n 1 | sed -e "s/\s//g"" + sunrise="grep -A 4 Sonnenaufgang: | grep Uhr | sed -e "s/\s//g" | sed -e "s/Uhr//"" + sunset="grep -A 4 Sonnenuntergang: | grep Uhr | sed -e "s/\s//g" | sed -e "s/Uhr//"" /> <data_current_temperature url="urlc" - update_time="grep -A 1 fc_center\ fc_sub_title\"\> | grep Uhr | sed -e 's/Uhr//'" - temperature="grep class=\"deg\" | sed -e "s/<\/*span[^\>]*>/ /g" | sed -e "s/ *$[^ \&]*$.*/\1/"" + update_time="grep -A 2 weatherStateText | grep Uhr | sed -e 's/.* $[0-9:]*$ Uhr.*/\1/'" + temperature="grep -A 2 degree-in | grep °\ C | sed -e "s/\s*$[^ \°]*$.*/\1/g"" temperature_felt="echo -n" /> <data_current_wind url="urlc" - wind_code="grep winddir | sed -e "s/.*winddir_s\/$.*$.gif.*/\1/"" - wind_speed="grep -A 8 winddir | grep -A 1 Windgeschwindigkeit | tail -n 1 | sed -e "s/\s*$[^\s]*$/\1/"" - wind="grep -A 4 winddir | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/<.*winddir_s\/$.*$.gif[^>]*>/\1/" | sed -e "s/<[^>]*>//g" | sed -e "s/&nbsp;/ /g" | sed -e "s/Windgeschwindigkeit/ - /"" + wind_code="grep wind- | sed -e "s/.*wind-$[^\.]*$.*/\1/" | sed -e "s/./\u&/g"" + wind_speed="grep -A 4 wind- | tail -n 1 | sed -e "s/\s*$[^(]*$.*/\1/"" + wind="grep -A 4 wind- | tail -n 2 | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/<.*>/ - /g" | sed -e "s/\s*$[^(]*$.*/\1/" | sed -e "s/\s\+/ /g"" /> <data_current_icon url="urlc" - icon="grep class=\"wx_icon | grep gif | sed -e "s/.*wx_icon\" src=\"$[^\"]*$\".*/\1/"" - icon_code="grep class=\"wx_icon | grep gif | sed -e "s/.*wx_icon\" src=\"$[^\"]*$\".*/\1/" | sed -e "s/.*\/$[dn]$_$[0-9]*$_b\.gif.*/\1\2/"" - icon_text="grep -A 1 class=\"wx_icon | tail -n 1 | sed -e "s/\s*$[^\s]*$/\1/" | sed -e "s/<[^>]*>//g"" + icon="grep wstate_small | sed -e "s/.*wstate_small $[^\"]*$_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" + icon_code="grep wstate_small | sed -e "s/.*wstate_small $[^\"]*$_S.*/\1/" | sed -e "s/_//g"" + icon_text="grep -A 2 sonnetext | tail -n 1" /> <data_current_additional url="urlc" - humidity="grep -A 1 Feuchte | tail -n 1 | sed -e "s/\s*$[^\s]*$/\1/"" - rain="grep -A 1 \<b\>Niederschlag | tail -n 1 | sed -e "s/\s*$[^\s]*$/\1/"" - dew_point="echo -n" - visibility="grep -A 1 Sicht | tail -n 1 | sed -e "s/\s*$[^\s]*$/\1/"" - pressure="grep -A 1 \<b\>Luftdruck | tail -n 1 | sed -e "s/\s*$[^\s]*$/\1/"" + humidity="grep -A 4 Relative\ Feuchte: | grep %" + rain="echo -n" + dew_point="grep -A 4 Taupunkt: | grep °" + visibility="grep -A 4 Sicht: | grep km" + pressure="grep -A 4 Luftdruck: | grep hPa" uv_index="echo -n" /> <data_day1 url="url1" - name="grep fc16_hd | head -n 1 | tail -n 1 | sed -e "s/.*fc16_hd\">$[^<]*$.*/\1/"" - temperature_low="grep class=\"deg\ text_m\ mgb\" | head -n 1 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\1/"" - temperature_high="grep class=\"deg\ text_m\ mgb\" | head -n 1 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\2/"" - icon="grep containersum0 | sed -e 's/.*class=\"wxicon d$[^\"]*$.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/d_\1_b.gif/'" - icon_code="grep containersum0 | sed -e 's/.*class=\"wxicon $[^\"]*$.*/\1/'" - icon_text="grep class=\"wx\" | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g"" + name="grep date_text | head -n 1 | tail -n 1 | sed -e "s/.*date_text: \"$[^,]*$.*/\1/"" + temperature_low="grep -B 4 date_text | grep min: | head -n 1 | tail -n 1 | sed -e "s/.*min: $[^,]*$.*/\1/"" + temperature_high="grep -B 4 date_text | grep max: | head -n 1 | tail -n 1 | sed -e "s/.*max: $[^,]*$.*/\1/"" + icon="grep wstate_small | head -n 1 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" + icon_code="grep wstate_small | head -n 1 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/\1/" | sed -e "s/_//g"" + icon_text="grep dn3 | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day2 url="url1" - name="grep fc16_hd | head -n 2 | tail -n 1 | sed -e "s/.*fc16_hd\">$[^<]*$.*/\1/"" - temperature_low="grep class=\"deg\ text_m\ mgb\" | head -n 2 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\1/"" - temperature_high="grep class=\"deg\ text_m\ mgb\" | head -n 2 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\2/"" icon="grep containersum1 | sed -e 's/.*class=\"wxicon d$[^\"]*$.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/d_\1_b.gif/'" - icon_code="grep containersum1 | sed -e 's/.*class=\"wxicon $[^\"]*$.*/\1/'" - icon_text="grep class=\"wx\" | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" + name="grep date_text | head -n 2 | tail -n 1 | sed -e "s/.*date_text: \"$[^,]*$.*/\1/"" + temperature_low="grep -B 4 date_text | grep min: | head -n 2 | tail -n 1 | sed -e "s/.*min: $[^,]*$.*/\1/"" + temperature_high="grep -B 4 date_text | grep max: | head -n 2 | tail -n 1 | sed -e "s/.*max: $[^,]*$.*/\1/"" + icon="grep wstate_small | head -n 2 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" + icon_code="grep wstate_small | head -n 2 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/\1/" | sed -e "s/_//g"" + icon_text="grep dn3 | head -n 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day3 url="url1" - name="grep fc16_hd | head -n 3 | tail -n 1 | sed -e "s/.*fc16_hd\">$[^<]*$.*/\1/"" - temperature_low="grep class=\"deg\ text_m\ mgb\" | head -n 3 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\1/"" - temperature_high="grep class=\"deg\ text_m\ mgb\" | head -n 3 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\2/"" icon="grep containersum2 | sed -e 's/.*class=\"wxicon d$[^\"]*$.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/d_\1_b.gif/'" - icon_code="grep containersum2 | sed -e 's/.*class=\"wxicon $[^\"]*$.*/\1/'" - icon_text="grep class=\"wx\" | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" + name="grep date_text | head -n 3 | tail -n 1 | sed -e "s/.*date_text: \"$[^,]*$.*/\1/"" + temperature_low="grep -B 4 date_text | grep min: | head -n 3 | tail -n 1 | sed -e "s/.*min: $[^,]*$.*/\1/"" + temperature_high="grep -B 4 date_text | grep max: | head -n 3 | tail -n 1 | sed -e "s/.*max: $[^,]*$.*/\1/"" + icon="grep wstate_small | head -n 3 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" + icon_code="grep wstate_small | head -n 3 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/\1/" | sed -e "s/_//g"" + icon_text="grep dn3 | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day4 url="url1" - name="grep fc16_hd | head -n 4 | tail -n 1 | sed -e "s/.*fc16_hd\">$[^<]*$.*/\1/"" - temperature_low="grep class=\"deg\ text_m\ mgb\" | head -n 4 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\1/"" - temperature_high="grep class=\"deg\ text_m\ mgb\" | head -n 4 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\2/"" icon="grep containersum3 | sed -e 's/.*class=\"wxicon d$[^\"]*$.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/d_\1_b.gif/'" - icon_code="grep containersum3 | sed -e 's/.*class=\"wxicon $[^\"]*$.*/\1/'" - icon_text="grep class=\"wx\" | head -n 4 | tail -n 1 | sed -e "s/<[^>]*>//g"" + name="grep date_text | head -n 4 | tail -n 1 | sed -e "s/.*date_text: \"$[^,]*$.*/\1/"" + temperature_low="grep -B 4 date_text | grep min: | head -n 4 | tail -n 1 | sed -e "s/.*min: $[^,]*$.*/\1/"" + temperature_high="grep -B 4 date_text | grep max: | head -n 4 | tail -n 1 | sed -e "s/.*max: $[^,]*$.*/\1/"" + icon="grep wstate_small | head -n 4 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" + icon_code="grep wstate_small | head -n 4 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/\1/" | sed -e "s/_//g"" + icon_text="grep dn3 | head -n 4 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day5 url="url1" - name="grep fc16_hd | head -n 5 | tail -n 1 | sed -e "s/.*fc16_hd\">$[^<]*$.*/\1/"" - temperature_low="grep class=\"deg\ text_m\ mgb\" | head -n 5 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\1/"" - temperature_high="grep class=\"deg\ text_m\ mgb\" | head -n 5 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\2/"" icon="grep containersum4 | sed -e 's/.*class=\"wxicon d$[^\"]*$.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/d_\1_b.gif/'" - icon_code="grep containersum4 | sed -e 's/.*class=\"wxicon $[^\"]*$.*/\1/'" - icon_text="grep class=\"wx\" | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" + name="grep date_text | head -n 5 | tail -n 1 | sed -e "s/.*date_text: \"$[^,]*$.*/\1/"" + temperature_low="grep -B 4 date_text | grep min: | head -n 5 | tail -n 1 | sed -e "s/.*min: $[^,]*$.*/\1/"" + temperature_high="grep -B 4 date_text | grep max: | head -n 5 | tail -n 1 | sed -e "s/.*max: $[^,]*$.*/\1/"" + icon="grep wstate_small | head -n 5 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" + icon_code="grep wstate_small | head -n 5 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/\1/" | sed -e "s/_//g"" + icon_text="grep dn3 | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day6 url="url1" - name="grep fc16_hd | head -n 6 | tail -n 1 | sed -e "s/.*fc16_hd\">$[^<]*$.*/\1/"" - temperature_low="grep class=\"deg\ text_m\ mgb\" | head -n 6 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\1/"" - temperature_high="grep class=\"deg\ text_m\ mgb\" | head -n 6 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\2/"" icon="grep containersum5 | sed -e 's/.*class=\"wxicon d$[^\"]*$.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/d_\1_b.gif/'" - icon_code="grep containersum5 | sed -e 's/.*class=\"wxicon $[^\"]*$.*/\1/'" - icon_text="grep class=\"wx\" | head -n 6 | tail -n 1 | sed -e "s/<[^>]*>//g"" + name="grep date_text | head -n 6 | tail -n 1 | sed -e "s/.*date_text: \"$[^,]*$.*/\1/"" + temperature_low="grep -B 4 date_text | grep min: | head -n 6 | tail -n 1 | sed -e "s/.*min: $[^,]*$.*/\1/"" + temperature_high="grep -B 4 date_text | grep max: | head -n 6 | tail -n 1 | sed -e "s/.*max: $[^,]*$.*/\1/"" + icon="grep wstate_small | head -n 6 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" + icon_code="grep wstate_small | head -n 6 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/\1/" | sed -e "s/_//g"" + icon_text="grep dn3 | head -n 6 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <data_day7 url="url1" - name="grep fc16_hd | head -n 7 | tail -n 1 | sed -e "s/.*fc16_hd\">$[^<]*$.*/\1/"" - temperature_low="grep class=\"deg\ text_m\ mgb\" | head -n 7 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\1/"" - temperature_high="grep class=\"deg\ text_m\ mgb\" | head -n 7 | tail -n 1 | sed -e "s/.*class=\"deg text_m mgb\">$[^\/]*$ \/ $[^&]*$.*/\2/"" icon="grep containersum6 | sed -e 's/.*class=\"wxicon d$[^\"]*$.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/d_\1_b.gif/'" - icon_code="grep containersum6 | sed -e 's/.*class=\"wxicon $[^\"]*$.*/\1/'" - icon_text="grep class=\"wx\" | head -n 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" + name="grep date_text | head -n 7 | tail -n 1 | sed -e "s/.*date_text: \"$[^,]*$.*/\1/"" + temperature_low="grep -B 4 date_text | grep min: | head -n 7 | tail -n 1 | sed -e "s/.*min: $[^,]*$.*/\1/"" + temperature_high="grep -B 4 date_text | grep max: | head -n 7 | tail -n 1 | sed -e "s/.*max: $[^,]*$.*/\1/"" + icon="grep wstate_small | head -n 7 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/http:\/\/imgs.wetter.com\/layout\/1\/wx_icons\/day_s\/\1_b.gif/"" + icon_code="grep wstate_small | head -n 7 | tail -n 1 | sed -e "s/.*wstate_small $[^\"]*$_S.*/\1/" | sed -e "s/_//g"" + icon_text="grep dn3 | head -n 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" /> <icon_transform diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/www_accuweather_com_us_celsius.xml new/cwp-1.5.12/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.5.11/data/www_accuweather_com_us_celsius.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/www_accuweather_com_us_celsius.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.5.12/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.5.11/data/www_accuweather_com_us_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/www_accuweather_com_us_fahrenheit.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="F" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/www_accuweather_com_world_celsius.xml new/cwp-1.5.12/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.5.11/data/www_accuweather_com_world_celsius.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/www_accuweather_com_world_celsius.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.5.12/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.5.11/data/www_accuweather_com_world_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/www_accuweather_com_world_fahrenheit.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="F" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/www_gismeteo_com.xml new/cwp-1.5.12/data/www_gismeteo_com.xml --- old/cwp-1.5.11/data/www_gismeteo_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/www_gismeteo_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.gismeteo.com" search_page="http://www.gismeteo.ru" example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.gismeteo.com" search_page="http://www.gismeteo.ru" example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/www_weather_com.cn.xml new/cwp-1.5.12/data/www_weather_com.cn.xml --- old/cwp-1.5.11/data/www_weather_com.cn.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/www_weather_com.cn.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.weather.com.cn" search_page="http://www.weather.com.cn" example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.weather.com.cn" search_page="http://www.weather.com.cn" example_zip="101010100" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/data/www_weather_com.xml new/cwp-1.5.12/data/www_weather_com.xml --- old/cwp-1.5.11/data/www_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/data/www_weather_com.xml 2012-03-12 20:58:00.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-28" name="www.weather.com" search_page="http://www.weather.com" example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2012-03-12" name="www.weather.com" search_page="http://www.weather.com" example_zip="USDC0001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -46,7 +46,7 @@ <data_current_icon url="urlc" icon="grep -A 2 animated-icon | grep http | sed -e "s/.*$http:.*png$.*/\1/"" icon_code="grep -A 2 animated-icon | grep http | sed -e "s/.*$http:.*png$.*/\1/" | sed -e "s/.*\/$[0-9]*$\.png/\1/"" - icon_text="grep -A 2 forecast-icon | head -n 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" + icon_text="grep -A 1 twc-col-1 | head -n 5 | tail -n 1" /> <data_current_additional url="urlc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/plasma-applet-cwp.desktop new/cwp-1.5.12/plasma-applet-cwp.desktop --- old/cwp-1.5.11/plasma-applet-cwp.desktop 2012-02-28 21:32:30.000000000 +0100 +++ new/cwp-1.5.12/plasma-applet-cwp.desktop 2012-03-12 20:58:00.000000000 +0100 @@ -30,7 +30,7 @@ X-KDE-PluginInfo-Author=Georg Hennig X-KDE-PluginInfo-Email=georg.hennig(a)web.de X-KDE-PluginInfo-Name=plasma_applet_cwp -X-KDE-PluginInfo-Version=1.5.11 +X-KDE-PluginInfo-Version=1.5.12 X-KDE-PluginInfo-Website=http://www.kde-look.org/content/show.php/show.php?… X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Depends= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.11/version.h new/cwp-1.5.12/version.h --- old/cwp-1.5.11/version.h 2012-02-28 21:32:31.000000000 +0100 +++ new/cwp-1.5.12/version.h 2012-03-12 20:58:00.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.5.11" +#define VERSION "1.5.12" #define DATE "2009-2012" #define AUTHOR "Georg Hennig" #define NAME "Customizable Weather Plasmoid (CWP)" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pidgin for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package pidgin for openSUSE:Factory checked in at 2012-03-16 13:20:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pidgin (Old) and /work/SRC/openSUSE:Factory/.pidgin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pidgin", Maintainer is "DMZhang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pidgin/pidgin.changes 2012-02-28 14:14:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pidgin.new/pidgin.changes 2012-03-16 13:20:51.000000000 +0100 @@ -1,0 +2,36 @@ +Wed Mar 14 11:12:34 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.10.2: + + General: + - Fix compilation when using binutils 2.22 and new GDK pixbuf. + - Fix compilation of the MXit protocol plugin with GLib 2.31. + + Pidgin: + - Add support for the GNOME3 Network dialog. + - Fix rare crash. + - Add support for the GNOME3 Default Application dialog for + configuring the Browser. + + libpurple: + - Support new connection states and signals for NetworkManager + 0.9+. + + AIM and ICQ: + - Fix a possible crash when receiving an unexpected message + from the server. + - Allow signing on with usernames containing periods and + underscores. + - Allow adding buddies containing periods and underscores. + - Don't try to format ICQ usernames entered as email addresses. + This gets rid of an "Unable to format username" error at + login. + + MSN: + - Fix possible crashes caused by not validating incoming + messages as UTF-8. + - Support new protocol version MSNP18. + - Fix messages to offline contacts. + + Plugins: + - The autoaccept plugin will no longer reset the preference for + unknown buddies to "Auto Reject" in certain cases. + + Windows-Specific Changes. +- Drop pidgin-nm09-more.patch: fixed upstream. +- Drop pidgin-glib-2.31.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- pidgin-2.10.1.tar.bz2 pidgin-glib-2.31.patch pidgin-nm09-more.patch New: ---- pidgin-2.10.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidgin.spec ++++++ --- /var/tmp/diff_new_pack.LcL95Q/_old 2012-03-16 13:20:54.000000000 +0100 +++ /var/tmp/diff_new_pack.LcL95Q/_new 2012-03-16 13:20:54.000000000 +0100 @@ -26,10 +26,10 @@ Summary: Multiprotocol Instant Messaging Client License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger -Version: 2.10.1 +Version: 2.10.2 Release: 0 Url: http://www.pidgin.im/ -Source: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/project/pidgin/Pidgin/2.10.2/%{name}-%{ver… Source1: pidgin-NLD-smiley-theme.tar.bz2 Source2: pidgin-Tango-smiley-theme.tar.bz2 Source3: pidgin-prefs.xml @@ -42,10 +42,6 @@ Patch14: pidgin-mono-buildfix.patch # PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz(a)opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8… as it breaks the build Patch15: pidgin-fix-perl-build.patch -# PATCH-FIX-UPSTREAM pidgin-nm09-more.patch vuntz(a)opensuse.org -- Fix to use new NM signal name http://developer.pidgin.im/ticket/13859 -Patch16: pidgin-nm09-more.patch -# PATCH-FIX-UPSTREAM pidgin-glib-2.31.patch http://developer.pidgin.im/ticket/14773 dimstar(a)opensuse.org -- Fix build with glib 2.31. -Patch17: pidgin-glib-2.31.patch # PATCH-FIX-UPSTREAM pidgin-port-to-farstream.patch http://developer.pidgin.im/ticket/14936 vuntz(a)opensuse.org -- Port to farstream Patch18: pidgin-port-to-farstream.patch # Can use external libzephyr @@ -287,8 +283,8 @@ Conflicts: otherproviders(libpurple-branding) Supplements: packageand(libpurple:branding-upstream) # It also provides pidgin branding -Provides: pidgin-branding-upstream = %{version} Provides: pidgin-branding = %{version} +Provides: pidgin-branding-upstream = %{version} Conflicts: otherproviders(pidgin-branding) Supplements: packageand(pidgin:branding-upstream) BuildArch: noarch @@ -379,8 +375,6 @@ %patch5 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 %if %suse_version > 1210 %patch18 -p0 %endif ++++++ pidgin-2.10.1.tar.bz2 -> pidgin-2.10.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/pidgin/pidgin-2.10.1.tar.bz2 /work/SRC/openSUSE:Factory/.pidgin.new/pidgin-2.10.2.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-symfony-YAML for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package php5-pear-symfony-YAML for openSUSE:Factory checked in at 2012-03-16 13:20:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-symfony-YAML (Old) and /work/SRC/openSUSE:Factory/.php5-pear-symfony-YAML.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-symfony-YAML", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-symfony-YAML.new/php5-pear-symfony-YAML.changes 2012-03-16 13:20:41.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Wed Aug 24 18:40:36 UTC 2011 - lang(a)b1-systems.de + +- version 1.0.6 +- initial packaging + New: ---- YAML-1.0.6.tgz php5-pear-symfony-YAML.changes php5-pear-symfony-YAML.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-symfony-YAML.spec ++++++ # # spec file for package php5-pear-symfony-YAML # # Copyright (c) 2011 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/ # Name: php5-pear-symfony-YAML %define pear_name YAML %define pear_sname yaml Summary: Symfony YAML Component Version: 1.0.6 Release: 1 License: MIT Group: Development/Libraries/PHP Source0: http://pear.symfony-project.com/get/%{pear_name}-%{version}.tgz Url: http://pear.symfony-project.com/ Requires: php5-pear-channel-symfony BuildRequires: php-macros BuildRequires: php5-pear >= 1.4.1 BuildRequires: php5-pear-channel-symfony Requires: php5-pear >= 1.4.1 Requires: php5-pear-channel-symfony BuildArch: noarch # Fix for renaming (package convention) Provides: php5-pear-%{pear_sname} = %{version} Provides: php-pear-%{pear_sname} = %{version} Provides: php-pear-%{pear_name} pear-%{pear_name} Provides: pear-%{pear_sname} = %{version} Obsoletes: php5-pear-%{pear_sname} < %{version} Obsoletes: php-pear-%{pear_sname} < %{version} Obsoletes: pear-%{pear_sname} < %{version} %description This is the Symfony YAML Component. YAML means Yet Another Markup Language and is your opportunity to shoot yourself into the foot if xml didn't do it for you. %prep %setup -c %build %install %{__mv} package*.xml %{pear_name}-%{version} cd %{pear_name}-%{version} PHP_PEAR_PHP_BIN="$(which php) -d memory_limit=50m" %{__mkdir_p} %{buildroot}%{php_peardir}/.channels/ %{__cp} %{php_peardir}/.channels/pear.*.reg \ %{buildroot}%{php_peardir}/.channels/ %{__pear} -v \ -d doc_dir=/%{_docdir} \ -d bin_dir=%{_bindir} \ -d data_dir=%{php_peardir}/data \ install --offline --nodeps -R "%{buildroot}" package.xml %{__install} -D -m 0644 package.xml %{buildroot}%{php_pearxmldir}/%{pear_name}.xml %{__rm} -rf %{buildroot}/{doc,tmp} %{__rm} -rf "%{buildroot}"/%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock} cd .. %php_pear_gen_filelist %post # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 if [ "$1" = "1" ]; then %{__pear} install --nodeps --soft --force --register-only %{php_pearxmldir}/%{pear_name}.xml fi if [ "$1" = "2" ]; then %{__pear} upgrade --offline --register-only %{php_pearxmldir}/%{pear_name}.xml fi %postun # on `rpm -e` PARAM is 0 if [ "$1" = "0" ]; then %{__pear} uninstall --nodeps --ignore-errors --register-only pear.symfony-project.com/%{pear_name} fi %clean %{__rm} -rf %{buildroot} %files -f %{name}.files %defattr(-,root,root) %doc %{_docdir}/%{pear_name} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-phpunit-PHP_CodeCoverage for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package php5-pear-phpunit-PHP_CodeCoverage for openSUSE:Factory checked in at 2012-03-16 13:20:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-phpunit-PHP_CodeCoverage (Old) and /work/SRC/openSUSE:Factory/.php5-pear-phpunit-PHP_CodeCoverage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-phpunit-PHP_CodeCoverage", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-phpunit-PHP_CodeCoverage/php5-pear-phpunit-PHP_CodeCoverage.changes 2012-02-29 14:10:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-phpunit-PHP_CodeCoverage.new/php5-pear-phpunit-PHP_CodeCoverage.changes 2012-03-16 13:20:37.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Feb 25 20:54:47 UTC 2012 - robert.munteanu(a)gmail.com + +- version 1.1.2 +- Fixed #80: Whitelisted files that do not exist lead to errors. +- Fixed #91: Traits are not handled properly. +- Fixed notice in + PHP_CodeCoverage_Util::resolveCoversToReflectionObjects(). +- The callbable, implements, and insteadof keywords are now properly + highlighted in the HTML report. + + +------------------------------------------------------------------- +Tue Feb 14 08:55:54 UTC 2012 - lang(a)b1-systems.de + +- license tag changed to BSD-3-Clause + +------------------------------------------------------------------- Old: ---- PHP_CodeCoverage-1.1.1.tgz New: ---- PHP_CodeCoverage-1.1.2.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-phpunit-PHP_CodeCoverage.spec ++++++ --- /var/tmp/diff_new_pack.rPDz6C/_old 2012-03-16 13:20:39.000000000 +0100 +++ /var/tmp/diff_new_pack.rPDz6C/_new 2012-03-16 13:20:39.000000000 +0100 @@ -16,13 +16,14 @@ # + Name: php5-pear-phpunit-PHP_CodeCoverage %define pear_name PHP_CodeCoverage %define pear_sname php_codecoverage Summary: PHP code coverage information -License: BSD +License: BSD-3-Clause Group: Development/Libraries/PHP -Version: 1.1.1 +Version: 1.1.2 Release: 0 Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz Url: http://pear.phpunit.de/ ++++++ PHP_CodeCoverage-1.1.1.tgz -> PHP_CodeCoverage-1.1.2.tgz ++++++ ++++ 15151 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-Horde_Image for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Image for openSUSE:Factory checked in at 2012-03-16 13:20:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Image (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Image.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Image", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Image/php5-pear-Horde_Image.changes 2011-09-23 12:40:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Image.new/php5-pear-Horde_Image.changes 2012-03-16 13:20:35.000000000 +0100 @@ -1,0 +2,33 @@ +Wed Feb 29 10:03:24 UTC 2012 - lang(a)b1-systems.de + +- changed license source to a static file + +------------------------------------------------------------------- +Tue Feb 28 15:26:37 UTC 2012 - lang(a)b1-systems.de + +- changed license tag because of the EXIF Parser (Bug #712242) (Bug #749343) + +------------------------------------------------------------------- +Fri Jan 13 13:44:50 UTC 2012 - lang(a)b1-systems.de + +- add license file +- version 1.0.9 +- [mjr] Added support for Lens and LensID EXIF fields) +- [mjr] Ensure string values are parsed as strings (Bug #10646). +- [mjr] Add basic unit tests for EXIF data +- [mjr] Fix parsing GPS values for locales that do not use the decimal separator (Bug #10643). +- [mjr] Add a version of the convert command for center cropping with ImageMagick versions less than 6.3.8 (Bug #10687). +- [jan] Update Croatian translation. +- [jan] Update Latvian translation. +- [jan] Update Japanese translation (Hiromi Kimura <hiromi(a)tac.tsukuba.ac.jp>). + + +------------------------------------------------------------------- +Sun Aug 14 21:07:28 UTC 2011 - lang(a)b1-systems.de + +- version 1.0.4 +- [jan] Update Lithuanian translation. +- [jan] Update Latvian translation. +- [jan] Update Brazilian Portuguese translation. + +------------------------------------------------------------------- Old: ---- Horde_Image-1.0.2.tgz New: ---- Horde_Image-1.0.9.tgz gpl-2.0.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Image.spec ++++++ --- /var/tmp/diff_new_pack.fOode0/_old 2012-03-16 13:20:37.000000000 +0100 +++ /var/tmp/diff_new_pack.fOode0/_new 2012-03-16 13:20:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Horde_Image # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -20,18 +20,18 @@ %define xmldir /var/lib/pear Summary: PEAR: Horde Image class +License: LGPL-2.1 and GPL-2.0 +Group: Development/Libraries/PHP Name: php5-pear-Horde_Image -Version: 1.0.2 -Release: 1 -License: LGPL -Group: Development/Libraries/PHP +Version: 1.0.9 +Release: 0 Source0: http://pear.horde.org/get/Horde_Image-%{version}.tgz +Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Image BuildRequires: php5-pear >= 1.4.7 Requires: php5-pear-Horde_Exception < 2.0.0, php5-pear >= 1.7.0, php5-pear-Horde_Support, php5-pear-Horde_Translation, php5-pear-Horde_Util, php5-pear-XML_SVG -Conflicts: php5-pear-Horde_Exception = 2.0.0 BuildRequires: php5-pear-channel-horde Requires: php5-pear-channel-horde Requires: php5-gd, php5-zlib, php5-json @@ -85,6 +85,7 @@ mkdir -p %{buildroot}%{xmldir} tar -xzf %{SOURCE0} package.xml cp -p package.xml %{buildroot}%{xmldir}/Horde_Image.xml +cp %{SOURCE1} %{buildroot}%{_docdir}/%{name}/GPL-20 %clean rm -rf %{buildroot} @@ -102,5 +103,6 @@ %{peardir}/* %{xmldir}/Horde_Image.xml +%doc %{_docdir}/%{name} %changelog ++++++ Horde_Image-1.0.2.tgz -> Horde_Image-1.0.9.tgz ++++++ ++++ 140192 lines of diff (skipped) ++++++ gpl-2.0.txt ++++++ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-CHI for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package perl-CHI for openSUSE:Factory checked in at 2012-03-16 13:20:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-CHI (Old) and /work/SRC/openSUSE:Factory/.perl-CHI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-CHI", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-CHI/perl-CHI.changes 2012-02-16 16:21:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-CHI.new/perl-CHI.changes 2012-03-16 13:20:33.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Mar 12 14:44:54 UTC 2012 - tabraham(a)novell.com + +- updated to 0.52 + - Subclasses inherit configuration from their parents unless they + also call config() + - Fix Config test to not require memcached + +- changes from 0.51 + - add CHI->config() to register storage types, and set core and + per-namespace defaults + - fix new test_max_key_length test to work on drivers that do not + support get_keys + +------------------------------------------------------------------- Old: ---- CHI-0.50.tar.gz New: ---- CHI-0.52.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-CHI.spec ++++++ --- /var/tmp/diff_new_pack.dZvPph/_old 2012-03-16 13:20:35.000000000 +0100 +++ /var/tmp/diff_new_pack.dZvPph/_new 2012-03-16 13:20:35.000000000 +0100 @@ -18,7 +18,7 @@ Name: perl-CHI -Version: 0.50 +Version: 0.52 Release: 1 License: GPL-1.0+ or Artistic-1.0 %define cpan_name CHI @@ -33,8 +33,8 @@ BuildRequires: perl(Carp::Assert) >= 0.20 BuildRequires: perl(Data::UUID) BuildRequires: perl(Date::Parse) -BuildRequires: perl(Digest::JHash) BuildRequires: perl(Digest::MD5) +BuildRequires: perl(Digest::JHash) BuildRequires: perl(File::Spec) >= 0.80 BuildRequires: perl(Hash::MoreUtils) BuildRequires: perl(JSON) @@ -72,6 +72,7 @@ #BuildRequires: perl(CHI::Serializer::Storable) #BuildRequires: perl(CHI::Stats) #BuildRequires: perl(CHI::t::Bugs) +#BuildRequires: perl(CHI::t::Config) #BuildRequires: perl(CHI::t::Constants) #BuildRequires: perl(CHI::t::Driver) #BuildRequires: perl(CHI::t::Driver::CacheCache) @@ -110,6 +111,7 @@ #BuildRequires: perl(Module::Mask) #BuildRequires: perl(Moose::Role) #BuildRequires: perl(Moose::Util::TypeConstraints) +#BuildRequires: perl(My::CHI) #BuildRequires: perl(Test::Pod) #BuildRequires: perl(Text::Table) #BuildRequires: perl(YAML::Any) @@ -117,8 +119,8 @@ Requires: perl(Data::UUID) Requires: perl(Digest::JHash) Requires: perl(Digest::MD5) -Requires: perl(File::Spec) >= 0.80 Requires: perl(Hash::MoreUtils) +Requires: perl(File::Spec) >= 0.80 Requires: perl(JSON) Requires: perl(List::MoreUtils) >= 0.13 Requires: perl(Log::Any) >= 0.08 ++++++ CHI-0.50.tar.gz -> CHI-0.52.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/Changes new/CHI-0.52/Changes --- old/CHI-0.50/Changes 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/Changes 2012-03-08 08:58:09.000000000 +0100 @@ -2,6 +2,22 @@ ** denotes an incompatible change +0.52 Mar 7, 2012 + +* Improvements + - Subclasses inherit configuration from their parents unless they also call config() + +* Fixes + - Fix Config test to not require memcached + +0.51 Mar 4, 2012 + +* Improvements + - Add CHI->config() to register storage types, and set core and per-namespace defaults + +* Fixes + - Fix new test_max_key_length test to work on drivers that do not support get_keys + 0.50 Nov 30, 2011 * Docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/MANIFEST new/CHI-0.52/MANIFEST --- old/CHI-0.50/MANIFEST 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/MANIFEST 2012-03-08 08:58:09.000000000 +0100 @@ -37,6 +37,7 @@ lib/CHI/Types.pm lib/CHI/Util.pm lib/CHI/t/Bugs.pm +lib/CHI/t/Config.pm lib/CHI/t/Constants.pm lib/CHI/t/Driver.pm lib/CHI/t/Driver/CacheCache.pm @@ -60,6 +61,7 @@ lib/CHI/t/Util.pm t/00-load.t t/Bugs.t +t/Config.t t/Constants.t t/Driver-Memory.t t/Driver-RawMemory.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/META.json new/CHI-0.52/META.json --- old/CHI-0.50/META.json 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/META.json 2012-03-08 08:58:09.000000000 +0100 @@ -4,7 +4,7 @@ "Jonathan Swartz <swartz(a)pobox.com>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.200008, CPAN::Meta::Converter version 2.102400", + "generated_by" : "Dist::Zilla version 4.200008, CPAN::Meta::Converter version 2.113640", "license" : [ "perl_5" ], @@ -77,6 +77,6 @@ "web" : "https://github.com/jonswar/perl-chi" } }, - "version" : "0.50" + "version" : "0.52" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/META.yml new/CHI-0.52/META.yml --- old/CHI-0.50/META.yml 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/META.yml 2012-03-08 08:58:09.000000000 +0100 @@ -13,7 +13,7 @@ configure_requires: ExtUtils::MakeMaker: 6.30 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.200008, CPAN::Meta::Converter version 2.102400' +generated_by: 'Dist::Zilla version 4.200008, CPAN::Meta::Converter version 2.113640' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -50,4 +50,4 @@ resources: bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=CHI repository: git://github.com/jonswar/perl-chi.git -version: 0.50 +version: 0.52 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/Makefile.PL new/CHI-0.52/Makefile.PL --- old/CHI-0.50/Makefile.PL 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/Makefile.PL 2012-03-08 08:58:09.000000000 +0100 @@ -44,7 +44,7 @@ 'Time::Duration::Parse' => '0.03', 'Try::Tiny' => '0.05' }, - 'VERSION' => '0.50', + 'VERSION' => '0.52', 'test' => { 'TESTS' => 't/*.t' } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/README new/CHI-0.52/README --- old/CHI-0.50/README 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/README 2012-03-08 08:58:10.000000000 +0100 @@ -2,7 +2,7 @@ CHI - Unified cache handling interface VERSION - version 0.50 + version 0.52 SYNOPSIS use CHI; @@ -79,7 +79,7 @@ * CHI::Driver::Memory - In-process memory based cache * CHI::Driver::RawMemory - In-process memory based cache that stores - references directly instead of deep-copying + references directly instead of serializing/deep-copying * CHI::Driver::File - File-based cache using one file per entry in a multi-level directory structure @@ -163,7 +163,8 @@ Serialization CHI handles its own serialization, passing a flat binary string to - the underlying cache backend. + the underlying cache backend. The notable exception is + CHI::Driver::RawMemory which does no serialization. Expiration CHI packs expiration times (as well as other metadata) inside the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Benchmarks.pod new/CHI-0.52/lib/CHI/Benchmarks.pod --- old/CHI-0.50/lib/CHI/Benchmarks.pod 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Benchmarks.pod 2012-03-08 08:58:09.000000000 +0100 @@ -9,7 +9,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/CacheObject.pm new/CHI-0.52/lib/CHI/CacheObject.pm --- old/CHI-0.50/lib/CHI/CacheObject.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/CacheObject.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::CacheObject; BEGIN { - $CHI::CacheObject::VERSION = '0.50'; + $CHI::CacheObject::VERSION = '0.52'; } use CHI::Constants qw(CHI_Max_Time); use Encode; @@ -180,7 +180,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Constants.pm new/CHI-0.52/lib/CHI/Constants.pm --- old/CHI-0.50/lib/CHI/Constants.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Constants.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Constants; BEGIN { - $CHI::Constants::VERSION = '0.50'; + $CHI::Constants::VERSION = '0.52'; } use strict; use warnings; @@ -28,7 +28,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Base/CacheContainer.pm new/CHI-0.52/lib/CHI/Driver/Base/CacheContainer.pm --- old/CHI-0.50/lib/CHI/Driver/Base/CacheContainer.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Base/CacheContainer.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::Base::CacheContainer; BEGIN { - $CHI::Driver::Base::CacheContainer::VERSION = '0.50'; + $CHI::Driver::Base::CacheContainer::VERSION = '0.52'; } use Moose; use Moose::Util::TypeConstraints; @@ -62,7 +62,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/CacheCache.pm new/CHI-0.52/lib/CHI/Driver/CacheCache.pm --- old/CHI-0.50/lib/CHI/Driver/CacheCache.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/CacheCache.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::CacheCache; BEGIN { - $CHI::Driver::CacheCache::VERSION = '0.50'; + $CHI::Driver::CacheCache::VERSION = '0.52'; } use Cache::Cache; use Carp; @@ -47,7 +47,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Development.pod new/CHI-0.52/lib/CHI/Driver/Development.pod --- old/CHI-0.50/lib/CHI/Driver/Development.pod 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Development.pod 2012-03-08 08:58:09.000000000 +0100 @@ -9,7 +9,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS @@ -149,7 +149,7 @@ =head2 Overridable methods -The following methods have a default implementation, but MAY be overriden by +The following methods have a default implementation, but MAY be overridden by your subclass: =over diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/FastMmap.pm new/CHI-0.52/lib/CHI/Driver/FastMmap.pm --- old/CHI-0.50/lib/CHI/Driver/FastMmap.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/FastMmap.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::FastMmap; BEGIN { - $CHI::Driver::FastMmap::VERSION = '0.50'; + $CHI::Driver::FastMmap::VERSION = '0.52'; } use Carp; use Cache::FastMmap; @@ -89,7 +89,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/File.pm new/CHI-0.52/lib/CHI/Driver/File.pm --- old/CHI-0.50/lib/CHI/Driver/File.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/File.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::File; BEGIN { - $CHI::Driver::File::VERSION = '0.50'; + $CHI::Driver::File::VERSION = '0.52'; } use Carp; use Cwd qw(realpath cwd); @@ -248,7 +248,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Memory.pm new/CHI-0.52/lib/CHI/Driver/Memory.pm --- old/CHI-0.50/lib/CHI/Driver/Memory.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Memory.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::Memory; BEGIN { - $CHI::Driver::Memory::VERSION = '0.50'; + $CHI::Driver::Memory::VERSION = '0.52'; } use Carp qw(cluck croak); use CHI::Constants qw(CHI_Meta_Namespace); @@ -105,7 +105,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Metacache.pm new/CHI-0.52/lib/CHI/Driver/Metacache.pm --- old/CHI-0.50/lib/CHI/Driver/Metacache.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Metacache.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::Metacache; BEGIN { - $CHI::Driver::Metacache::VERSION = '0.50'; + $CHI::Driver::Metacache::VERSION = '0.52'; } use CHI::Constants qw(CHI_Meta_Namespace); use Moose; @@ -66,7 +66,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Null.pm new/CHI-0.52/lib/CHI/Driver/Null.pm --- old/CHI-0.50/lib/CHI/Driver/Null.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Null.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::Null; BEGIN { - $CHI::Driver::Null::VERSION = '0.50'; + $CHI::Driver::Null::VERSION = '0.52'; } use Moose; use strict; @@ -28,7 +28,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/RawMemory.pm new/CHI-0.52/lib/CHI/Driver/RawMemory.pm --- old/CHI-0.50/lib/CHI/Driver/RawMemory.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/RawMemory.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::RawMemory; BEGIN { - $CHI::Driver::RawMemory::VERSION = '0.50'; + $CHI::Driver::RawMemory::VERSION = '0.52'; } use Moose; use strict; @@ -30,7 +30,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Role/HasSubcaches.pm new/CHI-0.52/lib/CHI/Driver/Role/HasSubcaches.pm --- old/CHI-0.50/lib/CHI/Driver/Role/HasSubcaches.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Role/HasSubcaches.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::Role::HasSubcaches; BEGIN { - $CHI::Driver::Role::HasSubcaches::VERSION = '0.50'; + $CHI::Driver::Role::HasSubcaches::VERSION = '0.52'; } use Moose::Role; use Hash::MoreUtils qw(slice_exists); @@ -38,7 +38,7 @@ qw(expires_at expires_in expires_variance namespace on_get_error on_set_error serializer) ); -# List of parameters that cannot be overriden in a subcache +# List of parameters that cannot be overridden in a subcache # my @subcache_nonoverride_param_keys = (qw(expires_at expires_in expires_variance serializer)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Role/IsSizeAware.pm new/CHI-0.52/lib/CHI/Driver/Role/IsSizeAware.pm --- old/CHI-0.50/lib/CHI/Driver/Role/IsSizeAware.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Role/IsSizeAware.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::Role::IsSizeAware; BEGIN { - $CHI::Driver::Role::IsSizeAware::VERSION = '0.50'; + $CHI::Driver::Role::IsSizeAware::VERSION = '0.52'; } use Carp::Assert; use Moose::Role; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Role/IsSubcache.pm new/CHI-0.52/lib/CHI/Driver/Role/IsSubcache.pm --- old/CHI-0.50/lib/CHI/Driver/Role/IsSubcache.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Role/IsSubcache.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::Role::IsSubcache; BEGIN { - $CHI::Driver::Role::IsSubcache::VERSION = '0.50'; + $CHI::Driver::Role::IsSubcache::VERSION = '0.52'; } use Moose::Role; use strict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver/Role/Universal.pm new/CHI-0.52/lib/CHI/Driver/Role/Universal.pm --- old/CHI-0.50/lib/CHI/Driver/Role/Universal.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver/Role/Universal.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver::Role::Universal; BEGIN { - $CHI::Driver::Role::Universal::VERSION = '0.50'; + $CHI::Driver::Role::Universal::VERSION = '0.52'; } use CHI::Constants qw(CHI_Meta_Namespace); use Moose::Role; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Driver.pm new/CHI-0.52/lib/CHI/Driver.pm --- old/CHI-0.50/lib/CHI/Driver.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Driver.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Driver; BEGIN { - $CHI::Driver::VERSION = '0.50'; + $CHI::Driver::VERSION = '0.52'; } use Carp; use CHI::CacheObject; @@ -50,6 +50,7 @@ has 'on_set_error' => ( is => 'rw', isa => 'CHI::Types::OnError', default => 'log' ); has 'serializer' => ( is => 'ro', isa => 'CHI::Types::Serializer', coerce => 1, default => sub { $default_serializer } ); has 'short_driver_name' => ( is => 'ro', lazy_build => 1 ); +has 'storage' => ( is => 'ro' ); # These methods must be implemented by subclass foreach my $method (qw(fetch store remove get_keys get_namespaces)) { @@ -697,7 +698,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Serializer/JSON.pm new/CHI-0.52/lib/CHI/Serializer/JSON.pm --- old/CHI-0.50/lib/CHI/Serializer/JSON.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Serializer/JSON.pm 2012-03-08 08:58:09.000000000 +0100 @@ -3,7 +3,7 @@ # package CHI::Serializer::JSON; BEGIN { - $CHI::Serializer::JSON::VERSION = '0.50'; + $CHI::Serializer::JSON::VERSION = '0.52'; } use Moose; use JSON; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Serializer/Storable.pm new/CHI-0.52/lib/CHI/Serializer/Storable.pm --- old/CHI-0.50/lib/CHI/Serializer/Storable.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Serializer/Storable.pm 2012-03-08 08:58:09.000000000 +0100 @@ -3,7 +3,7 @@ # package CHI::Serializer::Storable; BEGIN { - $CHI::Serializer::Storable::VERSION = '0.50'; + $CHI::Serializer::Storable::VERSION = '0.52'; } use Moose; use Storable; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Stats.pm new/CHI-0.52/lib/CHI/Stats.pm --- old/CHI-0.50/lib/CHI/Stats.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Stats.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Stats; BEGIN { - $CHI::Stats::VERSION = '0.50'; + $CHI::Stats::VERSION = '0.52'; } use Log::Any qw($log); use Moose; @@ -137,7 +137,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Test/Class.pm new/CHI-0.52/lib/CHI/Test/Class.pm --- old/CHI-0.50/lib/CHI/Test/Class.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Test/Class.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Test::Class; BEGIN { - $CHI::Test::Class::VERSION = '0.50'; + $CHI::Test::Class::VERSION = '0.52'; } use Getopt::Long; use CHI::Util qw(can_load); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Test/Driver/NonMoose.pm new/CHI-0.52/lib/CHI/Test/Driver/NonMoose.pm --- old/CHI-0.50/lib/CHI/Test/Driver/NonMoose.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Test/Driver/NonMoose.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Test::Driver::NonMoose; BEGIN { - $CHI::Test::Driver::NonMoose::VERSION = '0.50'; + $CHI::Test::Driver::NonMoose::VERSION = '0.52'; } use Carp; use strict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Test/Driver/Readonly.pm new/CHI-0.52/lib/CHI/Test/Driver/Readonly.pm --- old/CHI-0.50/lib/CHI/Test/Driver/Readonly.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Test/Driver/Readonly.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Test::Driver::Readonly; BEGIN { - $CHI::Test::Driver::Readonly::VERSION = '0.50'; + $CHI::Test::Driver::Readonly::VERSION = '0.52'; } use Carp; use Moose; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Test/Driver/Role/CheckKeyValidity.pm new/CHI-0.52/lib/CHI/Test/Driver/Role/CheckKeyValidity.pm --- old/CHI-0.50/lib/CHI/Test/Driver/Role/CheckKeyValidity.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Test/Driver/Role/CheckKeyValidity.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Test::Driver::Role::CheckKeyValidity; BEGIN { - $CHI::Test::Driver::Role::CheckKeyValidity::VERSION = '0.50'; + $CHI::Test::Driver::Role::CheckKeyValidity::VERSION = '0.52'; } use Carp; use Moose::Role; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Test/Driver/Writeonly.pm new/CHI-0.52/lib/CHI/Test/Driver/Writeonly.pm --- old/CHI-0.50/lib/CHI/Test/Driver/Writeonly.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Test/Driver/Writeonly.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Test::Driver::Writeonly; BEGIN { - $CHI::Test::Driver::Writeonly::VERSION = '0.50'; + $CHI::Test::Driver::Writeonly::VERSION = '0.52'; } use Carp; use strict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Test/Util.pm new/CHI-0.52/lib/CHI/Test/Util.pm --- old/CHI-0.50/lib/CHI/Test/Util.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Test/Util.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Test::Util; BEGIN { - $CHI::Test::Util::VERSION = '0.50'; + $CHI::Test::Util::VERSION = '0.52'; } use Date::Parse; use Test::Builder; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Test.pm new/CHI-0.52/lib/CHI/Test.pm --- old/CHI-0.50/lib/CHI/Test.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Test.pm 2012-03-08 08:58:09.000000000 +0100 @@ -2,7 +2,7 @@ # package CHI::Test; BEGIN { - $CHI::Test::VERSION = '0.50'; + $CHI::Test::VERSION = '0.52'; } use Log::Any::Test; # as early as possible use List::MoreUtils qw(uniq); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Types.pm new/CHI-0.52/lib/CHI/Types.pm --- old/CHI-0.50/lib/CHI/Types.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Types.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Types; BEGIN { - $CHI::Types::VERSION = '0.50'; + $CHI::Types::VERSION = '0.52'; } use Carp; use CHI::Util qw(can_load parse_duration parse_memory_size); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/Util.pm new/CHI-0.52/lib/CHI/Util.pm --- old/CHI-0.50/lib/CHI/Util.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/Util.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::Util; BEGIN { - $CHI::Util::VERSION = '0.50'; + $CHI::Util::VERSION = '0.52'; } use Carp qw( croak longmess ); use Class::MOP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Bugs.pm new/CHI-0.52/lib/CHI/t/Bugs.pm --- old/CHI-0.50/lib/CHI/t/Bugs.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Bugs.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Bugs; BEGIN { - $CHI::t::Bugs::VERSION = '0.50'; + $CHI::t::Bugs::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Config.pm new/CHI-0.52/lib/CHI/t/Config.pm --- old/CHI-0.50/lib/CHI/t/Config.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Config.pm 2012-03-08 08:58:09.000000000 +0100 @@ -0,0 +1,143 @@ +package CHI::t::Config; +BEGIN { + $CHI::t::Config::VERSION = '0.52'; +} +use CHI::Util qw(dump_one_line); +use CHI::Test; +use File::Temp qw(tempdir); +use strict; +use warnings; +use base qw(CHI::Test::Class); + +my $root_dir = tempdir( 'CHI-t-Config-XXXX', TMPDIR => 1, CLEANUP => 1 ); + +my %config = ( + storage => { + memory => { driver => 'Memory', global => 1 }, + file => { driver => 'File', root_dir => $root_dir }, + }, + namespace => { + 'Foo' => { storage => 'file' }, + 'Bar' => { storage => 'file', depth => 3 }, + }, + defaults => { storage => 'memory' }, +); + +{ + package My::CHI; +BEGIN { + $My::CHI::VERSION = '0.52'; +} + use base qw(CHI); + My::CHI->config( {%config} ); +} + +{ + package My::CHI::Subclass; +BEGIN { + $My::CHI::Subclass::VERSION = '0.52'; +} + use base qw(My::CHI); +} + +{ + package My::CHI::Memo; +BEGIN { + $My::CHI::Memo::VERSION = '0.52'; +} + use base qw(CHI); + My::CHI::Memo->config( { %config, memoize_cache_objects => 1 } ); +} + +sub _create { + my ( $params, $checks ) = @_; + + my $desc = dump_one_line($params); + foreach my $class (qw(My::CHI My::CHI::Subclass)) { + my $cache = $class->new(%$params); + while ( my ( $key, $value ) = each(%$checks) ) { + is( $cache->$key, $value, "$key == $value ($desc)" ); + } + } +} + +sub test_config : Tests { + my $self = shift; + + _create( + { namespace => 'Foo' }, + { + namespace => 'Foo', + storage => 'file', + short_driver_name => 'File', + root_dir => $root_dir, + depth => 2 + }, + ); + _create( + { namespace => 'Bar' }, + { + namespace => 'Bar', + storage => 'file', + short_driver_name => 'File', + root_dir => $root_dir, + depth => 3 + } + ); + _create( + { namespace => 'Foo', depth => 4 }, + { + namespace => 'Foo', + storage => 'file', + short_driver_name => 'File', + root_dir => $root_dir, + depth => 4 + } + ); + _create( + { namespace => 'Bar', depth => 4 }, + { + namespace => 'Bar', + storage => 'file', + short_driver_name => 'File', + root_dir => $root_dir, + depth => 4 + } + ); + + my %new_config = %config; + $new_config{namespace}->{'Bar'}->{depth} = 5; + My::CHI->config( {%new_config} ); + _create( + { namespace => 'Bar' }, + { + namespace => 'Bar', + storage => 'file', + short_driver_name => 'File', + root_dir => $root_dir, + depth => 5 + } + ); +} + +sub test_memoize : Tests { + my $cache1 = My::CHI::Memo->new( namespace => 'Foo' ); + my $cache2 = My::CHI::Memo->new( namespace => 'Foo' ); + is( $cache1, $cache2, "same - namespace Foo" ); + + my $cache3 = My::CHI::Memo->new( namespace => 'Bar', depth => 4 ); + my $cache4 = My::CHI::Memo->new( namespace => 'Bar', depth => 4 ); + isnt( $cache3, $cache4, "different - namespace Bar" ); + + My::CHI::Memo->clear_memoized_cache_objects(); + my $cache5 = My::CHI::Memo->new( namespace => 'Foo' ); + my $cache6 = My::CHI::Memo->new( namespace => 'Foo' ); + is( $cache5, $cache6, "same - namespace Foo" ); + isnt( $cache1, $cache3, "different - post-clear" ); + + my $cache7 = My::CHI->new( namespace => 'Foo' ); + my $cache8 = My::CHI->new( namespace => 'Foo' ); + isnt( $cache7, $cache8, "different - namespace Foo - no memoization" ); +} + +1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Constants.pm new/CHI-0.52/lib/CHI/t/Constants.pm --- old/CHI-0.50/lib/CHI/t/Constants.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Constants.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Constants; BEGIN { - $CHI::t::Constants::VERSION = '0.50'; + $CHI::t::Constants::VERSION = '0.52'; } use strict; use warnings; @@ -11,21 +11,21 @@ { package Foo; BEGIN { - $Foo::VERSION = '0.50'; + $Foo::VERSION = '0.52'; } use CHI::Constants qw(CHI_Meta_Namespace); } { package Bar; BEGIN { - $Bar::VERSION = '0.50'; + $Bar::VERSION = '0.52'; } use CHI::Constants qw(:all); } { package Baz; BEGIN { - $Baz::VERSION = '0.50'; + $Baz::VERSION = '0.52'; } } is( Foo::CHI_Meta_Namespace, '_CHI_METACACHE' ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/CacheCache.pm new/CHI-0.52/lib/CHI/t/Driver/CacheCache.pm --- old/CHI-0.50/lib/CHI/t/Driver/CacheCache.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/CacheCache.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::CacheCache; BEGIN { - $CHI::t::Driver::CacheCache::VERSION = '0.50'; + $CHI::t::Driver::CacheCache::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/FastMmap.pm new/CHI-0.52/lib/CHI/t/Driver/FastMmap.pm --- old/CHI-0.50/lib/CHI/t/Driver/FastMmap.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/FastMmap.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::FastMmap; BEGIN { - $CHI::t::Driver::FastMmap::VERSION = '0.50'; + $CHI::t::Driver::FastMmap::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/File/DepthZero.pm new/CHI-0.52/lib/CHI/t/Driver/File/DepthZero.pm --- old/CHI-0.50/lib/CHI/t/Driver/File/DepthZero.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/File/DepthZero.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::File::DepthZero; BEGIN { - $CHI::t::Driver::File::DepthZero::VERSION = '0.50'; + $CHI::t::Driver::File::DepthZero::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/File.pm new/CHI-0.52/lib/CHI/t/Driver/File.pm --- old/CHI-0.50/lib/CHI/t/Driver/File.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/File.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::File; BEGIN { - $CHI::t::Driver::File::VERSION = '0.50'; + $CHI::t::Driver::File::VERSION = '0.52'; } use strict; use warnings; @@ -24,7 +24,7 @@ { package CHI::t::Driver::File::NoTempDriver; BEGIN { - $CHI::t::Driver::File::NoTempDriver::VERSION = '0.50'; + $CHI::t::Driver::File::NoTempDriver::VERSION = '0.52'; } use Moose; extends 'CHI::Driver::File'; @@ -39,7 +39,7 @@ { package CHI::t::Driver::File::BadTempDriver; BEGIN { - $CHI::t::Driver::File::BadTempDriver::VERSION = '0.50'; + $CHI::t::Driver::File::BadTempDriver::VERSION = '0.52'; } use Moose; extends 'CHI::Driver::File'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/Memory.pm new/CHI-0.52/lib/CHI/t/Driver/Memory.pm --- old/CHI-0.50/lib/CHI/t/Driver/Memory.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/Memory.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::Memory; BEGIN { - $CHI::t::Driver::Memory::VERSION = '0.50'; + $CHI::t::Driver::Memory::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/NonMoose.pm new/CHI-0.52/lib/CHI/t/Driver/NonMoose.pm --- old/CHI-0.50/lib/CHI/t/Driver/NonMoose.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/NonMoose.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::NonMoose; BEGIN { - $CHI::t::Driver::NonMoose::VERSION = '0.50'; + $CHI::t::Driver::NonMoose::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/RawMemory.pm new/CHI-0.52/lib/CHI/t/Driver/RawMemory.pm --- old/CHI-0.50/lib/CHI/t/Driver/RawMemory.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/RawMemory.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::RawMemory; BEGIN { - $CHI::t::Driver::RawMemory::VERSION = '0.50'; + $CHI::t::Driver::RawMemory::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/Subcache/l1_cache.pm new/CHI-0.52/lib/CHI/t/Driver/Subcache/l1_cache.pm --- old/CHI-0.50/lib/CHI/t/Driver/Subcache/l1_cache.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/Subcache/l1_cache.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::Subcache::l1_cache; BEGIN { - $CHI::t::Driver::Subcache::l1_cache::VERSION = '0.50'; + $CHI::t::Driver::Subcache::l1_cache::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/Subcache/mirror_cache.pm new/CHI-0.52/lib/CHI/t/Driver/Subcache/mirror_cache.pm --- old/CHI-0.50/lib/CHI/t/Driver/Subcache/mirror_cache.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/Subcache/mirror_cache.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::Subcache::mirror_cache; BEGIN { - $CHI::t::Driver::Subcache::mirror_cache::VERSION = '0.50'; + $CHI::t::Driver::Subcache::mirror_cache::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver/Subcache.pm new/CHI-0.52/lib/CHI/t/Driver/Subcache.pm --- old/CHI-0.50/lib/CHI/t/Driver/Subcache.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver/Subcache.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver::Subcache; BEGIN { - $CHI::t::Driver::Subcache::VERSION = '0.50'; + $CHI::t::Driver::Subcache::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Driver.pm new/CHI-0.52/lib/CHI/t/Driver.pm --- old/CHI-0.50/lib/CHI/t/Driver.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Driver.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Driver; BEGIN { - $CHI::t::Driver::VERSION = '0.50'; + $CHI::t::Driver::VERSION = '0.52'; } use strict; use warnings; @@ -586,7 +586,7 @@ { package DummySerializer; BEGIN { - $DummySerializer::VERSION = '0.50'; + $DummySerializer::VERSION = '0.52'; } sub serialize { } sub deserialize { } @@ -1853,9 +1853,15 @@ $cache->set( $key, $value ); is( $cache->get($key), $value, $keyname ); is( $cache->mirror_cache->get($key), $value, $keyname ); + if ( $keyname eq 'medium' ) { + is( $cache->get_object($key)->key(), $key, "medium key stored" ); + } + else { + isnt( $cache->get_object($key)->key(), $key, "md5 key stored" ); + is( length( $cache->get_object($key)->key() ), + 32, "md5 key stored" ); + } } - cmp_set( [ $cache->get_keys() ], - [ 'medium', '66b08343f81782986329795e0a422a05' ], 'get_keys' ); } 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/GetError.pm new/CHI-0.52/lib/CHI/t/GetError.pm --- old/CHI-0.50/lib/CHI/t/GetError.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/GetError.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::GetError; BEGIN { - $CHI::t::GetError::VERSION = '0.50'; + $CHI::t::GetError::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Initialize.pm new/CHI-0.52/lib/CHI/t/Initialize.pm --- old/CHI-0.50/lib/CHI/t/Initialize.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Initialize.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Initialize; BEGIN { - $CHI::t::Initialize::VERSION = '0.50'; + $CHI::t::Initialize::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Null.pm new/CHI-0.52/lib/CHI/t/Null.pm --- old/CHI-0.50/lib/CHI/t/Null.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Null.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Null; BEGIN { - $CHI::t::Null::VERSION = '0.50'; + $CHI::t::Null::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/RequiredModules.pm new/CHI-0.52/lib/CHI/t/RequiredModules.pm --- old/CHI-0.50/lib/CHI/t/RequiredModules.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/RequiredModules.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::RequiredModules; BEGIN { - $CHI::t::RequiredModules::VERSION = '0.50'; + $CHI::t::RequiredModules::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Sanity.pm new/CHI-0.52/lib/CHI/t/Sanity.pm --- old/CHI-0.50/lib/CHI/t/Sanity.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Sanity.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Sanity; BEGIN { - $CHI::t::Sanity::VERSION = '0.50'; + $CHI::t::Sanity::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/SetError.pm new/CHI-0.52/lib/CHI/t/SetError.pm --- old/CHI-0.50/lib/CHI/t/SetError.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/SetError.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::SetError; BEGIN { - $CHI::t::SetError::VERSION = '0.50'; + $CHI::t::SetError::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Subcache.pm new/CHI-0.52/lib/CHI/t/Subcache.pm --- old/CHI-0.50/lib/CHI/t/Subcache.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Subcache.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Subcache; BEGIN { - $CHI::t::Subcache::VERSION = '0.50'; + $CHI::t::Subcache::VERSION = '0.52'; } use CHI::Test; use CHI::Util qw(can_load); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Subclass.pm new/CHI-0.52/lib/CHI/t/Subclass.pm --- old/CHI-0.50/lib/CHI/t/Subclass.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Subclass.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Subclass; BEGIN { - $CHI::t::Subclass::VERSION = '0.50'; + $CHI::t::Subclass::VERSION = '0.52'; } use strict; use warnings; @@ -12,7 +12,7 @@ { package CHI::t::Subclass::Driver::HasUnsupported; BEGIN { - $CHI::t::Subclass::Driver::HasUnsupported::VERSION = '0.50'; + $CHI::t::Subclass::Driver::HasUnsupported::VERSION = '0.52'; } use Moose; extends 'CHI::Driver::Memory'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI/t/Util.pm new/CHI-0.52/lib/CHI/t/Util.pm --- old/CHI-0.50/lib/CHI/t/Util.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI/t/Util.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,6 +1,6 @@ package CHI::t::Util; BEGIN { - $CHI::t::Util::VERSION = '0.50'; + $CHI::t::Util::VERSION = '0.52'; } use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/lib/CHI.pm new/CHI-0.52/lib/CHI.pm --- old/CHI-0.50/lib/CHI.pm 2011-11-30 22:28:51.000000000 +0100 +++ new/CHI-0.52/lib/CHI.pm 2012-03-08 08:58:09.000000000 +0100 @@ -1,20 +1,54 @@ package CHI; BEGIN { - $CHI::VERSION = '0.50'; + $CHI::VERSION = '0.52'; } use 5.006; use Carp; use CHI::Stats; +use Moose; use strict; use warnings; -my ( %final_class_seen, %stats ); +my ( %final_class_seen, %memoized_cache_objects, %stats ); +my %valid_config_keys = + map { ( $_, 1 ) } qw(defaults memoize_cache_objects namespace storage); sub logger { warn "CHI now uses Log::Any for logging - see Log::Any documentation for details"; } +sub config { + my $class = shift; + $class->_set_config(@_) if @_; + return $class->_get_config(); +} + +sub _set_config { + my ( $class, $config ) = @_; + if ( my @bad_keys = grep { !$valid_config_keys{$_} } keys(%$config) ) { + croak "unknown keys in config hash: " . join( ", ", @bad_keys ); + } + $class->meta->add_method( '_get_config' => sub { $config } ); +} + +CHI->config( {} ); + +sub memoized_cache_objects { + my ($class) = @_; + + # Each CHI root class gets its hash of memoized objects + # + $memoized_cache_objects{$class} ||= {}; + return $memoized_cache_objects{$class}; +} + +sub clear_memoized_cache_objects { + my ($class) = @_; + + $memoized_cache_objects{$class} = {}; +} + sub stats { my ($class) = @_; @@ -27,6 +61,41 @@ sub new { my ( $chi_root_class, %params ) = @_; + my $config = $chi_root_class->config; + + # Cache object memoization: See if cache object with these parameters + # has already been created, and return it if so. Only for parameters + # with 0 or 1 keys. + # + my ( $cache_object_key, $cache_objects ); + if ( $config->{memoize_cache_objects} && keys(%params) <= 1 ) { + $cache_object_key = join chr(28), %params; + $cache_objects = $chi_root_class->memoized_cache_objects; + if ( my $cache_object = $cache_objects->{$cache_object_key} ) { + return $cache_object; + } + } + + # Gather defaults + # + my $core_defaults = $config->{defaults} || {}; + my $namespace_defaults = + $config->{namespace}->{ $params{namespace} || 'Default' } || {}; + my $storage = + $params{storage} + || $namespace_defaults->{storage} + || $core_defaults->{storage}; + my $storage_defaults = {}; + if ( defined($storage) ) { + $storage_defaults = $config->{storage}->{$storage} + or croak "no config for storage type '$storage'"; + } + + # Combine passed params with defaults + # + %params = + ( %$core_defaults, %$storage_defaults, %$namespace_defaults, %params ); + # Get driver class from driver or driver_class parameters # my $driver_class; @@ -74,11 +143,21 @@ $meta->add_method( 'meta' => sub { $meta } ) if !$final_class_seen{$final_class}++; - return $final_class->new( + # Finally create the object + # + my $cache_object = $final_class->new( chi_root_class => $chi_root_class, driver_class => $driver_class, %params ); + + # Memoize if appropriate + # + if ($cache_object_key) { + $cache_objects->{$cache_object_key} = $cache_object; + } + + return $cache_object; } 1; @@ -93,7 +172,7 @@ =head1 VERSION -version 0.50 +version 0.52 =head1 SYNOPSIS @@ -186,9 +265,18 @@ =head1 CONSTRUCTOR -To create a new cache handle, call CHI-E<gt>new. It takes the following common -options. All are optional, except that either I<driver> or I<driver_class> must -be passed. +To create a new cache object, call C<<CHI-E<gt>new>. It takes the common +options listed below. All are optional, except that either I<driver> or +I<driver_class> must be passed. + +Some drivers will take additional constructor options. For example, the File +driver takes C<root_dir> and C<depth> options. + +You can configure default options for each new cache object created - see +L</SUBCLASSING AND CONFIGURING CHI>. + +Note that C<CHI-E<gt>new> returns an instance of a subclass of +L<CHI::Driver|CHI::Driver>, not C<CHI>. =over @@ -368,9 +456,6 @@ =back -Some drivers will take additional constructor options. For example, the File -driver takes C<root_dir> and C<depth> options. - =head1 INSTANCE METHODS The following methods can be called on any cache handle returned from @@ -672,6 +757,11 @@ =over +=item chi_root_class( ) + +Returns the name of the root class under which this object was created, e.g. +C<CHI> or C<My::CHI>. See L</SUBCLASSING AND CONFIGURING CHI>. + =item driver_class( ) Returns the full name of the driver class. e.g. @@ -809,7 +899,7 @@ my $cache = CHI->new( driver => 'Memcached', servers => [ "10.0.0.15:11211", "10.0.0.15:11212" ], - l1_cache => { driver => 'Memory' } + l1_cache => { driver => 'Memory', global => 1, max_size => 1024*1024 } ); On a C<get>, the L1 cache is checked first - if a valid value exists, it is @@ -925,7 +1015,7 @@ l1_cache => { driver => 'File', root_dir => '/path/to/root', - l1_cache => { driver => 'RawMemory' } + l1_cache => { driver => 'RawMemory', global => 1 } } ); @@ -1018,6 +1108,184 @@ L<CHI::Driver::File|File> - there is a race condition in the updating of size that can cause the size to grow inaccurate over time. +=head1 SUBCLASSING AND CONFIGURING CHI + +You can subclass CHI for your own application and configure it in a variety of +ways, e.g. pre-defining storage types and defaults for new cache objects. Your +configuration will be independent of the main CHI class and other CHI +subclasses. + +Start with a trivial subclass: + + package My::CHI; + use base qw(CHI); + 1; + +Then, just use your subclass in place of CHI: + + my $cache = My::CHI->new( ... ); + + print $cache->chi_root_class; + ==> 'My::CHI' + +This obviously doesn't change any behavior by itself. Here's an example with +actual config: + + package My::CHI; + use base qw(CHI); + + __PACKAGE__->config({ + storage => { + local_file => { driver => 'File', root_dir => '/my/root' }, + memcached => { + driver => 'Memcached::libmemcached', + servers => [ '10.0.0.15:11211', '10.0.0.15:11212' ] + }, + }, + namespace => { + 'Foo' => { storage => 'local_file' }, + 'Bar' => { storage => 'local_file', depth => 3 }, + 'Baz' => { storage => 'memcached' }, + } + defaults => { storage => 'local_file' }, + memoize_cache_objects => 1, + }); + + 1; + +Each of these config keys is explained in the next section. + +=head2 Configuration keys + +=over + +=item storage + +A map of names to parameter hashrefs. This provides a way to encapsulate common +sets of parameters that might be used in many caches. e.g. if you define + + storage => { + local_file => { driver => 'File', root_dir => '/my/root' }, + ... + } + +then + + my $cache = My::CHI->new + (namespace => 'Foo', storage => 'local_file'); + +is equivalent to + + my $cache = My::CHI->new + (namespace => 'Foo', driver => 'File', root_dir => '/my/root'); + +=item namespace + +A map of namespace names to parameter hashrefs. When you create a cache object +with the specified namespace, the hashref of parameters will be applied as +defaults. e.g. if you define + + namespace => { + 'Foo' => { driver => 'File', root_dir => '/my/root' }, + 'Bar' => { storage => 'database' }, + ... + } + +then + + my $cache1 = My::CHI->new + (namespace => 'Foo'); + my $cache2 = My::CHI->new + (namespace => 'Bar'); + +is equivalent to + + my $cache1 = My::CHI->new + (namespace => 'Foo', driver => 'File', root_dir => '/my/root'); + my $cache2 = My::CHI->new + (namespace => 'Bar', storage => 'database'); + +=item defaults + +A hash of parameters that will be used as core defaults for all cache objects +created under this root class. e.g. + + defaults => { + on_get_error => 'die', + expires_variance => 0.2, + } + +These can be overriden by namespace defaults, storage settings, or C<new> +parameters. + +=item memoize_cache_objects + +True or false, indicates whether C<My::CHI-E<gt>new> should memoize and return +the same cache object if given the same parameters. This can speed things up if +you create cache objects frequently. Will currently only work for 0- or 1- key +parameter hashes. e.g. + + My::CHI->config({ + memoize_cache_objects => 1, + }); + +then + + # $cache1 and $cache2 will be the same object, regardless of what + # namespace and storage defaults are associated with 'Foo' + # + my $cache1 = My::CHI->new(namespace => 'Foo'); + my $cache2 = My::CHI->new(namespace => 'Foo'); + + # $cache3 and $cache4 will be different objects + # + my $cache3 = My::CHI->new + (namespace => 'Bar', driver => 'File', root_dir => '/my/root'); + my $cache4 = My::CHI->new + (namespace => 'Bar', driver => 'File', root_dir => '/my/root'); + +To clear the memoized cache objects, call + + My::CHI->clear_memoized_cache_objects; + +=back + +=head2 How defaults are combined + +Defaults are applied in the following order, from highest to lowest precedence: + +=over + +=item * + +Parameters passed in C<new> + +=item * + +Namespace defaults, if any + +=item * + +Storage settings, if any + +=item * + +Core defaults defined under 'defaults' + +=back + +=head2 Inheritance of config + +A subclass will automatically inherit the configuration of its parent if it +does not call C<config> itself (ala +L<Class::Data::Inheritable|Class::Data::Inheritable>). + +=head2 Reading config from a file + + use YAML::XS qw(LoadFile); + + __PACKAGE__->config(LoadFile("/path/to/cache.yml")); + =for readme continue =head1 AVAILABILITY OF DRIVERS @@ -1033,7 +1301,7 @@ =item * L<CHI::Driver::RawMemory|CHI::Driver::RawMemory> - In-process memory based -cache that stores references directly instead of deep-copying +cache that stores references directly instead of serializing/deep-copying =item * @@ -1183,7 +1451,8 @@ =item Serialization CHI handles its own serialization, passing a flat binary string to the -underlying cache backend. +underlying cache backend. The notable exception is +L<CHI::Driver::RawMemory|CHI::Driver::RawMemory> which does no serialization. =item Expiration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHI-0.50/t/Config.t new/CHI-0.52/t/Config.t --- old/CHI-0.50/t/Config.t 1970-01-01 01:00:00.000000000 +0100 +++ new/CHI-0.52/t/Config.t 2012-03-08 08:58:09.000000000 +0100 @@ -0,0 +1,3 @@ +#!perl -w +use CHI::t::Config; +CHI::t::Config->runtests; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit package-translations for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package package-translations for openSUSE:Factory checked in at 2012-03-16 13:19:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/package-translations (Old) and /work/SRC/openSUSE:Factory/.package-translations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "package-translations", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/package-translations/package-translations.changes 2012-03-08 19:44:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.package-translations.new/package-translations.changes 2012-03-16 13:20:30.000000000 +0100 @@ -2 +2 @@ -Wed Mar 7 16:13:31 CET 2012 - coolo(a)suse.com +Wed Mar 14 16:13:31 CET 2012 - <coolo(a)suse.com> @@ -4 +4 @@ -- automated update on 2012-03-07 +- automated update on 2012-03-14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-translations.tar.bz2 ++++++ Files old/mo/package-translations-cs.mo and new/mo/package-translations-cs.mo differ Files old/mo/package-translations-ru.mo and new/mo/package-translations-ru.mo differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit PackageKit-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package PackageKit-branding-openSUSE for openSUSE:Factory checked in at 2012-03-16 13:19:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.PackageKit-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit-branding-openSUSE", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit-branding-openSUSE/PackageKit-branding-openSUSE.changes 2011-10-13 16:23:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit-branding-openSUSE.new/PackageKit-branding-openSUSE.changes 2012-03-16 13:20:28.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 08:03:44 UTC 2012 - vuntz(a)opensuse.org + +- Rebase PackageKit-branding-vendor.patch. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.ABQ43S/_old 2012-03-16 13:20:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ABQ43S/_new 2012-03-16 13:20:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package PackageKit-branding-openSUSE # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -22,10 +22,10 @@ # Do not edit this auto generated file! Edit PackageKit-branding.spec.in. Name: PackageKit-branding-openSUSE -License: GPL-2.0+ Version: 12.1 -Release: 1 +Release: 0 Summary: Simple software installation management software -- openSUSE default configuration +License: GPL-2.0+ Group: System/Daemons Url: http://packagekit.org/ Source0: COPYING @@ -37,8 +37,8 @@ # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with PackageKit-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! -BuildRequires: PackageKit-branding-upstream BuildRequires: PackageKit +BuildRequires: PackageKit-branding-upstream %define packagekit_version %(rpm -q --qf '%%{version}' PackageKit) Requires: PackageKit = %{packagekit_version} Provides: PackageKit-branding = %{packagekit_version} ++++++ PackageKit-branding-vendor.patch ++++++ --- /var/tmp/diff_new_pack.ABQ43S/_old 2012-03-16 13:20:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ABQ43S/_new 2012-03-16 13:20:30.000000000 +0100 @@ -18,7 +18,7 @@ # The URL which is shown to the user when hardware drivers could not be found. # It should explain why some hardware is not supported, and links to futher -@@ -54,10 +54,10 @@ +@@ -54,9 +54,9 @@ # The vendor name shown for the 'vendor' group # # default=My Vendor @@ -30,4 +30,3 @@ # default=emblem-favorite -VendorIcon=emblem-favorite +VendorIcon=distributor - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osc for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2012-03-16 13:19:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2012-03-13 09:37:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2012-03-16 13:20:27.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 15 08:57:44 UTC 2012 - adrian(a)suse.de + +- update to 0.134.1 + * adding unlock command + * maintenance_incident requests get created with source revision of package + +------------------------------------------------------------------- Old: ---- osc-0.134.0.tar.gz New: ---- osc-0.134.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.KfJcWR/_old 2012-03-16 13:20:28.000000000 +0100 +++ /var/tmp/diff_new_pack.KfJcWR/_new 2012-03-16 13:20:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: osc -Version: 0.134.0 +Version: 0.134.1 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ osc-0.134.0.tar.gz -> osc-0.134.1.tar.gz ++++++ ++++ 31920 lines of diff (skipped) ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.KfJcWR/_old 2012-03-16 13:20:28.000000000 +0100 +++ /var/tmp/diff_new_pack.KfJcWR/_new 2012-03-16 13:20:28.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.134.0 +Version: 0.134.1 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit orca for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package orca for openSUSE:Factory checked in at 2012-03-16 13:19:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orca (Old) and /work/SRC/openSUSE:Factory/.orca.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "orca", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/orca/orca.changes 2012-02-28 19:25:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.orca.new/orca.changes 2012-03-16 13:20:21.000000000 +0100 @@ -1,0 +2,26 @@ +Tue Mar 6 08:39:08 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Check for (and where appropriate present) expandable and + expanded states for toggle buttons and push buttons + + Present gnome-shell notifications + + Handle Earlybird (Thunderbird pre-release) as Thunderbird + + Fix for several UnicodeEncodeError and UnicodeDecodeError bugs + + Fix the presentation of mnemonics which are accented letters + + Present the localized rolenames we get via pyatspi rather than + use Orca's pre-pyatspi rolename code for non-abbreviated + rolenames + + Remove the old settings migration code from orca.py + + Fix for getListOfShortcuts() incorrectly eliminating commands + + Add an orca-customizations.py option to override the disabled + main window + + Fix for Orca not using the specified debug-file when debug flag + is not also provided + + Fix man page errors + + Avoid incorrectly detecting python modules which not installed + + Bugs fixed: bgo#666424, bgo#670547, bgo#670596, bgo#670827. + + Updated translations. +- Add python-cairo BuildRequires and Requires: they were missing + before. + +------------------------------------------------------------------- Old: ---- orca-3.3.90.tar.xz New: ---- orca-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orca.spec ++++++ --- /var/tmp/diff_new_pack.r4yeqS/_old 2012-03-16 13:20:26.000000000 +0100 +++ /var/tmp/diff_new_pack.r4yeqS/_new 2012-03-16 13:20:26.000000000 +0100 @@ -17,7 +17,7 @@ Name: orca -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Screen reader for GNOME License: LGPL-2.1+ @@ -31,6 +31,7 @@ BuildRequires: liblouis-devel BuildRequires: python BuildRequires: python-brlapi +BuildRequires: python-cairo BuildRequires: python-louis BuildRequires: python-speechd BuildRequires: python-xdg @@ -45,8 +46,9 @@ # pyatspi is a virtual name that is provided by the default at-spi stack Requires: pyatspi Requires: python-brlapi -Requires: python-gstreamer-0_10 +Requires: python-cairo Requires: python-gobject +Requires: python-gstreamer-0_10 Requires: python-louis Requires: python-xdg Recommends: %{name}-lang -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit open-vm-tools for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2012-03-16 13:19:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-vm-tools", Maintainer is "PRusnak(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2012-02-14 19:04:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools.changes 2012-03-16 13:20:20.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 15 13:56:41 UTC 2012 - prusnak(a)opensuse.org + +- added call to vmware-rpctool in %preun to unset the installed + version [bnc#748517] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.R16tdT/_old 2012-03-16 13:20:21.000000000 +0100 +++ /var/tmp/diff_new_pack.R16tdT/_new 2012-03-16 13:20:21.000000000 +0100 @@ -300,6 +300,7 @@ fi fi %stop_on_removal vmtoolsd +vmware-rpctool "tools.set.version 0" || : %postun %restart_on_update vmtoolsd -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-vpnc for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package NetworkManager-vpnc for openSUSE:Factory checked in at 2012-03-16 13:18:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-vpnc (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-vpnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-vpnc", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-vpnc/NetworkManager-vpnc.changes 2012-02-17 12:06:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager-vpnc.new/NetworkManager-vpnc.changes 2012-03-16 13:20:10.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Mar 2 19:24:15 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.3.995: + + Support for Juniper/Netscreen devices + + Support for "external UI mode" for DE-native dialogs (ie, GNOME + Shell and others) + + Config dialog tooltips now refer to corresponding vpnc config + option + + Updated translations. +- Add explicit pkgconfig(libnm-glib-vpn) BuildRequires: it's a long + standing requirement which currently comes implicit with + libnm-glib, as it's part of the same package at this moment. + +------------------------------------------------------------------- Old: ---- NetworkManager-vpnc-0.9.2.0.tar.bz2 New: ---- NetworkManager-vpnc-0.9.3.995.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-vpnc.spec ++++++ --- /var/tmp/diff_new_pack.m3jpqV/_old 2012-03-16 13:20:11.000000000 +0100 +++ /var/tmp/diff_new_pack.m3jpqV/_new 2012-03-16 13:20:11.000000000 +0100 @@ -20,26 +20,28 @@ Summary: NetworkManager VPN Support for vpnc License: GPL-2.0+ Group: Productivity/Networking/System -Version: 0.9.2.0 +Version: 0.9.3.995 Release: 0 # FIXME .desktop icon is currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import) # FIXME: --disable-more-warnings should be dropped from configure when possible. Added with 0.9.2.0 for Gtk+ 3.3 build. -Url: http://people.redhat.com/dcbw/NetworkManager/ -Source0: http://download.gnome.org/sources/NetworkManager-vpnc/0.9/%{name}-%{version… +Url: http://www.gnome.org/projects/NetworkManager +Source0: http://download.gnome.org/sources/NetworkManager-vpnc/0.9/%{name}-%{version… Source1: NetworkManager-vpnc-nm-vpnc.png Patch0: nm-vpnc-desktop.patch BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: pkgconfig(NetworkManager) +BuildRequires: pkgconfig(NetworkManager) >= 0.9.3 BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libnm-glib) -BuildRequires: pkgconfig(libnm-util) -Requires: vpnc %{name}-frontend +BuildRequires: pkgconfig(libnm-glib) >= 0.9.3 +BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.3 +BuildRequires: pkgconfig(libnm-util) >= 0.9.3 +Requires: %{name}-frontend Requires: NetworkManager >= 0.8.995 Requires: gnome-keyring +Requires: vpnc Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-pptp for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package NetworkManager-pptp for openSUSE:Factory checked in at 2012-03-16 13:18:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-pptp (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-pptp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-pptp", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-pptp/NetworkManager-pptp.changes 2012-02-17 12:06:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager-pptp.new/NetworkManager-pptp.changes 2012-03-16 13:20:07.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Mar 2 19:24:06 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.3.995: + + Support for "external UI mode" for DE-native dialogs (ie, GNOME + Shell and others) + + Fix issues with password dialog width on recent GTK+ versions + + Config dialog tooltips now refer to corresponding ppp/pptp + config options + + Updated translations. +- Add explicit pkgconfig(libnm-glib-vpn) BuildRequires: it's a long + standing requirement which currently comes implicit with + libnm-glib, as it's part of the same package at this moment. + +------------------------------------------------------------------- Old: ---- NetworkManager-pptp-0.9.2.0.tar.bz2 New: ---- NetworkManager-pptp-0.9.3.995.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-pptp.spec ++++++ --- /var/tmp/diff_new_pack.R2fiCg/_old 2012-03-16 13:20:08.000000000 +0100 +++ /var/tmp/diff_new_pack.R2fiCg/_new 2012-03-16 13:20:08.000000000 +0100 @@ -21,25 +21,27 @@ Summary: NetworkManager VPN support for PPTP License: GPL-2.0+ Group: Productivity/Networking/System -Version: 0.9.2.0 +Version: 0.9.3.995 Release: 0 # FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import) # FIXME: --disable-more-warnings should be dropped from configure when possible. Added with 0.9.2.0 for Gtk+ 3.3 build. Url: http://www.gnome.org/projects/NetworkManager -Source0: http://download.gnome.org/sources/NetworkManager-pptp/0.9/%{name}-%{version… +Source0: http://download.gnome.org/sources/NetworkManager-pptp/0.9/%{name}-%{version… Source1: gnome-mime-application-x-pptp-settings.png Patch0: nm-pptp-desktop.patch BuildRequires: grep BuildRequires: intltool BuildRequires: ppp-devel -BuildRequires: pkgconfig(NetworkManager) +BuildRequires: pkgconfig(NetworkManager) >= 0.9.3 BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libnm-glib) -BuildRequires: pkgconfig(libnm-util) -Requires: pptp %{name}-frontend = %{version} +BuildRequires: pkgconfig(libnm-glib) >= 0.9.3 +BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.3 +BuildRequires: pkgconfig(libnm-util) >= 0.9.3 +Requires: %{name}-frontend = %{version} Requires: NetworkManager >= 0.8.995 +Requires: pptp Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-openvpn for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package NetworkManager-openvpn for openSUSE:Factory checked in at 2012-03-16 13:18:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-openvpn (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-openvpn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-openvpn", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-openvpn/NetworkManager-openvpn.changes 2012-02-17 12:06:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager-openvpn.new/NetworkManager-openvpn.changes 2012-03-16 13:20:05.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Mar 2 19:23:37 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.3.995: + + Fix issues with password dialog width on recent GTK+ versions + + Allow cipher and HMAC options to be set for Static Key mode + + Support for "external UI mode" for DE-native dialogs (ie, GNOME + Shell and others) + + Updated translations. +- Add explicit pkgconfig(libnm-glib-vpn) BuildRequires: it's a long + standing requirement which currently comes implicit with + libnm-glib, as it's part of the same package at this moment. + +------------------------------------------------------------------- Old: ---- NetworkManager-openvpn-0.9.2.0.tar.bz2 New: ---- NetworkManager-openvpn-0.9.3.995.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-openvpn.spec ++++++ --- /var/tmp/diff_new_pack.xa0DsR/_old 2012-03-16 13:20:07.000000000 +0100 +++ /var/tmp/diff_new_pack.xa0DsR/_new 2012-03-16 13:20:07.000000000 +0100 @@ -20,24 +20,26 @@ Summary: NetworkManager VPN support for OpenVPN License: GPL-2.0+ Group: Productivity/Networking/System -Version: 0.9.2.0 +Version: 0.9.3.995 Release: 0 # FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import) # FIXME: --disable-more-warnings should be dropped from configure when possible. Added with 0.9.2.0 for Gtk+ 3.3 build. Url: http://www.gnome.org/projects/NetworkManager -Source0: http://download.gnome.org/sources/NetworkManager-openvpn/0.9/%{name}-%{vers… +Source0: http://download.gnome.org/sources/NetworkManager-openvpn/0.9/%{name}-%{vers… Source1: NetworkManager-openvpn-openvpn-settings.png Patch0: nm-openvpn-desktop.patch BuildRequires: intltool BuildRequires: translation-update-upstream -BuildRequires: pkgconfig(NetworkManager) +BuildRequires: pkgconfig(NetworkManager) >= 0.9.3 BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libnm-glib) -BuildRequires: pkgconfig(libnm-util) -Requires: openvpn %{name}-frontend +BuildRequires: pkgconfig(libnm-glib) >= 0.9.3 +BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.3 +BuildRequires: pkgconfig(libnm-util) >= 0.9.3 +Requires: %{name}-frontend Requires: NetworkManager >= 0.8.995 +Requires: openvpn Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-openconnect for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package NetworkManager-openconnect for openSUSE:Factory checked in at 2012-03-16 13:18:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-openconnect (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-openconnect.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-openconnect", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-openconnect/NetworkManager-openconnect.changes 2012-01-09 11:15:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager-openconnect.new/NetworkManager-openconnect.changes 2012-03-16 13:19:58.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Mar 2 19:23:27 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.3.995: + + Misc bug fixes. + + Updated translations. +- Drop upstream merged patches: + + nm-openconnect-0.9.2.0-g_thread_init.patch + + nm-openconnect-0.9.2.0-g_thread_new.patch + + nm-openconnect-0.9.2.0-gmutex.patch + + nm-openconnect-0.9.2.0-gtk_box_new.patch + + nm-openconnect-0.9.2.0-gtypes.patch + +------------------------------------------------------------------- Old: ---- NetworkManager-openconnect-0.9.2.0.tar.bz2 nm-openconnect-0.9.2.0-g_thread_init.patch nm-openconnect-0.9.2.0-g_thread_new.patch nm-openconnect-0.9.2.0-gmutex.patch nm-openconnect-0.9.2.0-gtk_box_new.patch nm-openconnect-0.9.2.0-gtypes.patch New: ---- NetworkManager-openconnect-0.9.3.995.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-openconnect.spec ++++++ --- /var/tmp/diff_new_pack.XSA6TS/_old 2012-03-16 13:20:04.000000000 +0100 +++ /var/tmp/diff_new_pack.XSA6TS/_new 2012-03-16 13:20:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package NetworkManager-openconnect # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,34 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: NetworkManager-openconnect -Version: 0.9.2.0 -Release: 1 -License: GPL-2.0+ ; LGPL-2.1 +Version: 0.9.3.995 +Release: 0 Summary: NetworkManager VPN support for OpenConnect -Url: http://www.gnome.org/projects/NetworkManager +License: GPL-2.0+ ; LGPL-2.1 Group: Productivity/Networking/System -Source0: http://download.gnome.org/sources/%{name}/0.9/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-gtypes.patch commit: ca8a39d1bb999ba98ead45e53041fc3ea28ecd5c - fixed in 0.9.3 -Patch0: nm-openconnect-0.9.2.0-gtypes.patch -# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-gtk_box_new.patch commit: b2a5782abc44710345ad6f907b7d855d81061ee5 - fixed in 0.9.3 -Patch1: nm-openconnect-0.9.2.0-gtk_box_new.patch -# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-g_thread_init.patch commit: c6d92c3e64898ea62789def04b86752dec904326 - fixed in 0.9.3 -Patch2: nm-openconnect-0.9.2.0-g_thread_init.patch -# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-gmutex.patch commit: 50af1fcf4fdb34b45799bbaa07be68b8adc8007b - fixed in 0.9.3 -Patch3: nm-openconnect-0.9.2.0-gmutex.patch -# PATCH-FIX-UPSTREAM nm-openconnect-0.9.2.0-g_thread_new.patch commit: e95980d9a4b96ac72c20740a35f411ceaca61312 - fixed in 0.9.3 -Patch4: nm-openconnect-0.9.2.0-g_thread_new.patch +Url: http://www.gnome.org/projects/NetworkManager +Source0: http://download.gnome.org/sources/NetworkManager-openconnect/0.9/%{name}-%{… BuildRequires: intltool BuildRequires: openconnect-devel BuildRequires: translation-update-upstream -BuildRequires: pkgconfig(NetworkManager) +BuildRequires: pkgconfig(NetworkManager) >= 0.9.3 BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libnm-glib) -BuildRequires: pkgconfig(libnm-glib-vpn) -BuildRequires: pkgconfig(libnm-util) +BuildRequires: pkgconfig(libnm-glib) >= 0.9.3 +BuildRequires: pkgconfig(libnm-glib-vpn) >= 0.9.3 +BuildRequires: pkgconfig(libnm-util) >= 0.9.3 BuildRequires: pkgconfig(libxml-2.0) Requires: %{name}-frontend Requires: NetworkManager >= 0.8.995 @@ -58,6 +49,7 @@ %package gnome Summary: NetworkManager VPN support for OpenConnect +Group: Productivity/Networking/System Requires: %{name} = %{version} Requires: NetworkManager-gnome >= 0.5.1 Provides: %{name}-frontend @@ -69,11 +61,6 @@ %lang_package %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 translation-update-upstream %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-gnome for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package NetworkManager-gnome for openSUSE:Factory checked in at 2012-03-16 13:18:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-gnome (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-gnome", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-gnome/NetworkManager-gnome.changes 2012-02-29 14:08:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-gnome.changes 2012-03-16 13:19:54.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 19:21:56 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.3.995: + + Updated translations. + +------------------------------------------------------------------- Old: ---- network-manager-applet-0.9.3.990.tar.xz New: ---- network-manager-applet-0.9.3.995.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-gnome.spec ++++++ --- /var/tmp/diff_new_pack.NdNw0l/_old 2012-03-16 13:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.NdNw0l/_new 2012-03-16 13:19:57.000000000 +0100 @@ -18,7 +18,7 @@ Name: NetworkManager-gnome Url: http://www.gnome.org/projects/NetworkManager/ -Version: 0.9.3.990 +Version: 0.9.3.995 Release: 0 # FIXME: --disable-more-warnings should be dropped from configure when possible. Added with 0.9.2.0 for Gtk+ 3.3 build. BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nautilus-actions for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package nautilus-actions for openSUSE:Factory checked in at 2012-03-16 13:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nautilus-actions (Old) and /work/SRC/openSUSE:Factory/.nautilus-actions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nautilus-actions", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/nautilus-actions/nautilus-actions.changes 2012-03-07 13:43:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nautilus-actions.new/nautilus-actions.changes 2012-03-16 13:19:51.000000000 +0100 @@ -1,0 +2,54 @@ +Fri Mar 9 09:59:12 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.2.2: + + UI enhancements: let the example label be expandable + + Bump FDL to 1.3 among all documentation + + Validate desktop file when making distcheck + + Fix wrong display in tabs vs. the current selection in tree + view + + Bugs fixed: bgo#671043, bgo#671044, bgo#671083 + + Updated translations. + +------------------------------------------------------------------- +Wed Feb 29 10:14:14 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.2.0: + + Let import/export assistants pages be scrollable + + Let the export format be selected in a treeview + + Let the import mode be selected in a treeview + + Make labels wrappable in import/export assistants + + Fix vertical expand in Preferences dialog + + Destroy the assistants toplevels when quitting + + Set "Relying on runtime detection" as default in "Runtime + execution" tab + + Detect XFCE desktop + + Force GConf I/O provider to be read-only after the migration + + Check if action is writable when deleting a profile + + Enable basenames, capabilities, folders, mimetypes and + schemes tabs if a context is available + + Migrate from dbus-glib to glib's GDBus (bgo#622909) + + User documentation and gtk-doc documentation not installed by + default (bgo#668181) + + Should check for ice pkgconfig in configure (bgo#670434) + + Mark strings as translatable (bgo#667429) + + Many other code changes. + + Several API additions (see NEWS for details). + + Build fixes. + + Updated translations. +- Remove xz BuildRequires now that it comes for free in the build + system. +- Remove pkgconfig(dbus-glib-1) BuildRequires: code is ported to + GDBus. +- Add pkgconfig(gio-2.0) and pkgconfig(ice) BuildRequires: now + checked for by configure. +- Stop passing --enable-html-manuals to configure: it's not needed + anymore, as the installation of documentation is now fixed. + +------------------------------------------------------------------- +Sun Feb 19 16:29:24 UTC 2012 - dimstar(a)opensuse.org + +- Add pkgconfig(sm) BuildRequires: this used to be pulled in by + something else before, but the relayout of xorg-x11 packages + changed that. + +------------------------------------------------------------------- Old: ---- nautilus-actions-3.1.5.tar.xz New: ---- nautilus-actions-3.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-actions.spec ++++++ --- /var/tmp/diff_new_pack.un32fB/_old 2012-03-16 13:19:54.000000000 +0100 +++ /var/tmp/diff_new_pack.un32fB/_new 2012-03-16 13:19:54.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package +# spec file for package nautilus-actions # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,32 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _nautilus_extdir %(pkg-config --variable extensiondir libnautilus-extension) Name: nautilus-actions -Version: 3.1.5 -Release: 1 -# FIXME: on update to > 3.1.5, see if gtk-doc doc is installed or can be built again (see bgo#668181) -# FIXME: on update, try to get rid of --enable-html-manuals; see bgo#668181 (last checked: 3.1.5) +Version: 3.2.2 +Release: 0 License: GPL-2.0+ Summary: Nautilus extension to launch arbitrary applications on files Url: http://www.nautilus-actions.org/ Group: System/GUI/GNOME -Source: http://download.gnome.org/sources/nautilus-actions/3.1/%{name}-%{version}.t… +Source: http://download.gnome.org/sources/nautilus-actions/3.2/%{name}-%{version}.t… BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: update-desktop-files -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz -BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.30.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.24.0 BuildRequires: pkgconfig(gnome-doc-utils) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(libnautilus-extension) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(sm) >= 1.0 BuildRequires: pkgconfig(unique-3.0) BuildRequires: pkgconfig(uuid) Requires: nautilus @@ -71,8 +70,7 @@ # it doesn't matter %configure \ --disable-schemas-install \ - --disable-scrollkeeper \ - --enable-html-manuals + --disable-scrollkeeper make %{?_smp_mflags} %install @@ -81,8 +79,8 @@ # Remove doc files that either aren't needed (html/pdf docs, # uninteresting files) or that we ship in another way (as %%doc) for file in AUTHORS ChangeLog* COPYING COPYING-DOCS \ - export-format-id INSTALL io-provider-id MAINTAINERS NEWS \ - objects-hierarchy.odg README README-GCONF TODO; do + INSTALL MAINTAINERS NEWS objects-hierarchy.odg README \ + README-GCONF TODO; do rm %{buildroot}%{_datadir}/doc/%{name}-%{version}/$file done for dir in html pdf; do @@ -123,10 +121,8 @@ %files devel %defattr(-, root, root) -%doc docs/export-format-id -%doc docs/io-provider-id %doc docs/objects-hierarchy.odg -#%doc %{_datadir}/gtk-doc/html/%{name}-3/ +%doc %{_datadir}/gtk-doc/html/%{name}-3/ %{_includedir}/%{name}/ %files lang -f %{name}.lang -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2012-03-16 13:18:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox", Maintainer is "bnc-team-mozilla(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2012-03-13 09:36:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2012-03-16 13:19:20.000000000 +0100 @@ -2 +2 @@ -Mon Mar 5 13:31:48 UTC 2012 - vdziewiecki(a)suse.com +Fri Mar 9 21:47:07 UTC 2012 - wr(a)rosenauer.org @@ -4 +4,18 @@ -- add Provides: browser(npapi) FATE#313084 +- update to Firefox 11.0 (bnc#750044) + * MFSA 2012-13/CVE-2012-0455 (bmo#704354) + XSS with Drag and Drop and Javascript: URL + * MFSA 2012-14/CVE-2012-0456/CVE-2012-0457 (bmo#711653, #720103) + SVG issues found with Address Sanitizer + * MFSA 2012-15/CVE-2012-0451 (bmo#717511) + XSS with multiple Content Security Policy headers + * MFSA 2012-16/CVE-2012-0458 + Escalation of privilege with Javascript: URL as home page + * MFSA 2012-17/CVE-2012-0459 (bmo#723446) + Crash when accessing keyframe cssText after dynamic modification + * MFSA 2012-18/CVE-2012-0460 (bmo#727303) + window.fullScreen writeable by untrusted content + * MFSA 2012-19/CVE-2012-0461/CVE-2012-0462/CVE-2012-0464/ + CVE-2012-0463 + Miscellaneous memory safety hazards +- ported and reenabled KDE integration (bnc#746591) +- explicitely build-require X libs @@ -7 +24 @@ -Tue Feb 28 07:25:08 UTC 2012 - wr(a)rosenauer.org +Mon Mar 5 13:31:48 UTC 2012 - vdziewiecki(a)suse.com @@ -9,3 +26 @@ -- update to version 11.0b5 -- ported and reenabled KDE integration (bnc#746591) -- explicitely build-require X libs +- add Provides: browser(npapi) FATE#313084 Old: ---- firefox-10.99-source.tar.bz2 l10n-10.99.tar.bz2 New: ---- firefox-11.0-source.tar.bz2 l10n-11.0.tar.bz2 mozilla-sle11-gcc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.Ayxxua/_old 2012-03-16 13:19:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Ayxxua/_new 2012-03-16 13:19:32.000000000 +0100 @@ -17,8 +17,8 @@ # -%define major 10 -%define mainver %major.99 +%define major 11 +%define mainver %major.0 Name: MozillaFirefox BuildRequires: Mesa-devel @@ -48,15 +48,15 @@ BuildRequires: nss-shared-helper-devel Version: %{mainver} Release: 0 -%define releasedate 2012022900 +%define releasedate 2012031200 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser +Provides: browser(npapi) # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package %define kde_helper_version 6 Provides: mozilla-kde4-version = %{kde_helper_version} -Provides: browser(npapi) Summary: Mozilla Firefox Web Browser License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Productivity/Networking/Web/Browsers @@ -90,6 +90,7 @@ Patch12: mozilla-linux3.patch Patch14: mozilla-disable-neon-option.patch Patch15: mozilla-yarr-pcre.patch +Patch16: mozilla-sle11-gcc.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -159,7 +160,7 @@ %package translations-other Summary: Extra translations for MozillaFirefox Group: System/Localization -Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;bn_IN;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -218,6 +219,7 @@ %patch12 -p1 %patch14 -p1 #%patch15 -p1 +%patch16 -p1 # %patch31 -p1 %patch32 -p1 @@ -280,7 +282,7 @@ ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=beta +ac_add_options --enable-update-channel=release EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.Ayxxua/_old 2012-03-16 13:19:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Ayxxua/_new 2012-03-16 13:19:32.000000000 +0100 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="beta" +CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_11_0b5_RELEASE" -VERSION="10.99" +RELEASE_TAG="FIREFOX_11_0_RELEASE" +VERSION="11.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ firefox-10.99-source.tar.bz2 -> firefox-11.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-10.99-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-11.0-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-10.99.tar.bz2 -> l10n-11.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-10.99.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-11.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-sle11-gcc.patch ++++++ # HG changeset patch # Parent 39e596b823926b5add22bb263734c6c872ee2aad diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/base/src/nsXULTooltipListener.h --- a/layout/xul/base/src/nsXULTooltipListener.h +++ b/layout/xul/base/src/nsXULTooltipListener.h @@ -107,17 +107,17 @@ protected: static void sTooltipCallback (nsITimer* aTimer, void* aListener); // screen coordinates of the last mousemove event, stored so that the // tooltip can be opened at this location. PRInt32 mMouseScreenX, mMouseScreenY; // various constants for tooltips enum { - kTooltipMouseMoveTolerance = 7, // 7 pixel tolerance for mousemove event + kTooltipMouseMoveTolerance = 7 // 7 pixel tolerance for mousemove event }; // flag specifying if the tooltip has already been displayed by a MouseMove // event. The flag is reset on MouseOut so that the tooltip will display // the next time the mouse enters the node (bug #395668). bool mTooltipShownOnce; #ifdef MOZ_XUL ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.Ayxxua/_old 2012-03-16 13:19:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Ayxxua/_new 2012-03-16 13:19:32.000000000 +0100 @@ -1,2 +1,2 @@ -REV=8c9e4873d419 -REPO=http://hg.mozilla.org/releases/mozilla-beta +REV=b967d9c07377 +REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mousetweaks for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package mousetweaks for openSUSE:Factory checked in at 2012-03-16 13:18:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mousetweaks (Old) and /work/SRC/openSUSE:Factory/.mousetweaks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mousetweaks", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/mousetweaks/mousetweaks.changes 2012-02-28 19:25:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mousetweaks.new/mousetweaks.changes 2012-03-16 13:19:19.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 5 15:51:20 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Updated translations. + +------------------------------------------------------------------- Old: ---- mousetweaks-3.3.90.tar.xz New: ---- mousetweaks-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mousetweaks.spec ++++++ --- /var/tmp/diff_new_pack.t5Ztqq/_old 2012-03-16 13:19:20.000000000 +0100 +++ /var/tmp/diff_new_pack.t5Ztqq/_new 2012-03-16 13:19:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: mousetweaks -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Tweak mouse settings in GNOME License: GPL-3.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ModemManager for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package ModemManager for openSUSE:Factory checked in at 2012-03-16 13:18:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ModemManager (Old) and /work/SRC/openSUSE:Factory/.ModemManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ModemManager", Maintainer is "tambet(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ModemManager/ModemManager.changes 2012-02-28 19:24:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ModemManager.new/ModemManager.changes 2012-03-16 13:19:17.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 14 17:13:02 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.5.2.0: + + Retry sending SMS messages in PDU mode if an error occurs in + text mode + +------------------------------------------------------------------- Old: ---- ModemManager-0.5.1.97.tar.xz New: ---- ModemManager-0.5.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ModemManager.spec ++++++ --- /var/tmp/diff_new_pack.EEs8cn/_old 2012-03-16 13:19:19.000000000 +0100 +++ /var/tmp/diff_new_pack.EEs8cn/_new 2012-03-16 13:19:19.000000000 +0100 @@ -17,7 +17,7 @@ Name: ModemManager -Version: 0.5.1.97 +Version: 0.5.2.0 Release: 0 Summary: DBus interface for modem handling License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mathomatic for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package mathomatic for openSUSE:Factory checked in at 2012-03-16 13:17:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mathomatic (Old) and /work/SRC/openSUSE:Factory/.mathomatic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mathomatic", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mathomatic/mathomatic.changes 2012-02-22 15:53:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mathomatic.new/mathomatic.changes 2012-03-16 13:19:02.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 9 18:18:45 UTC 2012 - georgegesslein(a)gmail.com + +- Updated to Mathomatic version 15.8.1 + This is a bugfix release +- Removed unnecessary INSTALL_PROGRAM=install from mathomatic.spec +- All other changes are listed at http://mathomatic.org/NEWS + +------------------------------------------------------------------- Old: ---- mathomatic-15.8.0.tar.bz2 New: ---- mathomatic-15.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathomatic.spec ++++++ --- /var/tmp/diff_new_pack.5folOZ/_old 2012-03-16 13:19:05.000000000 +0100 +++ /var/tmp/diff_new_pack.5folOZ/_new 2012-03-16 13:19:05.000000000 +0100 @@ -16,7 +16,7 @@ # George Gesslein II <gesslein(a)mathomatic.org> Name: mathomatic -Version: 15.8.0 +Version: 15.8.1 Release: 1 Summary: Computer algebra system @@ -76,12 +76,12 @@ make -C primes check bigcheck %install -make bininstall matho-rmath-install DESTDIR=%{buildroot} prefix=%{_prefix} docdir=%{_docdir} datadir=%{_datadir} INSTALL_PROGRAM="install" +make bininstall matho-rmath-install DESTDIR=%{buildroot} prefix=%{_prefix} docdir=%{_docdir} datadir=%{_datadir} install -D -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/applications/mathomatic.desktop %if 0%{?suse_version} %suse_update_desktop_file -n mathomatic %endif -make -C primes install DESTDIR=%{buildroot} prefix=%{_prefix} INSTALL_PROGRAM="install" +make -C primes install DESTDIR=%{buildroot} prefix=%{_prefix} make -C lib install DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir} includedir=%{_includedir} make -C lib distclean ++++++ mathomatic-15.8.0.tar.bz2 -> mathomatic-15.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/INSTALL.txt new/mathomatic-15.8.1/INSTALL.txt --- old/mathomatic-15.8.0/INSTALL.txt 2011-11-20 02:00:16.000000000 +0100 +++ new/mathomatic-15.8.1/INSTALL.txt 2012-02-27 00:59:18.000000000 +0100 @@ -40,7 +40,8 @@ Root (super-user) authority is needed to install Mathomatic, because write permission is needed to copy files into the directories in "/usr/local". -Mathomatic need not be installed to run the compiled executable. +Mathomatic need not be installed to run the compiled executable. Reading the +makefile comments is recommended. A typical compile/install is done by typing the following at the shell prompt, while in the Mathomatic source code directory: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/NEWS new/mathomatic-15.8.1/NEWS --- old/mathomatic-15.8.0/NEWS 2012-02-18 13:51:38.000000000 +0100 +++ new/mathomatic-15.8.1/NEWS 2012-03-09 18:29:08.000000000 +0100 @@ -1,6 +1,47 @@ +CHANGES MADE TO MATHOMATIC 15.8.0 TO BRING IT UP TO THE NEXT VERSION: + +Added some important missing documentation, and the makefiles were fixed. +Some scary messages explained to make them less scary. + +02/23/12 - All makefiles corrected to fix the following problem: + Removed -Cv option from the install command, so that installing + Mathomatic under NetBSD works without a hitch. The "install -Cv" + option is not supported under some operating systems, so compiling + and installing Mathomatic will now be easier on those systems. + +02/27/12 - Added Heron's formula (calculates the area of any triangle, given + all three side lengths) to the "help geometry" command. Mathomatic + can solve for any side length, too. See "tests/heron.in" for some + proofs. + +03/01/12 - "make uninstall" is now passing the current "prefix" (the directory + being operated on, like "/usr") to the lib and primes uninstall. + +03/04/12 - Added noisy compile-time warning if DBL_DIG is not 15, and display + it as digits precision in the version command. + + Removed "no right_associative_power" from set options listing, now + only lists "right_associative_power" if it is set. A very + unimportant and rarely used option that was just taking up display + space. However, when set, this option makes Mathomatic work like + most other computer algebra systems when parsing multiple power + operators on the same level (without parentheses). So feel free + to use it, or recommend I make it the default. + +03/06/12 - Fixed a bug in modulus simplification; sometimes it would go in an + infinite loop because it was not checking that it made the + expression smaller. It now checks that the result is actually + smaller. Surprisingly, this problem happened only when doing + polynomial division for a modulus operator to simplify it. + Here is a test expression, to see if you have this bug: + (x % ((x - y)/integer_any1)). Simplifying it results in a hang, + on any version of Mathomatic without the new bug fix. + +Mathomatic version 15.8.1 released Friday 03/09/12. + CHANGES MADE TO MATHOMATIC 15.7.3 TO BRING IT UP TO THE NEXT VERSION: 02/05/12 - The variables command now returns false (with error message) if @@ -1268,7 +1309,7 @@ ---------------------------------------------------------------------- End of this version history of the Mathomatic computer algebra system. -Current as of 02/18/12 (2012-02-18). +Current as of 03/09/12 (2012-03-09). The latest changes are at the beginning of this file. This file is available at http://mathomatic.org/NEWS Written and maintained by George Gesslein II. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/README.txt new/mathomatic-15.8.1/README.txt --- old/mathomatic-15.8.0/README.txt 2011-12-26 02:06:36.000000000 +0100 +++ new/mathomatic-15.8.1/README.txt 2012-03-02 20:24:04.000000000 +0100 @@ -15,10 +15,11 @@ (see directory "lib"). Mathomatic is a free, portable, general-purpose Computer Algebra System (CAS) -that can automatically solve, differentiate, simplify, combine, and compare -algebraic equations, perform standard, complex number, modular, and -polynomial arithmetic, etc. It does some calculus and is very easy to -compile, learn, and use. Plotting expressions with gnuplot is also supported. +and calculator software that can symbolically solve, simplify, combine, and +compare algebraic equations, simultaneously performing standard, complex +number, modular, and polynomial arithmetic, as needed. It does some calculus +and is very easy to compile/install, learn, and use. Plotting expressions +with gnuplot is also supported. Licenses @@ -50,7 +51,9 @@ On a Debian or Ubuntu Linux computer, the "build-essential" and readline development packages "libreadline-dev" are required to compile Mathomatic with readline functionality. To open a shell window in desktop Linux, launch -Applications/Accessories/Terminal. +Applications/Accessories/Terminal. Makefiles are text files used to build and +install software, and reading the comments contained within them is often +helpful when using them. The latest Mathomatic source code may be downloaded from: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/VERSION new/mathomatic-15.8.1/VERSION --- old/mathomatic-15.8.0/VERSION 2012-02-18 13:48:58.000000000 +0100 +++ new/mathomatic-15.8.1/VERSION 2012-03-09 18:19:10.000000000 +0100 @@ -1 +1 @@ -15.8.0 +15.8.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/am.h new/mathomatic-15.8.1/am.h --- old/mathomatic-15.8.0/am.h 2012-01-01 14:40:46.000000000 +0100 +++ new/mathomatic-15.8.1/am.h 2012-03-04 14:37:20.000000000 +0100 @@ -22,6 +22,13 @@ */ +#ifndef DBL_DIG +#error "DBL_DIG not defined!" +#elif DBL_DIG != 15 +#warning "DBL_DIG (the number of digits precision of doubles) is not 15." +#warning "This might be a problem." +#endif + #if sun #define INFINITY_NAME "Infinity" /* set this to the name of the infinity constant as displayed by printf(3) */ #define NAN_NAME "NaN" /* set this to the name of the NaN constant as displayed by printf(3) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/changes.txt new/mathomatic-15.8.1/changes.txt --- old/mathomatic-15.8.0/changes.txt 2012-02-18 13:50:12.000000000 +0100 +++ new/mathomatic-15.8.1/changes.txt 2012-03-09 18:19:12.000000000 +0100 @@ -1273,3 +1273,44 @@ division by complex numbers. Mathomatic version 15.8.0 released Saturday 02/18/12. + +CHANGES MADE TO MATHOMATIC 15.8.0 TO BRING IT UP TO THE NEXT VERSION: + +Added some important missing documentation, and the makefiles were fixed. +Some scary messages explained to make them less scary. + +02/23/12 - All makefiles corrected to fix the following problem: + Removed -Cv option from the install command, so that installing + Mathomatic under NetBSD works without a hitch. The "install -Cv" + option is not supported under some operating systems, so compiling + and installing Mathomatic will now be easier on those systems. + +02/27/12 - Added Heron's formula (calculates the area of any triangle, given + all three side lengths) to the "help geometry" command. Mathomatic + can solve for any side length, too. See "tests/heron.in" for some + proofs. + +03/01/12 - "make uninstall" is now passing the current "prefix" (the directory + being operated on, like "/usr") to the lib and primes uninstall. + +03/04/12 - Added noisy compile-time warning if DBL_DIG is not 15, and display + it as digits precision in the version command. + + Removed "no right_associative_power" from set options listing, now + only lists "right_associative_power" if it is set. A very + unimportant and rarely used option that was just taking up display + space. However, when set, this option makes Mathomatic work like + most other computer algebra systems when parsing multiple power + operators on the same level (without parentheses). So feel free + to use it, or recommend I make it the default. + +03/06/12 - Fixed a bug in modulus simplification; sometimes it would go in an + infinite loop because it was not checking that it made the + expression smaller. It now checks that the result is actually + smaller. Surprisingly, this problem happened only when doing + polynomial division for a modulus operator to simplify it. + Here is a test expression, to see if you have this bug: + (x % ((x - y)/integer_any1)). Simplifying it results in a hang, + on any version of Mathomatic without the new bug fix. + +Mathomatic version 15.8.1 released Friday 03/09/12. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/cmds.c new/mathomatic-15.8.1/cmds.c --- old/mathomatic-15.8.0/cmds.c 2012-02-14 23:21:06.000000000 +0100 +++ new/mathomatic-15.8.1/cmds.c 2012-03-04 18:44:18.000000000 +0100 @@ -259,6 +259,7 @@ #endif fprintf(gfp, "\nsizeof(int) = %u bytes, sizeof(long) = %u bytes.\n", (unsigned) sizeof(int), (unsigned) sizeof(long)); + fprintf(gfp, "sizeof(double) = %u bytes, %d digits precision.\n", (unsigned) sizeof(double), DBL_DIG); #ifdef __VERSION__ fprintf(gfp, _("C Compiler version: %s\n"), __VERSION__); #endif @@ -276,7 +277,7 @@ fprintf(gfp, _("The current security level is %d"), security_level); switch (security_level) { case 0: - fprintf(gfp, _(", no security.\n")); + fprintf(gfp, _(", no security, meaning users are unrestricted.\n")); break; case 3: fprintf(gfp, _(", high security.\n")); @@ -1113,10 +1114,9 @@ } fprintf(ofp, "factor_integers\n"); - if (!right_associative_power) { - fprintf(ofp, "no "); + if (right_associative_power) { /* option is hardly ever used */ + fprintf(ofp, "right_associative_power\n"); } - fprintf(ofp, "right_associative_power\n"); fprintf(ofp, "plot_prefix = "); fprintf_escaped(ofp, plot_prefix); @@ -2211,16 +2211,16 @@ approximate(lhs[i], &n_lhs[i]); approximate(lhs[j], &n_lhs[j]); } + if (compare_es(i, j)) { + fprintf(gfp, _("Expressions are identical.\n")); + return true; + } #if !SILENT if (debug_level >= 0) { list_sub(i); list_sub(j); } #endif - if (compare_es(i, j)) { - fprintf(gfp, _("Expressions are identical.\n")); - return true; - } uf_simp(lhs[i], &n_lhs[i]); uf_simp(lhs[j], &n_lhs[j]); if (approx) { @@ -2264,15 +2264,15 @@ approximate(rhs[i], &n_rhs[i]); approximate(rhs[j], &n_rhs[j]); } + if (compare_rhs(i, j, &diff_sign)) { + goto times_neg1; + } #if !SILENT if (debug_level >= 0) { list_sub(i); list_sub(j); } #endif - if (compare_rhs(i, j, &diff_sign)) { - goto times_neg1; - } uf_simp(rhs[i], &n_rhs[i]); uf_simp(rhs[j], &n_rhs[j]); if (approx) { @@ -3908,7 +3908,8 @@ } #if !SILENT if (rv) { - printf(_("Read operation on file \"%s\" aborted due to error.\n"), buf); + printf(_("Reading of file \"%s\" aborted due to failure return status\n"), buf); + printf(_("of a command or expression parsing, or some other error listed above.\n")); } else { if (!quiet_mode && debug_level >= 0) { printf(_("Successfully finished reading file \"%s\".\n"), buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/doc/am.html new/mathomatic-15.8.1/doc/am.html --- old/mathomatic-15.8.0/doc/am.html 2012-02-17 22:25:50.000000000 +0100 +++ new/mathomatic-15.8.1/doc/am.html 2012-02-26 04:54:34.000000000 +0100 @@ -170,26 +170,27 @@ <ul> <li> -a numerical expression, which is instantly evaluated and displayed with the -<a href="#calculate">calculate command</a> (<a href="#set">autocalc</a>), +A numerical expression, which is instantly evaluated and displayed with the +<a href="#calculate">calculate command</a>; this is the <a href="#set">autocalc</a> option; +with autocalc, the previously entered numerical expression is cleared. <li> -an <a href="manual.html#equations">algebraic expression or equation</a>, -which is stored and made the current equation, +An <a href="manual.html#equations">algebraic expression or equation</a>, +which is stored and made the current equation. <li> -a variable to <a href="#solving">solve</a> the current equation for (<a href="#set">autosolve</a>), +A variable to <a href="#solving">solve</a> the current equation for (<a href="#set">autosolve</a>). <li> -an equation number to <a href="#selecting">select</a> as the current equation (<a href="#set">autoselect</a>), +An equation number to <a href="#selecting">select</a> as the current equation (<a href="#set">autoselect</a>). <li> -a slash (<b>/</b>) or pound sign (<b>#</b>) followed by a variable name to search all equations spaces forward or backward for, +A slash (<b>/</b>) or pound sign (<b>#</b>) followed by a variable name to search all equations spaces forward or backward for. <li> -a Mathomatic command (listed in this document), +A Mathomatic command (listed in this document). <li> -a question mark (<b>?</b>) for quick, short help (same as the <a href="#help">help command</a>), +A question mark (<b>?</b>) for quick, short help (same as the <a href="#help">help command</a>). <li> -a semicolon (<b>;</b>) followed by a comment -(everything on a line after a semicolon is ignored), +A semicolon (<b>;</b>) followed by a comment; +everything on a line after a semicolon is ignored. <li> -or an exclamation point (<b>!</b>) followed by a shell or system command. +An exclamation point (<b>!</b>) followed by a shell or system command. "<b>!</b>" by itself invokes the default shell. </ul> @@ -1828,6 +1829,8 @@ "set no <b>autocalc</b>" will turn off automatic approximation and display with the <a href="#calculate">calculate command</a> of purely numerical input entered at the main prompt. +Numerical expressions are not automatically cleared from memory when this +option is turned off. <p> "set no <b>autoselect</b>" will turn off selecting of equation spaces by just typing in the equation number. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/doc/manual.html new/mathomatic-15.8.1/doc/manual.html --- old/mathomatic-15.8.0/doc/manual.html 2012-02-17 22:25:50.000000000 +0100 +++ new/mathomatic-15.8.1/doc/manual.html 2012-03-02 02:56:04.000000000 +0100 @@ -50,6 +50,10 @@ <a href="#equations">Equations and Expressions</a> <ol type="a"> <li> +<a href="#equationsonly">Equations</a> +<li> +<a href="#nonequations">Non-Equations</a> +<li> <a href="#constants">Constants</a> <li> <a href="#symbols">Variables</a> @@ -270,9 +274,19 @@ <p> Each equation space is successively numbered with an <strong>equation number</strong> (starting at 1). The main prompt "<tt>1—> </tt>" contains the equation number of the current equation space. -The current equation can be changed by typing a valid equation number at the main prompt, +The current equation can be changed by typing a valid equation number at the main prompt +(called <a href="am.html#selecting">selecting an equation space</a>), or by entering another equation or expression, which becomes the current equation. <p> +Any previously entered expression can be automatically entered again by entering a "#" +followed by the relative or absolute equation space number of that expression. +If this is entered first thing at the main prompt, +it means something entirely different, that you are <a href="am.html#selecting">selecting that equation space</a>; +Otherwise, the RHS or expression at that equation space is substituted, for your convenience. + +<a name="equationsonly"></a> +<h3>Equations</h3> +<p> To enter an equation into the first available equation space and make it the current equation, simply type it in at the main prompt. Each equation space consists of two equation sides, @@ -367,6 +381,9 @@ If an identity results (the LHS is identical to the RHS), a "Solution verified" message is displayed, otherwise "Solution might be incorrect" is displayed. + +<a name="nonequations"></a> +<h3>Expressions that are not equations</h3> <p> Non-equations, that is any mathematical expression without an equals sign, may be entered into equation spaces too. @@ -582,6 +599,7 @@ For example, entering <b>2x</b>, <b>2(x)</b>, and <b>(2)(x)</b> all result in the expression <b>2*x</b>. <p> +<a name="modular"></a> The modulus operator <b>(a % b)</b> (spoken as "a modulo b") gives the remainder of the division <b>(a / b)</b>, which allows modular arithmetic; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/doc/quickrefcard.html new/mathomatic-15.8.1/doc/quickrefcard.html --- old/mathomatic-15.8.0/doc/quickrefcard.html 2012-02-15 00:50:18.000000000 +0100 +++ new/mathomatic-15.8.1/doc/quickrefcard.html 2012-03-07 22:52:06.000000000 +0100 @@ -5,7 +5,7 @@ </head> <body> <table cellpadding="4" border="3" summary="Mathomatic Quick Reference Card"> -<tr bgcolor="#2648fe"><th colspan="3"><font color="white">Mathomatic version 15.7.3 Quick Reference Card</font></th></tr> +<tr bgcolor="#2648fe"><th colspan="3"><font color="white">Mathomatic version 15.8.0 Quick Reference Card</font></th></tr> <tr> <th>Command</th> <th>Usage</th> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/help.c new/mathomatic-15.8.1/help.c --- old/mathomatic-15.8.0/help.c 2012-01-02 04:27:28.000000000 +0100 +++ new/mathomatic-15.8.1/help.c 2012-03-07 20:44:32.000000000 +0100 @@ -148,8 +148,9 @@ char *geometry_strings[] = { "; Triangle area:\n", "triangle_area = base*height/2\n", - "; See Heron's formula for the area of any triangle\n", - "; given all three side lengths.\n", + "; Here is Heron's formula for the area of any triangle\n", + "; given all three side lengths (a, b, and c):\n", + "triangle_area = (((a + b + c)*(a - b + c)*(a + b - c)*(b - a + c))^(1/2))/4\n", "\n", "; Rectangle of length \"l\" and width \"w\":\n", "rectangle_area = l*w\n", @@ -921,11 +922,12 @@ P("If a colon (:) starts the line, preceding any of the above input to the main"); P("prompt, it will always return with successful status, preventing any current"); - P("read command operations from aborting."); + P("read command operation from aborting due to an error return status."); goto next_space; } - if (strncasecmp(cp, "copyrights", cp1 - cp) == 0 || strncasecmp(cp, "licenses", cp1 - cp) == 0) { + if (strncasecmp(cp, "copyrights", cp1 - cp) == 0 + || strncasecmp(cp, "licenses", cp1 - cp) == 0 || strncasecmp(cp, "licences", cp1 - cp) == 0) { underline_title(P("Copyright and License for Mathomatic")); fprintf(gfp, "%s", license_string); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/icons/mathomatic.svg new/mathomatic-15.8.1/icons/mathomatic.svg --- old/mathomatic-15.8.0/icons/mathomatic.svg 2012-01-24 15:31:16.000000000 +0100 +++ new/mathomatic-15.8.1/icons/mathomatic.svg 2012-03-06 13:45:32.000000000 +0100 @@ -10,12 +10,17 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="744.09448819" - height="1052.3622047" + width="192" + height="195.14284" id="svg2" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="New document 1"> + sodipodi:docname="mathomatic.svg" + inkscape:export-filename="/home/george/mathomatic.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <title + id="title2985">Mathomatic Logo</title> <defs id="defs4" /> <sodipodi:namedview @@ -26,8 +31,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" - inkscape:cx="375" - inkscape:cy="520" + inkscape:cx="153.85714" + inkscape:cy="136.28578" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +40,11 @@ inkscape:window-height="816" inkscape:window-x="0" inkscape:window-y="25" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> <metadata id="metadata7"> <rdf:RDF> @@ -44,31 +53,71 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title>Mathomatic Logo</dc:title> + <dc:date>1/24/2012</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>George Gesslein II</dc:title> + </cc:Agent> + </dc:creator> + <dc:rights> + <cc:Agent> + <dc:title>Trademark for the Mathomatic computer algebra system</dc:title> + </cc:Agent> + </dc:rights> + <dc:publisher> + <cc:Agent> + <dc:title>George Gesslein II</dc:title> + </cc:Agent> + </dc:publisher> + <dc:language>en</dc:language> + <dc:subject> + <rdf:Bag> + <rdf:li>algebra logo Mathomatic</rdf:li> + </rdf:Bag> + </dc:subject> + <dc:description>Made with Inkscape.</dc:description> + <dc:contributor> + <cc:Agent> + <dc:title>George Gesslein II</dc:title> + </cc:Agent> + </dc:contributor> + <dc:coverage>Rights are granted to use this image for anything related to Mathomatic, the computer algebra system.</dc:coverage> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> </rdf:RDF> </metadata> <g inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1"> + id="layer1" + transform="translate(-266.85715,-427.79077)"> <image y="427.79077" x="266.85715" id="image3066" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAARBJREFU -WIXFl0sWgzAIRcHTjblyl4aD1hNIQMin5A1R5IKIAYkIEJEgWUSEAAAIAOnBOcRHGuQNiNfPfjY2 -6Xc2NttX3ntYwbkz4qUG1oLWgVtf+RxRAYtcyzAqz7cBsBSpwIhvA2AR85ISnW4v8Ovc1wXQFM2e -v74H0vMN9cAjrS9mXo0K8CYONxt4CMCTNy80sUm4JqOYvqDNJPynZHWKfTmANZat5t5SgRQArQmL -rcB0A1iZRLq+zI5i6wYY/f6l36YKaEqrwDKAqKJT8TCvJKk6lGaMY/5HJdx+Kj6e8/mO4AAASNpx -OCC+zMwksb0JhwDqVW5mtdtega4eiGTa2w+vACu2Zg9IAGSs6TXQDQPJnMmPfQ/wAAAAAElFTkSu -QmCC -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAARBJREFU WIXFl0sWgzAIRcHTjblyl4aD1hNIQMin5A1R5IKIAYkIEJEgWUSEAAAIAOnBOcRHGuQNiNfPfjY2 6Xc2NttX3ntYwbkz4qUG1oLWgVtf+RxRAYtcyzAqz7cBsBSpwIhvA2AR85ISnW4v8Ovc1wXQFM2e v74H0vMN9cAjrS9mXo0K8CYONxt4CMCTNy80sUm4JqOYvqDNJPynZHWKfTmANZat5t5SgRQArQmL rcB0A1iZRLq+zI5i6wYY/f6l36YKaEqrwDKAqKJT8TCvJKk6lGaMY/5HJdx+Kj6e8/mO4AAASNpx OCC+zMwksb0JhwDqVW5mtdtega4eiGTa2w+vACu2Zg9IAGSs6TXQDQPJnMmPfQ/wAAAAAElFTkSu QmCC " width="192" height="192" style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" /> <path - style="fill:#000000;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:1;stroke-dasharray:none" + style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1;stroke-opacity:1;stroke-dasharray:none" d="m 437.14286,620.93361 -42.85715,-17.14286 -17.14285,-5.71428 -8.57143,-14.28572 -11.42857,-5.71428 0,0 c 0,0 -11.42857,20 -28.57143,28.57143 -17.14286,8.57143 0,0 -60,8.57143 l 91.42857,-20" id="path3841" inkscape:connector-curvature="0" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/license.h new/mathomatic-15.8.1/license.h --- old/mathomatic-15.8.0/license.h 2012-01-01 14:40:46.000000000 +0100 +++ new/mathomatic-15.8.1/license.h 2012-02-28 14:27:30.000000000 +0100 @@ -40,4 +40,6 @@ " George Gesslein II\n" " P.O. Box 224\n" " Lansing, New York 14882-0224\n" -" USA\n"; +" USA\n\n" + +"Others who have contributed code to Mathomatic are listed in file \"AUTHORS\".\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/main.c new/mathomatic-15.8.1/main.c --- old/mathomatic-15.8.0/main.c 2012-01-06 13:57:54.000000000 +0100 +++ new/mathomatic-15.8.1/main.c 2012-02-28 14:11:00.000000000 +0100 @@ -88,7 +88,10 @@ fprintf(fp, "m4 "); #endif fprintf(fp, "Mathomatic version %s\n", VERSION); - fprintf(fp, "Copyright (C) 1987-2012 George Gesslein II.\n"); + if (html_flag) + fprintf(fp, "Copyright © 1987-2012 George Gesslein II.\n"); + else + fprintf(fp, "Copyright (C) 1987-2012 George Gesslein II.\n"); fprintf(fp, _("%d equation spaces available in memory,\n%ld kilobytes per equation space.\n"), N_EQUATIONS, (long) n_tokens * sizeof(token_type) * 2L / 1000L); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/makefile new/mathomatic-15.8.1/makefile --- old/mathomatic-15.8.0/makefile 2011-11-20 02:11:14.000000000 +0100 +++ new/mathomatic-15.8.1/makefile 2012-03-09 18:26:52.000000000 +0100 @@ -16,6 +16,9 @@ # make READLINE=1 # make test # +# For Slackware, or any other OS that fails to find the curses library functions, use: +# LDLIBS=-lncurses make READLINE=1 + # To install the base Mathomatic system after compiling and testing, type: # sudo make install # @@ -27,14 +30,19 @@ # make test # sudo make m4install INSTALL=ginstall prefix=/usr M4=gm4 -# This makefile does NOT compile and install the Prime Number Tools in the "primes" directory. +# This makefile does NOT compile and install the Prime Number Tools in the "primes" directory, +# nor does it compile and install the Symbolic Math Library in the "lib" directory. +# sudo make uninstall +# here will uninstall all of Mathomatic, +# including the Prime Number Tools and the Symbolic Math Library, +# but it must know the "prefix" used to install Mathomatic, if specified during the install. SHELL = /bin/sh # from "http://www.gnu.org/prep/standards/", do not change CC ?= gcc # C compiler to use; this statement doesn't work usually, instead using cc. M4 ?= m4 # Change this to gm4 in Unix or a non-GNU system. INSTALL ?= install # Installer utility to use; change to ginstall under Unix. -INSTALL_PROGRAM ?= $(INSTALL) -Cv # Command to install executable program files; compares to see if any differences, first. -INSTALL_DATA ?= $(INSTALL) -m 0644 # command to install data files +INSTALL_PROGRAM ?= $(INSTALL) # Command to install executable program files. +INSTALL_DATA ?= $(INSTALL) -m 0644 # Command to install data files. CC_OPTIMIZE ?= -O3 # Default C compiler optimization flags that are safe. # Be sure and run tests to see if Mathomatic works and runs faster, if you uncomment the following line: @@ -55,7 +63,8 @@ # Install directories follow; installs everything in $(DESTDIR)/usr/local by default. # Note that support for the DESTDIR variable was added in version 15.2.1. -# DESTDIR is used by package maintainers, who should remove all DESTDIR patches. +# DESTDIR is used by package maintainers, who should remove all DESTDIR patches, +# because DESTDIR is handled properly (according to GNU standards) by this makefile now. prefix ?= /usr/local bindir ?= $(prefix)/bin datadir ?= $(prefix)/share @@ -258,7 +267,7 @@ # UNINSTALL MATHOMATIC -# Remove Mathomatic from your local computer system. +# Entirely remove Mathomatic from your local computer system. uninstall: cd $(DESTDIR)$(mandir)/man1 && rm -f $(MAN1) matho.1 cd $(DESTDIR)$(bindir) && rm -f $(AOUT) rmath matho @@ -269,9 +278,9 @@ @echo @echo Mathomatic uninstall completed. @echo - $(MAKE) -C primes uninstall + -$(MAKE) -C primes prefix=$(prefix) uninstall @echo - $(MAKE) -C lib uninstall + -$(MAKE) -C lib prefix=$(prefix) uninstall # CLEAN THIS DIRECTORY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/misc/known_bugs.txt new/mathomatic-15.8.1/misc/known_bugs.txt --- old/mathomatic-15.8.0/misc/known_bugs.txt 2012-02-14 18:57:54.000000000 +0100 +++ new/mathomatic-15.8.1/misc/known_bugs.txt 2012-03-06 22:28:54.000000000 +0100 @@ -21,3 +21,9 @@ The solve command may have a problem too, but using the verify option should check that the result of solving absolute value or complex number equations is 100% correct. + +Solving modulus equations: + May result in garbage, due to incomplete modulus operator solving code. +I could just disable it, but I choose to research it at a later time, because +it does sometimes work nicely. Again, the "solve verify" option tells the +truth. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/poly.c new/mathomatic-15.8.1/poly.c --- old/mathomatic-15.8.0/poly.c 2012-01-04 16:01:20.000000000 +0100 +++ new/mathomatic-15.8.1/poly.c 2012-03-07 00:56:08.000000000 +0100 @@ -1023,22 +1023,28 @@ } break; } +#if 1 /* Remove integer*n multiples in x for x%n by doing */ /* polynomial division x/n and replacing with remainder%n. */ /* Globals tlhs[] and trhs[] are wiped out by the polynomial division here. */ if (poly_div(&equation[j], len2, &equation[i+1], len1, NULL)) { uf_pplus(tlhs, &n_tlhs); /* so integer%(integer^integer) isn't simplified to 0 */ if (is_integer_expr(tlhs, n_tlhs)) { - if ((*np + (n_trhs - len2)) > n_tokens) - error_huge(); - for (k = 0; k < n_trhs; k++) - trhs[k].level += level; - blt(&equation[j+n_trhs], &equation[j+len2], (*np - (j + len2)) * sizeof(token_type)); - *np += n_trhs - len2; - blt(&equation[j], trhs, n_trhs * sizeof(token_type)); - return true; + if (n_trhs < len2 || REMAINDER_IS_ZERO()) { /* if it will make it smaller */ + if ((*np + (n_trhs - len2)) > n_tokens) + error_huge(); + for (k = 0; k < n_trhs; k++) + trhs[k].level += level; + blt(&equation[j+n_trhs], &equation[j+len2], (*np - (j + len2)) * sizeof(token_type)); + *np += n_trhs - len2; + blt(&equation[j], trhs, n_trhs * sizeof(token_type)); + debug_string(2, "Polynomial division successful in modulus simplification. The result is:"); + side_debug(2, equation, *np); + return true; + } } } +#endif } } return modified; @@ -1552,9 +1558,12 @@ count = find_greatest_power(trhs, n_trhs, vp, &d, &t1, &len_t1, &divide_flag); if (d < divisor_power) { /* Success! Polynomial division ends here. */ + debug_string(3, "Successful polynomial division!"); blt(tlhs, quotient, n_quotient * sizeof(token_type)); n_tlhs = n_quotient; + debug_string(3, "Quotient:"); side_debug(3, tlhs, n_tlhs); + debug_string(3, "Remainder:"); side_debug(3, trhs, n_trhs); if (REMAINDER_IS_ZERO()) return 2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/primes/makefile new/mathomatic-15.8.1/primes/makefile --- old/mathomatic-15.8.0/primes/makefile 2011-12-01 02:49:22.000000000 +0100 +++ new/mathomatic-15.8.1/primes/makefile 2012-02-23 19:52:20.000000000 +0100 @@ -9,8 +9,8 @@ SHELL = /bin/sh # from http://www.gnu.org/prep/standards/ CC ?= gcc # C compiler to use INSTALL ?= install # installer to use -INSTALL_PROGRAM ?= $(INSTALL) -Cv # command to install executable program files; compare to see any differences, first. -INSTALL_DATA ?= $(INSTALL) -m 0644 # command to install data files +INSTALL_PROGRAM ?= $(INSTALL) # Command to install executable program files. +INSTALL_DATA ?= $(INSTALL) -m 0644 # Command to install data files. CC_OPTIMIZE = -O3 # Default C compiler optimization flags that are safe. #CC_OPTIMIZE += -ffast-math -fomit-frame-pointer # Extra optimize for speed, not functional under Mac OS X. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/primes/t new/mathomatic-15.8.1/primes/t --- old/mathomatic-15.8.0/primes/t 2011-11-17 14:08:52.000000000 +0100 +++ new/mathomatic-15.8.1/primes/t 2012-02-27 15:53:08.000000000 +0100 @@ -4,6 +4,8 @@ set -e set -u +trap "rm -f test.out bigtest.out" EXIT + make check bigcheck echo Testing matho-pascal... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/solve.c new/mathomatic-15.8.1/solve.c --- old/mathomatic-15.8.0/solve.c 2012-02-15 00:39:42.000000000 +0100 +++ new/mathomatic-15.8.1/solve.c 2012-03-07 14:48:20.000000000 +0100 @@ -1117,7 +1117,7 @@ error_bug("g_of_f() called with invalid operandp."); } if (*side1np == prev_n1 && *side2np == prev_n2) { - if (++repeat_count >= 4 /* was 3 */) { + if (++repeat_count >= 4) { debug_string(1, _("Infinite loop aborted in solve routine.")); return false; } @@ -1261,7 +1261,7 @@ p2++; p2->level = 2; p2->kind = VARIABLE; - snprintf(var_name_buf, sizeof(var_name_buf), "%s%.0d", V_INTEGER_PREFIX, last_int_var); + snprintf(var_name_buf, sizeof(var_name_buf), "%s_any%.0d", V_INTEGER_PREFIX, last_int_var); if (parse_var(&p2->token.variable, var_name_buf) == NULL) return false; last_int_var++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/tests/all.out new/mathomatic-15.8.1/tests/all.out --- old/mathomatic-15.8.0/tests/all.out 2012-02-14 18:18:00.000000000 +0100 +++ new/mathomatic-15.8.1/tests/all.out 2012-02-28 00:22:08.000000000 +0100 @@ -1536,16 +1536,6 @@ 1-> compare with 4 Comparing #4 with #1... Completely simplifying both equations... - - ((c1*((b2*d3) - (b3*d2))) + (b1*((c3*d2) - (c2*d3))) + (d1*((b3*c2) - (c3*b2)))) -#4: x = -------------------------------------------------------------------------------- - ((a1*((b3*c2) - (c3*b2))) + (c1*((a3*b2) - (b3*a2))) + (b1*((c3*a2) - (a3*c2)))) - - - ((d1*((b2*c3) - (b3*c2))) + (b1*((d3*c2) - (d2*c3))) + (c1*((d2*b3) - (d3*b2)))) -#1: x = -------------------------------------------------------------------------------- - ((a1*((b2*c3) - (b3*c2))) + (b1*((a3*c2) - (a2*c3))) + (c1*((a2*b3) - (a3*b2)))) - Equations are identical. Successfully finished reading file "test3.in". 1-> read poly @@ -2090,20 +2080,6 @@ 7-> compare 6 Comparing #6 with #7... Completely simplifying both equations... - - 1 1 - ((((mass1^2)^-)*(((velocity1_old - velocity2_old)^2)^-)*sign0) + (mass1*velocity1_old) + (mass2*velocity2_old)) - 2 2 -#6: velocity2_new = --------------------------------------------------------------------------------------------------------------- - (mass1 + mass2) - - - 1 1 - ((sign*((mass1^2)^-)*(((velocity1_old - velocity2_old)^2)^-)) + (mass1*velocity1_old) + (mass2*velocity2_old)) - 2 2 -#7: velocity2_new = -------------------------------------------------------------------------------------------------------------- - (mass1 + mass2) - Equations are identical. Successfully finished reading file "test6.in". 7-> clear all @@ -2286,27 +2262,36 @@ #3: trapezoid_area = ----------------------------------------------------- 4 +3-> replace trapezoid_area with triangle_area + + 1 + (((a + b + c)*(a - b + c)*(a + b - c)*(b - a + c))^-) + 2 +#3: triangle_area = ----------------------------------------------------- + 4 + 3-> pause Please press the Enter key to verify the result. -3-> compare 2 ; simplify and compare the result with Heron's formula: -Comparing #2 with #3... -Completely simplifying both equations... +3-> copy + + 1 + (((a + b + c)*(a - b + c)*(a + b - c)*(b - a + c))^-) + 2 +#5: triangle_area = ----------------------------------------------------- + 4 + +3-> display 2 1 - (((2*((a^2*(b^2 + c^2)) + (b^2*c^2))) - a^4 - b^4 - c^4)^-) + (((2*((a^2*(b^2 + c^2)) + ((b*c)^2))) - a^4 - b^4 - c^4)^-) 2 #2: triangle_area = ----------------------------------------------------------- 4 - - 1 - (((2*((a^2*(b^2 + c^2)) + (c^2*b^2))) - a^4 - b^4 - c^4)^-) - 2 -#3: trapezoid_area = ----------------------------------------------------------- - 4 - -Variable triangle_area in the first equation -is equal to trapezoid_area in the second equation. -3-> clear +3-> compare 5 with 2 ; simplify and compare the result with Heron's formula: +Comparing #5 with #2... +Completely simplifying both equations... +Equations are identical. +3-> clear 5 3-> pause 3-> 3-> ; This is how we arrive at Heron's formula for the area @@ -2318,60 +2303,46 @@ 3-> 3-> 2s=a+b+c+d ; cyclic quadrilateral side lengths are a, b, c, and d -#3: 2*s = a + b + c + d +#5: 2*s = a + b + c + d -3-> cyclic_area = ((s-a)*(s-b)*(s-c)*(s-d))^.5 +5-> cyclic_area = ((s-a)*(s-b)*(s-c)*(s-d))^.5 1 -#5: cyclic_area = ((s - a)*(s - b)*(s - c)*(s - d))^- +#6: cyclic_area = ((s - a)*(s - b)*(s - c)*(s - d))^- 2 -5-> eliminate s ; Brahmagupta's formula: -Solving equation #3 for (s) and substituting into the current equation... +6-> eliminate s ; Brahmagupta's formula: +Solving equation #5 for (s) and substituting into the current equation... (a + b + c + d) (a + b + c + d) (a + b + c + d) (a + b + c + d) 1 -#5: cyclic_area = ((--------------- - a)*(--------------- - b)*(--------------- - c)*(--------------- - d))^- +#6: cyclic_area = ((--------------- - a)*(--------------- - b)*(--------------- - c)*(--------------- - d))^- 2 2 2 2 2 -5-> pause -5-> copy +6-> pause +6-> copy (a + b + c + d) (a + b + c + d) (a + b + c + d) (a + b + c + d) 1 -#6: cyclic_area = ((--------------- - a)*(--------------- - b)*(--------------- - c)*(--------------- - d))^- +#7: cyclic_area = ((--------------- - a)*(--------------- - b)*(--------------- - c)*(--------------- - d))^- 2 2 2 2 2 -5-> replace d with 0 ; make one side length zero to get Heron's formula: +6-> replace d with 0 ; make one side length zero to get Heron's formula: (a + b + c) (a + b + c) (a + b + c) (----------- - a)*(----------- - b)*(----------- - c)*(a + b + c) 2 2 2 1 -#5: cyclic_area = -----------------------------------------------------------------^- +#6: cyclic_area = -----------------------------------------------------------------^- 2 2 -5-> pause Please press the Enter key to verify the result. -5-> compare 2 ; simplify and compare the result with Heron's formula: -Comparing #2 with #5... +6-> pause Please press the Enter key to verify the result. +6-> compare 2 ; simplify and compare the result with Heron's formula: +Comparing #2 with #6... Completely simplifying both equations... - - 1 - (((2*((a^2*(b^2 + c^2)) + (b^2*c^2))) - a^4 - b^4 - c^4)^-) - 2 -#2: triangle_area = ----------------------------------------------------------- - 4 - - - 1 - (((2*((a^2*(b^2 + c^2)) + (c^2*b^2))) - a^4 - b^4 - c^4)^-) - 2 -#5: cyclic_area = ----------------------------------------------------------- - 4 - Variable triangle_area in the first equation is equal to cyclic_area in the second equation. -5-> clear -5-> clear 1 3 +6-> clear +6-> clear 1 5 Successfully finished reading file "heron.in". -5-> clear all +6-> clear all 1-> read radius 1-> 1-> ; Some more fun formulas. These are very similar to Heron's formula diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mathomatic-15.8.0/tests/heron.in new/mathomatic-15.8.1/tests/heron.in --- old/mathomatic-15.8.0/tests/heron.in 2009-07-05 12:21:28.000000000 +0200 +++ new/mathomatic-15.8.1/tests/heron.in 2012-02-28 00:12:50.000000000 +0100 @@ -22,9 +22,12 @@ copy replace c with 0 ; make the shorter parallel side length = 0 replace d with c ; Heron's formula in its simplest form: +replace trapezoid_area with triangle_area pause Please press the Enter key to verify the result. -compare 2 ; simplify and compare the result with Heron's formula: -clear +copy +display 2 +compare 5 with 2 ; simplify and compare the result with Heron's formula: +clear 5 pause ; This is how we arrive at Heron's formula for the area @@ -43,4 +46,4 @@ pause Please press the Enter key to verify the result. compare 2 ; simplify and compare the result with Heron's formula: clear -clear 1 3 +clear 1 5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lilo for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package lilo for openSUSE:Factory checked in at 2012-03-16 13:17:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lilo (Old) and /work/SRC/openSUSE:Factory/.lilo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lilo", Maintainer is "jplack(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lilo/lilo.changes 2012-03-05 18:00:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lilo.new/lilo.changes 2012-03-16 13:19:00.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 12 22:18:47 UTC 2012 - dvaleev(a)suse.com + +- Add support for PowerNV platform + +------------------------------------------------------------------- New: ---- lilo.ppc-22.8.opal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.c4j9xu/_old 2012-03-16 13:19:02.000000000 +0100 +++ /var/tmp/diff_new_pack.c4j9xu/_new 2012-03-16 13:19:02.000000000 +0100 @@ -83,6 +83,7 @@ Patch8608: lilo-libgcc.patch Patch8609: lilo.ppc.ps3.patch Patch8610: lilo.src.Makefile.patch +Patch8611: lilo.ppc-22.8.opal.patch # $Id: lilo.spec 1188 2008-12-09 14:29:53Z olh $ %description @@ -113,6 +114,7 @@ pushd lilo.ppc %patch8608 -p1 %patch8609 -p1 +%patch8611 popd %build ++++++ lilo.ppc-22.8.opal.patch ++++++ --- lilo.new.orig 2012-03-12 23:31:19.000000000 +0100 +++ lilo.new 2012-03-12 23:31:30.000000000 +0100 @@ -582,7 +582,7 @@ *Power\ Macintosh*) board_type=pmac ;; - IBM,*) + IBM,*|ibm,*) board_type=chrp ;; Momentum,Maple-D) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libunwind for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package libunwind for openSUSE:Factory checked in at 2012-03-16 13:17:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libunwind (Old) and /work/SRC/openSUSE:Factory/.libunwind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libunwind", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libunwind/libunwind.changes 2012-02-17 12:01:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libunwind.new/libunwind.changes 2012-03-16 13:18:59.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 5 22:35:56 CET 2012 - dmueller(a)suse.de + +- remove build from ARM + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libunwind.spec ++++++ --- /var/tmp/diff_new_pack.vNyhYa/_old 2012-03-16 13:19:00.000000000 +0100 +++ /var/tmp/diff_new_pack.vNyhYa/_new 2012-03-16 13:19:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libunwind # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,20 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libunwind -BuildRequires: gcc-c++ libtool +BuildRequires: gcc-c++ +BuildRequires: libtool Url: http://savannah.nongnu.org/projects/libunwind/ Summary: Unwind Library -Version: 1.0.1 -Release: 34 -Group: System/Base License: MIT +Group: System/Base +Version: 1.0.1 +Release: 0 Source: libunwind-%{version}.tar.gz Patch0: libunwind-1.0.1-ia64.diff Patch1: libunwind-1.0.1-memset.diff Patch2: libunwind-1.0.1-tests.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 x86_64 %arm +ExclusiveArch: %ix86 ia64 x86_64 %description A portable and efficient C programming interface (API) to determine the -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-thesaurus for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package libreoffice-thesaurus for openSUSE:Factory checked in at 2012-03-16 13:17:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice-thesaurus (Old) and /work/SRC/openSUSE:Factory/.libreoffice-thesaurus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice-thesaurus", Maintainer is "pmladek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice-thesaurus/libreoffice-thesaurus.changes 2011-09-23 02:10:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice-thesaurus.new/libreoffice-thesaurus.changes 2012-03-16 13:18:55.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Feb 29 13:23:07 UTC 2012 - cfarrell(a)suse.com + +- license update: AGPL-3.0+ and BSD-3-Clause and BSD-4-Clause and GFDL-1.2+ + and GPL-2.0 and GPL-2.0+ and GPL-3.0+ and LGPL-2.1 and LGPL-2.1+ and + LGPL-3.0 and MPL-1.1 + Use SPDX format for the licenses + +------------------------------------------------------------------- +Mon Apr 18 16:20:04 CEST 2011 - pmladek(a)suse.cz + +- bumped version to make sure that it is considered as a replacement + of the older package; initially done for the maintenance updates for + older openSUSE releases + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-thesaurus.spec ++++++ ++++ 666 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libreoffice-thesaurus/libreoffice-thesaurus.spec ++++ and /work/SRC/openSUSE:Factory/.libreoffice-thesaurus.new/libreoffice-thesaurus.spec ++++++ libreoffice-thesaurus-gen-spec ++++++ --- /var/tmp/diff_new_pack.GWdAvg/_old 2012-03-16 13:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.GWdAvg/_new 2012-03-16 13:18:59.000000000 +0100 @@ -286,7 +286,7 @@ my ($pdata) = @_; my @licenses = sort (keys %{$pdata->{'license'}}); - my $out = join ", ", @licenses; + my $out = join " and ", @licenses; return $out; } @@ -359,7 +359,7 @@ $out .= write_conditional_lines($pld, $locale, \&write_conditional_version_definition, 0); $out .= "\%package $pld->{'default'}{'pack_suffix'}\n"; - $out .= "License: " . join (", ", @{$pld->{'default'}{'license'}}) . "\n"; + $out .= "License: " . join (" or ", @{$pld->{'default'}{'license'}}) . "\n"; if (defined $condition_tag) { $out .= "Version: %${locale}_version\n"; } else { ++++++ libreoffice-thesaurus.data ++++++ --- /var/tmp/diff_new_pack.GWdAvg/_old 2012-03-16 13:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.GWdAvg/_new 2012-03-16 13:18:59.000000000 +0100 @@ -14,7 +14,7 @@ # the full locale here again, e.g. de_DE vs de_AT # Version: package version, e.g. 2.1.5 # Source: source file name, e.g. catalan.oxt -# License: comma separated list of dictionary licenses, e.g. GPLv2, LGPLv2.1 +# License: comma separated list of dictionary licenses, e.g. GPL-2.0, LGPL-2.1 # Types: comma separated list of included dictionary types; possible values are: # myspell, hunspell, hyphen, thesaurus # URL: url where the dictionary sources was taken from, e.g. @@ -33,8 +33,8 @@ Locale: bg_BG Language: Bulgarian -License: GPLv2+ -Version: 20071210 +License: GPL-2.0+ +Version: 20071210.1 Types: thesaurus # alternative url: http://extensions.services.openoffice.org/project/dictionaries-bg # dictionaries-bg.oxt, version 4.1.5 includes older thesaurus files => no update @@ -46,9 +46,9 @@ Locale: ca_ES Language: Catalan URL: http://extensions.services.openoffice.org/project/thesaurus-ca -Version: 1.5.0 +Version: 1.5.0.1 Types: hunspell -License: GPLv2, LGPLv2.1 +License: GPL-2.0, LGPL-2.1 # TODO mail to the owner to solve this Prep: mv thesaurus-ca/dictionaries/README_th_ca_ES_v3.txt thesaurus-ca/dictionaries/README_th_ca_ES_v2.txt Prep: mv thesaurus-ca/dictionaries/th_ca_ES_v3.dat thesaurus-ca/dictionaries/th_ca_ES_v2.dat @@ -59,8 +59,8 @@ Locale: cs_CZ Language: Czech -License: BSD3c -Version: 20070913 +License: BSD-3-Clause +Version: 20070913.1 Types: thesaurus # alternative url: http://extensions.services.openoffice.org/project/dict-cs # the thesaurus dictionary included in dict-cs-2.0.oxt is not freely redistributable @@ -70,9 +70,9 @@ Locale: da_DK Language: Danish URL: http://extensions.services.openoffice.org/project/danske_synonymer -Version: 20100126 +Version: 20100126.1 Types: thesaurus -License: GPLv2, LGPLv2.1, MPLv1.1 +License: GPL-2.0, LGPL-2.1, MPL-1.1 # hunspell, hyphen available: http://extensions.services.openoffice.org/project/dict-da Source: DanskeSynonymer.oxt @@ -81,9 +81,9 @@ pack_suffix: de-AT Prov_lang: de_AT URL: http://extensions.services.openoffice.org/project/dict-de_AT_frami -Version: 20100307 +Version: 20100307.1 Types: hunspell, hyphen, thesaurus -License: LGPLv2.1+ +License: LGPL-2.1+ Source: dict-de_AT-frami_2010-03-07.oxt Locale: de_CH @@ -91,23 +91,23 @@ pack_suffix: de-CH Prov_lang: de_CH URL: http://extensions.services.openoffice.org/project/dict-de_CH_frami -Version: 20100307 +Version: 20100307.1 Types: hunspell, hyphen, thesaurus -License: LGPLv2.1+ +License: LGPL-2.1+ Source: dict-de_CH-frami_2010-03-07.oxt Locale: de_DE Language: German URL: http://extensions.services.openoffice.org/project/dict-de_DE_frami -License: LGPLv2.1+ -Version: 20100307 +License: LGPL-2.1+ +Version: 20100307.1 Types: hunspell, hyphen, thesaurus Source: dict-de_DE-frami_2010-03-07.oxt Locale: el_GR Language: Greek -License: GPLv2+ -Version: 20061203 +License: GPL-2.0+ +Version: 20061203.1 Types: thesaurus Source: th_el.tar.bz2 @@ -115,8 +115,8 @@ Language: Australian Pack_suffix: en-AU Prov_lang: en_AU -License: BSD4c -Version: 20081215 +License: BSD-4-Clause +Version: 20081215.1 Types: myspell, hyphen, thesaurus URL: http://extensions.services.openoffice.org/project/AustralianDictionary Source: dict-en-au-2008-12-15.oxt @@ -125,20 +125,20 @@ Language: American Pack_suffix: en-US Prov_lang: en_US -License: BSD4c -Version: 20060111 +License: BSD-4-Clause +Version: 20060111.1 Types: thesaurus -Dependency: Provides: OpenOffice_org-thesaurus-en = 20060111 -Dependency: Obsoletes: OpenOffice_org-thesaurus-en <= 20060111 +Dependency: Provides: OpenOffice_org-thesaurus-en = %version +Dependency: Obsoletes: OpenOffice_org-thesaurus-en <= %version Source: thes_en_US_v2.tar.bz2 Locale: en_GB Language: British Pack_suffix: en-GB Prov_lang: en_GB -License: BSD4c +License: BSD-4-Clause Types: thesaurus -Version: 20051128 +Version: 20051128.1 Prep: mv thes_en_GB_v2/th_en_GB_final.dat thes_en_GB_v2/th_en_GB_v2.dat Prep: mv thes_en_GB_v2/th_en_GB_final.idx thes_en_GB_v2/th_en_GB_v2.idx # http://sourceforge.net/projects/brit-thesaurus/ @@ -149,16 +149,16 @@ pack_suffix: es-AR Prov_lang: es_AR URL: http://extensions.services.openoffice.org/project/diccionario_es_AR -Version: 0.1 +Version: 0.1.1 Types: myspell, hyphen, thesaurus -License: LGPLv2.1 +License: LGPL-2.1 Source: Diccionarios-Argentina_1.oxt Locale: es_ES Language: Spanish -License: LGPLv2.1+ +License: LGPL-2.1+ Types: thesaurus -Version: 20050720 +Version: 20050720.1 Source: thes_es_ES_v2.tar.bz2 Locale: es_VE @@ -166,16 +166,16 @@ pack_suffix: es-VE Prov_lang: es_VE URL: http://extensions.services.openoffice.org/project/dict-es_VE -Version: 1.0.1 +Version: 1.0.1.1 Types: hunspell, hyphen, thesaurus -License: GPLv3+ +License: GPL-3.0+ Source: dict-es_VE.oxt Locale: fr_FR Language: French URL: http://extensions.services.openoffice.org/project/french-dictionary-classic… -License: LGPLv2.1+ -Version: 20100125 # 3.5 +License: LGPL-2.1+ +Version: 20100125.1 # 3.5 Types: myspell, hyphen, thesaurus # under investigation, it looks it belongs to several countries Prep: mv ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/thes_fr.dat ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/th_fr_FR_v2.dat @@ -184,105 +184,105 @@ Locale: ga_IE Language: Irish -License: GFDLv1.2+ +License: GFDL-1.2+ Types: thesaurus -Version: 20071002 +Version: 20071002.1 Types: hunspell, hyphen, thesaurus URL: http://extensions.services.openoffice.org/project/focloiri-gaeilge Source: focloiri-gaeilge-4.4.oxt Locale: hu_HU Language: Hungarian -License: LGPLv2.1+ +License: LGPL-2.1+ Types: thesaurus -Version: 20080319 +Version: 20080319.1 # from hu_HU-1.3-pack.zip Source: thes_hu_HU_v2.tar.bz2 Locale: it_IT Language: Italian URL: http://extensions.services.openoffice.org/project/Dict_it_IT -Version: 20081129 +Version: 20081129.1 Types: hunspell, hyphen, thesaurus -License: AGPLv3+ +License: AGPL-3.0+ Source: Dizionari.IT_20081129.oxt # FIXME: the thesaurus dictionary is almost empty #Locale: lv_LV #Language: Latvian #URL: http://extensions.services.openoffice.org/project/dict_lv_LV -#Version: 20090916 # 0.8.2 +#Version: 20090916.1 # 0.8.2 #Types: hunspell, hyphen, thesaurus -#License: LGPLv2.1 +#License: LGPL-2.1 #Source: dict_lv_LV-0.8.2.oxt Locale: nb_NO Language: Norwegian Bokmaal -License: GPLv2+ +License: GPL-2.0+ Types: thesaurus -Version: 20080310 +Version: 20080310.1 # from no_NO-pack2-2.0.10.zip Source: thes_nb_NO_v2.tar.bz2 Locale: ne_NP Language: Nepali -License: LGPLv2.1+ +License: LGPL-2.1+ Types: thesaurus -Version: 1.1 +Version: 1.1.1 Source: thes_ne_NP_v2.tar.bz2 Locale: pl_PL Language: Polish URL: http://extensions.services.openoffice.org/project/pl-dict -License: LGPLv2.1 +License: LGPL-2.1 Types: myspell, hyphen, thesaurus -Version: 20081206 +Version: 20081206.1 Source: pl-dict.oxt Locale: pt_PT Language: Portuguese -License: GPLv2+ +License: GPL-2.0+ Types: hunspell, hyphen, thesaurus -Version: 20091015 +Version: 20091015.1 URL: http://extensions.services.openoffice.org/project/ptPTdict Source: oo3x-pt-PT.oxt Locale: ro_RO Language: Romanian -License: GPLv2+ +License: GPL-2.0+ Types: hunspell, hyphen, thesaurus -Version: 20091130 +Version: 20091130.1 URL: http://extensions.services.openoffice.org/project/dictionaries-ro-contempor… Source: dict-ro.1.1.oxt Locale: ru_RU Language: Russian -License: LGPLv3 +License: LGPL-3.0 Types: myspell, hyphen, thesaurus -Version: 20081013 +Version: 20081013.1 # TODO no source URL Source: dict_ru_RU-0.3.4.oxt Locale: sk_SK Language: Slovak -License: BSD3c +License: BSD-3-Clause Types: hunspell, hyphen, thesaurus -Version: 20100208 +Version: 20100208.1 URL: http://extensions.services.openoffice.org/project/dict-sk Source: dict-sk.oxt Locale: sl_SI Language: Slovenian -License: LGPLv2.1+ +License: LGPL-2.1+ Types: thesaurus -Version: 20080601 +Version: 20080601.1 Source: thes_sl_SI_v2.tar.bz2 Locale: sv_SE Language: Swedish -License: BSD3c +License: BSD-3-Clause Types: thesaurus -Version: 20090624 +Version: 20090624.1 # hunspell available: http://extensions.services.openoffice.org/project/dict-sv URL: http://extensions.services.openoffice.org/project/SweThes Source: SwedishThesaurus.oxt -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-converter for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package libreoffice-converter for openSUSE:Factory checked in at 2012-03-16 13:17:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice-converter (Old) and /work/SRC/openSUSE:Factory/.libreoffice-converter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice-converter", Maintainer is "pmladek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice-converter/libreoffice-converter.changes 2012-02-16 14:58:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice-converter.new/libreoffice-converter.changes 2012-03-16 13:18:53.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Mar 14 10:40:52 UTC 2012 - pmladek(a)suse.com + +- update package description for LibreOffice (bnc#751624) + +------------------------------------------------------------------- +Wed Mar 14 10:38:29 UTC 2012 - pelliott(a)blackpatchpanel.com + +- typo in man page + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-converter.spec ++++++ --- /var/tmp/diff_new_pack.Hi4SXA/_old 2012-03-16 13:18:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Hi4SXA/_new 2012-03-16 13:18:55.000000000 +0100 @@ -15,22 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libreoffice-converter %define ooo_home libreoffice Version: 3.3 -Release: 3 -License: LGPL-2.1+ -Group: Productivity/Office/Other -AutoReqProv: on +Release: 0 Requires: libreoffice-pyuno >= 2.99 Requires: procps # compat stuff Provides: OpenOffice_org-converter = %version Obsoletes: OpenOffice_org-converter <= %version Summary: Commandline Document Converter Using LibreOffice +License: LGPL-2.1+ +Group: Productivity/Office/Other Url: http://www.artofsolving.com/files/DocumentConverter.py Source0: DocumentConverter.py Source1: loconvert @@ -39,11 +36,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This package includes a simple script ooconvert that can be used to convert various document file formats on the commandline. It uses -OpenOffice.org that guarantees the quality and the variety of available +LibreOffice that guarantees the quality and the variety of available document file formats. @@ -53,10 +49,8 @@ cp %{S:0} %{S:1} %{S:2} . %patch0 - %build - %install install -m 755 -d $RPM_BUILD_ROOT%_datadir/%ooo_home/program install -m 755 -d $RPM_BUILD_ROOT%_bindir @@ -68,11 +62,9 @@ ln -sf loconvert $RPM_BUILD_ROOT%_bindir/ooconvert echo ".so man1/loconvert.1" >| $RPM_BUILD_ROOT%_mandir/man1/ooconvert.1 - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %dir %_datadir/%ooo_home @@ -81,6 +73,4 @@ %_bindir/* %_mandir/man1/* - - %changelog ++++++ loconvert.1 ++++++ --- /var/tmp/diff_new_pack.Hi4SXA/_old 2012-03-16 13:18:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Hi4SXA/_new 2012-03-16 13:18:55.000000000 +0100 @@ -10,7 +10,7 @@ It uses LibreOffice that guarantees the quality of available import and export filters. -This tool tries to start LibreOffice in the server mode on backgroud. +This tool tries to start LibreOffice in the server mode on background. It does not work if the LibreOffice application has already been running. Also it slows down the conversion a lot. We hope to reduce these limitations in the further versions. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libjreen for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package libjreen for openSUSE:Factory checked in at 2012-03-16 13:16:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjreen (Old) and /work/SRC/openSUSE:Factory/.libjreen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libjreen", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libjreen/libjreen.changes 2011-12-13 11:48:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libjreen.new/libjreen.changes 2012-03-16 13:16:53.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Mar 14 16:06:03 UTC 2012 - dev(a)dominik-schmidt.de + +- Update to version 1.0.3 + * Added Logger implementation + * Fixed QJDns initialization issue + +- Changes in 1.0.2 + * Added support for ProxyFactory + * Added immunity to invalid stanzas + * Added localization support for incoming stanzas + * Fixed QJDns initialization behaviour + +------------------------------------------------------------------- Old: ---- libjreen-1.0.1.tar.bz2 New: ---- libjreen-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjreen.spec ++++++ --- /var/tmp/diff_new_pack.zxDLBA/_old 2012-03-16 13:16:56.000000000 +0100 +++ /var/tmp/diff_new_pack.zxDLBA/_new 2012-03-16 13:16:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libjreen # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -19,12 +19,12 @@ %define soname 1 Name: libjreen -Version: 1.0.1 +Version: 1.0.3 Release: 0 -License: GPL-2.0+ Summary: Qt Jabber/XMPP library -Url: http://github.com/euroelessar/jreen +License: GPL-2.0+ Group: System/Libraries +Url: http://github.com/euroelessar/jreen Source: libjreen-%{version}.tar.bz2 BuildRequires: cmake BuildRequires: libqca2-devel ++++++ libjreen-1.0.1.tar.bz2 -> libjreen-1.0.3.tar.bz2 ++++++ ++++ 4267 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcryptui for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package libcryptui for openSUSE:Factory checked in at 2012-03-16 13:16:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcryptui (Old) and /work/SRC/openSUSE:Factory/.libcryptui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcryptui", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libcryptui/libcryptui.changes 2012-02-21 12:20:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libcryptui.new/libcryptui.changes 2012-03-16 13:16:44.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 9 19:08:48 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + Add dependency on libSM and libICE, needed for XSMP client +- No packaging change: we already have those BuildRequires. + +------------------------------------------------------------------- Old: ---- libcryptui-3.3.5.tar.xz New: ---- libcryptui-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcryptui.spec ++++++ --- /var/tmp/diff_new_pack.Lw4CNG/_old 2012-03-16 13:16:45.000000000 +0100 +++ /var/tmp/diff_new_pack.Lw4CNG/_new 2012-03-16 13:16:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: libcryptui -Version: 3.3.5 +Version: 3.3.91 Release: 0 # FIXME: find out why building introspection support for this package requires libtool Summary: Library for prompting for PGP keys @@ -47,8 +47,8 @@ License: LGPL-2.1+ Group: System/Libraries # Need some schema from gnome-keyring -Requires: gnome-keyring Requires: %{name}-data +Requires: gnome-keyring Recommends: %{name}-lang # The library talks to seahorse-daemon Recommends: seahorse-daemon -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit khmeros-fonts for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package khmeros-fonts for openSUSE:Factory checked in at 2012-03-16 13:16:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khmeros-fonts (Old) and /work/SRC/openSUSE:Factory/.khmeros-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "khmeros-fonts", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.khmeros-fonts.new/khmeros-fonts.changes 2012-03-16 13:16:37.000000000 +0100 @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Wed Feb 1 14:00:12 UTC 2012 - pgajdos(a)suse.com + +- renamed to khmeros-fonts + +------------------------------------------------------------------- +Sat Sep 17 09:38:06 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- +Thu Apr 8 18:14:27 CEST 2010 - tiwai(a)suse.de + +- remove unnecessary buildrequires for too old distros + +------------------------------------------------------------------- +Wed Jul 11 20:27:08 CEST 2007 - mfabian(a)suse.de + +- update to 5.0: + • some new fonts were added: KhmerOS_siemreap.ttf, + KhmerOS_metalchrieng.ttf, KhmerOS_content.ttf, + KhmerOS_muolpali.ttf, KhmerOS_muollight.ttf. + +------------------------------------------------------------------- +Wed Feb 21 12:56:32 CET 2007 - mfabian(a)suse.de + +- update to 4.0: + • two new fonts added: KhmerOSbattambang.ttf, KhmerOSbokor.ttf. + +------------------------------------------------------------------- +Wed Aug 09 16:07:21 CEST 2006 - mfabian(a)suse.de + +- move fonts to /usr/share/fonts/truetype + (openSUSE 10.2 will use X11R7). + +------------------------------------------------------------------- +Tue Feb 28 16:23:31 CET 2006 - mfabian(a)suse.de + +- add "Provides: locale(km)". + +------------------------------------------------------------------- +Wed Jan 25 21:45:38 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Jan 03 12:49:19 CET 2006 - mfabian(a)suse.de + +- new package: KhmerOS-fonts version 3.1. + + New: ---- All_KhmerOS_5.0.tar.bz2 LICENSE khmeros-fonts.changes khmeros-fonts.spec readme.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khmeros-fonts.spec ++++++ # # spec file for package KhmerOS-fonts # # Copyright (c) 2011 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/ # Name: khmeros-fonts %define fontdir /usr/share/fonts/truetype License: LGPL-2.1+ Group: System/X11/Fonts Provides: scalable-font-km PreReq: %suseconfig_fonts_prereq Provides: locale(km) Version: 5.0 Release: 106 Url: http://sourceforge.net/projects/khmer Source0: All_KhmerOS_5.0.tar.bz2 Source1: LICENSE Source2: readme.txt BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Fonts for the Khmer language of Cambodia %description Fonts for the Khmer language of Cambodia %prep %setup -n All_KhmerOS_5.0 cp $RPM_SOURCE_DIR/LICENSE . cp $RPM_SOURCE_DIR/readme.txt . %build %install mkdir -p $RPM_BUILD_ROOT%{fontdir} for i in *.ttf do install -c -m 644 "$i" $RPM_BUILD_ROOT%{fontdir} done %post %run_suseconfig_fonts %postun %run_suseconfig_fonts %files %defattr(-, root,root) %doc LICENSE readme.txt %{fontdir} %changelog ++++++ LICENSE ++++++ GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the library's name and a brief idea of what it does.> Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice That's all there is to it! ++++++ readme.txt ++++++ KhmerOS - font for the Khmer language of Cambodia Copyright 2005 Danh Hong Copyright 2005 Open Forum of Cambodia This font is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.? See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this font; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or visit http://www.gnu.org/licenses/lgpl.html-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit istanbul for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package istanbul for openSUSE:Factory checked in at 2012-03-16 13:16:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/istanbul (Old) and /work/SRC/openSUSE:Factory/.istanbul.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "istanbul", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/istanbul/istanbul.changes 2012-02-28 14:13:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.istanbul.new/istanbul.changes 2012-03-16 13:16:30.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 3 13:47:6 UTC 2012 - zaitor(a)opensuse.org + +- Change libX11-devel and libXext-devel BuildRequires into + pkgconfig(x11) and pkgconfig(xext), in order to build on 12.1 and + older. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ istanbul.spec ++++++ --- /var/tmp/diff_new_pack.UNWwN5/_old 2012-03-16 13:16:31.000000000 +0100 +++ /var/tmp/diff_new_pack.UNWwN5/_new 2012-03-16 13:16:31.000000000 +0100 @@ -23,8 +23,6 @@ BuildRequires: gstreamer-0_10-plugins-good BuildRequires: gtk2-devel BuildRequires: intltool -BuildRequires: libX11-devel -BuildRequires: libXext-devel BuildRequires: python-devel BuildRequires: python-gnome-devel BuildRequires: python-gnome-extras-devel @@ -32,7 +30,9 @@ BuildRequires: python-xlib BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xdamage) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) Version: 0.2.2 Release: 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gwibber for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gwibber for openSUSE:Factory checked in at 2012-03-16 13:16:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwibber (Old) and /work/SRC/openSUSE:Factory/.gwibber.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gwibber", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gwibber/gwibber.changes 2012-02-27 18:35:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gwibber.new/gwibber.changes 2012-03-16 13:16:21.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Mar 9 21:05:32 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 3.3.91: + + Fix duplicate detection by falling back to comparing html, + link_description, image_url and video_url (lp#933694). + + Fixed account migration path from 2.32 (desktopcouch) to 3.4 + (sqlite) (lp#740494). + + gwibber-accounts crashed with TypeError in function(): Item 0: + must be a subtype of gi.Boxed (lp#936071). + + Fixed position tracking so page down and page up move the + appropriate number of tiles (lp#629420). + + More escaping of text that pango markup can't support. + + Twitter: Use Twitter entities, improves getting hashtags, + mentions, links, images, and videos. (lp#948092). + +------------------------------------------------------------------- Old: ---- gwibber-3.3.90.tar.gz New: ---- gwibber-3.3.91.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwibber.spec ++++++ --- /var/tmp/diff_new_pack.epLNPJ/_old 2012-03-16 13:16:22.000000000 +0100 +++ /var/tmp/diff_new_pack.epLNPJ/_new 2012-03-16 13:16:22.000000000 +0100 @@ -21,7 +21,7 @@ %define __requires_exclude typelib\$Dbusmenu\$|typelib\$Indicate\$|typelib\$Unity\$ Name: gwibber -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Microblogging Client License: GPL-2.0+ @@ -37,7 +37,7 @@ BuildRequires: intltool BuildRequires: python-base BuildRequires: update-desktop-files -BuildRequires: vala >= 0.14.0 +BuildRequires: vala >= 0.15.0 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dee-1.0) >= 0.5.19 ++++++ gwibber-3.3.90.tar.gz -> gwibber-3.3.91.tar.gz ++++++ ++++ 26314 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtkmm-documentation for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gtkmm-documentation for openSUSE:Factory checked in at 2012-03-16 13:16:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkmm-documentation (Old) and /work/SRC/openSUSE:Factory/.gtkmm-documentation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtkmm-documentation", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkmm-documentation/gtkmm-documentation.changes 2012-02-16 12:22:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gtkmm-documentation.new/gtkmm-documentation.changes 2012-03-16 13:16:15.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 13 17:04:56 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 3.3.18: + + Remove Table and other deprecated classes. + + Use and mention Gtk::Application instead of Gtk::Main. + + Use Gtk::ApplicationWindow. + + Use ColorChooserDialog instead of deprecated + ColorSelectionDialog. + + Keyboard Events chapter: Clarify keyboard event propagation. + (bgo#661857). + + New example programs in the DrawingArea chapter. (bgo#666885). + +------------------------------------------------------------------- Old: ---- gtkmm-documentation-3.2.1.tar.bz2 New: ---- gtkmm-documentation-3.3.18.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkmm-documentation.spec ++++++ --- /var/tmp/diff_new_pack.jFypSo/_old 2012-03-16 13:16:17.000000000 +0100 +++ /var/tmp/diff_new_pack.jFypSo/_new 2012-03-16 13:16:17.000000000 +0100 @@ -17,17 +17,17 @@ Name: gtkmm-documentation -Version: 3.2.1 +Version: 3.3.18 Release: 0 Summary: C++ Bindings for GTK+ -- Documentation License: GFDL-1.2 ; GPL-2.0+ Group: Documentation/Other Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gtkmm-documentation/3.2/%{name}-%{version… +Source: http://download.gnome.org/sources/gtkmm-documentation/3.3/%{name}-%{version… BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel BuildRequires: pkgconfig(giomm-2.4) >= 2.24.0 -BuildRequires: pkgconfig(gtkmm-3.0) >= 3.2.0 +BuildRequires: pkgconfig(gtkmm-3.0) >= 3.3.18 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtkmm3 for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gtkmm3 for openSUSE:Factory checked in at 2012-03-16 13:16:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkmm3 (Old) and /work/SRC/openSUSE:Factory/.gtkmm3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtkmm3", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkmm3/gtkmm3.changes 2012-02-29 14:07:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gtkmm3.new/gtkmm3.changes 2012-03-16 13:16:12.000000000 +0100 @@ -1,0 +2,23 @@ +Fri Mar 9 11:00:18 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.18: + + Gtk: + - AboutDialog: Added add_credits_section(). + - Application: Added get/set_app_menu(), get/set_menubar(), + add/remove_accelerator(), inhibit(), uninhibit(), + is_inhibited() properties and signals. + - Add ApplicationWindow. + - Add ColorChooser and ColorChooserDialog. + - ColorSelection*: Document these as deprecated. + - EntryCompletion: Added compute_prefix(). + - FontChooser: Add properties and signals. + - Image: Add set_from_resource(). + - Main: Deprecate (most of) this in favor of Gtk::Application. + - StyleContext: Added set_parent() and unset_parent(). + - Widget: Add get_modifier_mask(). + - Window: Add unset/set/get_attached_to(), + get/set_hide_titlebar_when_maximized() and property. + + gmmproc: _CLASS_GTKOBJECT: Include destructor documentation + (bgo#668918). + +------------------------------------------------------------------- Old: ---- gtkmm-3.3.16.tar.xz New: ---- gtkmm-3.3.18.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkmm3.spec ++++++ --- /var/tmp/diff_new_pack.oJMk6a/_old 2012-03-16 13:16:14.000000000 +0100 +++ /var/tmp/diff_new_pack.oJMk6a/_new 2012-03-16 13:16:14.000000000 +0100 @@ -21,7 +21,7 @@ Name: gtkmm3 %define _name gtkmm -Version: 3.3.16 +Version: 3.3.18 Release: 0 Summary: C++ Interface for GTK3 (a GUI Library for X) License: LGPL-2.1+ @@ -33,8 +33,8 @@ BuildRequires: pkgconfig(atkmm-1.6) BuildRequires: pkgconfig(cairomm-1.0) >= 1.9.2 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.22.1 -BuildRequires: pkgconfig(giomm-2.4) >= 2.31.18.1 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.1.90 +BuildRequires: pkgconfig(giomm-2.4) >= 2.31.20 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.18 BuildRequires: pkgconfig(pangomm-1.4) >= 2.27.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grep for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package grep for openSUSE:Factory checked in at 2012-03-16 13:15:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grep (Old) and /work/SRC/openSUSE:Factory/.grep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grep", Maintainer is "jsmeix(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/grep/grep.changes 2012-02-07 14:45:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grep.new/grep.changes 2012-03-16 13:15:43.000000000 +0100 @@ -1,0 +2,72 @@ +Tue Mar 13 18:18:23 UTC 2012 - tabraham(a)novell.com + +- Update to 2.11: + * grep no longer dumps core on lines whose lengths do not fit in + 'int'. (e.g., lines longer than 2 GiB on a typical 64-bit host). + Instead, grep either works as expected, or reports an error. + An error can occur if not enough main memory is available, or if + the GNU C library's regular expression functions cannot handle + such long lines. [bug present since "the beginning"] + * The -m, -A, -B, and -C options no longer mishandle context line + counts that do not fit in 'int'. Also, grep -c's counts are now + limited by the type 'intmax_t' (typically less than 2**63) rather + than 'int' (typically less than 2**31). + * grep no longer silently suppresses errors when reading a directory + as if it were a text file. For example, "grep x ." now reports a + read error on most systems; formerly, it ignored the error. + [bug introduced in grep-2.5] + * grep now exits with status 2 if a directory loop is found, instead + of possibly exiting with status 0 or 1. [bug introduced in + grep-2.3] + * The -s option now suppresses certain input error diagnostics that + it formerly failed to suppress. These include errors when closing + the input, when lseeking the input, and when the input is also the + output. [bug introduced in grep-2.4] + * On POSIX systems, commands like "grep PAT < FILE >> FILE" now report + an error instead of looping. [bug present since "the beginning"] + * The --include, --exclude, and --exclude-dir options now handle + command-line arguments more consistently. --include and --exclude + apply only to non-directories and --exclude-dir applies only to + directories. "-" (standard input) is never excluded, since it is + not a file name. [bug introduced in grep-2.5] + * grep no longer rejects "grep -qr . > out", i.e., when run with -q + and an input file is the same as the output file, since with -q + grep generates no output, so there is no risk of infinite loop or + of an output-affecting race condition. Thus, the use of the + following options also disables the input-equals-output failure: + --max-count=N (-m) (for N >= 2) + --files-with-matches (-l) + --files-without-match (-L) + [bug introduced in grep-2.10] + * grep no longer emits an error message and quits on MS-Windows when + invoked with the -r option. + * grep no longer misinterprets some alternations involving anchors + (^, $, \< \> \B, \b). For example, grep -E "(^|\B)a" no + longer reports a match for the string "x a". [bug present since + "the beginning"] + * If no file operand is given, and a command-line -r or equivalent + option is given, grep now searches the working directory. Formerly + grep ignored the -r and searched standard input nonrecursively. + An -r found in GREP_OPTIONS does not have this new effect. + * grep now supports color highlighting of matches on MS-Windows. + * Use of the --mmap option now elicits a warning. It has been a no-op + since March of 2010. + * grep no longer diagnoses write errors repeatedly; it exits after + diagnosing the first write error. This is better behavior when + writing to a dangling pipe. + * Syntax errors in GREP_COLORS are now ignored, instead of sometimes + eliciting warnings. This is more consistent with programs that + (e.g.) ignore errors in termcap entries. + +- changes from 2.10: + * grep no longer mishandles high-bit-set pattern bytes on systems + where "char" is a signed type. [bug appears to affect only + MS-Windows] + * On POSIX systems, grep now rejects a command like + "grep -r pattern . > out", in which the output file is also one + of the inputs, because it can result in an "infinite" disk-filling + loop. [bug present since "the beginning"] + +- removed fix-testsuite.diff obsoleted by this release + +------------------------------------------------------------------- Old: ---- fix-testsuite.diff grep-2.9.tar.bz2 New: ---- grep-2.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grep.spec ++++++ --- /var/tmp/diff_new_pack.3YJ71n/_old 2012-03-16 13:15:45.000000000 +0100 +++ /var/tmp/diff_new_pack.3YJ71n/_new 2012-03-16 13:15:45.000000000 +0100 @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: grep BuildRequires: automake BuildRequires: pcre-devel @@ -24,14 +26,13 @@ Url: http://www.gnu.org/software/grep/ Provides: base:/usr/bin/grep PreReq: %{install_info_prereq} -Version: 2.9 +Version: 2.11 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0+ Group: Productivity/Text/Utilities Source: grep-%{version}.tar.bz2 -Patch0: fix-testsuite.diff -Patch1: grep-ppc-fix.patch +Patch0: grep-ppc-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,11 +45,10 @@ %if 0%{?suse_version} < 1120 echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache %endif -%patch0 # If you platform Long Double and Double to not match as expected %ifarch ppc ppc64 -%patch1 -p1 +%patch0 -p1 %endif %build ++++++ grep-2.9.tar.bz2 -> grep-2.11.tar.bz2 ++++++ ++++ 95834 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit go-goauth2 for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package go-goauth2 for openSUSE:Factory checked in at 2012-03-16 13:15:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go-goauth2 (Old) and /work/SRC/openSUSE:Factory/.go-goauth2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "go-goauth2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/go-goauth2/go-goauth2.changes 2012-02-14 11:24:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.go-goauth2.new/go-goauth2.changes 2012-03-16 13:15:38.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 7 20:23:00 UTC 2012 - graham(a)andtech.eu + +- Update spec file for latest Go rpm macro changes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go-goauth2.spec ++++++ --- /var/tmp/diff_new_pack.cIdz0H/_old 2012-03-16 13:15:39.000000000 +0100 +++ /var/tmp/diff_new_pack.cIdz0H/_new 2012-03-16 13:15:39.000000000 +0100 @@ -41,9 +41,11 @@ %patch0 -p1 %build +%goprep code.google.com/p/goauth2 +%gobuild oauth %install -%goinstall code.google.com/p/goauth2 oauth +%goinstall %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit goffice for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package goffice for openSUSE:Factory checked in at 2012-03-16 13:15:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/goffice (Old) and /work/SRC/openSUSE:Factory/.goffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "goffice", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/goffice/goffice.changes 2012-01-25 10:37:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.goffice.new/goffice.changes 2012-03-16 13:15:30.000000000 +0100 @@ -1,0 +2,27 @@ +Sat Mar 3 10:08:01 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.2: + + Improve sensitivity handling of SI related widgets in format + selector. + + Fix scientific format with SI prefix selection. + + Fix recognition of formats with SI prefix by format selector. + + Handle numeral shapes for number formats. + + Fixed rounding errors in limits displayed in contour plot + legend. + + Support wrapped charts labels. + + Fixed GdkPixbuf usage. + + Don't truncate images when exporting a chart. + + Add automatic Bezier spline interpolation. + + Fixed graph type selector position. + + Fix bounds for partial range logarithmic axes. + + Fix Y-axis label position. + + Add limits to the regression curve display range. + + Don't move any other axis when changing an axis position. + + Embed library ui files into library. + + Embed svg-patterns.xml and error bar image files too. + + Embed icons and ui files into plugins. + + Bugs fixed: bgo#665301, bgo#665303, bgo#666292, bgo#643873, + bgo#667005, bgo#645938, bgo#663356, bgo#667793, bgo#669257, + bgo#669325, bgo#669252, bgo#669050. + +------------------------------------------------------------------- Old: ---- goffice-0.9.1.tar.xz New: ---- goffice-0.9.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goffice.spec ++++++ --- /var/tmp/diff_new_pack.5mUHcC/_old 2012-03-16 13:15:32.000000000 +0100 +++ /var/tmp/diff_new_pack.5mUHcC/_new 2012-03-16 13:15:32.000000000 +0100 @@ -17,7 +17,7 @@ Name: goffice -Version: 0.9.1 +Version: 0.9.2 Release: 0 Summary: GLib/GTK+ Set of Document-Centric Objects and Utilities License: GPL-2.0 @@ -57,7 +57,6 @@ %package -n libgoffice-0_10-9 Summary: GLib/GTK+ Set of Document-Centric Objects and Utilities -License: GPL-2.0 Group: System/Libraries Recommends: %{name}-lang # To make lang package installable @@ -76,7 +75,6 @@ %package devel Summary: Development files for goffice -License: GPL-2.0 Group: Development/Libraries/GNOME Requires: libgoffice-0_10-9 = %{version} Obsoletes: goffice-doc < %{version} @@ -118,10 +116,6 @@ %{_libdir}/libgoffice-0.10.so.* %dir %{_libdir}/goffice %{_libdir}/goffice/%{version}/ -%dir %{_datadir}/goffice -%{_datadir}/goffice/%{version}/ -%dir %{_datadir}/pixmaps/goffice -%{_datadir}/pixmaps/goffice/%{version}/ # Directory for external plugins %dir %{_libdir}/goffice/0.10 %dir %{_libdir}/goffice/0.10/plugins -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnumeric for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnumeric for openSUSE:Factory checked in at 2012-03-16 13:15:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnumeric (Old) and /work/SRC/openSUSE:Factory/.gnumeric.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnumeric", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnumeric/gnumeric.changes 2012-01-25 15:01:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnumeric.new/gnumeric.changes 2012-03-16 13:15:15.000000000 +0100 @@ -1,0 +2,47 @@ +Sat Mar 3 10:20:40 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.11.2: + + Colour the range expressions to match the range cursor. + + Implement ctrl-click cell deselection. + + Fix LaTeX export of cyrillic. + + Fix function tool tip. + + Delay function completion tooltip. + + Import inline text from xlsx files. + + Fix rich text import from xlsx. + + Fix data shuffle. + + Clarify the skew-t and skew-normal descriptions. + + Fix EXACT. + + Fix editing of decimals. + + Fix edit line display. + + Avoid recalculation on pure comment deletion. + + Fix formula interpretation in plot series. + + Don't destroy a sheet object when inserting it. + + Improve parsing on numbers with non-ascii digits. + + Make solver check for exceeding the time limit. + + Fix object life-cycle problems in solver. + + Fix multihead problem with format dialog. + + Fix auto-expression problem with sheet deletion. + + Fix ellipsizing of auto-expression. + + Fix auto-expression of single cell when moved. + + Fix problems with underlines and rotated cells. + + Fix multihead problem with auto-expressions. + + Fix allocate-free mismatch in sheet management dialog. + + Fix paste special undo problem. + + Fix F4 (abs/rel-cycling) bug. + + Fix minor function name completion bug. + + Fix abs/rel stickiness in expression entry. + + Minor quit-dialog improvements. + + Put DataShuffle back on the menus. + + Resurrect the splash screen from bit rot. + + Make sheet removal respect manual recalculation. + + Bugs fixed: bgo#632156, bgo#610696, bgo#666340, bgo#668685, + bgo#668683, bgo#668936, bgo#669083, bgo#669184, bgo#670232, + bgo#670558, bgo#555519, bgo#670603, bgo#662237, bgo#669648, + bgo#667152, bgo#667702, bgo#668625, bgo#668624, bgo#668691, + bgo#670449, bgo#671192. +- Add explicit pkgconfig(libgsf-1) and pkgconfig(libxml-2.0) + BuildRequires. +- Remove xz BuildRequires now that it comes for free in the + buildsystem. + +------------------------------------------------------------------- Old: ---- gnumeric-1.11.1.tar.xz New: ---- gnumeric-1.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnumeric.spec ++++++ --- /var/tmp/diff_new_pack.kn1kM4/_old 2012-03-16 13:15:18.000000000 +0100 +++ /var/tmp/diff_new_pack.kn1kM4/_new 2012-03-16 13:15:18.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnumeric -Version: 1.11.1 +Version: 1.11.2 Release: 0 Summary: Spreadsheet Application License: GPL-2.0+ @@ -34,11 +34,11 @@ BuildRequires: scrollkeeper BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 -BuildRequires: pkgconfig(libgoffice-0.10) >= 0.9.1 +BuildRequires: pkgconfig(libgoffice-0.10) >= 0.9.2 +BuildRequires: pkgconfig(libgsf-1) >= 1.14.18 +BuildRequires: pkgconfig(libxml-2.0) >= 2.4.12 BuildRequires: pkgconfig(pango) >= 1.24.0 BuildRequires: pkgconfig(pangocairo) >= 1.24.0 Recommends: %{name}-lang -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnote for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnote for openSUSE:Factory checked in at 2012-03-16 13:15:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnote (Old) and /work/SRC/openSUSE:Factory/.gnote.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnote", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnote/gnote.changes 2012-01-09 11:15:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnote.new/gnote.changes 2012-03-16 13:15:10.000000000 +0100 @@ -1,0 +2,19 @@ +Sat Mar 10 18:28:58 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.0: + + New Features: + - Added core synchronization support + - Added addin to synchronize with local folder. + + Fixes: + - Fix missing header for Glib::signal_idle (bgo#667349) + - Call startup defined in GApplication + - Remove mnemonic references in documentation (bgo#670916) + - Fix selection deletion and remembering it + - Fix quit application for glib >= 2.32 + + Updated translations. +- Remove xz BuildRequires now that it comes for free in the build + system. +- Drop gnote-new-glibmm.patch: fixed upstream. +- Add gnote-buildfix.patch: Fix build by incuding missing headers. + +------------------------------------------------------------------- Old: ---- gnote-0.8.2.tar.xz gnote-new-glibmm.patch New: ---- gnote-0.9.0.tar.xz gnote-buildfix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnote.spec ++++++ --- /var/tmp/diff_new_pack.a6YB7M/_old 2012-03-16 13:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.a6YB7M/_new 2012-03-16 13:15:12.000000000 +0100 @@ -15,16 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gnote -Version: 0.8.2 +Version: 0.9.0 Release: 0 Summary: A Port of Tomboy to C++ License: GPL-3.0+ Group: Productivity/Text/Editors Url: http://live.gnome.org/Gnote -Source: http://download.gnome.org/sources/gnote/0.8/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gnote-new-glibmm.patch bgo#667349 vuntz(a)opensuse.org -- Fix build with recent versions of glibmm; taken from git -Patch0: gnote-new-glibmm.patch +Source: http://download.gnome.org/sources/gnote/0.9/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnote-buildfix.patch bgo#671787 dimstar(a)opensuse.org -- Fix build by including missing headers. +Patch0: gnote-buildfix.patch BuildRequires: boost-devel >= 1.34 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -36,8 +37,6 @@ BuildRequires: libxslt-devel BuildRequires: pcre-devel BuildRequires: update-desktop-files -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(libpanelapplet-4.0) >= 3.0 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,6 +57,7 @@ %install %make_install +find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print %suse_update_desktop_file gnote Utility DesktopUtility %find_lang %{name} %{?no_lang_C} @@ -89,6 +89,9 @@ %{_bindir}/gnote %{_libexecdir}/gnote-applet %{_libdir}/gnote/ +# Splitting does not make sense as it's just a lib for gnote itself (and it's plugins) +%{_libdir}/libgnote-0.9.so* +%{_libdir}/libgnote.so %{_datadir}/applications/gnote.desktop %{_datadir}/dbus-1/services/org.gnome.Gnote.service %{_datadir}/dbus-1/services/org.gnome.panel.applet.GnoteAppletFactory.service ++++++ gnote-buildfix.patch ++++++ >From d0e06bcc294330ccd83c60d54b56bc5741160ce5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <dimstar(a)opensuse.org> Date: Sat, 10 Mar 2012 19:50:32 +0100 Subject: [PATCH] Fix missing header includes for Glib::TimeoutSource. Fixes bug 671787. --- src/synchronization/syncmanager.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/synchronization/syncmanager.hpp b/src/synchronization/syncmanager.hpp index 19b87dd..6506ed1 100644 --- a/src/synchronization/syncmanager.hpp +++ b/src/synchronization/syncmanager.hpp @@ -26,6 +26,7 @@ #include <map> #include <string> +#include <glibmm/main.h> #include <glibmm/thread.h> #include "note.hpp" -- 1.7.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-themes-standard for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnome-themes-standard for openSUSE:Factory checked in at 2012-03-16 13:15:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-themes-standard (Old) and /work/SRC/openSUSE:Factory/.gnome-themes-standard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-themes-standard", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-themes-standard/gnome-themes-standard.changes 2012-02-28 19:23:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-themes-standard.new/gnome-themes-standard.changes 2012-03-16 13:15:04.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 6 08:11:55 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Use bright color for text on high-saturation infobars + + Theme GtkColorChooser dark variation + + Theme junction between scrollbars + + Fix missing GtkSpinner animation + + Fix wrong color for focused dim-labels + + Fix insensitive state for GtkTreeView and GtkIconView + + Update Documents theming for 0.3.91 + + Remove gedit sidepane custom styling for 3.4 + +------------------------------------------------------------------- Old: ---- gnome-themes-standard-3.3.90.1.tar.xz New: ---- gnome-themes-standard-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-themes-standard.spec ++++++ --- /var/tmp/diff_new_pack.1mGJY9/_old 2012-03-16 13:15:06.000000000 +0100 +++ /var/tmp/diff_new_pack.1mGJY9/_new 2012-03-16 13:15:06.000000000 +0100 @@ -20,7 +20,7 @@ Summary: Standard GNOME Themes License: LGPL-2.1+ Group: System/GUI/GNOME -Version: 3.3.90.1 +Version: 3.3.91 Release: 0 Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-themes-standard/3.3/%{name}-%{versi… -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-system-monitor for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnome-system-monitor for openSUSE:Factory checked in at 2012-03-16 13:14:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-system-monitor (Old) and /work/SRC/openSUSE:Factory/.gnome-system-monitor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-system-monitor", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-system-monitor/gnome-system-monitor.changes 2012-02-28 19:23:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-system-monitor.new/gnome-system-monitor.changes 2012-03-16 13:14:58.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 08:35:39 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-system-monitor-3.3.90.tar.xz New: ---- gnome-system-monitor-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-system-monitor.spec ++++++ --- /var/tmp/diff_new_pack.6UQ3nm/_old 2012-03-16 13:15:00.000000000 +0100 +++ /var/tmp/diff_new_pack.6UQ3nm/_new 2012-03-16 13:15:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-system-monitor -Version: 3.3.90 +Version: 3.3.91 Release: 0 Url: http://www.gnome.org Summary: A Simple Process Monitor -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-screenshot for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnome-screenshot for openSUSE:Factory checked in at 2012-03-16 13:14:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-screenshot (Old) and /work/SRC/openSUSE:Factory/.gnome-screenshot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-screenshot", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-screenshot/gnome-screenshot.changes 2012-02-16 12:21:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-screenshot.new/gnome-screenshot.changes 2012-03-16 13:14:54.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 5 16:48:17 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Use the new Shell API to include mouse pointer + + Make sure not to override the delay setting for non-interactive + mode + +------------------------------------------------------------------- Old: ---- gnome-screenshot-3.3.2.tar.xz New: ---- gnome-screenshot-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-screenshot.spec ++++++ --- /var/tmp/diff_new_pack.eihTmy/_old 2012-03-16 13:14:56.000000000 +0100 +++ /var/tmp/diff_new_pack.eihTmy/_new 2012-03-16 13:14:56.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-screenshot -Version: 3.3.2 +Version: 3.3.91 Release: 0 Summary: Utility to take pictures of your screen License: GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-keyring for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at 2012-03-16 13:14:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-keyring (Old) and /work/SRC/openSUSE:Factory/.gnome-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-keyring", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-keyring/gnome-keyring.changes 2012-02-16 16:14:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-keyring.new/gnome-keyring.changes 2012-03-16 13:14:47.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Mar 12 09:15:24 UTC 2012 - vuntz(a)opensuse.org + +- Pass --with-ca-certificates=%{_sysconfdir}/ssl/ca-bundle.pem + instead of --with-root-certs=%{_sysconfdir}/ssl/certs to + configure: it's better to use the single ca certificates file + than the directory with all certificates, as it's what upstream + prefers. + +------------------------------------------------------------------- +Fri Mar 9 19:08:31 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + Fix regression in changing a keyring master password + + Set better button labels for the prompts + + Fix assertion when cancelling a unlock prompt + + Use a single CA certificates file by default + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-keyring-3.3.5.tar.xz New: ---- gnome-keyring-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.qG1rb7/_old 2012-03-16 13:14:49.000000000 +0100 +++ /var/tmp/diff_new_pack.qG1rb7/_new 2012-03-16 13:14:50.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-keyring -Version: 3.3.5 +Version: 3.3.91 Release: 0 Url: http://www.gnome.org/ Summary: GNOME Keyring @@ -130,7 +130,7 @@ %if 0%{?BUILD_FROM_VCS} --enable-gtk-doc \ %endif - --with-root-certs=%{_sysconfdir}/ssl/certs + --with-ca-certificates=%{_sysconfdir}/ssl/ca-bundle.pem make %{?jobs:-j%jobs} V=1 %install -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-icon-theme-symbolic for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnome-icon-theme-symbolic for openSUSE:Factory checked in at 2012-03-16 13:14:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-icon-theme-symbolic (Old) and /work/SRC/openSUSE:Factory/.gnome-icon-theme-symbolic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-icon-theme-symbolic", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic.changes 2012-01-12 15:26:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-icon-theme-symbolic.new/gnome-icon-theme-symbolic.changes 2012-03-16 13:14:40.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 5 16:43:32 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + numerous additions to category, action and app contexts + + fix of floating point export issues exposing as a filled + rectangle + +------------------------------------------------------------------- Old: ---- gnome-icon-theme-symbolic-3.2.2.tar.xz New: ---- gnome-icon-theme-symbolic-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-icon-theme-symbolic.spec ++++++ --- /var/tmp/diff_new_pack.fTSX6M/_old 2012-03-16 13:14:42.000000000 +0100 +++ /var/tmp/diff_new_pack.fTSX6M/_new 2012-03-16 13:14:42.000000000 +0100 @@ -15,15 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gnome-icon-theme-symbolic -Version: 3.2.2 +Version: 3.3.91 Release: 0 # FIXME: when we have icon-naming-utils > 0.8.90, we will have icontool-render, so check if something has to be changed. Summary: Symbolic icon theme for GNOME License: CC-BY-SA-3.0 Group: System/X11/Icons Url: http://www.gnome.org/ -Source: http://download.gnome.org/sources/gnome-icon-theme-symbolic/3.2/%{name}-%{v… +Source: http://download.gnome.org/sources/gnome-icon-theme-symbolic/3.3/%{name}-%{v… BuildRequires: gnome-icon-theme # This is just for gtk-update-icon-cache BuildRequires: gtk3-tools -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-contacts for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnome-contacts for openSUSE:Factory checked in at 2012-03-16 13:14:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-contacts (Old) and /work/SRC/openSUSE:Factory/.gnome-contacts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-contacts", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-contacts/gnome-contacts.changes 2012-02-28 19:22:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-contacts.new/gnome-contacts.changes 2012-03-16 13:14:24.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 5 16:44:53 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Update the call support to work with latest Telepathy/Empathy + + Allow linking non-primary contacts to each other and not only + to primary ones + + Fix crash in linking + + Show unknown online status as offline + + Updated translations. +- Add pkgconfig(telepathy-glib) BuildRequires: new dependency + upstream. + +------------------------------------------------------------------- Old: ---- gnome-contacts-3.3.90.tar.xz New: ---- gnome-contacts-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-contacts.spec ++++++ --- /var/tmp/diff_new_pack.zhYQ17/_old 2012-03-16 13:14:26.000000000 +0100 +++ /var/tmp/diff_new_pack.zhYQ17/_new 2012-03-16 13:14:26.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-contacts -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Contacts Manager for GNOME License: GPL-2.0+ @@ -38,6 +38,7 @@ BuildRequires: pkgconfig(libebook-1.2) >= 3.2 BuildRequires: pkgconfig(libedataserver-1.2) >= 3.2 BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(telepathy-glib) >= 0.17.5 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-color-manager for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnome-color-manager for openSUSE:Factory checked in at 2012-03-16 13:14:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-color-manager (Old) and /work/SRC/openSUSE:Factory/.gnome-color-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-color-manager", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-color-manager/gnome-color-manager.changes 2012-02-16 12:21:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-color-manager.new/gnome-color-manager.changes 2012-03-16 13:14:17.000000000 +0100 @@ -1,0 +2,24 @@ +Wed Mar 14 14:45:11 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + New Features: + - Compile the GtkBuilder files as a GResources to speed up + startup + - Show the calibration progress bar level for new versions of + Argyllcms + + Bugfix: + - Allow the calibration to ask more than one interaction + question + - Correctly restore the calibration status panel after asking + the user a question + - Detect a sample misread from argyllcms and try to recover + - Do not show a critical warning if we re-try a failed + calibration + - Don't assume dispcal is /usr/bin/dispcal + - Ensure the user can quit if the calibration fails + - Ensure the VTE is flushed when the spawned program exits + - Fix a critial warning when setting the brightness + - Replace use of deprecated clutter api + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-color-manager-3.3.5.tar.xz New: ---- gnome-color-manager-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-color-manager.spec ++++++ --- /var/tmp/diff_new_pack.IwZVwd/_old 2012-03-16 13:14:19.000000000 +0100 +++ /var/tmp/diff_new_pack.IwZVwd/_new 2012-03-16 13:14:19.000000000 +0100 @@ -18,7 +18,7 @@ Name: gnome-color-manager -Version: 3.3.5 +Version: 3.3.91 Release: 0 # FIXME: possibly add mash BuildRequires for 3D support. Check first if mash is still alive upstream. # (https://github.com/clutter-project/mash / packaged as libmash in Fedora) @@ -36,7 +36,7 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(colord) >= 0.1.12 BuildRequires: pkgconfig(exiv2) -BuildRequires: pkgconfig(glib-2.0) >= 2.30.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.31.10 BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gtk+-3.0) >= 2.91.0 BuildRequires: pkgconfig(lcms2) >= 2.2 @@ -50,8 +50,8 @@ Requires: colord Requires: shared-color-profiles Recommends: %{name}-lang -Obsoletes: libcolor-glib1 < %{version} Obsoletes: gnome-color-manager-devel < %{version} +Obsoletes: libcolor-glib1 < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-backgrounds for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnome-backgrounds for openSUSE:Factory checked in at 2012-03-16 13:14:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-backgrounds (Old) and /work/SRC/openSUSE:Factory/.gnome-backgrounds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-backgrounds", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-backgrounds/gnome-backgrounds.changes 2012-01-05 19:11:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-backgrounds.new/gnome-backgrounds.changes 2012-03-16 13:14:12.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 5 16:33:08 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-backgrounds-3.3.3.tar.xz New: ---- gnome-backgrounds-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-backgrounds.spec ++++++ --- /var/tmp/diff_new_pack.U4bGK6/_old 2012-03-16 13:14:14.000000000 +0100 +++ /var/tmp/diff_new_pack.U4bGK6/_new 2012-03-16 13:14:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-backgrounds # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -25,7 +25,7 @@ BuildRequires: xz AutoReqProv: off BuildArch: noarch -Version: 3.3.3 +Version: 3.3.91 Release: 0 Source: http://download.gnome.org/sources/gnome-backgrounds/3.3/%{name}-%{version}.… Url: http://www.gnome.org/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnash for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gnash for openSUSE:Factory checked in at 2012-03-16 13:14:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnash (Old) and /work/SRC/openSUSE:Factory/.gnash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnash", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gnash/gnash.changes 2012-03-07 13:42:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnash.new/gnash.changes 2012-03-16 13:14:09.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 14:46:13 CET 2012 - tiwai(a)suse.de + +- VUL-0: gnash: integer overflow (CVE-2012-1175, bnc#752373) + +------------------------------------------------------------------- New: ---- gnash-CVE-2012-1175.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnash.spec ++++++ --- /var/tmp/diff_new_pack.SGt11S/_old 2012-03-16 13:14:10.000000000 +0100 +++ /var/tmp/diff_new_pack.SGt11S/_new 2012-03-16 13:14:10.000000000 +0100 @@ -54,6 +54,7 @@ Patch: gnash-0.8.5-build-fixes.diff Patch1: gnash-fix-insecure-temp-files.diff Patch2: gnash-CVE-2011-4328.diff +Patch3: gnash-CVE-2012-1175.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -88,6 +89,7 @@ %patch -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf -fi ++++++ gnash-CVE-2012-1175.diff ++++++ >From bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527 Mon Sep 17 00:00:00 2001 From: Benjamin Wolsey <bwy(a)benjaminwolsey.de> Date: Sat, 10 Mar 2012 14:52:50 +0000 Subject: Fix crash in GnashImage.cpp --- --- libbase/GnashImage.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) --- a/libbase/GnashImage.cpp +++ b/libbase/GnashImage.cpp @@ -24,6 +24,7 @@ #include <memory> // for auto_ptr #include <boost/scoped_array.hpp> #include <boost/shared_ptr.hpp> +#include <cassert> #include "FileTypes.h" #include "GnashImage.h" @@ -42,6 +43,21 @@ namespace gnash namespace { void processAlpha(GnashImage::iterator imageData, size_t pixels); + bool checkValidSize(size_t width, size_t height, size_t channels) { + + if (width == 0 || height == 0) return false; + + assert(channels > 0); + + boost::uint32_t maxSize = std::numeric_limits<boost::int32_t>::max(); + if (width >= maxSize || height >= maxSize) return false; + + maxSize /= channels; + maxSize /= width; + maxSize /= height; + + return maxSize > 0; + } } GnashImage::GnashImage(iterator data, size_t width, size_t height, @@ -53,6 +69,8 @@ GnashImage::GnashImage(iterator data, si _height(height), _data(data) { + // Callers should check dimensions + assert(checkValidSize(_width, _height, channels())); } /// Create an image allocating a buffer of height*pitch bytes @@ -64,8 +82,9 @@ GnashImage::GnashImage(size_t width, siz _width(width), _height(height) { - const size_t max = std::numeric_limits<boost::int32_t>::max(); - if (size() > max) { + // Constructed from external input, so restrict dimensions to avoid + // overflow in size calculations + if (!checkValidSize(_width, _height, channels())) { throw std::bad_alloc(); } _data.reset(new value_type[size()]); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glib2-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package glib2-branding-openSUSE for openSUSE:Factory checked in at 2012-03-16 13:13:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.glib2-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glib2-branding-openSUSE", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/glib2-branding-openSUSE/glib2-branding-openSUSE.changes 2012-01-05 19:11:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glib2-branding-openSUSE.new/glib2-branding-openSUSE.changes 2012-03-16 13:13:59.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 9 11:33:43 UTC 2012 - vuntz(a)opensuse.org + +- Change GSettings default: + + Disable audible bell + (org.gnome.desktop.wm.preferences/audible-bell): it's more + annoying than useful. + + Add comments to help people who want to change the window + manager theme. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.V7Cs82/_old 2012-03-16 13:14:01.000000000 +0100 +++ /var/tmp/diff_new_pack.V7Cs82/_new 2012-03-16 13:14:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package glib2-branding-openSUSE # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 ++++++ glib2-branding.gschema.override.in ++++++ --- /var/tmp/diff_new_pack.V7Cs82/_old 2012-03-16 13:14:01.000000000 +0100 +++ /var/tmp/diff_new_pack.V7Cs82/_new 2012-03-16 13:14:01.000000000 +0100 @@ -29,6 +29,14 @@ @@IF_openSUSE@@# theme-name = "" @@IF_SLE@@theme-name = "novell" +[org.gnome.desktop.wm.preferences] +## Audible bell is more annoying than useful +audible-bell = false +### For the theme, we stay with the defaults +# titlebar-uses-system-font = false +# titlebar-font = "" +# theme = "" + [org.gnome.settings-daemon.plugins.media-keys] ## Mute button always mute, instead of toggling. ## Comes from gnome-settings-daemon-bnc462640-mute-action.patch in gnome-settings-daemon -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghex for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package ghex for openSUSE:Factory checked in at 2012-03-16 13:13:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghex (Old) and /work/SRC/openSUSE:Factory/.ghex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghex", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/ghex/ghex.changes 2012-02-25 14:12:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghex.new/ghex.changes 2012-03-16 13:13:50.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Mar 9 19:40:31 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + Store the UI definition file as resource data + + Better experience for the "Goto Byte..." dialog + + Various code cleanups + + Updated translations. + +------------------------------------------------------------------- Old: ---- ghex-3.3.90.tar.xz New: ---- ghex-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghex.spec ++++++ --- /var/tmp/diff_new_pack.2xssqK/_old 2012-03-16 13:13:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2xssqK/_new 2012-03-16 13:13:52.000000000 +0100 @@ -17,7 +17,7 @@ Name: ghex -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: GNOME Binary Editor License: GPL-2.0+ @@ -33,8 +33,8 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(atk) >= 1.0.0 BuildRequires: pkgconfig(gail-3.0) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.31.10 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.8 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -114,7 +114,6 @@ %{_datadir}/GConf/gsettings/ghex.convert %{_datadir}/glib-2.0/schemas/org.gnome.GHex.gschema.xml %{_datadir}/icons/hicolor/*/apps/ghex.* -%{_datadir}/%{name}/ %dir %{_datadir}/gnome/help/%{name} %doc %{_datadir}/gnome/help/%{name}/C/ %doc %{_datadir}/omf/%{name}/%{name}-C.omf -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gedit-plugins for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gedit-plugins for openSUSE:Factory checked in at 2012-03-16 13:13:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gedit-plugins (Old) and /work/SRC/openSUSE:Factory/.gedit-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gedit-plugins", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gedit-plugins/gedit-plugins.changes 2012-02-28 19:22:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gedit-plugins.new/gedit-plugins.changes 2012-03-16 13:13:48.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Mar 8 17:05:34 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.4: + + Port colorpicker to new color chooser widget + + Use GResource for drawspaces + + Misc bugfixes + + Updated translations. + +------------------------------------------------------------------- Old: ---- gedit-plugins-3.3.3.tar.xz New: ---- gedit-plugins-3.3.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gedit-plugins.spec ++++++ --- /var/tmp/diff_new_pack.fAmWQ5/_old 2012-03-16 13:13:49.000000000 +0100 +++ /var/tmp/diff_new_pack.fAmWQ5/_new 2012-03-16 13:13:49.000000000 +0100 @@ -21,7 +21,7 @@ Summary: A collection of plugins for gedit License: GPL-2.0+ Group: Productivity/Editors/Other -Version: 3.3.3 +Version: 3.3.4 Release: 0 Source: http://download.gnome.org/sources/gedit-plugins/3.3/%{name}-%{version}.tar.… # PATCH-FIX-UPSTREAM gedit-plugins-implicit.patch bgo#665541 dimstar(a)opensuse.org -- #include stdio.h to have atoi defined. @@ -125,7 +125,6 @@ # drawspaces %{_libdir}/gedit/plugins/drawspaces.plugin %{_libdir}/gedit/plugins/libdrawspaces.so -%{_datadir}/gedit/plugins/drawspaces/ %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.drawspaces.gschema.xml # joinlines %{_libdir}/gedit/plugins/joinlines.plugin -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gedit-code-assistance for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gedit-code-assistance for openSUSE:Factory checked in at 2012-03-16 13:13:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gedit-code-assistance (Old) and /work/SRC/openSUSE:Factory/.gedit-code-assistance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gedit-code-assistance", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gedit-code-assistance/gedit-code-assistance.changes 2012-01-05 19:10:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gedit-code-assistance.new/gedit-code-assistance.changes 2012-03-16 13:13:40.000000000 +0100 @@ -1,0 +2,15 @@ +Sun Mar 11 18:56:24 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.1.3: + + Fix memory leaks + + Move c backend to its own directory + + Misc bugfixes. +- Drop gedit-code-assistance-vala015.patch: fixed upstream. + +------------------------------------------------------------------- +Sun Mar 4 20:20:34 UTC 2012 - dimstar(a)opensuse.org + +- Add gedit-code-assistance-vala015.patch: Fix build with vala + 0.15. + +------------------------------------------------------------------- Old: ---- gedit-code-assistance-0.1.2.tar.bz2 New: ---- gedit-code-assistance-0.1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gedit-code-assistance.spec ++++++ --- /var/tmp/diff_new_pack.y3p5km/_old 2012-03-16 13:13:42.000000000 +0100 +++ /var/tmp/diff_new_pack.y3p5km/_new 2012-03-16 13:13:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gedit-code-assistance # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,15 +16,14 @@ # - Name: gedit-code-assistance -Version: 0.1.2 -Release: 1 -License: GPL-3.0+ +Version: 0.1.3 +Release: 0 Summary: Plugin for gedit which provides code assistance for C, C++ and Objective-C -Url: http://git.gnome.org/browse/gedit-code-assistance +License: GPL-3.0+ Group: Productivity/Text/Editors -Source: http://download.gnome.org/sources/gedit-code-assistance/0.1/%{name}-%{versi… +Url: http://git.gnome.org/browse/gedit-code-assistance +Source: http://download.gnome.org/sources/gedit-code-assistance/0.1/%{name}-%{versi… BuildRequires: llvm-clang-devel >= 2.8 BuildRequires: llvm-devel >= 2.8 BuildRequires: vala -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gedit for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gedit for openSUSE:Factory checked in at 2012-03-16 13:13:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gedit (Old) and /work/SRC/openSUSE:Factory/.gedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gedit", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gedit/gedit.changes 2012-02-28 19:22:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gedit.new/gedit.changes 2012-03-16 13:13:33.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Mar 6 20:16:28 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.7: + + Add support for fdo desktop action spec. + + Misc bugfixes. +- Rebase gedit-desktop.patch. + +------------------------------------------------------------------- +Mon Mar 5 22:10:33 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.6: + + Fix the "time" plugin + + Misc bugfixes + + Updated translations. + +------------------------------------------------------------------- +Fri Mar 2 19:25:35 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.5: + + Less clutter search popup + + Use GResources + + Misc bugfixes + + Updated translations. +- Add pkgconfig(gtk+-3.0) and pkgconfig(libxml-2.0) BuildRequires + to be able to require a minimum version. + +------------------------------------------------------------------- Old: ---- gedit-3.3.4.tar.xz New: ---- gedit-3.3.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gedit.spec ++++++ --- /var/tmp/diff_new_pack.P6Ivsy/_old 2012-03-16 13:13:35.000000000 +0100 +++ /var/tmp/diff_new_pack.P6Ivsy/_new 2012-03-16 13:13:35.000000000 +0100 @@ -16,8 +16,9 @@ # + Name: gedit -Version: 3.3.4 +Version: 3.3.7 Release: 0 # FIXME: the %%{_datadir}/help/$locale/ files be found by %%find_lang Summary: Small and lightweight UTF-8 text editor @@ -37,10 +38,12 @@ BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.15 BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(ice) -BuildRequires: pkgconfig(libpeas-gtk-1.0) +BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.1.0 BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libxml-2.0) >= 2.5.0 BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0 BuildRequires: pkgconfig(sm) >= 1.0.0 BuildRequires: pkgconfig(x11) ++++++ gedit-desktop.patch ++++++ --- /var/tmp/diff_new_pack.P6Ivsy/_old 2012-03-16 13:13:35.000000000 +0100 +++ /var/tmp/diff_new_pack.P6Ivsy/_new 2012-03-16 13:13:35.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- data/gedit.desktop.in.in.orig +++ data/gedit.desktop.in.in -@@ -5,7 +5,7 @@ Exec=gedit %U +@@ -6,7 +6,7 @@ Exec=gedit %U Terminal=false Type=Application StartupNotify=true @@ -10,4 +10,4 @@ +MimeType=application/x-awk;application/x-csh;application/x-perl;application/x-php;application/x-shellscript;text/plain;text/x-c;text/x-c++;text/x-c++hdr;text/x-chdr;text/x-c++src;text/x-csrc;text/x-fortran;text/x-java;text/x-log;text/x-makefile;text/x-moc;text/x-pascal;text/x-patch;text/x-python;text/x-readme;text/x-scheme;text/x-tcl;text/x-tex; Icon=accessories-text-editor Categories=GNOME;GTK;Utility;TextEditor; - X-GNOME-DocPath=gedit/gedit.xml + Actions=Window;Document; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gdl for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gdl for openSUSE:Factory checked in at 2012-03-16 13:13:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdl (Old) and /work/SRC/openSUSE:Factory/.gdl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdl", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gdl/gdl.changes 2012-02-28 19:21:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gdl.new/gdl.changes 2012-03-16 13:13:20.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 5 21:46:09 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + Merge more changes from Inkscape. + +------------------------------------------------------------------- Old: ---- gdl-3.3.90.tar.xz New: ---- gdl-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdl.spec ++++++ --- /var/tmp/diff_new_pack.7Pdxnd/_old 2012-03-16 13:13:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7Pdxnd/_new 2012-03-16 13:13:22.000000000 +0100 @@ -17,7 +17,7 @@ Name: gdl -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Gnome Devtool Libraries License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcr for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gcr for openSUSE:Factory checked in at 2012-03-16 13:13:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcr (Old) and /work/SRC/openSUSE:Factory/.gcr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcr", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gcr/gcr.changes 2012-02-16 12:20:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gcr.new/gcr.changes 2012-03-16 13:13:16.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 1 16:44:43 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90: + + Expose the secure memory API +- Remove xz BuildRequires now that it comes for free in the build + system. + +------------------------------------------------------------------- Old: ---- gcr-3.3.5.tar.xz New: ---- gcr-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcr.spec ++++++ --- /var/tmp/diff_new_pack.fOzTY9/_old 2012-03-16 13:13:17.000000000 +0100 +++ /var/tmp/diff_new_pack.fOzTY9/_new 2012-03-16 13:13:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: gcr -Version: 3.3.5 +Version: 3.3.90 Release: 0 # FIXME: Verify if parallel build works again. Last checked in version 3.3.2 Summary: Library for Crypto UI related task @@ -35,8 +35,6 @@ # We need the %%mime_database_* macros BuildRequires: shared-mime-info BuildRequires: update-desktop-files -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.30.0 @@ -162,6 +160,7 @@ find %{buildroot} -type f -name "*.la" -delete -print # Cleanup installed test modules rm %{buildroot}%{_libdir}/libmock-test-module.so +%suse_update_desktop_file gcr-prompter %suse_update_desktop_file gcr-viewer %find_lang %{name} @@ -209,6 +208,7 @@ %files prompter %defattr(-, root, root) %{_libexecdir}/gcr-prompter +%{_datadir}/applications/gcr-prompter.desktop %{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service %{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gconf2-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at 2012-03-16 13:13:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gconf2-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.gconf2-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gconf2-branding-openSUSE", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-10-13 16:25:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gconf2-branding-openSUSE.new/gconf2-branding-SLED.changes 2012-03-16 13:13:07.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Mar 9 11:21:40 UTC 2012 - vuntz(a)opensuse.org + +- Remove system-wide desktop icons: + + This was done with a patch that won't get used anymore, see + discussion in bnc#533598. + + Drop GnomeOnlineHelp.desktop and suse-help.svg sources. + + Stop changing /apps/nautilus/desktop/predefined_items_dir. +- Update for metacity/mutter move to GSettings: + + Stop changing /apps/metacity/general/audible_bell. + + Remove commented entries for /apps/metacity/general/theme, + /apps/metacity/general/titlebar_font, + /desktop/gnome/shell/windows/theme. +- Update after drop of gnome-main-menu and move to GNOME 3 in + general: + + Stop changing + /apps/metacity/global_keybindings/panel_main_menu_list. +- Update after drop of PolicyKit-gnome: + + Stop changing + /desktop/gnome/policykit/auth_dialog_retain_authorization. + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change Old: ---- GnomeOnlineHelp.desktop suse-help.svg ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gconf2-branding-SLED # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_openSUSE 0 %define build_SLED 1 @@ -35,21 +34,15 @@ %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. - Name: gconf2-branding-SLED +Summary: SLED defaults for the GNOME configuration system License: BSD-3-Clause Group: System/GUI/GNOME -Summary: SLED defaults for the GNOME configuration system Version: %{pkg_version} -Release: 1 +Release: 0 Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh Source3: gconf2-branding-COPYING -%if %build_openSUSE -# Launchers on the desktop -Source10: GnomeOnlineHelp.desktop -Source11: suse-help.svg -%endif %if %build_SLED || %build_SLES # Novell sound theme Source30: novell-sound-index.theme @@ -79,9 +72,7 @@ on GConf database system. %if %build_SLED || %build_SLES - %package -n novell-sound-theme -License: BSD-3-Clause Summary: Novell Sound Theme Group: System/GUI/GNOME # the sound theme inherits from the freedesktop one @@ -120,45 +111,19 @@ %endif %gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false" %gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false" -# Do not retain PK authorizations by default (bnc#431569) lnussel(a)suse.de -%gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" # This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: %gconf_set /desktop/gnome/url-handlers/http/command --type=string "firefox %s" %gconf_set /desktop/gnome/url-handlers/https/command --type=string "firefox %s" # Use xchat for irc %gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s" %gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true" -# Disable audible bell in metacity: -%gconf_set /apps/metacity/general/audible_bell --type=bool "false" -%if %build_SLED || %build_SLES -# Enable Windows flag keys to show the panel's main menu in SLED: -%gconf_set /apps/metacity/global_keybindings/panel_main_menu_list --type=list --list-type=string "[Super_L,Super_R]" -%endif # We want to use pulseaudio by default; this makes empathy calls work better %gconf_set /system/gstreamer/0.10/default/audiosrc --type=string "pulsesrc" -## Disabled since we don't have any other good theme than the upstream one for GNOME 3 -# Change default theme in Metacity: -#%%gconf_set /apps/metacity/general/theme --type=string "Sonar" -#%%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" -# Change default theme in GNOME Shell: -#%%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" # # Merge is optional, but one larger file is better than many small files: gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/*/* rmdir $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/* 2>/dev/null || : -# This is deliberately done after the merge. We may want to modify it in scriptlets. -# -# Set up .desktop files to be shown in users' desktops -%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files -install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files -install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons -%if %build_openSUSE -install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ -# Compatibility: We cannot move these icons to another location without -# providing an homedir update process: -install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -167,16 +132,8 @@ %defattr(-,root,root) %doc COPYING %verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/* -%dir %{_datadir}/dist -%dir %{_datadir}/dist/desktop-files -%dir %{_datadir}/dist/icons -%if %build_openSUSE -%{_datadir}/dist/desktop-files/* -%{_datadir}/dist/icons/* -%endif %if %build_SLED || %build_SLES - %files -n novell-sound-theme %defattr(-,root,root) %doc COPYING ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gconf2-branding-SLES # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_openSUSE 0 %define build_SLED 0 @@ -35,21 +34,15 @@ %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. - Name: gconf2-branding-SLES +Summary: SLES defaults for the GNOME configuration system License: BSD-3-Clause Group: System/GUI/GNOME -Summary: SLES defaults for the GNOME configuration system Version: %{pkg_version} -Release: 1 +Release: 0 Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh Source3: gconf2-branding-COPYING -%if %build_openSUSE -# Launchers on the desktop -Source10: GnomeOnlineHelp.desktop -Source11: suse-help.svg -%endif %if %build_SLED || %build_SLES # Novell sound theme Source30: novell-sound-index.theme @@ -79,9 +72,7 @@ on GConf database system. %if %build_SLED || %build_SLES - %package -n novell-sound-theme -License: BSD-3-Clause Summary: Novell Sound Theme Group: System/GUI/GNOME # the sound theme inherits from the freedesktop one @@ -120,45 +111,19 @@ %endif %gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false" %gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false" -# Do not retain PK authorizations by default (bnc#431569) lnussel(a)suse.de -%gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" # This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: %gconf_set /desktop/gnome/url-handlers/http/command --type=string "firefox %s" %gconf_set /desktop/gnome/url-handlers/https/command --type=string "firefox %s" # Use xchat for irc %gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s" %gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true" -# Disable audible bell in metacity: -%gconf_set /apps/metacity/general/audible_bell --type=bool "false" -%if %build_SLED || %build_SLES -# Enable Windows flag keys to show the panel's main menu in SLED: -%gconf_set /apps/metacity/global_keybindings/panel_main_menu_list --type=list --list-type=string "[Super_L,Super_R]" -%endif # We want to use pulseaudio by default; this makes empathy calls work better %gconf_set /system/gstreamer/0.10/default/audiosrc --type=string "pulsesrc" -## Disabled since we don't have any other good theme than the upstream one for GNOME 3 -# Change default theme in Metacity: -#%%gconf_set /apps/metacity/general/theme --type=string "Sonar" -#%%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" -# Change default theme in GNOME Shell: -#%%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" # # Merge is optional, but one larger file is better than many small files: gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/*/* rmdir $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/* 2>/dev/null || : -# This is deliberately done after the merge. We may want to modify it in scriptlets. -# -# Set up .desktop files to be shown in users' desktops -%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files -install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files -install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons -%if %build_openSUSE -install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ -# Compatibility: We cannot move these icons to another location without -# providing an homedir update process: -install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -167,16 +132,8 @@ %defattr(-,root,root) %doc COPYING %verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/* -%dir %{_datadir}/dist -%dir %{_datadir}/dist/desktop-files -%dir %{_datadir}/dist/icons -%if %build_openSUSE -%{_datadir}/dist/desktop-files/* -%{_datadir}/dist/icons/* -%endif %if %build_SLED || %build_SLES - %files -n novell-sound-theme %defattr(-,root,root) %doc COPYING ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gconf2-branding-openSUSE # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_openSUSE 1 %define build_SLED 0 @@ -35,21 +34,15 @@ %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. - Name: gconf2-branding-openSUSE +Summary: openSUSE defaults for the GNOME configuration system License: BSD-3-Clause Group: System/GUI/GNOME -Summary: openSUSE defaults for the GNOME configuration system Version: %{pkg_version} -Release: 1 +Release: 0 Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh Source3: gconf2-branding-COPYING -%if %build_openSUSE -# Launchers on the desktop -Source10: GnomeOnlineHelp.desktop -Source11: suse-help.svg -%endif %if %build_SLED || %build_SLES # Novell sound theme Source30: novell-sound-index.theme @@ -79,9 +72,7 @@ on GConf database system. %if %build_SLED || %build_SLES - %package -n novell-sound-theme -License: BSD-3-Clause Summary: Novell Sound Theme Group: System/GUI/GNOME # the sound theme inherits from the freedesktop one @@ -120,45 +111,19 @@ %endif %gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false" %gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false" -# Do not retain PK authorizations by default (bnc#431569) lnussel(a)suse.de -%gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" # This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: %gconf_set /desktop/gnome/url-handlers/http/command --type=string "firefox %s" %gconf_set /desktop/gnome/url-handlers/https/command --type=string "firefox %s" # Use xchat for irc %gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s" %gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true" -# Disable audible bell in metacity: -%gconf_set /apps/metacity/general/audible_bell --type=bool "false" -%if %build_SLED || %build_SLES -# Enable Windows flag keys to show the panel's main menu in SLED: -%gconf_set /apps/metacity/global_keybindings/panel_main_menu_list --type=list --list-type=string "[Super_L,Super_R]" -%endif # We want to use pulseaudio by default; this makes empathy calls work better %gconf_set /system/gstreamer/0.10/default/audiosrc --type=string "pulsesrc" -## Disabled since we don't have any other good theme than the upstream one for GNOME 3 -# Change default theme in Metacity: -#%%gconf_set /apps/metacity/general/theme --type=string "Sonar" -#%%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" -# Change default theme in GNOME Shell: -#%%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" # # Merge is optional, but one larger file is better than many small files: gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/*/* rmdir $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/* 2>/dev/null || : -# This is deliberately done after the merge. We may want to modify it in scriptlets. -# -# Set up .desktop files to be shown in users' desktops -%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files -install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files -install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons -%if %build_openSUSE -install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ -# Compatibility: We cannot move these icons to another location without -# providing an homedir update process: -install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -167,16 +132,8 @@ %defattr(-,root,root) %doc COPYING %verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/* -%dir %{_datadir}/dist -%dir %{_datadir}/dist/desktop-files -%dir %{_datadir}/dist/icons -%if %build_openSUSE -%{_datadir}/dist/desktop-files/* -%{_datadir}/dist/icons/* -%endif %if %build_SLED || %build_SLES - %files -n novell-sound-theme %defattr(-,root,root) %doc COPYING ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Fri Mar 9 11:21:40 UTC 2012 - vuntz(a)opensuse.org + +- Remove system-wide desktop icons: + + This was done with a patch that won't get used anymore, see + discussion in bnc#533598. + + Drop GnomeOnlineHelp.desktop and suse-help.svg sources. + + Stop changing /apps/nautilus/desktop/predefined_items_dir. +- Update for metacity/mutter move to GSettings: + + Stop changing /apps/metacity/general/audible_bell. + + Remove commented entries for /apps/metacity/general/theme, + /apps/metacity/general/titlebar_font, + /desktop/gnome/shell/windows/theme. +- Update after drop of gnome-main-menu and move to GNOME 3 in + general: + + Stop changing + /apps/metacity/global_keybindings/panel_main_menu_list. +- Update after drop of PolicyKit-gnome: + + Stop changing + /desktop/gnome/policykit/auth_dialog_retain_authorization. + +------------------------------------------------------------------- Thu Oct 13 12:54:05 UTC 2011 - vuntz(a)opensuse.org - Remove %{release} from the gconf2 versioned Requires, to not ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -43,11 +43,6 @@ Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh Source3: gconf2-branding-COPYING -%if %build_openSUSE -# Launchers on the desktop -Source10: GnomeOnlineHelp.desktop -Source11: suse-help.svg -%endif %if %build_SLED || %build_SLES # Novell sound theme Source30: novell-sound-index.theme @@ -117,45 +112,19 @@ %endif %gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false" %gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false" -# Do not retain PK authorizations by default (bnc#431569) lnussel(a)suse.de -%gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" # This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: %gconf_set /desktop/gnome/url-handlers/http/command --type=string "firefox %s" %gconf_set /desktop/gnome/url-handlers/https/command --type=string "firefox %s" # Use xchat for irc %gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s" %gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true" -# Disable audible bell in metacity: -%gconf_set /apps/metacity/general/audible_bell --type=bool "false" -%if %build_SLED || %build_SLES -# Enable Windows flag keys to show the panel's main menu in SLED: -%gconf_set /apps/metacity/global_keybindings/panel_main_menu_list --type=list --list-type=string "[Super_L,Super_R]" -%endif # We want to use pulseaudio by default; this makes empathy calls work better %gconf_set /system/gstreamer/0.10/default/audiosrc --type=string "pulsesrc" -## Disabled since we don't have any other good theme than the upstream one for GNOME 3 -# Change default theme in Metacity: -#%%gconf_set /apps/metacity/general/theme --type=string "Sonar" -#%%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" -# Change default theme in GNOME Shell: -#%%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" # # Merge is optional, but one larger file is better than many small files: gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/*/* rmdir $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/* 2>/dev/null || : -# This is deliberately done after the merge. We may want to modify it in scriptlets. -# -# Set up .desktop files to be shown in users' desktops -%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files -install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files -install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons -%if %build_openSUSE -install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ -# Compatibility: We cannot move these icons to another location without -# providing an homedir update process: -install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -164,13 +133,6 @@ %defattr(-,root,root) %doc COPYING %verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/* -%dir %{_datadir}/dist -%dir %{_datadir}/dist/desktop-files -%dir %{_datadir}/dist/icons -%if %build_openSUSE -%{_datadir}/dist/desktop-files/* -%{_datadir}/dist/icons/* -%endif %if %build_SLED || %build_SLES %files -n novell-sound-theme -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit folks for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package folks for openSUSE:Factory checked in at 2012-03-16 13:12:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/folks (Old) and /work/SRC/openSUSE:Factory/.folks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "folks", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/folks/folks.changes 2012-02-28 19:21:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.folks.new/folks.changes 2012-03-16 13:12:26.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 5 07:25:41 UTC 2012 - vuntz(a)opensuse.org + +- Add folks-libsocialweb-quiescent.patch: fix issue where the + libsocialweb backend caused empathy to not display contacts in + the contact list. + +------------------------------------------------------------------- New: ---- folks-libsocialweb-quiescent.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ folks.spec ++++++ --- /var/tmp/diff_new_pack.x7p7iO/_old 2012-03-16 13:12:28.000000000 +0100 +++ /var/tmp/diff_new_pack.x7p7iO/_new 2012-03-16 13:12:28.000000000 +0100 @@ -27,6 +27,8 @@ Group: System/Libraries Url: http://telepathy.freedesktop.org/wiki/Folks Source: http://download.gnome.org/sources/folks/0.6/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM folks-libsocialweb-quiescent.patch bgo#670191 vuntz(a)opensuse.org -- Fix issue where empathy doesn't show the contacts in the contact list +Patch0: folks-libsocialweb-quiescent.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: readline-devel @@ -121,6 +123,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure \ ++++++ folks-libsocialweb-quiescent.patch ++++++ >From 1597b40820a06f184741d92a810340ace4fb0ab3 Mon Sep 17 00:00:00 2001 From: Philip Withnall <philip(a)tecnocode.co.uk> Date: Sun, 4 Mar 2012 20:24:49 +0000 Subject: [PATCH] libsocialweb: Tidy up Swf.PersonaStore.prepare() to return asynchronously MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, the prepare() method would return synchronously, firing off some asynchronous methods in libsocialweb, which would later return in callbacks and (theoretically) cause the persona store to reach quiescence. This behaviour was not playing nicely with the expected asynchronous behaviour of prepare(), and wasn't handling errors properly — on an error, the code would cancel preparation, but not throw an error or remove the persona store. The code now throws errors and removes the persona store if preparation fails, which should hopefully help some of the not-reaching-quiescence issues we’ve been seeing. Helps: https://bugzilla.gnome.org/show_bug.cgi?id=670191 --- backends/libsocialweb/lib/swf-persona-store.vala | 241 +++++++++++++++------- 1 files changed, 165 insertions(+), 76 deletions(-) diff --git a/backends/libsocialweb/lib/swf-persona-store.vala b/backends/libsocialweb/lib/swf-persona-store.vala index b26c131..8a00403 100644 --- a/backends/libsocialweb/lib/swf-persona-store.vala +++ b/backends/libsocialweb/lib/swf-persona-store.vala @@ -212,12 +212,96 @@ public class Swf.PersonaStore : Folks.PersonaStore "Personas cannot be removed from this store."); } + private async string[]? _get_static_capabilities () throws GLib.Error + { + /* Take a reference to the PersonaStore while waiting for the async call + * to return. See: bgo#665039. */ + this.ref (); + + var received_callback = false; + var has_yielded = false; + + string[]? caps = null; + Error? error = null; + + this.service.get_static_capabilities ((service, _caps, _error) => + { + received_callback = true; + + caps = _caps; + error = _error; + + if (has_yielded == true) + { + this._get_static_capabilities.callback (); + } + }); + + /* Yield for the get_static_capabilities() callback to be invoked, if it + * hasn't already been invoked (which could happen if + * get_static_capabilities() called it immediately). */ + if (received_callback == false) + { + has_yielded = true; + yield; + } + + this.unref (); + + /* Handle the error, if it was set. */ + if (error != null) + { + throw error; + } + + return caps; + } + + private async ClientContactView? _contacts_query_open_view (string query, + HashTable<weak string, weak string> parameters) + { + /* Take a reference to the PersonaStore while waiting for the async call + * to return. See: bgo#665039. */ + this.ref (); + + var received_callback = false; + var has_yielded = false; + + ClientContactView? contact_view = null; + + this.service.contacts_query_open_view (query, parameters, + (service, _contact_view) => + { + received_callback = true; + + contact_view = _contact_view; + + if (has_yielded == true) + { + this._contacts_query_open_view.callback (); + } + }); + + /* Yield for the contacts_query_open_view() callback to be invoked, if it + * hasn't already been invoked (which could happen if + * contacts_query_open_view() called it immediately). */ + if (received_callback == false) + { + has_yielded = true; + yield; + } + + this.unref (); + + return contact_view; + } + /** * Prepare the PersonaStore for use. * * See {@link Folks.PersonaStore.prepare}. */ - public override async void prepare () + public override async void prepare () throws GLib.Error { lock (this._is_prepared) { @@ -225,83 +309,88 @@ public class Swf.PersonaStore : Folks.PersonaStore { this._prepare_pending = true; - /* Take a reference to the PersonaStore while waiting for the - * async call to return. See: bgo#665039. */ - this.ref (); + /* Get the service's capabilities. */ + string[]? caps = null; + + try + { + caps = yield this._get_static_capabilities (); - this.service.get_static_capabilities ( - (service, caps, error) => + if (caps == null) { - if (caps == null) - { - this.unref (); - this._prepare_pending = false; - return; - } - - bool has_contacts = ClientService.has_cap (caps, - "has-contacts-query-iface"); - if (!has_contacts) - { - this.unref (); - this._prepare_pending = false; - return; - } - - var parameters = new HashTable<weak string, weak string> - (str_hash, str_equal); - - /* Take another ref for this async call. */ - this.ref (); - - this.service.contacts_query_open_view - ("people", parameters, (query, contact_view) => - { - /* The D-Bus call could return an error. In this - * case, contact_view is null */ - if (contact_view == null) - { - this.unref (); - this._prepare_pending = false; - return; - } - - contact_view.contacts_added.connect - (this.contacts_added_cb); - contact_view.contacts_changed.connect - (this.contacts_changed_cb); - contact_view.contacts_removed.connect - (this.contacts_removed_cb); - - this._contact_view = contact_view; - this._is_prepared = true; - this._prepare_pending = false; - this.notify_property ("is-prepared"); - - /* FIXME: for lsw Stores with 0 contacts or badly - * configured (or not authenticated, etc) we are - * condemned to never reach quiescence if we wait for - * contacts to be added. A possible way around this - * would be, if libsocialweb provided such properties, - * to query the social client to see if it's available - * (authenticated and ready) and the number of - * contacts that we would (eventually) get. That is - * the only way we could ever reach quiescence without - * waiting for eternity. - * - * See: - * https://bugzilla.gnome.org/show_bug.cgi?id=658445 - */ - this._is_quiescent = true; - this.notify_property ("is-quiescent"); - - this._contact_view.start (); - - this.unref (); - }); - - this.unref (); - }); + throw new PersonaStoreError.INVALID_ARGUMENT ( + /* Translators: the parameter is an error message. */ + _("Couldn’t prepare libsocialweb service: %s"), + _("No capabilities were found.")); + } + } + catch (GLib.Error e1) + { + /* Remove the persona store on error */ + this.removed (); + this._prepare_pending = false; + + throw e1; + } + + /* Check for the contacts query interface. */ + bool has_contacts = ClientService.has_cap (caps, + "has-contacts-query-iface"); + if (!has_contacts) + { + /* Remove the persona store on error */ + this.removed (); + this._prepare_pending = false; + + throw new PersonaStoreError.INVALID_ARGUMENT ( + /* Translators: the parameter is an error message. */ + _("Couldn’t prepare libsocialweb service: %s"), + _("No contacts capability was found.")); + } + + /* Open a contacts query view. */ + var contact_view = yield this._contacts_query_open_view ("people", + new HashTable<weak string, weak string> (str_hash, + str_equal)); + + /* Propagate errors from the contacts_query_open_view() + * callback. */ + if (contact_view == null) + { + /* Remove the persona store on error */ + this.removed (); + this._prepare_pending = false; + + throw new PersonaStoreError.INVALID_ARGUMENT ( + /* Translators: the parameter is an error message. */ + _("Couldn’t prepare libsocialweb service: %s"), + _("Error opening contacts view.")); + } + + contact_view.contacts_added.connect (this.contacts_added_cb); + contact_view.contacts_changed.connect (this.contacts_changed_cb); + contact_view.contacts_removed.connect (this.contacts_removed_cb); + + this._contact_view = contact_view; + this._is_prepared = true; + this._prepare_pending = false; + this.notify_property ("is-prepared"); + + /* FIXME: for lsw Stores with 0 contacts or badly configured (or + * not authenticated, etc) we are condemned to never reach + * quiescence if we wait for contacts to be added. A possible way + * around this would be, if libsocialweb provided such properties, + * to query the social client to see if it's available + * (authenticated and ready) and the number of contacts that we + * would (eventually) get. That is the only way we could ever + * reach quiescence without waiting for eternity. + * + * See: https://bugzilla.gnome.org/show_bug.cgi?id=658445 + */ + this._is_quiescent = true; + this.notify_property ("is-quiescent"); + + this._contact_view.start (); } } } -- 1.7.7.6 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit filesystem for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package filesystem for openSUSE:Factory checked in at 2012-03-16 13:12:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filesystem (Old) and /work/SRC/openSUSE:Factory/.filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "filesystem", Maintainer is "kkaempf(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/filesystem/filesystem.changes 2012-01-30 12:23:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.filesystem.new/filesystem.changes 2012-03-16 13:12:14.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 13 15:22:06 UTC 2012 - vuntz(a)opensuse.org + +- Also create /usr/share/help/$LOCALE for each LOCALE defined in + the languages file. This will allow our packages to have + translations for the XDG help system. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filesystem.spec ++++++ --- /var/tmp/diff_new_pack.kkR7nm/_old 2012-03-16 13:12:16.000000000 +0100 +++ /var/tmp/diff_new_pack.kkR7nm/_new 2012-03-16 13:12:16.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: filesystem Summary: Basic Directory Layout License: GPL-2.0+ @@ -121,6 +122,7 @@ # Create the locale directories: while read LANG ; do create_dir 0755 root root /usr/share/locale/$LANG/LC_MESSAGES + create_dir 0755 root root /usr/share/help/$LANG done < %{SOURCE2} RPM_INSTALL_PREFIX=$RPM_BUILD_ROOT export RPM_BUILD_ROOT @@ -181,6 +183,7 @@ + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit file-roller for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package file-roller for openSUSE:Factory checked in at 2012-03-16 13:12:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file-roller (Old) and /work/SRC/openSUSE:Factory/.file-roller.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "file-roller", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/file-roller/file-roller.changes 2012-02-28 19:21:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.file-roller.new/file-roller.changes 2012-03-16 13:12:11.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 5 22:05:14 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + 'All files' entry is duplicated in available formats combobox + (bgo#671029) + + Updated translations. + +------------------------------------------------------------------- Old: ---- file-roller-3.3.90.tar.xz New: ---- file-roller-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file-roller.spec ++++++ --- /var/tmp/diff_new_pack.EqkYUq/_old 2012-03-16 13:12:12.000000000 +0100 +++ /var/tmp/diff_new_pack.EqkYUq/_new 2012-03-16 13:12:12.000000000 +0100 @@ -17,7 +17,7 @@ Name: file-roller -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: An Archive Manager for GNOME License: GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution-groupwise for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package evolution-groupwise for openSUSE:Factory checked in at 2012-03-16 13:11:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-groupwise (Old) and /work/SRC/openSUSE:Factory/.evolution-groupwise.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-groupwise", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-groupwise/evolution-groupwise.changes 2012-02-28 19:21:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution-groupwise.new/evolution-groupwise.changes 2012-03-16 13:11:45.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 6 09:43:04 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Do not use find_book_view to update status, instead use + e_book_backend_foreach_view + + Adapt to last-minute Evolution library rearrangement. + +------------------------------------------------------------------- Old: ---- evolution-groupwise-3.3.90.tar.xz New: ---- evolution-groupwise-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-groupwise.spec ++++++ --- /var/tmp/diff_new_pack.twclbt/_old 2012-03-16 13:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.twclbt/_new 2012-03-16 13:11:46.000000000 +0100 @@ -21,7 +21,7 @@ Name: evolution-groupwise # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 3.4 -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: GroupWise Connector for Evolution License: LGPL-2.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution-exchange for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package evolution-exchange for openSUSE:Factory checked in at 2012-03-16 13:11:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-exchange (Old) and /work/SRC/openSUSE:Factory/.evolution-exchange.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-exchange", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-exchange/evolution-exchange.changes 2012-02-20 16:10:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution-exchange.new/evolution-exchange.changes 2012-03-16 13:11:37.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 6 09:42:59 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Adapt to last-minute Evolution library rearrangement. + + Updated translations. + +------------------------------------------------------------------- Old: ---- evolution-exchange-3.3.5.tar.xz New: ---- evolution-exchange-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-exchange.spec ++++++ --- /var/tmp/diff_new_pack.HO7qmd/_old 2012-03-16 13:11:38.000000000 +0100 +++ /var/tmp/diff_new_pack.HO7qmd/_new 2012-03-16 13:11:38.000000000 +0100 @@ -38,7 +38,7 @@ # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz BuildRequires: pkgconfig(libical) >= 0.43 -Version: 3.3.5 +Version: 3.3.91 Release: 0 Summary: Evolution Connector for Microsoft Exchange Server 2000/2003 License: GPL-2.0+ @@ -49,8 +49,8 @@ DocDir: %{_defaultdocdir}/evolution-exchange Recommends: %{name}-lang Provides: ximian-connector -Obsoletes: ximian-connector Obsoletes: %{name}-doc <= %{version} +Obsoletes: ximian-connector %gconf_schemas_prereq %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution-ews for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package evolution-ews for openSUSE:Factory checked in at 2012-03-16 13:11:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-ews (Old) and /work/SRC/openSUSE:Factory/.evolution-ews.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-ews", Maintainer is "PChenthill(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-ews/evolution-ews.changes 2012-02-28 19:21:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution-ews.new/evolution-ews.changes 2012-03-16 13:11:32.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 09:42:54 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Updated translations. + +------------------------------------------------------------------- Old: ---- evolution-ews-3.3.90.tar.xz New: ---- evolution-ews-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-ews.spec ++++++ --- /var/tmp/diff_new_pack.RoHqPF/_old 2012-03-16 13:11:34.000000000 +0100 +++ /var/tmp/diff_new_pack.RoHqPF/_new 2012-03-16 13:11:34.000000000 +0100 @@ -19,7 +19,7 @@ Name: evolution-ews # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 3.4 -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later License: LGPL-2.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at 2012-03-16 13:11:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution (Old) and /work/SRC/openSUSE:Factory/.evolution.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution/evolution.changes 2012-03-02 13:47:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution.new/evolution.changes 2012-03-16 13:11:15.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Mar 6 09:38:24 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Further staging of mailer code to be moved to + evolution-data-server; new libevolution-utils introduced as a + temporary bridge during the staging phase. + + Various user documentation improvements. + + Show account properties on remote folders. + + Show errors on message load. + + Avoid crash when formatting broken message. + + Show composer window on "Continue editing". + + Handle cut-paste appointments better. + + Bugs fixed: bgo#617557, bgo#661265, bgo#663745, bgo#669294, + bgo#670432, bgo#670512, bgo#670934, bgo#671211. + + Updated translations. + +------------------------------------------------------------------- Old: ---- evolution-3.3.90.tar.xz New: ---- evolution-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.5EpbIw/_old 2012-03-16 13:11:17.000000000 +0100 +++ /var/tmp/diff_new_pack.5EpbIw/_new 2012-03-16 13:11:17.000000000 +0100 @@ -79,7 +79,7 @@ BuildRequires: pkgconfig(sm) # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 3.4 -Version: 3.3.90 +Version: 3.3.91 Release: 0 # FIXME: check if note on license is still valid (comment before license) # FIXME: check with upstream/meego if we want to enable clutter for express mode -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evince for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package evince for openSUSE:Factory checked in at 2012-03-16 13:10:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evince (Old) and /work/SRC/openSUSE:Factory/.evince.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evince", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/evince/evince.changes 2012-02-28 19:21:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evince.new/evince.changes 2012-03-16 13:11:00.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Mar 12 18:51:27 UTC 2012 - dimstar(a)opensuse.org + +- Replace old-style BuildRequires with pkgconfig() style ones and + be more explicit. List all BuildRequires that are checked for by + configure: + + Old style: gnome-doc-utils-devel, gobject-introspection-devel, + gtk3-devel, libdjvulibre-devel, libgnome-keyring-devel, + libgxps-devel, libpoppler-glib-devel, libspectre-devel, + nautilus-devel, zlib-devel. + + New style: ddjvuapi, gio-2.0, gnome-doc-utils, + gnome-icon-theme, gnome-keyring-1, gobject-introspection-1.0, + gthread-2.0, gtk+-3.0, ice, libgxps, libnautilus-extension, + libspectre, libxml-2.0, poppler-glib, sm, x11, zlib. +- Drop libtool BuildRequires: there is no need for it. +- Pass --with-smclient=xsmp to configure: this used to be + autodetected, but having multiple backends in gdk makes this + detection fail. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evince.spec ++++++ --- /var/tmp/diff_new_pack.LYyQdD/_old 2012-03-16 13:11:04.000000000 +0100 +++ /var/tmp/diff_new_pack.LYyQdD/_new 2012-03-16 13:11:04.000000000 +0100 @@ -29,23 +29,29 @@ BuildRequires: gcc-c++ BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-x11 -BuildRequires: gnome-doc-utils-devel -BuildRequires: gobject-introspection-devel -BuildRequires: gtk3-devel BuildRequires: intltool -BuildRequires: libdjvulibre-devel -BuildRequires: libgnome-keyring-devel -BuildRequires: libgxps-devel >= 0.2.1 -BuildRequires: libpoppler-glib-devel -BuildRequires: libspectre-devel BuildRequires: libtiff-devel -BuildRequires: libtool -BuildRequires: nautilus-devel BuildRequires: t1lib-devel BuildRequires: texlive-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: zlib-devel +BuildRequires: pkgconfig(ddjvuapi) >= 3.5.17 +BuildRequires: pkgconfig(gio-2.0) >= 2.25.11 +BuildRequires: pkgconfig(gnome-doc-utils) >= 0.3.2 +BuildRequires: pkgconfig(gnome-icon-theme) >= 2.17.1 +BuildRequires: pkgconfig(gnome-keyring-1) >= 2.22.0 +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.6 +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.2 +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libgxps) >= 0.2.1 +BuildRequires: pkgconfig(libnautilus-extension) >= 2.91.4 +BuildRequires: pkgconfig(libspectre) >= 0.2.0 +BuildRequires: pkgconfig(libxml-2.0) >= 2.5.0 +BuildRequires: pkgconfig(poppler-glib) >= 0.18.0 +BuildRequires: pkgconfig(sm) >= 1.0.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(zlib) Recommends: %{name}-lang # For "send to" action; the action will be hidden if nautilus-sendto is not available Recommends: nautilus-sendto @@ -56,7 +62,8 @@ # Replaces ggv in <= 10.3, gpdf in <= 10.2: Provides: ggv Provides: gpdf -Obsoletes: ggv gpdf +Obsoletes: ggv +Obsoletes: gpdf BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -95,6 +102,7 @@ %build %configure --disable-static --with-pic\ --libexecdir=%{_libexecdir}/%{name} \ + --with-smclient=xsmp\ --disable-scrollkeeper\ --enable-djvu\ --enable-dvi\ @@ -102,17 +110,17 @@ --enable-t1lib\ --enable-nautilus\ --enable-introspection -%__make V=1 %{?_smp_mflags} +make V=1 %{?_smp_mflags} %install -%makeinstall +%make_install %if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file -N Evince evince find %{buildroot} -type f -name "*.la" -delete -print -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %post /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit eric5 for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package eric5 for openSUSE:Factory checked in at 2012-03-16 13:10:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eric5 (Old) and /work/SRC/openSUSE:Factory/.eric5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eric5", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.eric5.new/eric5.changes 2012-03-16 13:10:56.000000000 +0100 @@ -0,0 +1,517 @@ +------------------------------------------------------------------- +Mon Feb 20 10:39:55 UTC 2012 - saschpe(a)suse.de + +- Disable some optional requires for now + +------------------------------------------------------------------- +Mon Feb 20 09:24:32 UTC 2012 - saschpe(a)suse.de + +- Update to version 5.2.0: + * bug fixes + * Cooperation Functions + * added code to the cooperation functions to support IPv6 + * Debugger + * extended debugger to show class variables + * extended debugger to ignore exceptions occuring in lines having a + '__IGNORE_EXCEPTION__' line flag set + * Editor + * added an action to preview the file in the eric web browser. File name + extension to support this feature can be configured on the + Editor->Filehandling page + * added an action to the editor context menu and to the tabview and listview + view managers to open an associated 'rejections' file (i.e. same file name + with '.rej' appended) + * added an action to toggle block comments + * added a syntax check while typing function + * added source navigation function for Python 2, Python 3 and Ruby sources + * added support for QScintilla 2.6 (and newer) + * added capability to zoom by Ctrl + Mouse Wheel (same for the shell and terminal) + * added capability to zoom by a pinch gesture (same for the shell and terminal) + * added capability to go to method and class definitions by Shift + Mouse Wheel + * added the capability to replace just the selected occurence of the search text + * Plug-in Manager Tools + * added code to download and install plug-ins + * Source Browser + * show class attributes, class methods and static methods with different icons + * added context menu for attributes + * Source Documentor + * introduced separate sections for class methods and static methods + * Tasks Manager + * made tasks manager forget about global file tasks when file is closed + (configurable via configuration dialog) +- Removed services +- Drop custom desktop and png files, use upstream instead +- Cleanup (Build)Requires, provide a better description and fix several + rpmlint issues + +------------------------------------------------------------------- +Sat Feb 4 19:48:34 UTC 2012 - termim(a)gmail.com + +- update to 5.1.8 + - bug fixes + +------------------------------------------------------------------- +Thu Nov 24 04:16:27 UTC 2011 - termim(a)gmail.com + +- update to 5.1.6 + - bug fixes + - enhancement to the API generator to support the latest eric + assistant plug-in + +------------------------------------------------------------------- +Mon Aug 15 04:01:05 UTC 2011 - termim(a)gmail.com + +- update to 5.1.4 + +------------------------------------------------------------------- +Thu Jun 9 01:17:29 UTC 2011 - fisiu(a)opensuse.org + +- update to 4.4.15: bugfix release +- drop plugins, those can be installed using plugin manager + +------------------------------------------------------------------- +Thu Feb 17 13:38:26 UTC 2011 - toddrme2178(a)gmail.com + +- update to 4.4.12 + * bugfixes. +- update to 4.4.11 + * bugfixes. + +------------------------------------------------------------------- +Fri Dec 10 10:17:58 UTC 2010 - toddrme2178(a)gmail.com + +- update to 4.4.10 + * bugfixes. + +------------------------------------------------------------------- +Mon Oct 11 12:12:29 UTC 2010 - toddrme2178(a)gmail.com + +- update to 4.4.9 + * bugfixes. + +-update django plugin to 2.1.2 + * bugfixes. + +------------------------------------------------------------------- +Thu Sep 9 17:52:40 UTC 2010 - toddrme2178(a)gmail.com + +- update to 4.4.8 + * bugfixes. + +------------------------------------------------------------------- +Wed Aug 26 03:31:12 UTC 2010 - toddrme2178(a)gmail.com + +- update to 4.4.7 + * bugfixes. + +------------------------------------------------------------------- +Thu May 20 20:30:33 UTC 2010 - cmorve69(a)yahoo.es + +- Fix build-compare + +------------------------------------------------------------------- +Tue Mar 30 12:04:20 UTC 2010 - tittiatcoke(a)gmail.com + +- update to 4.4.2 + * bugfixes. + +------------------------------------------------------------------- +Sat Feb 6 12:38:37 UTC 2010 - tittiatcoke(a)gmail.com + +- update to 4.4.1 + * bugfixes + +------------------------------------------------------------------- +Sat Jan 9 14:05:55 UTC 2010 - tittiatcoke(a)gmail.com + +- update to 4.4.0 + * changed the help viewer to a full blown web browser (based on QtWebKit) + * improved debugger support + + added a Python3 compatible debugger and a respective project type + + added a thread list viewer to the debug viewer + + added support for forking to the Python debuggers (follow child or parent) + + added code for handling infinite recursions to the Python debuggers + * added Italian translations + * added the SQL Browser tool to inspect databases + * added a little icon editor tool + * removed Qt3 support + +------------------------------------------------------------------- +Tue Dec 15 19:11:24 UTC 2009 - tittiatcoke(a)gmail.com + +- Update to 4.3.10 + * Bug fixes + * for detailed changelog, see included changelog + +------------------------------------------------------------------- +Fri Sep 4 18:18:01 CEST 2009 - hpj(a)urpla.net + +- add python-enchant to recommends + +------------------------------------------------------------------- +Wed Sep 2 08:58:23 UTC 2009 - beineri(a)opensuse.org + +- downgrade one more requirement to recommends + +------------------------------------------------------------------- +Tue Aug 25 12:03:20 UTC 2009 - beineri(a)opensuse.org + +- don't require not in distribution existing package + +------------------------------------------------------------------- +Sat Aug 8 23:21:37 CEST 2009 - hpj(a)urpla.net + +- pylint renamed to python-pylint + +------------------------------------------------------------------- +Fri Aug 7 20:57:01 CEST 2009 - hpj(a)urpla.net + +- fix python-rope required version + +------------------------------------------------------------------- +Thu Aug 6 23:14:36 CEST 2009 - hpj(a)urpla.net + +- add python-rope and pylint with specific versions in order to pull + the required packages +- python-logilab-astng and python-logilab-common as required (again + with specific versions in order to pull the required packages) + +------------------------------------------------------------------- +Wed Aug 5 17:49:15 CEST 2009 - hpj(a)urpla.net + +- add pylint and python-rope as dependencies, python-cx-freeze + as recommended pkg + +------------------------------------------------------------------- +Sat Aug 1 14:15:16 UTC 2009 - tittiatcoke(a)gmail.com + +- update to 4.3.6 + * mainly bugfixes + * for detailed changelog, see included changelog + +------------------------------------------------------------------- +Sat Jul 11 15:13:22 CEST 2009 - tittiatcoke(a)gmail.com + +- update to 4.3.5: + * for detailed changelog, see included changelog + ++++ 320 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.eric5.new/eric5.changes New: ---- eric5-5.2.0.tar.gz eric5-build_compare.patch eric5-i18n-cs-5.2.0.tar.gz eric5-i18n-de-5.2.0.tar.gz eric5-i18n-en-5.2.0.tar.gz eric5-i18n-es-5.2.0.tar.gz eric5-i18n-fr-5.2.0.tar.gz eric5-i18n-it-5.2.0.tar.gz eric5-i18n-ru-5.2.0.tar.gz eric5-i18n-tr-5.2.0.tar.gz eric5-i18n-zh_CN.GB2312-5.2.0.tar.gz eric5.changes eric5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eric5.spec ++++++ # # spec file for package eric # # Copyright (c) 2012 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/ # Name: eric5 Version: 5.2.0 Release: 0 License: GPL-3.0+ Summary: Python IDE based on Qt4 Url: http://eric-ide.python-projects.org/ Group: Development/Tools/IDE Source0: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source10: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source11: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source12: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source13: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source14: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source15: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source16: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source17: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Source18: http://downloads.sourceforge.net/project/eric-ide/eric5/stable/5.2.0/eric5-… Patch0: %{name}-build_compare.patch BuildRequires: fdupes BuildRequires: libjpeg-devel BuildRequires: libqt4-devel BuildRequires: python3-devel BuildRequires: python3-qscintilla BuildRequires: python3-qt4 BuildRequires: python3-sip BuildRequires: python3-xml BuildRequires: update-desktop-files #Requires: python3-logilab-astng >= 0.19.0 #Requires: python3-logilab-common >= 0.43.0 #Requires: python3-pysvn >= 1.7.0 Requires: python3-qscintilla Requires: python3-qt4 Requires: python3-xml Recommends: python3-cx_Freeze Recommends: python3-doc Recommends: python3-enchant >= 1.5.3 Recommends: python3-pylint >= 0.18.0 Recommends: python3-rope >= 0.9.2 Conflicts: eric4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description Eric is a full featured Python and Ruby editor and IDE, written in python. It is based on the cross platform Qt gui toolkit, integrating the highly flexible Scintilla editor control. It is designed to be usable as everdays' quick and dirty editor as well as being usable as a professional project management tool integrating many advanced features Python offers the professional coder. %prep %setup -q -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -n %{name}-%{version} %patch0 # Fix non-executable scripts: sed -i "s|#!/usr/bin/env python*||" eric/{eric5_sqlbrowser,eric5_uipreviewer,Examples/rhallo,eric5_plugininstall,eric5_tray,eric5_pluginrepository,eric5_unittest,eric5_api,UtilitiesPython2/Py2SyntaxChecker,eric5,compileUiFiles,eric5_editor,eric5_trpreviewer,eric5_diff,install-i18n,UtilitiesPython2/TabnannyChecker,uninstall,eric5_re,install,eric5_webbrowser,eric5_configure,eric5_iconeditor,Examples/hallo,eric5_qregexp,eric5_pluginuninstall,Utilities/crypto/py3AES,eric5_compare,eric5_doc}.py %build # nothing here %install python3 install.py -b /usr/bin -d %python3_sitelib -i %{buildroot} -x %suse_update_desktop_file -i %{name} Development IDE %fdupes %{buildroot}/%python3_sitelib/%{name} %files %defattr(-,root,root) %doc LICENSE.GPL3 README THANKS %{_bindir}/* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/eric.png %{python3_sitelib}/* %changelog ++++++ eric5-build_compare.patch ++++++ --- install.py.orig 2011-11-23 23:34:48.000000000 -0500 +++ install.py 2011-11-23 23:35:00.000000000 -0500 @@ -469,24 +469,24 @@ apidir = os.path.join(cfg['apidir'], progLanguage.lower()) if not os.path.exists(apidir): os.makedirs(apidir) - for apiName in glob.glob(os.path.join(sourceDir, "APIs", progLanguage, "*.api")): + for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", progLanguage, "*.api"))): try: shutil.copy(apiName, apidir) except EnvironmentError: print("Could not install '{0}'.".format(apiName)) - for apiName in glob.glob(os.path.join(sourceDir, "APIs", progLanguage, "*.bas")): + for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", progLanguage, "*.bas"))): try: shutil.copy(apiName, apidir) except EnvironmentError: print("Could not install '{0}'.".format(apiName)) if progLanguage == "Python": # copy Python3 API files to the same destination - for apiName in glob.glob(os.path.join(sourceDir, "APIs", "Python3", "*.api")): + for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", "Python3", "*.api"))): try: shutil.copy(apiName, apidir) except EnvironmentError: print("Could not install '{0}'.".format(apiName)) - for apiName in glob.glob(os.path.join(sourceDir, "APIs", "Python3", "*.bas")): + for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", "Python3", "*.bas"))): try: shutil.copy(apiName, apidir) except EnvironmentError: @@ -547,11 +547,11 @@ apis = [] for progLanguage in progLanguages: - for apiName in glob.glob(os.path.join(sourceDir, "APIs", progLanguage, "*.api")): + for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", progLanguage, "*.api"))): apis.append(os.path.basename(apiName)) if progLanguage == "Python": # treat Python3 API files the same as Python API files - for apiName in glob.glob(os.path.join(sourceDir, "APIs", "Python3", "*.api")): + for apiName in sorted(glob.glob(os.path.join(sourceDir, "APIs", "Python3", "*.api"))): apis.append(os.path.basename(apiName)) fn = 'eric5config.py' -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bash for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at 2012-03-16 13:10:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash (Old) and /work/SRC/openSUSE:Factory/.bash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bash", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bash/bash.changes 2012-03-12 08:53:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bash.new/bash.changes 2012-03-16 13:10:49.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 09:34:58 UTC 2012 - werner(a)suse.de + +- Update bash 4.2 to patch level 24 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.qzFUl4/_old 2012-03-16 13:10:52.000000000 +0100 +++ /var/tmp/diff_new_pack.qzFUl4/_new 2012-03-16 13:10:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bash # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,6 +16,7 @@ # + Name: bash BuildRequires: autoconf BuildRequires: bison ++++++ bash-4.2-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-021 new/bash-4.2-patches/bash42-021 --- old/bash-4.2-patches/bash42-021 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-021 2012-03-12 02:19:01.000000000 +0100 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-021 + +Bug-Reported-by: Dan Douglas <ormaaj(a)gmail.com> +Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html + +Bug-Description: + +Using `read -N' to assign values to an array can result in NUL values being +assigned to some array elements. These values cause seg faults when referenced +later. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/read.def 2011-11-21 18:03:38.000000000 -0500 +--- builtins/read.def 2011-12-19 19:52:12.000000000 -0500 +*************** +*** 738,742 **** + } + else +! var = bind_read_variable (varname, t); + } + else +--- 775,779 ---- + } + else +! var = bind_read_variable (varname, t ? t : ""); + } + else +*************** +*** 799,803 **** + } + else +! var = bind_read_variable (list->word->word, input_string); + + if (var) +--- 836,840 ---- + } + else +! var = bind_read_variable (list->word->word, input_string ? input_string : ""); + + if (var) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-022 new/bash-4.2-patches/bash42-022 --- old/bash-4.2-patches/bash42-022 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-022 2012-03-12 02:19:29.000000000 +0100 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-022 + +Bug-Reported-by: Gregory Margo <gmargo(a)pacbell.net> +Bug-Reference-ID: <20110727174529.GA3333(a)pacbell.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html + +Bug-Description: + +The return value from lseek is `off_t'. This can cause corrupted return +values when the file offset is greater than 2**31 - 1. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/sh/zread.c Mon Mar 2 08:54:45 2009 +--- lib/sh/zread.c Thu Jul 28 18:16:53 2011 +*************** +*** 161,166 **** + int fd; + { +! off_t off; +! int r; + + off = lused - lind; +--- 161,165 ---- + int fd; + { +! off_t off, r; + + off = lused - lind; +*************** +*** 169,173 **** + r = lseek (fd, -off, SEEK_CUR); + +! if (r >= 0) + lused = lind = 0; + } +--- 168,172 ---- + r = lseek (fd, -off, SEEK_CUR); + +! if (r != -1) + lused = lind = 0; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-023 new/bash-4.2-patches/bash42-023 --- old/bash-4.2-patches/bash42-023 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-023 2012-03-12 02:19:42.000000000 +0100 @@ -0,0 +1,62 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-023 + +Bug-Reported-by: Ewan Mellor <Ewan.Mellor(a)eu.citrix.com> +Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12(a)LONPMAILBOX01.citrite.net> +Bug-Reference-URL: + +Bug-Description: + +Under some circumstances, an exit trap triggered by a bad substitution +error when errexit is enabled will cause the shell to exit with an +incorrect exit status (0). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-11-21 12:04:38.000000000 -0500 +--- subst.c 2012-02-08 13:36:28.000000000 -0500 +*************** +*** 7275,7278 **** +--- 7281,7285 ---- + case '\0': + bad_substitution: ++ last_command_exit_value = EXECUTION_FAILURE; + report_error (_("%s: bad substitution"), string ? string : "??"); + FREE (value); +*** ../bash-4.2-patched/error.c 2009-08-21 22:31:31.000000000 -0400 +--- error.c 2012-02-25 15:54:40.000000000 -0500 +*************** +*** 201,205 **** + va_end (args); + if (exit_immediately_on_error) +! exit_shell (1); + } + +--- 201,209 ---- + va_end (args); + if (exit_immediately_on_error) +! { +! if (last_command_exit_value == 0) +! last_command_exit_value = 1; +! exit_shell (last_command_exit_value); +! } + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-024 new/bash-4.2-patches/bash42-024 --- old/bash-4.2-patches/bash42-024 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-024 2012-03-12 02:19:55.000000000 +0100 @@ -0,0 +1,45 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-024 + +Bug-Reported-by: Jim Avera <james_avera(a)yahoo.com> +Bug-Reference-ID: <4F29E07A.80405(a)yahoo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html + +Bug-Description: + +When `printf -v' is used to set an array element, the format string contains +`%b', and the corresponding argument is the empty string, the buffer used +to store the value to be assigned can be NULL, which results in NUL being +assigned to the array element. This causes a seg fault when it's used later. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/printf.def 2011-02-25 12:07:41.000000000 -0500 +--- builtins/printf.def 2012-02-02 08:37:12.000000000 -0500 +*************** +*** 256,259 **** +--- 257,262 ---- + { + vflag = 1; ++ if (vbsize == 0) ++ vbuf = xmalloc (vbsize = 16); + vblen = 0; + if (vbuf) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit eog for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package eog for openSUSE:Factory checked in at 2012-03-16 13:10:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eog (Old) and /work/SRC/openSUSE:Factory/.eog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eog", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/eog/eog.changes 2012-02-28 19:20:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.eog.new/eog.changes 2012-03-16 13:10:45.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 5 20:59:50 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + More deprecated code removal (bgo#671008) + + Documentation improvements (bgo#670245) + + Various fixes & improvement (bgo#670700, bgo#671038, + bgo#671202) + + Updated translations. + +------------------------------------------------------------------- Old: ---- eog-3.3.90.tar.xz New: ---- eog-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eog.spec ++++++ --- /var/tmp/diff_new_pack.sFF9hX/_old 2012-03-16 13:10:48.000000000 +0100 +++ /var/tmp/diff_new_pack.sFF9hX/_new 2012-03-16 13:10:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: eog -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Image Viewer for GNOME License: GPL-2.0+ ; LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit devhelp for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package devhelp for openSUSE:Factory checked in at 2012-03-16 13:10:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/devhelp (Old) and /work/SRC/openSUSE:Factory/.devhelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "devhelp", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/devhelp/devhelp.changes 2012-01-09 12:03:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.devhelp.new/devhelp.changes 2012-03-16 13:10:41.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 5 16:50:27 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.91: + + Optional port to WebKit2 (pass --with-webkit2 to configure). + + Bugs fixed: bgo#647383, bgo#669696. + + Updated translations. +- Remove xz BuildRequires now that it comes for free in the build + system. +- Note that we don't build with WebKit2 at the moment, as WebKit2 + is still considered experimental. We'll switch to it when it will + be the default. + +------------------------------------------------------------------- Old: ---- devhelp-3.3.3.tar.xz New: ---- devhelp-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ devhelp.spec ++++++ --- /var/tmp/diff_new_pack.cOc7Jx/_old 2012-03-16 13:10:42.000000000 +0100 +++ /var/tmp/diff_new_pack.cOc7Jx/_new 2012-03-16 13:10:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package devhelp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -19,7 +19,7 @@ %define vimplugin_dir %{_datadir}/vim/site Name: devhelp -Version: 3.3.3 +Version: 3.3.91 Release: 0 Summary: Developer's Help Program for GNOME License: GPL-2.0+ @@ -35,8 +35,6 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: vim -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(webkitgtk-3.0) Recommends: %{name}-lang Suggests: gedit-plugin-devhelp @@ -49,6 +47,7 @@ %package devel Summary: Developer's Help Program For GNOME +Group: Development/Tools/Other Requires: %{name} = %{version} %description devel @@ -56,6 +55,7 @@ %package -n gedit-plugin-devhelp Summary: Developer's Help Program for GNOME +Group: Development/Tools/Other Requires: gedit %description -n gedit-plugin-devhelp @@ -63,6 +63,7 @@ %package -n vim-plugin-devhelp Summary: Developer's Help Program for GNOME +Group: Development/Tools/Other Requires: vim %description -n vim-plugin-devhelp -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc46 for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gcc46 for openSUSE:Factory checked in at 2012-03-16 13:10:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc46 (Old) and /work/SRC/openSUSE:Factory/.gcc46.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc46", Maintainer is "RGuenther(a)suse.com" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.gcc46.new/cross-armv5el-gcc-icecream-backend.changes 2012-03-16 13:10:32.000000000 +0100 @@ -0,0 +1,379 @@ +------------------------------------------------------------------- +Thu Mar 1 14:40:10 UTC 2012 - rguenther(a)suse.com + +- Update to GCC 4.6.3 release. + +------------------------------------------------------------------- +Mon Feb 27 13:20:21 UTC 2012 - rguenther(a)suse.com + +- Cleanup icecream environment build. + +------------------------------------------------------------------- +Fri Feb 24 09:09:14 UTC 2012 - rguenther(a)suse.com + +- Update to GCC 4.6.3 release candidate (r184540). + +------------------------------------------------------------------- +Thu Feb 23 11:23:41 UTC 2012 - rguenther(a)suse.com + +- Change icecream targets to configure for suse OS. +- Build armv7l and armv5el icecream cross targets. + +------------------------------------------------------------------- +Mon Feb 20 14:32:20 UTC 2012 - rguenther(a)suse.com + +- Properly disable automatic provides detection of rpm for the shared + library packages of the optional compiler on the SDK. [bnc#746751] + +------------------------------------------------------------------- +Wed Feb 15 11:35:05 UTC 2012 - rguenther(a)suse.com + +- Adjust for cross-$arch-binutils install location change. + +------------------------------------------------------------------- +Mon Jan 30 13:08:01 UTC 2012 - rguenther(a)suse.com + +- Drop AWT support from libgcj. [bnc#742935] + +------------------------------------------------------------------- +Thu Jan 26 13:16:49 UTC 2012 - rguenther(a)suse.com + +- Adjust license tags to follow SPDX conventions. + +------------------------------------------------------------------- +Mon Jan 23 09:28:15 UTC 2012 - rguenther(a)suse.com + +- Properly use FULLVER in cppbuiltin.c. [bnc#742747] + +------------------------------------------------------------------- +Thu Jan 12 11:34:41 UTC 2012 - rguenther(a)suse.com + +- Use proper groups for the documentation packages. [bnc#732685] + +------------------------------------------------------------------- +Thu Jan 5 08:47:31 UTC 2012 - rguenther(a)suse.com + +- When building libffi use make stage1-bubble to build the + C compiler, not make all-gcc. + +------------------------------------------------------------------ +Wed Dec 21 15:24:33 CET 2011 - dmueller(a)suse.de + +- run all-gcc first, otherwise /xgcc might not exist, so + make all-target-libffi fails to configure (depending on race + conditions) +- apply changes from obs-service-format_spec_file to gcc.spec.in + to make diffing somehow sane: + * Release: is now always 0 + * only one Buildrequires per tag + * Autoreqprov: on is default since ages and unneeded + * Summary: is the first line after %package + * Group comes before other tags + +------------------------------------------------------------------- +Wed Dec 21 13:24:20 UTC 2011 - rguenther(a)suse.com + +- Fix previous change. + +------------------------------------------------------------------- +Tue Dec 20 16:49:16 CET 2011 - dmueller(a)suse.de + +- build STAGE1 with -O0 on %arm (otherwise it OOMs) + +------------------------------------------------------------------- +Tue Dec 13 13:19:13 UTC 2011 - rguenther(a)suse.com + +- Package libstdc++ pretty-printers. [bnc#736249] + +------------------------------------------------------------------- +Mon Dec 12 09:20:51 UTC 2011 - rguenther(a)suse.com + +- Update to gcc-4_6-branch head (r182222). [bnc#735982] + +------------------------------------------------------------------- +Mon Nov 7 19:55:43 CET 2011 - dmueller(a)suse.de + +- disable setjmp/longjump exceptions + +------------------------------------------------------------------- +Mon Nov 7 14:42:29 UTC 2011 - adrian(a)suse.de + +- add pr50193.diff: backport from Andrew for + broken shift patterns on arm + +------------------------------------------------------------------- +Tue Nov 1 16:48:41 CET 2011 - dmueller(a)suse.de + +- remove build-id.diff and use the included build-id code + +------------------------------------------------------------------- +Wed Oct 26 13:29:40 UTC 2011 - rguenther(a)suse.com + +- Update to GCC 4.6.2 release. + +------------------------------------------------------------------- +Mon Oct 24 13:23:05 UTC 2011 - rguenther(a)suse.com + +- Do not depend on gcc45-ada. + +------------------------------------------------------------------- +Fri Oct 21 16:25:23 CEST 2011 - mls(a)suse.de + +- do not use /usr/src/packages in specfile + +------------------------------------------------------------------- +Wed Oct 12 15:29:12 UTC 2011 - rguenther(a)suse.com + +- Update to gcc-4_6-branch head (r179856). [bnc#723304] + +------------------------------------------------------------------- +Tue Oct 4 13:48:33 UTC 2011 - adrian(a)suse.de + +- we will switch to "armv7l" instead of "armv7hl". This is just a + rename to follow architectures as officialy defined, but we keep + hard float with that name + +------------------------------------------------------------------- +Tue Oct 4 09:35:25 UTC 2011 - rguenther(a)suse.com + +- Fix gcc-fortran dependencies on libquadmath. + +------------------------------------------------------------------- +Sun Oct 2 15:24:07 CEST 2011 - dmueller(a)suse.de + +- initialize default ABI/cpu on arm properly + +------------------------------------------------------------------- +Fri Sep 30 15:08:51 UTC 2011 - adrian(a)suse.de + +- enable java for arm + +------------------------------------------------------------------- +Fri Sep 30 10:22:44 UTC 2011 - adrian(a)suse.de + +- enable cloog for arm + +------------------------------------------------------------------- +Thu Sep 29 09:14:19 UTC 2011 - adrian(a)suse.de + +- default to hard float for armv7hl + +------------------------------------------------------------------- +Mon Sep 26 10:29:17 CEST 2011 - dmueller(a)suse.de + +- fix build for %arm targets + +------------------------------------------------------------------- +Mon Sep 26 08:10:46 UTC 2011 - rguenther(a)suse.com + +- Update to gcc-4_6-branch head (r179180). + +------------------------------------------------------------------- +Fri Sep 9 11:36:19 UTC 2011 - rguenther(a)suse.com + +- Update to gcc-4_6-branch head (r178725). + +------------------------------------------------------------------- +Thu Sep 1 11:20:20 UTC 2011 - rguenther(a)suse.com + +- For icecream crosses also build and pack liblto_plugin.so. + +------------------------------------------------------------------- +Mon Aug 1 13:43:37 UTC 2011 - rguenther(a)novell.com + +- Update to gcc-4_6-branch head (r177033). + +------------------------------------------------------------------- +Wed Jul 6 09:55:09 UTC 2011 - rguenther(a)novell.com + +- Do not depend on non-existent libquadmath0 for ppc, ppc64, s390 + and s390x. + +------------------------------------------------------------------- +Fri Jul 1 07:19:03 UTC 2011 - rguenther(a)novell.com + +- Update to gcc-4_6-branch head (r175746). [fate#312149] + * Includes GCC 4.6.1 release. +- Backport -mvzeroupper fixes. ++++ 182 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.gcc46.new/cross-armv5el-gcc-icecream-backend.changes New Changes file: cross-armv7l-gcc-icecream-backend.changes: same change --- /work/SRC/openSUSE:Factory/gcc46/cross-hppa-gcc-icecream-backend.changes 2012-02-17 15:00:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gcc46.new/cross-hppa-gcc-icecream-backend.changes 2012-03-16 13:10:32.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Mar 1 14:40:10 UTC 2012 - rguenther(a)suse.com + +- Update to GCC 4.6.3 release. + +------------------------------------------------------------------- +Mon Feb 27 13:20:21 UTC 2012 - rguenther(a)suse.com + +- Cleanup icecream environment build. + +------------------------------------------------------------------- +Fri Feb 24 09:09:14 UTC 2012 - rguenther(a)suse.com + +- Update to GCC 4.6.3 release candidate (r184540). + +------------------------------------------------------------------- +Thu Feb 23 11:23:41 UTC 2012 - rguenther(a)suse.com + +- Change icecream targets to configure for suse OS. +- Build armv7l and armv5el icecream cross targets. + +------------------------------------------------------------------- +Mon Feb 20 14:32:20 UTC 2012 - rguenther(a)suse.com + +- Properly disable automatic provides detection of rpm for the shared + library packages of the optional compiler on the SDK. [bnc#746751] + +------------------------------------------------------------------- cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc46-testresults.changes: same change gcc46.changes: same change libffi46.changes: same change libgcj46.changes: same change Old: ---- cross-arm-gcc-icecream-backend.changes cross-arm-gcc-icecream-backend.spec gcc-4.6.2-20111212.tar.bz2 gcc46-arm-volatile.patch New: ---- cross-armv5el-gcc-icecream-backend.changes cross-armv5el-gcc-icecream-backend.spec cross-armv7l-gcc-icecream-backend.changes cross-armv7l-gcc-icecream-backend.spec gcc-4.6.3-20120301.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-armv5el-gcc-icecream-backend.spec ++++++ # # spec file for package cross-armv5el-gcc-icecream-backend # # Copyright (c) 2012 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/ # %define build_cp 1 %define build_ada 0 %define build_libjava 0 %define build_java 0 %define build_fortran 0 %define build_objc 0 %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 %define gcc_target_arch armv5el-suse-linux %define gcc_icecream 1 %define binutils_target armv5el %if %{binutils_target} == "armv7l" %define binutils_target arm %endif %if %{binutils_target} == "arm5el" %define binutils_target arm %endif Name: cross-armv5el-gcc-icecream-backend BuildRequires: bison BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit BuildRequires: mpc-devel BuildRequires: mpfr-devel BuildRequires: perl BuildRequires: texinfo BuildRequires: zlib-devel %ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc BuildRequires: cloog-devel BuildRequires: libelf-devel BuildRequires: ppl-devel %endif %ifarch ia64 BuildRequires: libunwind-devel %endif ExclusiveArch: ppc ppc64 %ix86 x86_64 ia64 %define _binary_payload w.ufdio # COMMON-BEGIN # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.6 # COMMON-END # COMMON-BEGIN BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2 Source1: change_spec Source2: libgcj46-rpmlintrc Source3: gcc46-rpmlintrc Source4: ecj.jar Source5: README.First-for.SuSE.packagers Source6: baselibs.conf Patch1: gcc-dir-version.patch Patch2: gcc-sles-version.patch Patch3: gcc-noalias-warn.diff Patch5: boehm-gc-strict-aliasing.patch Patch6: suse-record-gcc-opts.diff Patch7: gcc-add-defaultsspec.diff Patch8: Wunprototyped-calls.diff Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch25: pr27880.diff Patch28: pr33763.diff Patch29: pr50193.diff Patch30: gcc43-no-unwind-tables.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch Patch57: gcc41-ppc32-retaddr.patch # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch # Patches for SAP features Patch130: sap303956-uchar.diff # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN # LIBJAVA-DELETE-BEGIN Summary: The GNU C Compiler and Support Files License: GPL-3.0+ Group: Development/Languages/C and C++ %description Core package for the GNU Compiler Collection, including the C language frontend. Language frontends other than C are split to different sub-packages, namely gcc-ada, gcc-c++, gcc-fortran, gcc-java, gcc-objc and gcc-obj-c++. # COMMON-END # COMMON-BEGIN # Define the canonical target and host architecture # %gcc_target_arch is supposed to be the full target triple # %TARGET_ARCH is the canonicalized CPU part # %CONFIGURE_TARGET is the target triple used for --target= %if 0%{?gcc_target_arch:1} %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" %define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" %define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" %define CONFIGURE_TARGET i586-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" %define CONFIGURE_TARGET armv7l-suse-linux-gnueabi %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" %define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %endif %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac) %ifarch ppc %define GCCDIST powerpc64-suse-linux %else %ifarch %sparc %define GCCDIST sparc64-suse-linux %else %ifarch %arm %define GCCDIST %{HOST_ARCH}-suse-linux-gnueabi %else %define GCCDIST %{HOST_ARCH}-suse-linux %endif %endif %endif %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version} %define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version} # COMMON-END # COMMON-BEGIN %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} %patch1 %patch2 %patch3 %patch5 %patch6 %patch7 %patch8 %patch10 %if !%{build_nof} %patch12 %endif %patch23 %patch24 %patch25 %patch28 %patch29 -p1 %patch30 %patch51 %patch55 %patch57 %patch60 %patch61 %patch130 %patch140 -p1 %patch141 -p1 %build # Avoid rebuilding of generated files contrib/gcc_update --touch # Avoid fucking up testsuite results with Java and indirect dispatch export SUSE_ASNEEDED=0 # Split version file into version used for directories (X.Y) and # version to report with --version (X.Y.Z). # See also gcc-dir-version.patch. # Also decrement the patchlevel version by one if test `cat gcc/DEV-PHASE` == "prerelease"; then ( cat gcc/BASE-VER | cut -d '.' -f 1-2 | tr -d '\n'; echo -n .; cat gcc/BASE-VER | cut -d '.' -f 3 | tr '0123456789' '0012345678' ) > gcc/FULL-VER else mv gcc/BASE-VER gcc/FULL-VER fi cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER rm -rf obj-%{GCCDIST} mkdir obj-%{GCCDIST} cd obj-%{GCCDIST} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE" RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g' -e 's/-Wmissing-format-attribute//g' -e 's/-fstack-protector//g' -e 's/-ffortify=.//g' -e 's/-Wall//g' -e 's/-m32//g' -e 's/-m64//g'` %ifarch %ix86 # -mcpu is superceded by -mtune but -mtune is not supported by # our bootstrap compiler. -mcpu gives a warning that stops # the build process, so remove it for now. Also remove all other # -march and -mtune flags. They are superseeded by proper # default compiler settings now. RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-mcpu=i.86//g' -e 's/-march=i.86//g' -e 's/-mtune=i.86//g'` %endif %ifarch s390 s390x RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fsigned-char//g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-O1/-O2/g'` %endif %if 0%{?gcc_target_arch:1} && 0%{!?gcc_icecream:1} # Kill all -march/tune/cpu because that screws building the target libs RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m$arch\|tune\|cpu$=[^ ]*//g'` %endif # Replace 2 spaces by one finally RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/ / /g'` languages=c %if %{build_cp} languages=$languages,c++ %endif %if %{build_objc} languages=$languages,objc %endif %if %{build_fortran} languages=$languages,fortran %endif %if %{build_objcp} languages=$languages,obj-c++ %endif %if %{build_java} languages=$languages,java %endif %if %{build_ada} languages=$languages,ada %endif J=%{?jobs:%jobs} if test -z "$J"; then J=$(getconf _NPROCESSORS_CONF) JL=$(($J * 2)) else test 1 -gt "$J" && J=1 JL=$(($(getconf _NPROCESSORS_CONF)*2)) fi if test "$J" == "0"; then J=1 fi if test "$JL" == "0"; then JL=1 fi PARALLEL="-j$J -l$JL" # we don't want some miscompiles in the testsuite, or some fault in # the compiler to kill the machine. Hence we limit the amount of memory # by the physical RAM plus half of swap #MEM=$(free -m | awk '/^Mem:/ {print $2}') #SWAP=$(free -m | awk '/^Swap:/ {print $2}') #ulimit -v $(((MEM + SWAP/2)*1024)) # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. #ENABLE_CHECKING="--enable-checking=yes" ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 # configure tries to parse include/features.h to detect # if glibc supports SSP. When cross compiling we would need # to install a cross glibc, which we don't, or make the whole # thing point to the native glibc, which is in /, hence the # --with-sysroot=/ %if %{build_ada} # Using the host gnatmake like # CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}" # GNATMAKE="gnatmake%{hostsuffix}" # doesn't work due to PR33857, so an un-suffixed gnatmake has to be # available mkdir -p host-tools/bin cp -a /usr/bin/gnatmake%{hostsuffix} host-tools/bin/gnatmake cp -a /usr/bin/gnatlink%{hostsuffix} host-tools/bin/gnatlink cp -a /usr/bin/gnatbind%{hostsuffix} host-tools/bin/gnatbind cp -a /usr/bin/gcc%{hostsuffix} host-tools/bin/gcc ln -sf /usr/%{_lib} host-tools/%{_lib} export PATH="`pwd`/host-tools/bin:$PATH" %endif #%if 0%{?gcc_target_arch:1} && 0%{!?gcc_icecream:1} #%else # --enable-threads=posix \ #%endif # --enable-shared \ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \ ../configure \ --prefix=%{_prefix} \ --infodir=%{_infodir} \ --mandir=%{_mandir} \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ --disable-libssp \ --disable-plugin \ --with-bugurl="http://bugs.opensuse.org/" \ --with-pkgversion="SUSE Linux" \ %if !%{build_libjava} --disable-libgcj \ %else --with-java-home=%{_libdir}/jvm/java-1.5.0-gcj%{binsuffix}-1.5.0.0/jre \ --with-ecj-jar=%{libsubdir}/ecj.jar \ --disable-java-awt \ %if !%{biarch_libjava} --disable-libjava-multilib \ %endif %endif %if !%{build_with_mudflap} --disable-libmudflap \ %endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ --enable-libstdcxx-allocator=new \ --disable-libstdcxx-pch \ --enable-version-specific-runtime-libs \ %if 0%{suse_version} > 1100 --enable-linker-build-id \ %endif %if 0%{?gcc_target_arch:1} %if 0%{?gcc_icecream:1} --with-sysroot=/ \ --enable-linux-futex \ %endif %if 0%{?build_static:1} --disable-shared \ %endif %if "%{TARGET_ARCH}" == "spu" --with-sysroot=/usr/spu \ --with-gxx-include-dir=%{_prefix}/spu/include/c++/%{gcc_dir_version} \ --with-newlib \ %endif --disable-nls \ --target=%{CONFIGURE_TARGET} \ %else --program-suffix=%{binsuffix} \ --enable-linux-futex \ %ifarch ia64 --with-system-libunwind \ %else --without-system-libunwind \ %endif %endif %if "%{TARGET_ARCH}" == "armv5tel" --with-arch=armv5te \ --with-float=softfp \ --with-mode=arm \ --with-abi=aapcs-linux \ --disable-sjlj-exceptions \ %endif %if "%{TARGET_ARCH}" == "armv7l" || "%{TARGET_ARCH}" == "armv7hl" --with-arch=armv7-a \ --with-tune=cortex-a9 \ --with-float=hard \ --with-mode=thumb \ --with-abi=aapcs-linux \ --with-fpu=vfpv3-d16 \ --disable-sjlj-exceptions \ %endif %if "%{TARGET_ARCH}" == "powerpc" --with-cpu=default32 \ --enable-secureplt \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" --with-cpu=power4 \ --enable-secureplt \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "sparc64" --with-cpu=ultrasparc \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "sparc" --with-cpu=v8 \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "i586" --with-arch-32=i586 \ --with-tune=generic \ %endif %if "%{TARGET_ARCH}" == "x86_64" --with-arch-32=i586 \ --with-tune=generic \ %endif %if "%{TARGET_ARCH}" == "s390" --with-tune=z196 --with-arch=z10 \ --with-long-double-128 \ --enable-decimal-float \ %endif %if "%{TARGET_ARCH}" == "s390x" --with-tune=z196 --with-arch=z10 \ --with-long-double-128 \ --enable-decimal-float \ %endif --build=%{GCCDIST} # COMMON-END # COMMON-END make %{?jobs:-j%jobs} all-gcc TARGET-gcc="cc1 cc1plus gcc-cross g++ native" %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ $RPM_BUILD_ROOT/env/usr/bin/gcc %define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do # Check wether the same library also exists in the parent directory, # and prefer that on the assumption that it is a more generic one. baselib=`echo "$lib" | sed 's,/[^/]*$/[^/]*$$,\1,'` test -f "$baselib" && lib=$baselib install -s -D $lib $RPM_BUILD_ROOT/env$lib done rm -rf $RPM_BUILD_ROOT/inst cd $RPM_BUILD_ROOT/env tar cvzf ../%{name}_%{_arch}.tar.gz * cd .. mkdir -p usr/share/icecream-envs mv %{name}_%{_arch}.tar.gz usr/share/icecream-envs rpm -q --changelog glibc > usr/share/icecream-envs/%{name}_%{_arch}.glibc rpm -q --changelog binutils > usr/share/icecream-envs/%{name}_%{_arch}.binutils rm -r env %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/share/icecream-envs %changelog ++++++ cross-armv7l-gcc-icecream-backend.spec ++++++ # # spec file for package cross-armv7l-gcc-icecream-backend # # Copyright (c) 2012 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/ # %define build_cp 1 %define build_ada 0 %define build_libjava 0 %define build_java 0 %define build_fortran 0 %define build_objc 0 %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 %define gcc_target_arch armv7l-suse-linux %define gcc_icecream 1 %define binutils_target armv7l %if %{binutils_target} == "armv7l" %define binutils_target arm %endif %if %{binutils_target} == "arm5el" %define binutils_target arm %endif Name: cross-armv7l-gcc-icecream-backend BuildRequires: bison BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit BuildRequires: mpc-devel BuildRequires: mpfr-devel BuildRequires: perl BuildRequires: texinfo BuildRequires: zlib-devel %ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc BuildRequires: cloog-devel BuildRequires: libelf-devel BuildRequires: ppl-devel %endif %ifarch ia64 BuildRequires: libunwind-devel %endif ExclusiveArch: ppc ppc64 %ix86 x86_64 ia64 %define _binary_payload w.ufdio # COMMON-BEGIN # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.6 # COMMON-END # COMMON-BEGIN BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2 Source1: change_spec Source2: libgcj46-rpmlintrc Source3: gcc46-rpmlintrc Source4: ecj.jar Source5: README.First-for.SuSE.packagers Source6: baselibs.conf Patch1: gcc-dir-version.patch Patch2: gcc-sles-version.patch Patch3: gcc-noalias-warn.diff Patch5: boehm-gc-strict-aliasing.patch Patch6: suse-record-gcc-opts.diff Patch7: gcc-add-defaultsspec.diff Patch8: Wunprototyped-calls.diff Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch25: pr27880.diff Patch28: pr33763.diff Patch29: pr50193.diff Patch30: gcc43-no-unwind-tables.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch Patch57: gcc41-ppc32-retaddr.patch # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch # Patches for SAP features Patch130: sap303956-uchar.diff # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN # LIBJAVA-DELETE-BEGIN Summary: The GNU C Compiler and Support Files License: GPL-3.0+ Group: Development/Languages/C and C++ %description Core package for the GNU Compiler Collection, including the C language frontend. Language frontends other than C are split to different sub-packages, namely gcc-ada, gcc-c++, gcc-fortran, gcc-java, gcc-objc and gcc-obj-c++. # COMMON-END # COMMON-BEGIN # Define the canonical target and host architecture # %gcc_target_arch is supposed to be the full target triple # %TARGET_ARCH is the canonicalized CPU part # %CONFIGURE_TARGET is the target triple used for --target= %if 0%{?gcc_target_arch:1} %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" %define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" %define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" %define CONFIGURE_TARGET i586-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" %define CONFIGURE_TARGET armv7l-suse-linux-gnueabi %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" %define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %endif %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac) %ifarch ppc %define GCCDIST powerpc64-suse-linux %else %ifarch %sparc %define GCCDIST sparc64-suse-linux %else %ifarch %arm %define GCCDIST %{HOST_ARCH}-suse-linux-gnueabi %else %define GCCDIST %{HOST_ARCH}-suse-linux %endif %endif %endif %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version} %define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version} # COMMON-END # COMMON-BEGIN %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} %patch1 %patch2 %patch3 %patch5 %patch6 %patch7 %patch8 %patch10 %if !%{build_nof} %patch12 %endif %patch23 %patch24 %patch25 %patch28 %patch29 -p1 %patch30 %patch51 %patch55 %patch57 %patch60 %patch61 %patch130 %patch140 -p1 %patch141 -p1 %build # Avoid rebuilding of generated files contrib/gcc_update --touch # Avoid fucking up testsuite results with Java and indirect dispatch export SUSE_ASNEEDED=0 # Split version file into version used for directories (X.Y) and # version to report with --version (X.Y.Z). # See also gcc-dir-version.patch. # Also decrement the patchlevel version by one if test `cat gcc/DEV-PHASE` == "prerelease"; then ( cat gcc/BASE-VER | cut -d '.' -f 1-2 | tr -d '\n'; echo -n .; cat gcc/BASE-VER | cut -d '.' -f 3 | tr '0123456789' '0012345678' ) > gcc/FULL-VER else mv gcc/BASE-VER gcc/FULL-VER fi cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER rm -rf obj-%{GCCDIST} mkdir obj-%{GCCDIST} cd obj-%{GCCDIST} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE" RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g' -e 's/-Wmissing-format-attribute//g' -e 's/-fstack-protector//g' -e 's/-ffortify=.//g' -e 's/-Wall//g' -e 's/-m32//g' -e 's/-m64//g'` %ifarch %ix86 # -mcpu is superceded by -mtune but -mtune is not supported by # our bootstrap compiler. -mcpu gives a warning that stops # the build process, so remove it for now. Also remove all other # -march and -mtune flags. They are superseeded by proper # default compiler settings now. RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-mcpu=i.86//g' -e 's/-march=i.86//g' -e 's/-mtune=i.86//g'` %endif %ifarch s390 s390x RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fsigned-char//g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-O1/-O2/g'` %endif %if 0%{?gcc_target_arch:1} && 0%{!?gcc_icecream:1} # Kill all -march/tune/cpu because that screws building the target libs RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m$arch\|tune\|cpu$=[^ ]*//g'` %endif # Replace 2 spaces by one finally RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/ / /g'` languages=c %if %{build_cp} languages=$languages,c++ %endif %if %{build_objc} languages=$languages,objc %endif %if %{build_fortran} languages=$languages,fortran %endif %if %{build_objcp} languages=$languages,obj-c++ %endif %if %{build_java} languages=$languages,java %endif %if %{build_ada} languages=$languages,ada %endif J=%{?jobs:%jobs} if test -z "$J"; then J=$(getconf _NPROCESSORS_CONF) JL=$(($J * 2)) else test 1 -gt "$J" && J=1 JL=$(($(getconf _NPROCESSORS_CONF)*2)) fi if test "$J" == "0"; then J=1 fi if test "$JL" == "0"; then JL=1 fi PARALLEL="-j$J -l$JL" # we don't want some miscompiles in the testsuite, or some fault in # the compiler to kill the machine. Hence we limit the amount of memory # by the physical RAM plus half of swap #MEM=$(free -m | awk '/^Mem:/ {print $2}') #SWAP=$(free -m | awk '/^Swap:/ {print $2}') #ulimit -v $(((MEM + SWAP/2)*1024)) # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. #ENABLE_CHECKING="--enable-checking=yes" ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 # configure tries to parse include/features.h to detect # if glibc supports SSP. When cross compiling we would need # to install a cross glibc, which we don't, or make the whole # thing point to the native glibc, which is in /, hence the # --with-sysroot=/ %if %{build_ada} # Using the host gnatmake like # CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}" # GNATMAKE="gnatmake%{hostsuffix}" # doesn't work due to PR33857, so an un-suffixed gnatmake has to be # available mkdir -p host-tools/bin cp -a /usr/bin/gnatmake%{hostsuffix} host-tools/bin/gnatmake cp -a /usr/bin/gnatlink%{hostsuffix} host-tools/bin/gnatlink cp -a /usr/bin/gnatbind%{hostsuffix} host-tools/bin/gnatbind cp -a /usr/bin/gcc%{hostsuffix} host-tools/bin/gcc ln -sf /usr/%{_lib} host-tools/%{_lib} export PATH="`pwd`/host-tools/bin:$PATH" %endif #%if 0%{?gcc_target_arch:1} && 0%{!?gcc_icecream:1} #%else # --enable-threads=posix \ #%endif # --enable-shared \ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \ ../configure \ --prefix=%{_prefix} \ --infodir=%{_infodir} \ --mandir=%{_mandir} \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ --disable-libssp \ --disable-plugin \ --with-bugurl="http://bugs.opensuse.org/" \ --with-pkgversion="SUSE Linux" \ %if !%{build_libjava} --disable-libgcj \ %else --with-java-home=%{_libdir}/jvm/java-1.5.0-gcj%{binsuffix}-1.5.0.0/jre \ --with-ecj-jar=%{libsubdir}/ecj.jar \ --disable-java-awt \ %if !%{biarch_libjava} --disable-libjava-multilib \ %endif %endif %if !%{build_with_mudflap} --disable-libmudflap \ %endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ --enable-libstdcxx-allocator=new \ --disable-libstdcxx-pch \ --enable-version-specific-runtime-libs \ %if 0%{suse_version} > 1100 --enable-linker-build-id \ %endif %if 0%{?gcc_target_arch:1} %if 0%{?gcc_icecream:1} --with-sysroot=/ \ --enable-linux-futex \ %endif %if 0%{?build_static:1} --disable-shared \ %endif %if "%{TARGET_ARCH}" == "spu" --with-sysroot=/usr/spu \ --with-gxx-include-dir=%{_prefix}/spu/include/c++/%{gcc_dir_version} \ --with-newlib \ %endif --disable-nls \ --target=%{CONFIGURE_TARGET} \ %else --program-suffix=%{binsuffix} \ --enable-linux-futex \ %ifarch ia64 --with-system-libunwind \ %else --without-system-libunwind \ %endif %endif %if "%{TARGET_ARCH}" == "armv5tel" --with-arch=armv5te \ --with-float=softfp \ --with-mode=arm \ --with-abi=aapcs-linux \ --disable-sjlj-exceptions \ %endif %if "%{TARGET_ARCH}" == "armv7l" || "%{TARGET_ARCH}" == "armv7hl" --with-arch=armv7-a \ --with-tune=cortex-a9 \ --with-float=hard \ --with-mode=thumb \ --with-abi=aapcs-linux \ --with-fpu=vfpv3-d16 \ --disable-sjlj-exceptions \ %endif %if "%{TARGET_ARCH}" == "powerpc" --with-cpu=default32 \ --enable-secureplt \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" --with-cpu=power4 \ --enable-secureplt \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "sparc64" --with-cpu=ultrasparc \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "sparc" --with-cpu=v8 \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "i586" --with-arch-32=i586 \ --with-tune=generic \ %endif %if "%{TARGET_ARCH}" == "x86_64" --with-arch-32=i586 \ --with-tune=generic \ %endif %if "%{TARGET_ARCH}" == "s390" --with-tune=z196 --with-arch=z10 \ --with-long-double-128 \ --enable-decimal-float \ %endif %if "%{TARGET_ARCH}" == "s390x" --with-tune=z196 --with-arch=z10 \ --with-long-double-128 \ --enable-decimal-float \ %endif --build=%{GCCDIST} # COMMON-END # COMMON-END make %{?jobs:-j%jobs} all-gcc TARGET-gcc="cc1 cc1plus gcc-cross g++ native" %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ $RPM_BUILD_ROOT/env/usr/bin/gcc %define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do # Check wether the same library also exists in the parent directory, # and prefer that on the assumption that it is a more generic one. baselib=`echo "$lib" | sed 's,/[^/]*$/[^/]*$$,\1,'` test -f "$baselib" && lib=$baselib install -s -D $lib $RPM_BUILD_ROOT/env$lib done rm -rf $RPM_BUILD_ROOT/inst cd $RPM_BUILD_ROOT/env tar cvzf ../%{name}_%{_arch}.tar.gz * cd .. mkdir -p usr/share/icecream-envs mv %{name}_%{_arch}.tar.gz usr/share/icecream-envs rpm -q --changelog glibc > usr/share/icecream-envs/%{name}_%{_arch}.glibc rpm -q --changelog binutils > usr/share/icecream-envs/%{name}_%{_arch}.binutils rm -r env %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/share/icecream-envs %changelog ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -25,12 +25,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch hppa-linux +%define gcc_target_arch hppa-suse-linux %define gcc_icecream 1 +%define binutils_target hppa +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-hppa-gcc-icecream-backend BuildRequires: bison -BuildRequires: cross-hppa-binutils +BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit @@ -55,7 +63,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -98,9 +106,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -130,13 +135,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -192,7 +203,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files @@ -434,34 +444,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ cross-i386-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -25,12 +25,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch i386-linux +%define gcc_target_arch i386-suse-linux %define gcc_icecream 1 +%define binutils_target i386 +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-i386-gcc-icecream-backend BuildRequires: bison -BuildRequires: cross-i386-binutils +BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit @@ -55,7 +63,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -98,9 +106,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -130,13 +135,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -192,7 +203,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files @@ -434,34 +444,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ cross-ia64-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -25,12 +25,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch ia64-linux +%define gcc_target_arch ia64-suse-linux %define gcc_icecream 1 +%define binutils_target ia64 +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-ia64-gcc-icecream-backend BuildRequires: bison -BuildRequires: cross-ia64-binutils +BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit @@ -55,7 +63,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -98,9 +106,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -130,13 +135,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -192,7 +203,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files @@ -434,34 +444,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ cross-ppc-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -25,12 +25,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch ppc-linux +%define gcc_target_arch ppc-suse-linux %define gcc_icecream 1 +%define binutils_target ppc +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-ppc-gcc-icecream-backend BuildRequires: bison -BuildRequires: cross-ppc-binutils +BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit @@ -55,7 +63,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -98,9 +106,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -130,13 +135,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -192,7 +203,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files @@ -434,34 +444,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ cross-ppc64-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -25,12 +25,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch ppc64-linux +%define gcc_target_arch ppc64-suse-linux %define gcc_icecream 1 +%define binutils_target ppc64 +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-ppc64-gcc-icecream-backend BuildRequires: bison -BuildRequires: cross-ppc64-binutils +BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit @@ -55,7 +63,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -98,9 +106,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -130,13 +135,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -192,7 +203,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files @@ -434,34 +444,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ cross-s390-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -25,12 +25,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch s390-linux +%define gcc_target_arch s390-suse-linux %define gcc_icecream 1 +%define binutils_target s390 +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-s390-gcc-icecream-backend BuildRequires: bison -BuildRequires: cross-s390-binutils +BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit @@ -55,7 +63,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -98,9 +106,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -130,13 +135,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -192,7 +203,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files @@ -434,34 +444,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ cross-s390x-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -25,12 +25,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch s390x-linux +%define gcc_target_arch s390x-suse-linux %define gcc_icecream 1 +%define binutils_target s390x +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-s390x-gcc-icecream-backend BuildRequires: bison -BuildRequires: cross-s390x-binutils +BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit @@ -55,7 +63,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -98,9 +106,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -130,13 +135,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -192,7 +203,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files @@ -434,34 +444,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ cross-x86_64-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -25,12 +25,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch x86_64-linux +%define gcc_target_arch x86_64-suse-linux %define gcc_icecream 1 +%define binutils_target x86_64 +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-x86_64-gcc-icecream-backend BuildRequires: bison -BuildRequires: cross-x86_64-binutils +BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit @@ -55,7 +63,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -98,9 +106,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -130,13 +135,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -192,7 +203,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files @@ -434,34 +444,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ gcc46-testresults.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -166,7 +166,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -230,9 +230,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch Summary: Testsuite results License: SUSE-Public-Domain @@ -252,13 +249,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -427,7 +430,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files ++++++ gcc46.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -149,7 +149,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -213,9 +213,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -381,6 +378,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgcc%{libgcc_s} = %{version}-%{release} Conflicts: libgcc%{libgcc_s} < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgcc46 @@ -401,6 +400,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgcc%{libgcc_s}-32bit = %{version}-%{release} Conflicts: libgcc%{libgcc_s}-32bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgcc46-32bit @@ -421,6 +422,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgcc%{libgcc_s}-64bit = %{version}-%{release} Conflicts: libgcc%{libgcc_s}-64bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgcc46-64bit @@ -442,6 +445,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgomp1 = %{version}-%{release} Conflicts: libgomp1 < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgomp46 @@ -466,6 +471,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgomp1-32bit = %{version}-%{release} Conflicts: libgomp1-32bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgomp46-32bit @@ -490,6 +497,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgomp1-64bit = %{version}-%{release} Conflicts: libgomp1-64bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgomp46-64bit @@ -515,6 +524,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libstdc++6 = %{version}-%{release} Conflicts: libstdc++6 < %{version}-%{release} +%else +Autoprov: no %endif %description -n libstdc++46 @@ -536,6 +547,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libstdc++6-32bit = %{version}-%{release} Conflicts: libstdc++6-32bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libstdc++46-32bit @@ -557,6 +570,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libstdc++6-64bit = %{version}-%{release} Conflicts: libstdc++6-64bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libstdc++46-64bit @@ -903,6 +918,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgfortran3 = %{version}-%{release} Conflicts: libgfortran3 < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgfortran46 @@ -924,6 +941,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgfortran3-32bit = %{version}-%{release} Conflicts: libgfortran3-32bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgfortran46-32bit @@ -945,6 +964,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgfortran3-64bit = %{version}-%{release} Conflicts: libgfortran3-64bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgfortran46-64bit @@ -962,11 +983,13 @@ # PACKAGE-BEGIN %package -n libquadmath46 Summary: The GNU Fortran Compiler Quadmath Runtime Library -License: LGPL-2.1+ +License: LGPL-2.1 Group: Development/Languages/Fortran %if 0%{!?build_optional_compiler:1} Provides: libquadmath0 = %{version}-%{release} Conflicts: libquadmath0 < %{version}-%{release} +%else +Autoprov: no %endif %description -n libquadmath46 @@ -984,11 +1007,13 @@ # PACKAGE-BEGIN %package -n libquadmath46-32bit Summary: The GNU Fortran Compiler Quadmath Runtime Library -License: LGPL-2.1+ +License: LGPL-2.1 Group: Development/Languages/Fortran %if 0%{!?build_optional_compiler:1} Provides: libquadmath0-32bit = %{version}-%{release} Conflicts: libquadmath0-32bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libquadmath46-32bit @@ -1006,11 +1031,13 @@ # PACKAGE-BEGIN %package -n libquadmath46-64bit Summary: The GNU Fortran Compiler Quadmath Runtime Library -License: LGPL-2.1+ +License: LGPL-2.1 Group: Development/Languages/Fortran %if 0%{!?build_optional_compiler:1} Provides: libquadmath0-64bit = %{version}-%{release} Conflicts: libquadmath0-64bit < %{version}-%{release} +%else +Autoprov: no %endif %description -n libquadmath46-64bit @@ -1304,13 +1331,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -1479,7 +1512,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files ++++++ libffi46.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -165,7 +165,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -229,9 +229,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # PACKAGE-BEGIN @@ -351,13 +348,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -526,7 +529,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files ++++++ libgcj46.spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -165,7 +165,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -229,9 +229,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -451,13 +448,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -626,7 +629,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files ++++++ change_spec ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -127,7 +127,7 @@ # disabled: mips, sparc, alpha if test "$do_icecream" = 1 ; then - for arch in hppa i386 x86_64 s390 s390x ppc ppc64 ia64 arm; do + for arch in hppa i386 x86_64 s390 s390x ppc ppc64 ia64 armv7l armv5el; do { sed -n -e '1,/COMMON-BEGIN/p' cross-icecream.spec.in sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' $outfile sed -n -e '/COMMON-END/,$p' cross-icecream.spec.in; } | ++++++ cross-icecream.spec.in ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -19,12 +19,20 @@ %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 -%define gcc_target_arch @cross_arch@-linux +%define gcc_target_arch @cross_arch@-suse-linux %define gcc_icecream 1 +%define binutils_target @cross_arch@ +%if %{binutils_target} == "armv7l" +%define binutils_target arm +%endif +%if %{binutils_target} == "arm5el" +%define binutils_target arm +%endif + Name: cross-@cross_arch@-gcc-icecream-backend BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel mpc-devel -BuildRequires: cross-@cross_arch@-binutils +BuildRequires: cross-%{binutils_target}-binutils %ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc BuildRequires: cloog-devel ppl-devel libelf-devel %endif @@ -42,34 +50,29 @@ %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT -BUILD_TARGET=%{TARGET_ARCH} -ORIG_TARGET=$BUILD_TARGET -# We play funny tricks with the ppc compiler. We want to have it biarch, -# which the powerpc compiler itself doesn't support. So we actually -# configure it as powerpc64 target compiler (i.e. a native cross compiler -# even on ppc), with the default code generation to be powerpc32. -# But this doesn't hide the fact that it's still a cross compiler which -# shows also in various paths -test "$BUILD_TARGET" = powerpc && BUILD_TARGET=powerpc64 make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/${ORIG_TARGET}-linux-as $RPM_BUILD_ROOT/env/usr/bin/as -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++ -install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc +install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ + $RPM_BUILD_ROOT/env/usr/bin/as +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ + $RPM_BUILD_ROOT/env/usr/bin/g++ +install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ + $RPM_BUILD_ROOT/env/usr/bin/gcc +%define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done -if test -f $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so; then - install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so \ - $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/liblto_plugin.so +if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then + install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ + $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi -libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/*; do \ +libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do ++++++ gcc-4.6.2-20111212.tar.bz2 -> gcc-4.6.3-20120301.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/gcc46/gcc-4.6.2-20111212.tar.bz2 /work/SRC/openSUSE:Factory/.gcc46.new/gcc-4.6.3-20120301.tar.bz2 differ: char 11, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.9BQ9oR/_old 2012-03-16 13:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9BQ9oR/_new 2012-03-16 13:10:40.000000000 +0100 @@ -152,7 +152,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 4.6.2_20111212 +Version: 4.6.3_20120301 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -216,9 +216,6 @@ # Patches for AMD features Patch140: amd-save-the-initial-options-after-checking-vzeroupper.patch Patch141: amd-ix86_reorg-run-move_or_dele.patch -# ARM & Qemu build fixes -# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html -Patch150: gcc46-arm-volatile.patch # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN @@ -340,6 +337,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgcc%{libgcc_s}@variant@ = %{version}-%{release} Conflicts: libgcc%{libgcc_s}@variant@ < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgcc@base_ver@@variant@ @@ -360,6 +359,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgomp1@variant@ = %{version}-%{release} Conflicts: libgomp1@variant@ < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgomp@base_ver@@variant@ @@ -384,6 +385,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libstdc++6@variant@ = %{version}-%{release} Conflicts: libstdc++6@variant@ < %{version}-%{release} +%else +Autoprov: no %endif %description -n libstdc++@base_ver@@variant@ @@ -537,6 +540,8 @@ %if 0%{!?build_optional_compiler:1} Provides: libgfortran3@variant@ = %{version}-%{release} Conflicts: libgfortran3@variant@ < %{version}-%{release} +%else +Autoprov: no %endif %description -n libgfortran@base_ver@@variant@ @@ -553,11 +558,13 @@ # PACKAGE-BEGIN %package -n libquadmath@base_ver@@variant@ Summary: The GNU Fortran Compiler Quadmath Runtime Library -License: LGPLv2.1+ +License: LGPL-2.1 Group: Development/Languages/Fortran %if 0%{!?build_optional_compiler:1} Provides: libquadmath0@variant@ = %{version}-%{release} Conflicts: libquadmath0@variant@ < %{version}-%{release} +%else +Autoprov: no %endif %description -n libquadmath@base_ver@@variant@ @@ -698,7 +705,7 @@ # PACKAGE-BEGIN %package -n libffi@base_ver@@variant@ Summary: Foreign Function Interface library -License: BSD3c +License: BSD-3-Clause Group: Development/Languages/C and C++ Provides: g-wrap:/usr/lib/libffi.so.4 Provides: libffi4@variant@ = %{version}-%{release} @@ -717,7 +724,7 @@ # PACKAGE-BEGIN %package -n libffi@base_ver@-devel@variant@ Summary: Foreign Function Interface library development files -License: BSD 3-Clause +License: BSD-3-Clause Group: Development/Languages/C and C++ Requires: libffi4@variant@ >= %{version}-%{release} Provides: libffi-devel@variant@ = %{version}-%{release} @@ -730,7 +737,7 @@ %package -n gcc@base_ver@-testresults # GCC-TESTSUITE-DELETE-END Summary: Testsuite results -License: Public Domain, Freeware +License: SUSE-Public-Domain Group: Development/Languages/C and C++ %description -n gcc@base_ver@-testresults @@ -747,13 +754,19 @@ %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" -%define CONFIGURE_TARGET powerpc64-linux +%define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" -%define CONFIGURE_TARGET i586-linux +%define CONFIGURE_TARGET i586-suse-linux +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" +%define CONFIGURE_TARGET armv7l-suse-linux-gnueabi +%endif +%if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" +%define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") @@ -924,7 +937,6 @@ %patch130 %patch140 -p1 %patch141 -p1 -%patch150 -p1 %build # Avoid rebuilding of generated files -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc47 for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package gcc47 for openSUSE:Factory checked in at 2012-03-16 13:10:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc47 (Old) and /work/SRC/openSUSE:Factory/.gcc47.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc47", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.gcc47.new/gcc47-testresults.changes 2012-03-16 13:10:30.000000000 +0100 @@ -0,0 +1,70 @@ +------------------------------------------------------------------- +Wed Feb 29 09:03:10 UTC 2012 - rguenther(a)suse.com + +- Fixup more SPDX license issues. + +------------------------------------------------------------------- +Tue Feb 28 13:10:03 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184624). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Fri Feb 24 09:35:29 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184541). + +------------------------------------------------------------------- +Tue Feb 21 13:05:10 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184435). +- Merge changes from GCC 4.6 package. +- Add patches for PR49484 and PR52080. + +------------------------------------------------------------------- +Wed Feb 8 11:14:05 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184004). + +------------------------------------------------------------------- +Tue Jan 31 10:35:44 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183753). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Tue Jan 24 14:46:07 UTC 2012 - rguenther(a)suse.com + +- Drop AWT support from libgcj. [bnc#742935] + +------------------------------------------------------------------- +Wed Jan 18 14:48:06 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183273). + +------------------------------------------------------------------- +Wed Jan 11 11:51:29 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183092). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Wed Jan 4 13:36:37 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r182872). + +------------------------------------------------------------------- +Tue Dec 20 10:48:33 UTC 2011 - rguenther(a)suse.com + +- Update to SVN trunk head (r182525). + +------------------------------------------------------------------- +Sun Dec 18 11:10:32 UTC 2011 - adrian(a)suse.de + +- fix file list for arm architecture + +------------------------------------------------------------------- +Thu Nov 3 15:23:33 UTC 2011 - rguenther(a)suse.com + +- New package. + New Changes file: gcc47.changes: same change New Changes file: libffi47.changes: same change New Changes file: libgcj47.changes: same change New: ---- README.First-for.SuSE.packagers Wunprototyped-calls.diff baselibs.conf change_spec check-build.sh cross-icecream.spec.in cross.spec.in ecj.jar gcc-4.7.0-20120228.tar.bz2 gcc-add-defaultsspec.diff gcc-dir-version.patch gcc-noalias-warn.diff gcc-sles-version.patch gcc.spec.in gcc4-ppc64-m32-m64-multilib-only.patch gcc41-ia64-stack-protector.patch gcc41-java-slow_pthread_self.patch gcc41-ppc32-retaddr.patch gcc43-no-unwind-tables.diff gcc44-rename-info-files.patch gcc44-textdomain.patch gcc47-rpmlintrc gcc47-testresults.changes gcc47-testresults.spec gcc47.changes gcc47.spec libffi47.changes libffi47.spec libgcj47-rpmlintrc libgcj47.changes libgcj47.spec libjava-no-multilib.diff pr33763.diff pr49484.diff pr52080.diff pre_checkin.sh program-transform-name.diff sap303956-uchar.diff suse-record-gcc-opts.diff tls-no-direct.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc47-testresults.spec ++++++ ++++ 702 lines (skipped) gcc47.spec: same change libffi47.spec: same change libgcj47.spec: same change ++++++ README.First-for.SuSE.packagers ++++++ IMPORTANT: Please change gcc.spec.in and then run ./pre_checkin.sh! Do not change gcc.spec directly! Since GCC comes with a testsuite that runs for quite a long time and that test suite also contains some known failures, we should run the testsuite of GCC whenever the compiler is changed to ensure a high quality compiler. The package is now split into multiple parts, gcc$VER, libgcj$VER, gcc$VER-testresults and libffi$VER (plus various spec files for cross and icecream cross compilers). The testsuite is run from gcc$VER-testresults, a dummy package with the testresults, gcc$VER-testresults, is generated from it which contains testing logfiles and summary. Before checking in a new compiler, please do the following steps as QA measure to check that the new compiler does not introduce any new failures: - Run mbuild for all archs for at least the gcc$VER and the gcc$VER-testresults subpackages - When mbuild is finished, call /suse/rguenther/bin/compare-testresults.sh mbuild-directory (for the gcc$VER-testresults build). The output of that script should not show any failures. If it does, please fix them or discuss this with the gcc package maintainers. - Do not remove this file. Thanks, Your GCC packagers. ++++++ Wunprototyped-calls.diff ++++++ Index: gcc/c-family/c.opt =================================================================== *** gcc/c-family/c.opt.orig 2012-02-07 11:33:52.000000000 +0100 --- gcc/c-family/c.opt 2012-02-08 12:54:08.000000000 +0100 *************** Wunused-local-typedefs *** 665,670 **** --- 665,674 ---- C ObjC C++ ObjC++ Var(warn_unused_local_typedefs) Warning Warn when typedefs locally defined in a function are not used + Wunprototyped-calls + C Var(warn_unprototyped_calls) Warning + Warn about calls to unprototyped functions with at least one argument + Wunused-macros C ObjC C++ ObjC++ Warning Warn about macros defined in the main file that are not used Index: gcc/testsuite/gcc.dg/cleanup-1.c =================================================================== *** gcc/testsuite/gcc.dg/cleanup-1.c.orig 2010-02-23 12:43:21.000000000 +0100 --- gcc/testsuite/gcc.dg/cleanup-1.c 2012-02-08 12:54:08.000000000 +0100 *************** *** 6,12 **** #define C(x) __attribute__((cleanup(x))) static int f1(void *x U) { return 0; } ! static void f2() { } static void f3(void) { } /* { dg-message "note: declared here" } */ static void f4(void *x U) { } static void f5(int *x U) { } --- 6,12 ---- #define C(x) __attribute__((cleanup(x))) static int f1(void *x U) { return 0; } ! static void f2() { } /* { dg-message "declared here" "" } */ static void f3(void) { } /* { dg-message "note: declared here" } */ static void f4(void *x U) { } static void f5(int *x U) { } *************** static void f9(int x U) { } /* { dg-mess *** 18,24 **** void test(void) { int o1 C(f1); ! int o2 C(f2); int o3 C(f3); /* { dg-error "too many arguments" } */ int o4 C(f4); int o5 C(f5); --- 18,24 ---- void test(void) { int o1 C(f1); ! int o2 C(f2); /* { dg-warning "without a real prototype" } */ int o3 C(f3); /* { dg-error "too many arguments" } */ int o4 C(f4); int o5 C(f5); Index: gcc/c-typeck.c =================================================================== *** gcc/c-typeck.c.orig 2012-02-07 11:34:02.000000000 +0100 --- gcc/c-typeck.c 2012-02-08 12:54:08.000000000 +0100 *************** build_function_call_vec (location_t loc, *** 2823,2828 **** --- 2823,2841 ---- && !check_builtin_function_arguments (fundecl, nargs, argarray)) return error_mark_node; + /* If we cannot check function arguments because a prototype is + missing for the callee, warn here. */ + if (warn_unprototyped_calls + && nargs > 0 && !TYPE_ARG_TYPES (fntype) + && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl) + && !DECL_ARGUMENTS (fundecl)) + { + if (warning (OPT_Wunprototyped_calls, + "call to function %qD without a real prototype", fundecl)) + inform (DECL_SOURCE_LOCATION (fundecl), "%qD was declared here", + fundecl); + } + /* Check that the arguments to the function are valid. */ check_function_arguments (fntype, nargs, argarray); Index: gcc/c-family/c-opts.c =================================================================== *** gcc/c-family/c-opts.c.orig 2012-01-18 15:23:58.000000000 +0100 --- gcc/c-family/c-opts.c 2012-02-08 12:54:08.000000000 +0100 *************** c_common_handle_option (size_t scode, co *** 392,397 **** --- 392,398 ---- can turn it off only if it's not explicit. */ if (warn_main == -1) warn_main = (value ? 2 : 0); + warn_unprototyped_calls = 1; /* In C, -Wall turns on -Wenum-compare, which we do here. In C++ it is on by default, which is done in ++++++ baselibs.conf ++++++ targettype x86 package libgcc47 targettype x86 package libstdc++47 libgcj47 requires "libgcj47" libgcj47-devel gcc47-gij requires "libgcj47-<targettype>" +/usr/bin/gij-4.7 -> /usr/bin/gij<extension>-4.7 +/usr/bin/grmiregistry-4.7 -> /usr/bin/grmiregistry<extension>-4.7 ++++++ change_spec ++++++ #!/bin/bash do_icecream=0 do_cross_static=0 do_cross_shared=0 do_optional_compiler=0 do_optional_compiler_languages=0 rm -f libgcj*.spec libgcj*.changes libffi*.spec libffi*.changes gcc*-testresults.spec gcc*-testresults.changes gcc*.spec cross*.spec cross*.changes # Default is to generate the normal gcc package # unless a parameter is given. In case that it is '-*', # that parameter will be used as suffix for the package name # and as suffix for the install path (/opt/gccSUFFIX) # In case that it is '[0-9]*', that parameter will be used # as a suffix for a versioned package name. if [ $# -lt 1 ]; then outfile=gcc.spec else case $1 in [0-9]*) base_ver=$1 outfile=gcc$1.spec ;; *) exit 1 ;; esac fi echo -n > $outfile if test "$do_optional_compiler" = "1"; then echo '%define run_tests 1' >> $outfile echo '%define build_optional_compiler 1' >> $outfile fi if test "$do_optional_compiler_languages" = "1"; then echo '%define run_tests 1' >> $outfile echo '%define build_optional_compiler_languages 1' >> $outfile fi sed -e 's%@base_ver@%'$base_ver'%g' \ gcc.spec.in \ | sed -n -e '{ /^# PACKAGE-BEGIN/h /^# PACKAGE-BEGIN/,/^# PACKAGE-END/H /^# PACKAGE-BEGIN/,/^# PACKAGE-END/!p /^# PACKAGE-END/{g s/@variant@//g p g s/@variant@/-32bit/g p g s/@variant@/-64bit/g p } }' >> $outfile if test "$do_optional_compiler" = "0"; then if test "$do_optional_compiler_languages" = "0"; then echo '%define building_libjava 1' > libgcj$base_ver.spec sed -e '/^# LIBJAVA-DELETE-BEGIN/,/^# LIBJAVA-DELETE-END/d;s/-n libgcj@base_ver@$//g;s/^Name:[[:space:]]*gcc/Name: libgcj/g' \ gcc.spec.in \ | sed -e 's%@base_ver@%'$base_ver'%g' \ | sed -n -e '{ /^# PACKAGE-BEGIN/h /^# PACKAGE-BEGIN/,/^# PACKAGE-END/H /^# PACKAGE-BEGIN/,/^# PACKAGE-END/!p /^# PACKAGE-END/{g s/@variant@//g p g s/@variant@/-32bit/g p g s/@variant@/-64bit/g p } }' >> libgcj$base_ver.spec echo '%define building_testsuite 1' > gcc$base_ver-testresults.spec echo '%define run_tests 1' >> gcc$base_ver-testresults.spec sed -e '/^# GCC-TESTSUITE-DELETE-BEGIN/,/^# GCC-TESTSUITE-DELETE-END/d;s/-n gcc@base_ver@-testresults$//g;s/^Name:[[:space:]]*gcc@base_ver@/Name: gcc@base_ver@-testresults/g' \ gcc.spec.in \ | sed -e 's%@base_ver@%'$base_ver'%g' \ >> gcc$base_ver-testresults.spec echo '%define building_libffi 1' > libffi$base_ver.spec sed -e '/^# LIBFFI-DELETE-BEGIN/,/^# LIBFFI-DELETE-END/d;s/^Name:[[:space:]]*gcc/Name: libffi/g' \ gcc.spec.in \ | sed -e 's%@base_ver@%'$base_ver'%g' \ | sed -n -e '{ /^# PACKAGE-BEGIN/h /^# PACKAGE-BEGIN/,/^# PACKAGE-END/H /^# PACKAGE-BEGIN/,/^# PACKAGE-END/!p /^# PACKAGE-END/{g s/@variant@//g p g s/@variant@/-32bit/g p g s/@variant@/-64bit/g p } }' \ | sed -e '/^%package -n libffi'$base_ver'$/d' \ | sed -e 's/-n libffi'$base_ver'$//g' \ >> libffi$base_ver.spec test -f gcc$base_ver.changes \ && ( ln -f gcc$base_ver.changes libgcj$base_ver.changes; \ ln -f gcc$base_ver.changes libffi$base_ver.changes; \ ln -f gcc$base_ver.changes gcc$base_ver-testresults.changes; ) fi fi # disabled: mips, sparc, alpha if test "$do_icecream" = 1 ; then for arch in hppa i386 x86_64 s390 s390x ppc ppc64 ia64 armv7l armv5el; do { sed -n -e '1,/COMMON-BEGIN/p' cross-icecream.spec.in sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' $outfile sed -n -e '/COMMON-END/,$p' cross-icecream.spec.in; } | sed -e "s#@cross_arch@#$arch#" > cross-$arch-gcc-icecream-backend.spec test -f gcc$base_ver.changes && ln -f gcc$base_ver.changes cross-$arch-gcc-icecream-backend.changes done fi export outfile if test "$do_cross_shared" = 1 ; then # shared cross for arch in ; do base_ver=$base_ver cross_arch=$arch sh cross.spec.in > cross-$arch-gcc$base_ver.spec test -f gcc$base_ver.changes && ln -f gcc$base_ver.changes cross-$arch-gcc$base_ver.changes done fi if test "$do_cross_static" = 1 ; then # static crosses for arch in ; do echo '%define build_static 1' > cross-$arch-gcc$base_ver-static.spec base_ver=$base_ver cross_arch=$arch name_suffix="-static" sh cross.spec.in >> cross-$arch-gcc$base_ver-static.spec test -f gcc$base_ver.changes && ln -f gcc$base_ver.changes cross-$arch-gcc$base_ver-static.changes done # # avr is static but wants the non-static versioned name # echo '%define build_static 1' > cross-avr-gcc$base_ver.spec # base_ver=$base_ver cross_arch=avr sh cross.spec.in >> cross-avr-gcc$base_ver.spec # test -f gcc$base_ver.changes && ln -f gcc$base_ver.changes cross-avr-gcc$base_ver.changes fi exit 0 ++++++ check-build.sh ++++++ #!/bin/bash # Copyright (c) 2003,2005 SUSE Linux Products GmbH, Germany. All rights reserved. # # Authors: Thorsten Kukuk <kukuk(a)suse.de> # # this script use the following variable(s): # # - $BUILD_BASENAME # case $BUILD_BASENAME in *ppc*) # Our biarch 32-bit compiler needs to be build on a 64-bit machine, # otherwise some configure checks fail. # Note that we cannot use uname here since powerpc32 was invoked # already. grep 'series64\|ppc64' /proc/version > /dev/null if [ $? -ne 0 ] ; then echo "build does not work on `hostname` for gcc" exit 1 fi ;; *x86_64*) #if [ `ulimit -v` -le 740000 ] ; then # echo "build does not work on ("`hostname`" for gcc)" # exit 1 #fi if [ `getconf _NPROCESSORS_CONF` -lt 2 ] ; then echo "build does not work on `hostname` for gcc" exit 1 fi ;; *) ;; esac exit 0 ++++++ cross-icecream.spec.in ++++++ # # spec file for package gcc (Version 4.0.1) # # Copyright (c) 2005 SUSE Linux AG, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://www.suse.de/feedback/ # # norootforbuild %define build_cp 1 %define build_ada 0 %define build_libjava 0 %define build_java 0 %define build_fortran 0 %define build_objc 0 %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 %define gcc_target_arch @cross_arch@-suse-linux %define gcc_icecream 1 %define binutils_target @cross_arch@ %if %{binutils_target} == "armv7l" %define binutils_target arm %endif %if %{binutils_target} == "arm5el" %define binutils_target arm %endif Name: cross-@cross_arch@-gcc-icecream-backend BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel mpc-devel BuildRequires: cross-%{binutils_target}-binutils %ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc BuildRequires: cloog-devel ppl-devel libelf-devel %endif %ifarch ia64 BuildRequires: libunwind-devel %endif ExclusiveArch: ppc ppc64 %ix86 x86_64 ia64 %define _binary_payload w.ufdio # COMMON-BEGIN # COMMON-END make %{?jobs:-j%jobs} all-gcc TARGET-gcc="cc1 cc1plus gcc-cross g++ native" %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target install -s -D %{_prefix}/bin/%{binutils_target}-linux-as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ $RPM_BUILD_ROOT/env/usr/bin/gcc %define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do # Check wether the same library also exists in the parent directory, # and prefer that on the assumption that it is a more generic one. baselib=`echo "$lib" | sed 's,/[^/]*$/[^/]*$$,\1,'` test -f "$baselib" && lib=$baselib install -s -D $lib $RPM_BUILD_ROOT/env$lib done rm -rf $RPM_BUILD_ROOT/inst cd $RPM_BUILD_ROOT/env tar cvzf ../%{name}_%{_arch}.tar.gz * cd .. mkdir -p usr/share/icecream-envs mv %{name}_%{_arch}.tar.gz usr/share/icecream-envs rpm -q --changelog glibc > usr/share/icecream-envs/%{name}_%{_arch}.glibc rpm -q --changelog binutils > usr/share/icecream-envs/%{name}_%{_arch}.binutils rm -r env %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/share/icecream-envs %changelog -n cross-@cross_arch@-gcc-icecream-backend ++++++ cross.spec.in ++++++ #! /bin/sh # # call this via pre_checkin.sh # # 2005-05-09, jw(a)suse.de test -z "$cross_arch" && echo 1>&2 "Error: $0 needs environment variable 'cross_arch'" test -z "$outfile" && echo 1>&2 "Error: $0 needs environment variable 'outfile'" cross_arch_cpu=`echo $cross_arch | sed -e 's/$[^-]*$-\?.*/\1/'` cat << EOF # # spec file for package gcc (Version 4.0.1) # # Copyright (c) 2005 SUSE Linux AG, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://www.suse.de/feedback/ # # norootforbuild %define build_cp 1 %define build_ada 0 %define build_java 0 %define build_libjava 0 %define build_fortran 0 %define build_objc 0 %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 %define gcc_target_arch $cross_arch %if "$cross_arch" == "spu" %define build_fortran 1 %endif %if 0%{?build_static:1} %define build_fortran 0 %endif Name: cross-$cross_arch-gcc$base_ver$name_suffix BuildRequires: bison flex mpfr-devel zlib-devel mpc-devel %ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc BuildRequires: cloog-devel ppl-devel libelf-devel %endif BuildRequires: cross-$cross_arch_cpu-binutils %if "$cross_arch" == "spu" %if 0%{?build_static:1} BuildRequires: cross-$cross_arch_cpu-newlib-headers %else BuildRequires: cross-$cross_arch_cpu-newlib %endif Requires: cross-$cross_arch_cpu-newlib %endif Requires: cross-$cross_arch_cpu-binutils # Suffixed gcc conflicts with unsuffixed gcc %if "$name_suffix" == "" %else Conflicts: cross-$cross_arch_cpu-gcc$base_ver %endif %define _prefix /opt/cross EOF sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' $outfile | sed -n -e '1,/%description/p' cat << EOF This compiler supports the C language on $cross_arch microprocessors. Also install cross-$cross_arch-binutils and $cross_arch-libc. EOF sed -n -e '/%description/,$p' $outfile | sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' cat << EOF make %{?jobs:-j%jobs} %install cd obj-%{GCCDIST} make install DESTDIR=\$RPM_BUILD_ROOT rm -rf \$RPM_BUILD_ROOT%{_prefix}/share rm -f \$RPM_BUILD_ROOT%{_prefix}/bin/*-gccbug find \$RPM_BUILD_ROOT -name libiberty.a | xargs rm %clean rm -rf \$RPM_BUILD_ROOT %files %defattr(-,root,root) %{_prefix} EOF ++++++ gcc-add-defaultsspec.diff ++++++ Index: gcc/gcc.c =================================================================== --- gcc/gcc.c.orig 2011-11-03 16:27:42.000000000 +0100 +++ gcc/gcc.c 2011-11-03 17:08:03.000000000 +0100 @@ -260,6 +260,7 @@ static const char *replace_outfile_spec_ static const char *remove_outfile_spec_function (int, const char **); static const char *version_compare_spec_function (int, const char **); static const char *include_spec_function (int, const char **); +static const char *include_noerr_spec_function (int, const char **); static const char *find_file_spec_function (int, const char **); static const char *find_plugindir_spec_function (int, const char **); static const char *print_asm_header_spec_function (int, const char **); @@ -1247,6 +1248,7 @@ static const struct spec_function static { "remove-outfile", remove_outfile_spec_function }, { "version-compare", version_compare_spec_function }, { "include", include_spec_function }, + { "include_noerr", include_noerr_spec_function }, { "find-file", find_file_spec_function }, { "find-plugindir", find_plugindir_spec_function }, { "print-asm-header", print_asm_header_spec_function }, @@ -6240,6 +6242,8 @@ main (int argc, char **argv) if (access (specs_file, R_OK) == 0) read_specs (specs_file, TRUE); + do_self_spec ("%:include_noerr(defaults.spec)%(default_spec)"); + /* Process any configure-time defaults specified for the command line options, via OPTION_DEFAULT_SPECS. */ for (i = 0; i < ARRAY_SIZE (option_default_specs); i++) @@ -8088,6 +8092,21 @@ get_random_number (void) return ret ^ getpid(); } +static const char * +include_noerr_spec_function (int argc, const char **argv) +{ + char *file; + + if (argc != 1) + abort (); + + file = find_a_file (&startfile_prefixes, argv[0], R_OK, 0); + if (file) + read_specs (file, FALSE); + + return NULL; +} + /* %:compare-debug-dump-opt spec function. Save the last argument, expected to be the last -fdump-final-insns option, or generate a temporary. */ ++++++ gcc-dir-version.patch ++++++ Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in.orig 2011-11-08 16:23:29.000000000 +0100 +++ gcc/Makefile.in 2011-11-09 11:59:34.000000000 +0100 @@ -792,12 +792,14 @@ GTM_H = tm.h $(tm_file_list) in TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H) # Variables for version information. -BASEVER := $(srcdir)/BASE-VER # 4.x.y +BASEVER := $(srcdir)/BASE-VER # 4.x +FULLVER := $(srcdir)/FULL-VER # 4.x.y DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, "" DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX] BASEVER_c := $(shell cat $(BASEVER)) +FULLVER_c := $(shell cat $(FULLVER)) DEVPHASE_c := $(shell cat $(DEVPHASE)) DATESTAMP_c := $(shell cat $(DATESTAMP)) @@ -816,6 +818,7 @@ version := $(BASEVER_c) # (i.e. if DEVPHASE_c is empty). The space immediately after the # comma in the $(if ...) constructs is significant - do not remove it. BASEVER_s := "\"$(BASEVER_c)\"" +FULLVER_s := "\"$(FULLVER_c)\"" DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\"" DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\"" PKGVERSION_s:= "\"@PKGVERSION@\"" @@ -2146,11 +2149,11 @@ options-save.o: options-save.c $(CONFIG_ dumpvers: dumpvers.c -CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ +CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ -DREVISION=$(REVISION_s) \ -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ -DBUGURL=$(BUGURL_s) -version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) +version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) gtype-desc.o: gtype-desc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(HASHTAB_H) $(SPLAY_TREE_H) $(OBSTACK_H) $(BITMAP_H) \ @@ -2736,10 +2739,10 @@ common/common-targhooks.o : common/commo coretypes.h $(INPUT_H) $(TM_H) $(COMMON_TARGET_H) common/common-targhooks.h bversion.h: s-bversion; @true -s-bversion: BASE-VER - echo "#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) | sed -e 's/^$[0-9]*$.*$$/\1/'`" > bversion.h - echo "#define BUILDING_GCC_MINOR `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.$[0-9]*$.*$$/\1/'`" >> bversion.h - echo "#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.$[0-9]*$$$/\1/'`" >> bversion.h +s-bversion: FULL-VER + echo "#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) | sed -e 's/^$[0-9]*$.*$$/\1/'`" > bversion.h + echo "#define BUILDING_GCC_MINOR `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.$[0-9]*$.*$$/\1/'`" >> bversion.h + echo "#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.$[0-9]*$$$/\1/'`" >> bversion.h echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h $(STAMP) s-bversion @@ -3811,9 +3814,9 @@ build/%.o : # dependencies provided by ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs ## several C macro definitions, just like version.o build/version.o: version.c version.h \ - $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) + $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) $(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \ - -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ + -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ -DREVISION=$(REVISION_s) \ -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ -DBUGURL=$(BUGURL_s) -o $@ $< @@ -3988,7 +3991,7 @@ PREPROCESSOR_DEFINES = \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ @TARGET_SYSTEM_ROOT_DEFINE@ -CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s) +CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s) cppbuiltin.o: cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) cppbuiltin.h Makefile @@ -4008,8 +4011,8 @@ build/gcov-iov$(build_exeext): build/gco build/gcov-iov.o -o $@ gcov-iov.h: s-iov -s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE) - build/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \ +s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE) + build/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \ > tmp-gcov-iov.h $(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h $(STAMP) s-iov Index: libjava/Makefile.am =================================================================== --- libjava/Makefile.am.orig 2011-11-03 16:30:42.000000000 +0100 +++ libjava/Makefile.am 2011-11-09 11:59:34.000000000 +0100 @@ -774,7 +774,7 @@ install_data_local_split = 50 install-data-local: $(PRE_INSTALL) ## Install the .pc file. - @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ + @pc_version=`echo $(GCJVERSION)`; \ file="libgcj-$${pc_version}.pc"; \ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ Index: libjava/Makefile.in =================================================================== --- libjava/Makefile.in.orig 2011-11-03 16:31:17.000000000 +0100 +++ libjava/Makefile.in 2011-11-09 11:59:34.000000000 +0100 @@ -12411,7 +12411,7 @@ install-exec-hook: install-binPROGRAMS i @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext) install-data-local: $(PRE_INSTALL) - @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ + @pc_version=`echo $(GCJVERSION)`; \ file="libgcj-$${pc_version}.pc"; \ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ Index: libjava/testsuite/lib/libjava.exp =================================================================== --- libjava/testsuite/lib/libjava.exp.orig 2011-04-18 12:48:54.000000000 +0200 +++ libjava/testsuite/lib/libjava.exp 2011-11-09 11:59:34.000000000 +0100 @@ -177,7 +177,7 @@ proc libjava_init { args } { set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] regexp " version \[^\n\r\]*" $text version - set libjava_version [lindex $version 1] + set libjava_version 4.7 verbose "version: $libjava_version" Index: gcc/cppbuiltin.c =================================================================== --- gcc/cppbuiltin.c.orig 2011-03-14 15:04:06.000000000 +0100 +++ gcc/cppbuiltin.c 2012-01-24 10:22:18.000000000 +0100 @@ -38,9 +38,9 @@ parse_basever (int *major, int *minor, i static int s_major = -1, s_minor, s_patchlevel; if (s_major == -1) - if (sscanf (BASEVER, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3) + if (sscanf (version_string, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3) { - sscanf (BASEVER, "%d.%d", &s_major, &s_minor); + sscanf (version_string, "%d.%d", &s_major, &s_minor); s_patchlevel = 0; } ++++++ gcc-noalias-warn.diff ++++++ Index: boehm-gc/finalize.c =================================================================== --- boehm-gc/finalize.c.orig 2007-03-11 13:17:59.000000000 +0100 +++ boehm-gc/finalize.c 2010-07-01 16:26:16.000000000 +0200 @@ -165,6 +165,7 @@ signed_word * log_size_ptr; int index; struct disappearing_link * new_dl; DCL_LOCK_STATE; + struct disappearing_link *** dl_head_adr = &dl_head; if ((word)link & (ALIGNMENT-1)) ABORT("Bad arg to GC_general_register_disappearing_link"); @@ -177,7 +178,7 @@ signed_word * log_size_ptr; # ifndef THREADS DISABLE_SIGNALS(); # endif - GC_grow_table((struct hash_chain_entry ***)(&dl_head), + GC_grow_table((struct hash_chain_entry ***)dl_head_adr, &log_dl_table_size); # ifdef CONDPRINT if (GC_print_stats) { @@ -348,6 +349,7 @@ finalization_mark_proc * mp; struct finalizable_object *new_fo; hdr *hhdr; DCL_LOCK_STATE; + struct finalizable_object *** fo_head_adr = &fo_head; # ifdef THREADS DISABLE_SIGNALS(); @@ -358,7 +360,7 @@ finalization_mark_proc * mp; # ifndef THREADS DISABLE_SIGNALS(); # endif - GC_grow_table((struct hash_chain_entry ***)(&fo_head), + GC_grow_table((struct hash_chain_entry ***)fo_head_adr, &log_fo_table_size); # ifdef CONDPRINT if (GC_print_stats) { ++++++ gcc-sles-version.patch ++++++ Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in.orig 2011-11-03 17:00:43.000000000 +0100 +++ gcc/Makefile.in 2011-11-03 17:01:28.000000000 +0100 @@ -2145,7 +2145,7 @@ dumpvers: dumpvers.c CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ -DREVISION=$(REVISION_s) \ - -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ + -DDEVPHASE="" -DPKGVERSION=$(PKGVERSION_s) \ -DBUGURL=$(BUGURL_s) version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) ++++++ gcc.spec.in ++++++ ++++ 2300 lines (skipped) ++++++ gcc4-ppc64-m32-m64-multilib-only.patch ++++++ Index: gcc/config/rs6000/t-linux64 =================================================================== --- gcc/config/rs6000/t-linux64.orig 2011-11-03 16:27:34.000000000 +0100 +++ gcc/config/rs6000/t-linux64 2011-11-03 17:08:21.000000000 +0100 @@ -26,10 +26,10 @@ # it doesn't tell anything about the 32bit libraries on those systems. Set # MULTILIB_OSDIRNAMES according to what is found on the target. -MULTILIB_OPTIONS = m64/m32 msoft-float -MULTILIB_DIRNAMES = 64 32 nof +MULTILIB_OPTIONS = m64/m32 +MULTILIB_DIRNAMES = 64 32 MULTILIB_EXTRA_OPTS = fPIC mstrict-align -MULTILIB_EXCEPTIONS = m64/msoft-float -MULTILIB_EXCLUSIONS = m64/!m32/msoft-float +MULTILIB_EXCEPTIONS = +MULTILIB_EXCLUSIONS = MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) ++++++ gcc41-ia64-stack-protector.patch ++++++ 2005-07-08 Jakub Jelinek <jakub(a)redhat.com> * config/ia64/ia64.h (FRAME_GROWS_DOWNWARD): Define to 1 if -fstack-protect. * config/ia64/ia64.c (ia64_compute_frame_size): Make sure size is a multiple of 16 if FRAME_GROWS_DOWNWARD. (ia64_initial_elimination_offset): Support FRAME_GROWS_DOWNWARD layout. * config/ia64/linux.h (TARGET_LIBC_PROVIDES_SSP): Define. * config/ia64/ia64.md (stack_protect_set, stack_protect_test): New expanders. Index: gcc/config/ia64/linux.h =================================================================== --- gcc/config/ia64/linux.h.orig 2011-11-03 16:27:28.000000000 +0100 +++ gcc/config/ia64/linux.h 2011-11-04 11:39:46.000000000 +0100 @@ -77,6 +77,11 @@ do { \ #undef LINK_EH_SPEC #define LINK_EH_SPEC "" +#ifdef TARGET_LIBC_PROVIDES_SSP +/* IA-64 glibc provides __stack_chk_guard in [r13-8]. */ +#define TARGET_THREAD_SSP_OFFSET -8 +#endif + /* Put all *tf routines in libgcc. */ #undef LIBGCC2_HAS_TF_MODE #define LIBGCC2_HAS_TF_MODE 1 Index: gcc/config/ia64/ia64.c =================================================================== --- gcc/config/ia64/ia64.c.orig 2011-11-03 16:27:28.000000000 +0100 +++ gcc/config/ia64/ia64.c 2011-11-04 11:39:47.000000000 +0100 @@ -2797,6 +2797,9 @@ ia64_compute_frame_size (HOST_WIDE_INT s else pretend_args_size = crtl->args.pretend_args_size; + if (FRAME_GROWS_DOWNWARD) + size = IA64_STACK_ALIGN (size); + total_size = (spill_size + extra_spill_size + size + pretend_args_size + crtl->outgoing_args_size); total_size = IA64_STACK_ALIGN (total_size); @@ -2829,32 +2832,19 @@ ia64_can_eliminate (const int from ATTRI HOST_WIDE_INT ia64_initial_elimination_offset (int from, int to) { - HOST_WIDE_INT offset; + HOST_WIDE_INT offset, size = get_frame_size (); - ia64_compute_frame_size (get_frame_size ()); + ia64_compute_frame_size (size); switch (from) { case FRAME_POINTER_REGNUM: - switch (to) - { - case HARD_FRAME_POINTER_REGNUM: - if (current_function_is_leaf) - offset = -current_frame_info.total_size; - else - offset = -(current_frame_info.total_size - - crtl->outgoing_args_size - 16); - break; - - case STACK_POINTER_REGNUM: - if (current_function_is_leaf) - offset = 0; - else - offset = 16 + crtl->outgoing_args_size; - break; - - default: - gcc_unreachable (); - } + offset = FRAME_GROWS_DOWNWARD ? IA64_STACK_ALIGN (size) : 0; + if (!current_function_is_leaf) + offset += 16 + crtl->outgoing_args_size; + if (to == HARD_FRAME_POINTER_REGNUM) + offset -= current_frame_info.total_size; + else + gcc_assert (to == STACK_POINTER_REGNUM); break; case ARG_POINTER_REGNUM: Index: gcc/config/ia64/ia64.md =================================================================== --- gcc/config/ia64/ia64.md.orig 2011-11-03 16:27:28.000000000 +0100 +++ gcc/config/ia64/ia64.md 2011-11-04 11:39:47.000000000 +0100 @@ -5180,6 +5180,43 @@ "mov %0 = ip" [(set_attr "itanium_class" "frbr")]) +;; +;; Stack guard expanders + +(define_expand "stack_protect_set" + [(set (match_operand 0 "memory_operand" "") + (match_operand 1 "memory_operand" ""))] + "" +{ +#ifdef TARGET_THREAD_SSP_OFFSET + rtx thread_pointer_rtx = gen_rtx_REG (Pmode, 13); + rtx canary = gen_rtx_MEM (Pmode, gen_rtx_PLUS (Pmode, thread_pointer_rtx, + GEN_INT (TARGET_THREAD_SSP_OFFSET))); + MEM_VOLATILE_P (canary) = MEM_VOLATILE_P (operands[1]); + operands[1] = canary; +#endif + emit_move_insn (operands[0], operands[1]); + DONE; +}) + +(define_expand "stack_protect_test" + [(match_operand 0 "memory_operand" "") + (match_operand 1 "memory_operand" "") + (match_operand 2 "" "")] + "" +{ +#ifdef TARGET_THREAD_SSP_OFFSET + rtx thread_pointer_rtx = gen_rtx_REG (Pmode, 13); + rtx canary = gen_rtx_MEM (Pmode, gen_rtx_PLUS (Pmode, thread_pointer_rtx, + GEN_INT (TARGET_THREAD_SSP_OFFSET))); + MEM_VOLATILE_P (canary) = MEM_VOLATILE_P (operands[1]); + operands[1] = canary; +#endif + emit_cmp_and_jump_insns (operands[0], operands[1], EQ, NULL_RTX, + ptr_mode, 1, operands[2]); + DONE; +}) + ;; Vector operations (include "vect.md") ;; Atomic operations Index: gcc/config/ia64/ia64.h =================================================================== --- gcc/config/ia64/ia64.h.orig 2011-04-28 15:02:22.000000000 +0200 +++ gcc/config/ia64/ia64.h 2011-11-04 11:39:47.000000000 +0100 @@ -872,7 +872,7 @@ enum reg_class /* Define this macro to nonzero if the addresses of local variable slots are at negative offsets from the frame pointer. */ -#define FRAME_GROWS_DOWNWARD 0 +#define FRAME_GROWS_DOWNWARD (flag_stack_protect != 0) /* Offset from the frame pointer to the first local variable slot to be allocated. */ ++++++ gcc41-java-slow_pthread_self.patch ++++++ 2005-05-20 Jakub Jelinek <jakub(a)redhat.com> * configure.host (slow_pthread_self): Set to empty unconditionally on Linux targets. Index: libjava/configure.host =================================================================== --- libjava/configure.host.orig 2011-11-03 16:30:42.000000000 +0100 +++ libjava/configure.host 2011-11-04 11:39:57.000000000 +0100 @@ -227,6 +227,7 @@ case "${host}" in sh-linux* | sh[34]*-linux*) can_unwind_signal=yes libgcj_ld_symbolic='-Wl,-Bsymbolic' + slow_pthread_self= if test x$slow_pthread_self = xyes \ && test x$cross_compiling != xyes; then cat > conftest.c <<EOF ++++++ gcc41-ppc32-retaddr.patch ++++++ 2005-11-28 Jakub Jelinek <jakub(a)redhat.com> * config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0, read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx instead of doing an extran indirection from frame_pointer_rtx. * gcc.dg/20051128-1.c: New test. Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c.orig 2011-11-03 16:27:33.000000000 +0100 +++ gcc/config/rs6000/rs6000.c 2011-11-04 11:40:05.000000000 +0100 @@ -18653,17 +18653,22 @@ rs6000_return_addr (int count, rtx frame don't try to be too clever here. */ if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic)) { + rtx x; cfun->machine->ra_needs_full_frame = 1; - return - gen_rtx_MEM - (Pmode, - memory_address - (Pmode, - plus_constant (copy_to_reg - (gen_rtx_MEM (Pmode, - memory_address (Pmode, frame))), - RETURN_ADDRESS_OFFSET))); + if (count == 0) + { + gcc_assert (frame == frame_pointer_rtx); + x = arg_pointer_rtx; + } + else + { + x = memory_address (Pmode, frame); + x = copy_to_reg (gen_rtx_MEM (Pmode, x)); + } + + x = plus_constant (x, RETURN_ADDRESS_OFFSET); + return gen_rtx_MEM (Pmode, memory_address (Pmode, x)); } cfun->machine->ra_need_lr = 1; Index: gcc/testsuite/gcc.dg/20051128-1.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gcc/testsuite/gcc.dg/20051128-1.c 2011-11-04 11:40:05.000000000 +0100 @@ -0,0 +1,41 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fpic" } */ + +extern void exit (int); +extern void abort (void); + +int b; + +struct A +{ + void *pad[147]; + void *ra, *h; + long o; +}; + +void +__attribute__((noinline)) +foo (struct A *a, void *x) +{ + __builtin_memset (a, 0, sizeof (a)); + if (!b) + exit (0); +} + +void +__attribute__((noinline)) +bar (void) +{ + struct A a; + + __builtin_unwind_init (); + foo (&a, __builtin_return_address (0)); +} + +int +main (void) +{ + bar (); + abort (); + return 0; +} ++++++ gcc43-no-unwind-tables.diff ++++++ Index: libgcc/Makefile.in =================================================================== --- libgcc/Makefile.in.orig 2011-11-03 16:29:25.000000000 +0100 +++ libgcc/Makefile.in 2011-11-03 17:21:33.000000000 +0100 @@ -279,7 +279,7 @@ INTERNAL_CFLAGS = $(CFLAGS) $(LIBGCC2_CF CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ -finhibit-size-directive -fno-inline -fno-exceptions \ -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \ - -fno-stack-protector \ + -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables \ $(INHIBIT_LIBC_CFLAGS) # Extra flags to use when compiling crt{begin,end}.o. ++++++ gcc44-rename-info-files.patch ++++++ ++++ 922 lines (skipped) ++++++ gcc44-textdomain.patch ++++++ #! /bin/sh -e # DP: Set gettext's domain and textdomain to the versioned package name. dir= if [ $# -eq 3 -a "$2" = '-d' ]; then pdir="-d $3" dir="$3/" elif [ $# -ne 1 ]; then echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" exit 1 fi case "$1" in -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0 ;; -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 ;; *) echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" exit 1 esac exit 0 Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in.orig 2011-11-08 17:43:16.000000000 +0100 +++ gcc/Makefile.in 2011-11-08 17:43:23.000000000 +0100 @@ -5209,8 +5209,8 @@ install-po: dir=$(localedir)/$$lang/LC_MESSAGES; \ echo $(mkinstalldirs) $(DESTDIR)$$dir; \ $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \ - echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \ - $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \ + echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.7.mo; \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.7.mo; \ done # Rule for regenerating the message template (gcc.pot). Index: gcc/intl.c =================================================================== --- gcc/intl.c.orig 2010-12-06 12:01:18.000000000 +0100 +++ gcc/intl.c 2011-11-08 17:43:23.000000000 +0100 @@ -56,8 +56,8 @@ gcc_init_libintl (void) setlocale (LC_ALL, ""); #endif - (void) bindtextdomain ("gcc", LOCALEDIR); - (void) textdomain ("gcc"); + (void) bindtextdomain ("gcc-4.7", LOCALEDIR); + (void) textdomain ("gcc-4.7"); /* Opening quotation mark. */ open_quote = _("`"); Index: libcpp/Makefile.in =================================================================== --- libcpp/Makefile.in.orig 2011-11-08 16:24:10.000000000 +0100 +++ libcpp/Makefile.in 2011-11-08 17:44:28.000000000 +0100 @@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ PACKAGE = @PACKAGE@ +PACKAGE_SUFFIX = -4.7 RANLIB = @RANLIB@ SHELL = @SHELL@ USED_CATALOGS = @USED_CATALOGS@ @@ -73,8 +74,10 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/. -I$(srcdir)/include ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) +ALL_CFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\" ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \ $(CPPFLAGS) +ALL_CXXFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\" # The name of the compiler to use. ENABLE_BUILD_WITH_CXX = @ENABLE_BUILD_WITH_CXX@ @@ -170,8 +173,8 @@ install-strip install: all installdirs else continue; \ fi; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ - echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \ done mostlyclean: Index: libcpp/system.h =================================================================== --- libcpp/system.h.orig 2011-11-03 16:30:43.000000000 +0100 +++ libcpp/system.h 2011-11-08 17:43:23.000000000 +0100 @@ -273,7 +273,7 @@ extern int errno; #endif #ifndef _ -# define _(msgid) dgettext (PACKAGE, msgid) +# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid) #endif #ifndef N_ Index: libcpp/init.c =================================================================== --- libcpp/init.c.orig 2011-11-03 16:30:43.000000000 +0100 +++ libcpp/init.c 2011-11-08 17:43:23.000000000 +0100 @@ -140,7 +140,7 @@ init_library (void) init_trigraph_map (); #ifdef ENABLE_NLS - (void) bindtextdomain (PACKAGE, LOCALEDIR); + (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR); #endif } } ++++++ gcc47-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * addFilter ("libgomp.*shlib-policy-name-error") addFilter ("libgcc.*shlib-policy-name-error") addFilter ("libgfortran.*shlib-policy-name-error") addFilter ("libquadmath.*shlib-policy-name-error") addFilter ("libobjc.*shlib-policy-name-error") addFilter ("libstdc.*shlib-policy-name-error") addFilter ("gcc47.*devel-dependency glibc-devel") addFilter ("gcc47-c.*devel-dependency libstdc") ++++++ libgcj47-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * addFilter ("libgcj_bc47.*shlib-policy-name-error") ++++++ libjava-no-multilib.diff ++++++ Index: libjava/configure =================================================================== --- libjava/configure.orig 2011-11-03 16:31:17.000000000 +0100 +++ libjava/configure 2011-11-03 17:08:27.000000000 +0100 @@ -3364,6 +3364,26 @@ else fi +# Default to --enable-libjava-multilib +# Check whether --enable-libjava-multilib or --disable-libjava-multilib was given. +if test "${enable_libjava_multilib+set}" = set; then + enableval="$enable_libjava_multilib" + case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for libjava-multilib option" >&5 +echo "$as_me: error: bad value ${enableval} for libjava-multilib option" >&2;} + { (exit 1); exit 1; }; } ;; + esac +else + multilib=yes +fi; +if test "$multilib" = no; then +# Reset also --enable-multilib state, as that is what is looked at +# by config-ml.in + ac_configure_args="$ac_configure_args --disable-multilib" +fi + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. ++++++ pr33763.diff ++++++ Index: gcc/tree-inline.c =================================================================== *** gcc/tree-inline.c.orig 2011-11-03 16:27:43.000000000 +0100 --- gcc/tree-inline.c 2011-11-04 11:37:21.000000000 +0100 *************** expand_call_inline (basic_block bb, gimp *** 3775,3780 **** --- 3775,3786 ---- goto egress; if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) + /* For extern inline functions that get redefined we always + silently ignored alway_inline flag. Better behaviour would + be to be able to keep both bodies and use extern inline body + for inlining, but we can't do that because frontends overwrite + the body. */ + && !cg_edge->callee->local.redefined_extern_inline /* Avoid warnings during early inline pass. */ && cgraph_global_info_ready /* PR 20090218-1_0.c. Body can be provided by another module. */ ++++++ pr49484.diff ++++++ 2012-01-18 Richard Guenther <rguenther(a)suse.de> * gthr.h (__GTHREAD_MUTEX_INIT_FUNCTION): Adjust specification. * gthr-posix.h (__GTHREAD_MUTEX_INIT_FUNCTION): Define. (__gthread_mutex_init_function): New function. * gthr-single.h (__GTHREAD_MUTEX_INIT_FUNCTION): Define. PR gcov/49484 * libgcov.c: Include gthr.h. (__gcov_flush_mx): New global variable. (init_mx, init_mx_once): New functions. (__gcov_flush): Protect self with a mutex. (__gcov_fork): Re-initialize mutex after forking. * unwind-dw2-fde.c: Change condition under which to use __GTHREAD_MUTEX_INIT_FUNCTION. Index: libgcc/libgcov.c =================================================================== *** libgcc/libgcov.c.orig 2012-02-21 14:47:55.000000000 +0100 --- libgcc/libgcov.c 2012-02-21 14:48:00.000000000 +0100 *************** see the files COPYING3 and COPYING.RUNTI *** 30,35 **** --- 30,36 ---- #include "coretypes.h" #include "tm.h" #include "libgcc_tm.h" + #include "gthr.h" #if defined(inhibit_libc) #define IN_LIBGCOV (-1) *************** __gcov_init (struct gcov_info *info) *** 705,710 **** --- 706,730 ---- info->version = 0; } + #ifdef __GTHREAD_MUTEX_INIT + ATTRIBUTE_HIDDEN __gthread_mutex_t __gcov_flush_mx = __GTHREAD_MUTEX_INIT; + #define init_mx_once() + #else + __gthread_mutex_t __gcov_flush_mx ATTRIBUTE_HIDDEN; + + static void + init_mx (void) + { + __GTHREAD_MUTEX_INIT_FUNCTION (&mx); + } + static void + init_mx_once (void) + { + static __gthread_once_t once = __GTHREAD_ONCE_INIT; + __gthread_once (&once, init_mx); + } + #endif + /* Called before fork or exec - write out profile information gathered so far and reset it to zero. This avoids duplication or loss of the profile information gathered so far. */ *************** __gcov_flush (void) *** 714,719 **** --- 734,742 ---- { const struct gcov_info *gi_ptr; + init_mx_once (); + __gthread_mutex_lock (&__gcov_flush_mx); + gcov_exit (); for (gi_ptr = gcov_list; gi_ptr; gi_ptr = gi_ptr->next) { *************** __gcov_flush (void) *** 737,742 **** --- 760,767 ---- } } } + + __gthread_mutex_unlock (&__gcov_flush_mx); } #endif /* L_gcov */ *************** __gcov_ior_profiler (gcov_type *counters *** 975,982 **** pid_t __gcov_fork (void) { __gcov_flush (); ! return fork (); } #endif --- 1000,1012 ---- pid_t __gcov_fork (void) { + pid_t pid; + extern __gthread_mutex_t __gcov_flush_mx; __gcov_flush (); ! pid = fork (); ! if (pid == 0) ! __GTHREAD_MUTEX_INIT_FUNCTION (&__gcov_flush_mx); ! return pid; } #endif Index: libgcc/unwind-dw2-fde.c =================================================================== *** libgcc/unwind-dw2-fde.c.orig 2012-02-21 14:47:55.000000000 +0100 --- libgcc/unwind-dw2-fde.c 2012-02-21 14:48:00.000000000 +0100 *************** static struct object *seen_objects; *** 47,57 **** #ifdef __GTHREAD_MUTEX_INIT static __gthread_mutex_t object_mutex = __GTHREAD_MUTEX_INIT; #else static __gthread_mutex_t object_mutex; - #endif - #ifdef __GTHREAD_MUTEX_INIT_FUNCTION static void init_object_mutex (void) { --- 47,56 ---- #ifdef __GTHREAD_MUTEX_INIT static __gthread_mutex_t object_mutex = __GTHREAD_MUTEX_INIT; + #define init_object_mutex_once() #else static __gthread_mutex_t object_mutex; static void init_object_mutex (void) { *************** init_object_mutex_once (void) *** 64,71 **** static __gthread_once_t once = __GTHREAD_ONCE_INIT; __gthread_once (&once, init_object_mutex); } - #else - #define init_object_mutex_once() #endif /* Called from crtbegin.o to register the unwind info for an object. */ --- 63,68 ---- Index: libgcc/gthr-posix.h =================================================================== *** libgcc/gthr-posix.h.orig 2012-02-21 14:47:55.000000000 +0100 --- libgcc/gthr-posix.h 2012-02-21 14:48:00.000000000 +0100 *************** typedef struct timespec __gthread_time_t *** 63,68 **** --- 63,69 ---- #define __GTHREAD_HAS_COND 1 #define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER + #define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function #define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER) #define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER *************** __gthread_mutex_init_function (__gthread *** 754,759 **** --- 755,768 ---- #endif static inline int + __gthread_mutex_init_function (__gthread_mutex_t *__mutex) + { + if (__gthread_active_p ()) + return __gthrw_(pthread_mutex_init) (__mutex, NULL); + return 0; + } + + static inline int __gthread_mutex_destroy (__gthread_mutex_t *__mutex) { if (__gthread_active_p ()) Index: libgcc/gthr-single.h =================================================================== *** libgcc/gthr-single.h.orig 2012-02-21 14:47:55.000000000 +0100 --- libgcc/gthr-single.h 2012-02-21 14:48:00.000000000 +0100 *************** typedef int __gthread_recursive_mutex_t; *** 36,41 **** --- 36,42 ---- #define __GTHREAD_ONCE_INIT 0 #define __GTHREAD_MUTEX_INIT 0 + #define __GTHREAD_MUTEX_INIT_FUNCTION (mx) #define __GTHREAD_RECURSIVE_MUTEX_INIT 0 #define UNUSED __attribute__((unused)) Index: libgcc/gthr.h =================================================================== *** libgcc/gthr.h.orig 2012-02-21 14:47:55.000000000 +0100 --- libgcc/gthr.h 2012-02-21 14:48:00.000000000 +0100 *************** see the files COPYING3 and COPYING.RUNTI *** 52,62 **** to initialize __gthread_mutex_t to get a fast non-recursive mutex. __GTHREAD_MUTEX_INIT_FUNCTION ! some systems can't initialize a mutex without a ! function call. On such systems, define this to a ! function which looks like this: void __GTHREAD_MUTEX_INIT_FUNCTION (__gthread_mutex_t *) ! Don't define __GTHREAD_MUTEX_INIT in this case __GTHREAD_RECURSIVE_MUTEX_INIT __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION as above, but for a recursive mutex. --- 52,63 ---- to initialize __gthread_mutex_t to get a fast non-recursive mutex. __GTHREAD_MUTEX_INIT_FUNCTION ! to initialize __gthread_mutex_t to get a fast ! non-recursive mutex. ! Define this to a function which looks like this: void __GTHREAD_MUTEX_INIT_FUNCTION (__gthread_mutex_t *) ! Some systems can't initialize a mutex without a ! function call. Don't define __GTHREAD_MUTEX_INIT in this case. __GTHREAD_RECURSIVE_MUTEX_INIT __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION as above, but for a recursive mutex. ++++++ pr52080.diff ++++++ ++++ 708 lines (skipped) ++++++ pre_checkin.sh ++++++ #!/bin/bash # This script is called automatically during autobuild checkin. case $0 in \./*) here=$PWD ;; */*) here=${0%/*} ;; *) here=$PWD ;; esac case ${here##*/} in gcc-*) suffix=${here##*/} set ${suffix#*-}- ;; gcc[0-9]*) suffix=${here##*/} set ${suffix#gcc} ;; esac . ${here}/change_spec ++++++ program-transform-name.diff ++++++ Index: gcc/ada/gcc-interface/Make-lang.in =================================================================== --- gcc/ada/gcc-interface/Make-lang.in.orig 2011-11-03 16:26:46.000000000 +0100 +++ gcc/ada/gcc-interface/Make-lang.in 2011-11-03 17:08:13.000000000 +0100 @@ -758,6 +758,21 @@ doc/gnat-style.pdf: ada/gnat-style.texi # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnat, # gnatprep, gnatls, gnatxref, gnatfind, gnatname, gnatclean, # gnatsym +GNATBIND_INSTALL_NAME := $(shell echo gnatbind|sed '$(program_transform_name)') +GNATCHOP_INSTALL_NAME := $(shell echo gnatchop|sed '$(program_transform_name)') +GNAT_INSTALL_NAME := $(shell echo gnat|sed '$(program_transform_name)') +GNATKR_INSTALL_NAME := $(shell echo gnatkr|sed '$(program_transform_name)') +GNATLINK_INSTALL_NAME := $(shell echo gnatlink|sed '$(program_transform_name)') +GNATLS_INSTALL_NAME := $(shell echo gnatls|sed '$(program_transform_name)') +GNATMAKE_INSTALL_NAME := $(shell echo gnatmake|sed '$(program_transform_name)') +GNATNAME_INSTALL_NAME := $(shell echo gnatname|sed '$(program_transform_name)') +GNATPREP_INSTALL_NAME := $(shell echo gnatprep|sed '$(program_transform_name)') +GNATXREF_INSTALL_NAME := $(shell echo gnatxref|sed '$(program_transform_name)') +GNATFIND_INSTALL_NAME := $(shell echo gnatfind|sed '$(program_transform_name)') +GNATCLEAN_INSTALL_NAME := $(shell echo gnatclean|sed '$(program_transform_name)') +GNATSYM_INSTALL_NAME := $(shell echo gnatsym|sed '$(program_transform_name)') +GNATDLL_INSTALL_NAME := $(shell echo gnatdll|sed '$(program_transform_name)') +VXADDR2LINE_INSTALL_NAME := $(shell echo vxaddr2line|sed '$(program_transform_name)') ada.install-common: $(MKDIR) $(DESTDIR)$(bindir) -if [ -f gnat1$(exeext) ] ; \ @@ -771,8 +786,8 @@ ada.install-common: $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ fi; \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ - $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -786,8 +801,8 @@ ada.install-common: $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ fi ; \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -801,8 +816,8 @@ ada.install-common: $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ fi; \ else \ - $(RM) $(DESTDIR)$(bindir)/gnat$(exeext); \ - $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/gnat$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -816,8 +831,8 @@ ada.install-common: $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ fi; \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ - $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -831,8 +846,8 @@ ada.install-common: $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ fi; \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ - $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -846,8 +861,8 @@ ada.install-common: $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ fi; \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatls$(exeext); \ - $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/gnatls$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -861,8 +876,8 @@ ada.install-common: $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ fi; \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ - $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -872,8 +887,8 @@ ada.install-common: $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/gnatname$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -887,8 +902,8 @@ ada.install-common: $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ fi; \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ - $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -898,8 +913,8 @@ ada.install-common: $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -909,8 +924,8 @@ ada.install-common: $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ @@ -920,8 +935,8 @@ ada.install-common: $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ else \ - $(RM) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ - $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ fi ; \ fi # @@ -935,7 +950,7 @@ ada.install-common: $(INSTALL_PROGRAM) gnatsym-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatsym$(exeext); \ else \ $(RM) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ - $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ + $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/$(GNATSYM_INSTALL_NAME)$(exeext); \ fi ; \ fi # @@ -943,8 +958,8 @@ ada.install-common: # -if [ -f gnat1$(exeext) ] ; \ then \ - $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ - $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ fi # # vxaddr2line is only used for cross ports (it calls the underlying cross @@ -954,8 +969,8 @@ ada.install-common: then \ if [ -f vxaddr2line$(exeext) ] ; \ then \ - $(RM) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ - $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ fi ; \ fi @@ -1019,8 +1034,6 @@ ada.uninstall: -$(RM) $(DESTDIR)$(tooldir)/bin/gnatxref$(exeext) -$(RM) $(DESTDIR)$(tooldir)/bin/gnatclean$(exeext) -$(RM) $(DESTDIR)$(tooldir)/bin/gnatsym$(exeext) -# Gnatchop is only used on VMS - -$(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext) # Clean hooks: # A lot of the ancillary files are deleted by the main makefile. ++++++ sap303956-uchar.diff ++++++ Index: gcc/ginclude/uchar.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gcc/ginclude/uchar.h 2011-11-09 12:00:01.000000000 +0100 @@ -0,0 +1,38 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ + +/* As a special exception, if you include this header file into source + files compiled by GCC, this header file does not by itself cause + the resulting executable to be covered by the GNU General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU General + Public License. */ + +/* + * template header so that char16_t and char32_t are available + * in C (not only in C++). This is not a full implementation of <uchar.h> + */ + +#ifndef _UCHAR_H___ +#define _UCHAR_H___ +#ifndef __cplusplus +typedef __CHAR16_TYPE__ char16_t; +typedef __CHAR32_TYPE__ char32_t; +#endif +#endif Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in.orig 2011-11-09 11:59:58.000000000 +0100 +++ gcc/Makefile.in 2011-11-09 12:00:01.000000000 +0100 @@ -375,6 +375,7 @@ USER_H = $(srcdir)/ginclude/float.h \ $(srcdir)/ginclude/stddef.h \ $(srcdir)/ginclude/varargs.h \ $(srcdir)/ginclude/stdfix.h \ + $(srcdir)/ginclude/uchar.h \ $(srcdir)/ginclude/stdnoreturn.h \ $(srcdir)/ginclude/stdalign.h \ $(EXTRA_HEADERS) ++++++ suse-record-gcc-opts.diff ++++++ Index: gcc/varasm.c =================================================================== --- gcc/varasm.c.orig 2011-11-03 16:27:43.000000000 +0100 +++ gcc/varasm.c 2011-11-03 17:07:57.000000000 +0100 @@ -6979,6 +6979,35 @@ file_end_indicate_split_stack (void) } } +/* This is a generic routine emitting a SUSE specific section for + QA check marks. */ + +void +suse_file_end_indicate_optflags (void) +{ + unsigned int flags = SECTION_DEBUG | SECTION_STRINGS | SECTION_MERGE | (SECTION_ENTSIZE & 1); + + /* + o/O: optimize was off/on + s/S: size optimisation was off/on + p/P: stack-protector was off/on + w/W: warnings were off/on + g/G: debug was off/on + */ + + char opts_buffer[6]; + + opts_buffer[0] = (optimize >= 2) ? 'O' : 'o'; + opts_buffer[1] = (optimize >= 1 && optimize_size) ? 'S' : 's'; + opts_buffer[2] = (flag_stack_protect >= 1) ? 'P' : 'p'; + opts_buffer[3] = (warn_uninitialized >= 1 && warn_sequence_point >= 1) ? 'W' : 'w'; + opts_buffer[4] = (debug_info_level > DINFO_LEVEL_NONE) ? 'G' : 'g'; + opts_buffer[5] = '\0'; + + switch_to_section (get_section (".comment.SUSE.OPTs", flags, NULL)); + ASM_OUTPUT_ASCII (asm_out_file, opts_buffer, strlen (opts_buffer) + 1); +} + /* Output DIRECTIVE (a C string) followed by a newline. This is used as a get_unnamed_section callback. */ Index: gcc/output.h =================================================================== --- gcc/output.h.orig 2011-11-03 16:27:43.000000000 +0100 +++ gcc/output.h 2011-11-03 17:07:57.000000000 +0100 @@ -652,6 +652,7 @@ extern void default_asm_declare_constant extern void default_file_start (void); extern void file_end_indicate_exec_stack (void); extern void file_end_indicate_split_stack (void); +extern void suse_file_end_indicate_optflags (void); extern void default_elf_asm_output_external (FILE *file, tree, const char *); Index: gcc/toplev.c =================================================================== --- gcc/toplev.c.orig 2011-11-03 16:27:43.000000000 +0100 +++ gcc/toplev.c 2011-11-03 17:07:57.000000000 +0100 @@ -682,6 +682,8 @@ compile_file (void) /* Invoke registered plugin callbacks. */ invoke_plugin_callbacks (PLUGIN_FINISH_UNIT, NULL); + suse_file_end_indicate_optflags (); + /* This must be at the end. Some target ports emit end of file directives into the assembly file here, and hence we can not output anything to the assembly file after this point. */ ++++++ tls-no-direct.diff ++++++ Index: gcc/config/i386/gnu-user.h =================================================================== --- gcc/config/i386/gnu-user.h.orig 2011-05-09 17:58:22.000000000 +0200 +++ gcc/config/i386/gnu-user.h 2011-11-03 17:12:38.000000000 +0100 @@ -30,8 +30,12 @@ along with GCC; see the file COPYING3. #define DEFAULT_PCC_STRUCT_RETURN 1 /* We arrange for the whole %gs segment to map the tls area. */ +/* This slows down Xen, so take a very small general performance hit + for not accessing the %gs segment with negative offsets by making + GCC not emit direct accesses to %gs at all. #undef TARGET_TLS_DIRECT_SEG_REFS_DEFAULT #define TARGET_TLS_DIRECT_SEG_REFS_DEFAULT MASK_TLS_DIRECT_SEG_REFS + */ #undef ASM_COMMENT_START #define ASM_COMMENT_START "#" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit culmus-fonts for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package culmus-fonts for openSUSE:Factory checked in at 2012-03-16 13:10:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/culmus-fonts (Old) and /work/SRC/openSUSE:Factory/.culmus-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "culmus-fonts", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.culmus-fonts.new/culmus-fonts.changes 2012-03-16 13:10:24.000000000 +0100 @@ -0,0 +1,73 @@ +------------------------------------------------------------------- +Wed Feb 1 13:49:17 UTC 2012 - pgajdos(a)suse.com + +- renamed to culmus-fonts + +------------------------------------------------------------------- +Sun Sep 18 00:08:08 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- +Thu May 5 10:08:40 CEST 2011 - pgajdos(a)suse.cz + +- package missed TTF fonts -- thanks to andrei.levi at gmail.com + +------------------------------------------------------------------- +Mon Nov 22 09:11:35 CET 2010 - pgajdos(a)suse.cz + +- updated to 0.120: + 1. Keter YG - complete family with cantillation marks support. + Based on Aleppo codex. + 2. Left quotes added to David, Miriam, Miriam Mono. + 3. Geresh and gershayim lowered in David, Miriam, Miriam Mono. + 4. Dreydl symbol added to Caladings. + +------------------------------------------------------------------- +Fri Oct 15 09:08:21 CEST 2010 - pgajdos(a)suse.cz + +- updated to 0.110: + 1. Hadasim CLM - complete family with diacritics supported. Inspired by + Henri Friedlander's Hadassah font. + 2. Simple CLM - complete sans-serif family with diacritics supported. + 3. Stam Ashkenaz CLM and Stam Sefarad CLM - each in single weight, modeled + after the respective Torah scroll writing traditions. + +------------------------------------------------------------------- +Mon Aug 30 15:44:15 CEST 2010 - pgajdos(a)suse.cz + +- updated to 0.105: + 1. Introduced diacritics placement into Miriam Mono font, meteg supported. + 2. Supported "Hataf" diacritics with all letters in Miriam, David. + +------------------------------------------------------------------- +Mon Mar 15 09:35:43 CET 2010 - pgajdos(a)suse.cz + +- updated to 0.104: + * Fixed TZVEY YUDN MIT A PASEKH in David. + * Miriam font enhanced to support diacritics, more symbols. + +------------------------------------------------------------------- +Tue Dec 8 11:56:01 CET 2009 - pgajdos(a)suse.cz + +- updated to 0.103 + +------------------------------------------------------------------- +Wed Aug 9 10:51:44 CEST 2006 - dmueller(a)suse.de + +- install into /usr/share/fonts + +------------------------------------------------------------------- +Wed Mar 01 13:12:49 CET 2006 - mfabian(a)suse.de + +- add "Provides: locale(he)". + +------------------------------------------------------------------- +Wed Jan 25 21:46:02 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Sep 29 14:16:44 CEST 2005 - mfabian(a)suse.de + +- new package: culmus, version 0.101. New: ---- culmus-0.120.tar.bz2 culmus-fonts.changes culmus-fonts.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ culmus-fonts.spec ++++++ # # spec file for package culmus # # Copyright (c) 2011 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/ # %define type1dir /usr/share/fonts/Type1 %define ttfdir /usr/share/fonts/truetype %define upstream_name culmus Name: culmus-fonts Version: 0.120 License: GPL-2.0+ Group: System/X11/Fonts PreReq: %suseconfig_fonts_prereq Provides: locale(he) # FIXME: This causes a rpmlint warning; change <= to < once here's a new upstream version Obsoletes: culmus <= %{version} Provides: culmus = %{version} Release: 6 Url: http://culmus.sourceforge.net/ Source0: %{upstream_name}-%{version}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Free Hebrew Fonts %description Nine Hebrew font families. ASCII glyphs partially borrowed from the URW and Bitstream fonts. Those families provide a basic set of a serif (Frank Ruehl), sans serif (Nachlieli), and monospaced (Miriam Mono) fonts. Also included Miriam, Drugulin, Aharoni, David, Yehuda, and Ellinia. %prep %setup -q -n %{upstream_name}-%{version} %build %install mkdir -p $RPM_BUILD_ROOT%ttfdir install -m 0644 *.ttf \ $RPM_BUILD_ROOT%ttfdir mkdir -p $RPM_BUILD_ROOT%type1dir install -c -m 644 *.afm *.pf? $RPM_BUILD_ROOT%type1dir install -c -m 644 fonts.scale-type1 \ $RPM_BUILD_ROOT%type1dir/fonts.scale.culmus %post %run_suseconfig_fonts %postun %run_suseconfig_fonts %files %defattr(-, root,root) %doc CHANGES fonts.scale-ttf culmus.conf GNU-GPL LICENSE LICENSE-BITSTREAM %type1dir %ttfdir %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crash for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package crash for openSUSE:Factory checked in at 2012-03-16 13:10:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crash (Old) and /work/SRC/openSUSE:Factory/.crash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crash", Maintainer is "PTesarik(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/crash/crash.changes 2012-02-16 14:55:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crash.new/crash.changes 2012-03-16 13:10:18.000000000 +0100 @@ -1,0 +2,45 @@ +Wed Feb 29 22:12:17 UTC 2012 - dmair(a)suse.com + +- Update to crash 6.0.4 from upstream and adjust patch locations + to match current crash source. + 6.0.4 changelog is: + o Fix to allow the recently-added "mod -g" and "mod -r" options + to be used together. + o Additional update for 3.1.x and later kernels configured with + CONFIG_SLAB, which have replaced the kmem_cache.nodelists[] + array with a pointer to an outside array. + o Document the "crash [-h|--help] all" option in the crash.8 man + page and in the "crash [-h|--help]" output. + o Fix the S390/S390X-specific "s390dbf" command's "hex_ascii" + debug data printing routine to prevent the display of + non-ASCII characters. + o Fix for ARM stack unwinding on 3.2 and later kernels due to + commit: + http://git.kernel.org/linus/de66a979012dbc66b1ec0125795a3f79ee667b8a + o Implemented a new "search -x <count>" option that displays the + memory contents before and after any found search target. + o Fix for the x86_64 Xen hypervisor "bt" command. Without the + patch, the contents of the RDX register in exception frames + incorrectly shows the contents of the RCX register. + o Implementation of a platform-based vmalloc address translation + scheme for the 32-bit PPC architecture, introducing suppport + for the PPC44X platform while maintaining the current default + platform. + o Fix for the usage of native gdb commands where the command + output is redirected to a pipe and then redirected to a file. + o Fix to prevent a crash session that is run over a network + connection that is killed/removed from going into 100% + cpu-time loop. + o Fix for the support of PPC64 compressed kdumps, a regression + that was introduced in crash-6.0.3 when support for 32-bit PPC + compressed kdumps was implemented. + o Fix for the x86_64 "bt" command to prevent the possible + skipping of the stack frame just above an exception frame that + indicates "[exception RIP: unknown or invalid address]". + Patches with modified target locations are: + crash-make-emacs-default.diff + crash-sles9-time.patch + crash-crosscrash-hint.diff + crash-missing-declarations.patch + +------------------------------------------------------------------- Old: ---- crash-6.0.3.tar.gz New: ---- crash-6.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crash.spec ++++++ --- /var/tmp/diff_new_pack.AUByvf/_old 2012-03-16 13:10:21.000000000 +0100 +++ /var/tmp/diff_new_pack.AUByvf/_new 2012-03-16 13:10:21.000000000 +0100 @@ -16,7 +16,7 @@ # -%define crash_version 6.0.3 +%define crash_version 6.0.4 %define whitepaper_version 2003 %define scripts_version 2008-02-08 %define gcore_version 2011-09-22 ++++++ crash-6.0.3.tar.gz -> crash-6.0.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/crash/crash-6.0.3.tar.gz /work/SRC/openSUSE:Factory/.crash.new/crash-6.0.4.tar.gz differ: char 5, line 1 ++++++ crash-crosscrash-hint.diff ++++++ --- /var/tmp/diff_new_pack.AUByvf/_old 2012-03-16 13:10:22.000000000 +0100 +++ /var/tmp/diff_new_pack.AUByvf/_new 2012-03-16 13:10:22.000000000 +0100 @@ -15,7 +15,7 @@ --- a/tools.c +++ b/tools.c -@@ -4680,7 +4680,12 @@ machine_type_mismatch(char *file, char * +@@ -4728,7 +4728,12 @@ machine_type_mismatch(char *file, char * fprintf(fp, " crash utility: %s\n", MACHINE_TYPE); fprintf(fp, " %s: %s%s%s\n\n", file, e_machine, alt ? " or " : "", alt ? alt : ""); ++++++ crash-make-emacs-default.diff ++++++ --- /var/tmp/diff_new_pack.AUByvf/_old 2012-03-16 13:10:22.000000000 +0100 +++ /var/tmp/diff_new_pack.AUByvf/_new 2012-03-16 13:10:22.000000000 +0100 @@ -4,7 +4,7 @@ --- a/main.c +++ b/main.c -@@ -966,12 +966,6 @@ setup_environment(int argc, char **argv) +@@ -1007,12 +1007,6 @@ setup_environment(int argc, char **argv) pc->flags |= READLINE; pc->editing_mode = "no_mode"; @@ -17,7 +17,7 @@ /* * Resolve $HOME .rc file first, then the one in the local directory. -@@ -1021,7 +1015,7 @@ setup_environment(int argc, char **argv) +@@ -1062,7 +1056,7 @@ setup_environment(int argc, char **argv) } if (STREQ(pc->editing_mode, "no_mode")) ++++++ crash-missing-declarations.patch ++++++ --- /var/tmp/diff_new_pack.AUByvf/_old 2012-03-16 13:10:22.000000000 +0100 +++ /var/tmp/diff_new_pack.AUByvf/_new 2012-03-16 13:10:22.000000000 +0100 @@ -9,7 +9,7 @@ --- a/gdb-7.3.1.patch +++ b/gdb-7.3.1.patch -@@ -1244,6 +1244,16 @@ +@@ -1253,6 +1253,16 @@ ./pex-djgpp.$(objext) ./pex-msdos.$(objext) \ ./pex-unix.$(objext) ./pex-win32.$(objext) \ ./putenv.$(objext) \ @@ -26,4 +26,3 @@ --- gdb-7.3.1/gdb/symtab.c.orig +++ gdb-7.3.1/gdb/symtab.c @@ -4951,10 +4951,17 @@ static void - ++++++ crash-sles9-time.patch ++++++ --- /var/tmp/diff_new_pack.AUByvf/_old 2012-03-16 13:10:22.000000000 +0100 +++ /var/tmp/diff_new_pack.AUByvf/_new 2012-03-16 13:10:22.000000000 +0100 @@ -16,7 +16,7 @@ --- a/defs.h +++ b/defs.h -@@ -591,6 +591,7 @@ struct kernel_table { +@@ -614,6 +614,7 @@ struct kernel_table { ulong p2m_missing; } pvops_xen; int highest_irq; @@ -24,7 +24,7 @@ #define IKCONFIG_AVAIL 0x1 /* kernel contains ikconfig data */ #define IKCONFIG_LOADED 0x2 /* ikconfig data is currently loaded */ int ikconfig_flags; -@@ -4993,6 +4994,13 @@ extern struct lkcd_environment *lkcd; +@@ -5215,6 +5216,13 @@ extern struct lkcd_environment *lkcd; #endif /* LKCD_COMMON */ @@ -40,7 +40,7 @@ */ --- a/kernel.c +++ b/kernel.c -@@ -211,6 +211,12 @@ kernel_init() +@@ -212,6 +212,12 @@ kernel_init() verify_version(); @@ -53,7 +53,7 @@ if (symbol_exists("__per_cpu_offset")) { if (LKCD_KERNTYPES()) i = get_cpus_possible(); -@@ -4089,7 +4095,7 @@ get_uptime(char *buf, ulonglong *j64p) +@@ -4205,7 +4211,7 @@ get_uptime(char *buf, ulonglong *j64p) if (symbol_exists("jiffies_64")) { get_symbol_data("jiffies_64", sizeof(ulonglong), &jiffies_64); @@ -62,7 +62,7 @@ wrapped = (jiffies_64 & 0xffffffff00000000ULL); if (wrapped) { wrapped -= 0x100000000ULL; -@@ -4623,6 +4629,7 @@ no_cpu_flags: +@@ -4739,6 +4745,7 @@ no_cpu_flags: fprintf(fp, " p2m_top: %lx\n", kt->pvops_xen.p2m_top); fprintf(fp, " p2m_top_entries: %d\n", kt->pvops_xen.p2m_top_entries); fprintf(fp, " p2m_missing: %lx\n", kt->pvops_xen.p2m_missing); @@ -72,7 +72,7 @@ /* --- a/task.c +++ b/task.c -@@ -3513,6 +3513,12 @@ start_time_timespec(void) +@@ -3547,6 +3547,12 @@ start_time_timespec(void) default: break; } @@ -85,7 +85,7 @@ tt->flags |= NO_TIMESPEC; -@@ -3544,6 +3550,11 @@ convert_start_time(ulonglong start_time, +@@ -3578,6 +3584,11 @@ convert_start_time(ulonglong start_time, ulong tmp1, tmp2; ulonglong wrapped; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit claws-mail for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package claws-mail for openSUSE:Factory checked in at 2012-03-16 13:10:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/claws-mail (Old) and /work/SRC/openSUSE:Factory/.claws-mail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "claws-mail", Maintainer is "nadvornik(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/claws-mail/claws-mail.changes 2012-02-21 12:16:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.claws-mail.new/claws-mail.changes 2012-03-16 13:10:10.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Mar 3 13:36:27 UTC 2012 - zaitor(a)opensuse.org + +- Change libSM-devel BuildRequires to pkgconfig(sm), to make it + build on 12.1 and older releases in GNOME:Apps. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ claws-mail.spec ++++++ --- /var/tmp/diff_new_pack.FCS23H/_old 2012-03-16 13:10:12.000000000 +0100 +++ /var/tmp/diff_new_pack.FCS23H/_new 2012-03-16 13:10:12.000000000 +0100 @@ -47,7 +47,6 @@ %else BuildRequires: gtk3-devel %endif -BuildRequires: libSM-devel BuildRequires: libetpan-devel >= 0.57 BuildRequires: libgcrypt-devel BuildRequires: openldap2-devel @@ -57,6 +56,7 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-1) >= 0.60 BuildRequires: pkgconfig(dbus-glib-1) >= 0.60 +BuildRequires: pkgconfig(sm) BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: pinentry-gtk2 Recommends: %{name}-lang -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit brp-extract-appdata for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package brp-extract-appdata for openSUSE:Factory checked in at 2012-03-16 13:10:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-extract-appdata (Old) and /work/SRC/openSUSE:Factory/.brp-extract-appdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brp-extract-appdata", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/brp-extract-appdata/brp-extract-appdata.changes 2012-03-11 20:03:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brp-extract-appdata.new/brp-extract-appdata.changes 2012-03-16 13:10:09.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 09:54:39 UTC 2012 - coolo(a)suse.com + +- fix XML structure of generated files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extract-icons.pl ++++++ --- /var/tmp/diff_new_pack.DeLrUT/_old 2012-03-16 13:10:10.000000000 +0100 +++ /var/tmp/diff_new_pack.DeLrUT/_new 2012-03-16 13:10:10.000000000 +0100 @@ -99,7 +99,7 @@ my $tmpdir = mkdtemp("/tmp/icons.XXXXXX"); my @napps; for my $app ( @$apps) { - my $id = shift @{$app->{id}}; + my $id = @{$app->{id}}[0]; next if defined $ids{$id->{content}}; $ids{$id->{content}} = 1; my $icon = extract_icon(@{$app->{icon}}[0], $tmpdir); @@ -107,6 +107,7 @@ push(@napps, $app); } +$xml->{version} = "1.0"; $xml->{application} = \@napps; $xml = XMLout($xml, RootName => "applications"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit brp-check-suse for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package brp-check-suse for openSUSE:Factory checked in at 2012-03-16 13:09:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-check-suse (Old) and /work/SRC/openSUSE:Factory/.brp-check-suse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brp-check-suse", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/brp-check-suse/brp-check-suse.changes 2012-03-12 20:11:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brp-check-suse.new/brp-check-suse.changes 2012-03-16 13:09:58.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 13 13:53:13 CET 2012 - ro(a)suse.de + +- integrate brp-check-xdg-menus.patch (and add to git) +- ignore empty elements in rpath + +------------------------------------------------------------------- Old: ---- brp-check-xdg-menus.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brp-check-suse.spec ++++++ --- /var/tmp/diff_new_pack.AhC9LG/_old 2012-03-16 13:09:59.000000000 +0100 +++ /var/tmp/diff_new_pack.AhC9LG/_new 2012-03-16 13:09:59.000000000 +0100 @@ -33,7 +33,6 @@ # make package # Source0: %{name}-%{version}.tar.bz2 -Patch0: brp-check-xdg-menus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides" %global __find_provides %provfind @@ -45,7 +44,6 @@ %prep %setup -q -%patch0 -p1 %ifnarch x86_64 s390x ppc64 rm brp-65-lib64-linux %endif ++++++ brp-check-suse-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/brp-35-rpath new/brp-check-suse-1.0/brp-35-rpath --- old/brp-check-suse-1.0/brp-35-rpath 2011-12-11 09:48:56.000000000 +0100 +++ new/brp-check-suse-1.0/brp-35-rpath 2012-03-13 13:52:11.000000000 +0100 @@ -24,6 +24,10 @@ while [ -n "$RPATH_VAL" ]; do RPATH_VAL_NXT=${RPATH_VAL%%:*} RPATH_VAL=${RPATH_VAL##$RPATH_VAL_NXT:} + test -z "$RPATH_VAL_NXT" && { + echo "WARNING: ignoring empty rpath \"\" in $FILE" + continue + } test -d "$RPATH_VAL_NXT" && RPATH_VAL_NXT=$(cd ${RPATH_VAL_NXT//#\/\//\/}; pwd -P) case ":$RPATH_VAL_NXT" in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/brp-desktop.data/xdg_menu new/brp-check-suse-1.0/brp-desktop.data/xdg_menu --- old/brp-check-suse-1.0/brp-desktop.data/xdg_menu 2011-12-11 09:48:56.000000000 +0100 +++ new/brp-check-suse-1.0/brp-desktop.data/xdg_menu 2012-03-13 13:52:11.000000000 +0100 @@ -38,44 +38,310 @@ my %Directory_entries; # These icons get accepted by default. Newer icon themes should provide them -# in any case +# in any case. List fetched from icon naming spec (last change from 2009), +# without animation and international icons. my %standardIconNames = ( +# Standard Action Icons + "address-book-new" => undef, + "application-exit" => undef, + "appointment-new" => undef, + "call-start" => undef, + "call-stop" => undef, + "contact-new" => undef, + "document-new" => undef, + "document-open" => undef, + "document-open-recent" => undef, + "document-page-setup" => undef, + "document-print" => undef, + "document-print-preview" => undef, + "document-properties" => undef, + "document-revert" => undef, + "document-save" => undef, + "document-save-as" => undef, + "document-send" => undef, + "edit-clear" => undef, + "edit-copy" => undef, + "edit-cut" => undef, + "edit-delete" => undef, + "edit-find" => undef, + "edit-find-replace" => undef, + "edit-paste" => undef, + "edit-redo" => undef, + "edit-select-all" => undef, + "edit-undo" => undef, + "folder-new" => undef, + "format-indent-less" => undef, + "format-indent-more" => undef, + "format-justify-center" => undef, + "format-justify-fill" => undef, + "format-justify-left" => undef, + "format-justify-right" => undef, + "format-text-direction-ltr" => undef, + "format-text-direction-rtl" => undef, + "format-text-bold" => undef, + "format-text-italic" => undef, + "format-text-underline" => undef, + "format-text-strikethrough" => undef, + "go-bottom" => undef, + "go-down" => undef, + "go-first" => undef, + "go-home" => undef, + "go-jump" => undef, + "go-last" => undef, + "go-next" => undef, + "go-previous" => undef, + "go-top" => undef, + "go-up" => undef, + "help-about" => undef, + "help-contents" => undef, + "help-faq" => undef, + "insert-image" => undef, + "insert-link" => undef, + "insert-object" => undef, + "insert-text" => undef, + "list-add" => undef, + "list-remove" => undef, + "mail-forward" => undef, + "mail-mark-important" => undef, + "mail-mark-junk" => undef, + "mail-mark-notjunk" => undef, + "mail-mark-read" => undef, + "mail-mark-unread" => undef, + "mail-message-new" => undef, + "mail-reply-all" => undef, + "mail-reply-sender" => undef, + "mail-send" => undef, + "mail-send-receive" => undef, + "media-eject" => undef, + "media-playback-pause" => undef, + "media-playback-start" => undef, + "media-playback-stop" => undef, + "media-record" => undef, + "media-seek-backward" => undef, + "media-seek-forward" => undef, + "media-skip-backward" => undef, + "media-skip-forward" => undef, + "object-flip-horizontal" => undef, + "object-flip-vertical" => undef, + "object-rotate-left" => undef, + "object-rotate-right" => undef, + "process-stop" => undef, + "system-lock-screen" => undef, + "system-log-out" => undef, + "system-run" => undef, + "system-search" => undef, + "system-reboot" => undef, + "system-shutdown" => undef, + "tools-check-spelling" => undef, + "view-fullscreen" => undef, + "view-refresh" => undef, + "view-restore" => undef, + "view-sort-ascending" => undef, + "view-sort-descending" => undef, + "window-close" => undef, + "window-new" => undef, + "zoom-fit-best" => undef, + "zoom-in" => undef, + "zoom-original" => undef, + "zoom-out" => undef, + # Standard Application Icons - "accessories-calculator" => undef, "accessories-character-map" => undef, - "accessories-dictionary" => undef, "accessories-text-editor" => undef, - "help-browser" => undef, "multimedia-volume-control" => undef, - "preferences-desktop-accessibility" => undef, - "preferences-desktop-font" => undef, - "preferences-desktop-keyboard" => undef, - "preferences-desktop-locale" => undef, - "preferences-desktop-multimedia" => undef, - "preferences-desktop-screensaver" => undef, - "preferences-desktop-theme" => undef, - "preferences-desktop-wallpaper" => undef, - "system-file-manager" => undef, - "system-software-update" => undef, - "utilities-system-monitor" => undef, - "utilities-terminal" => undef, + "accessories-calculator" => undef, + "accessories-character-map" => undef, + "accessories-dictionary" => undef, + "accessories-text-editor" => undef, + "help-browser" => undef, + "multimedia-volume-control" => undef, + "preferences-desktop-accessibility" => undef, + "preferences-desktop-font" => undef, + "preferences-desktop-keyboard" => undef, + "preferences-desktop-locale" => undef, + "preferences-desktop-multimedia" => undef, + "preferences-desktop-screensaver" => undef, + "preferences-desktop-theme" => undef, + "preferences-desktop-wallpaper" => undef, + "system-file-manager" => undef, + "system-software-install" => undef, + "system-software-update" => undef, + "utilities-system-monitor" => undef, + "utilities-terminal" => undef, + # Standard Category Icons - "applications-accessories" => undef, - "applications-development" => undef, - "applications-engineering" => undef, - "applications-games" => undef, - "applications-graphics" => undef, - "applications-internet" => undef, - "applications-multimedia" => undef, - "applications-office" => undef, - "applications-other" => undef, - "applications-science" => undef, - "applications-system" => undef, - "applications-utilities" => undef, - "preferences-desktop" => undef, - "preferences-desktop-peripherals" => undef, - "preferences-desktop-personal" => undef, - "preferences-other" => undef, - "preferences-system" => undef, - "preferences-system-network" => undef, - "system-help" => undef, + "applications-accessories" => undef, + "applications-development" => undef, + "applications-engineering" => undef, + "applications-games" => undef, + "applications-graphics" => undef, + "applications-internet" => undef, + "applications-multimedia" => undef, + "applications-office" => undef, + "applications-other" => undef, + "applications-science" => undef, + "applications-system" => undef, + "applications-utilities" => undef, + "preferences-desktop" => undef, + "preferences-desktop-peripherals" => undef, + "preferences-desktop-personal" => undef, + "preferences-other" => undef, + "preferences-system" => undef, + "preferences-system-network" => undef, + "system-help" => undef, + +# Standard Device Icons + "audio-card" => undef, + "audio-input-microphone" => undef, + "battery" => undef, + "camera-photo" => undef, + "camera-video" => undef, + "camera-web" => undef, + "computer" => undef, + "drive-harddisk" => undef, + "drive-optical" => undef, + "drive-removable-media" => undef, + "input-gaming" => undef, + "input-keyboard" => undef, + "input-mouse" => undef, + "input-tablet" => undef, + "media-flash" => undef, + "media-floppy" => undef, + "media-optical" => undef, + "media-tape" => undef, + "modem" => undef, + "multimedia-player" => undef, + "network-wired" => undef, + "network-wireless" => undef, + "pda" => undef, + "phone" => undef, + "printer" => undef, + "scanner" => undef, + "video-display" => undef, + +# Standard Emblem Icons + "emblem-default" => undef, + "emblem-documents" => undef, + "emblem-downloads" => undef, + "emblem-favorite" => undef, + "emblem-important" => undef, + "emblem-mail" => undef, + "emblem-photos" => undef, + "emblem-readonly" => undef, + "emblem-shared" => undef, + "emblem-symbolic-link" => undef, + "emblem-synchronized" => undef, + "emblem-system" => undef, + "emblem-unreadable" => undef, + +# Standard Emotion Icons + "face-angel" => undef, + "face-angry" => undef, + "face-cool" => undef, + "face-crying" => undef, + "face-devilish" => undef, + "face-embarrassed" => undef, + "face-kiss" => undef, + "face-laugh" => undef, + "face-monkey" => undef, + "face-plain" => undef, + "face-raspberry" => undef, + "face-sad" => undef, + "face-sick" => undef, + "face-smile" => undef, + "face-smile-big" => undef, + "face-smirk" => undef, + "face-surprise" => undef, + "face-tired" => undef, + "face-uncertain" => undef, + "face-wink" => undef, + "face-worried" => undef, + +# Standard MIME Type Icons + "application-x-executable" => undef, + "audio-x-generic" => undef, + "font-x-generic" => undef, + "image-x-generic" => undef, + "package-x-generic" => undef, + "text-html" => undef, + "text-x-generic" => undef, + "text-x-generic-template" => undef, + "text-x-script" => undef, + "video-x-generic" => undef, + "x-office-address-book" => undef, + "x-office-calendar" => undef, + "x-office-document" => undef, + "x-office-presentation" => undef, + "x-office-spreadsheet" => undef, + +# Standard Place Icons + "folder" => undef, + "folder-remote" => undef, + "network-server" => undef, + "network-workgroup" => undef, + "start-here" => undef, + "user-bookmarks" => undef, + "user-desktop" => undef, + "user-home" => undef, + "user-trash" => undef, + +# Standard Status Icons + "appointment-missed" => undef, + "appointment-soon" => undef, + "audio-volume-high" => undef, + "audio-volume-low" => undef, + "audio-volume-medium" => undef, + "audio-volume-muted" => undef, + "battery-caution" => undef, + "battery-low" => undef, + "dialog-error" => undef, + "dialog-information" => undef, + "dialog-password" => undef, + "dialog-question" => undef, + "dialog-warning" => undef, + "folder-drag-accept" => undef, + "folder-open" => undef, + "folder-visiting" => undef, + "image-loading" => undef, + "image-missing" => undef, + "mail-attachment" => undef, + "mail-unread" => undef, + "mail-read" => undef, + "mail-replied" => undef, + "mail-signed" => undef, + "mail-signed-verified" => undef, + "media-playlist-repeat" => undef, + "media-playlist-shuffle" => undef, + "network-error" => undef, + "network-idle" => undef, + "network-offline" => undef, + "network-receive" => undef, + "network-transmit" => undef, + "network-transmit-receive" => undef, + "printer-error" => undef, + "printer-printing" => undef, + "security-high" => undef, + "security-medium" => undef, + "security-low" => undef, + "software-update-available" => undef, + "software-update-urgent" => undef, + "sync-error" => undef, + "sync-synchronizing" => undef, + "task-due" => undef, + "task-past-due" => undef, + "user-available" => undef, + "user-away" => undef, + "user-idle" => undef, + "user-offline" => undef, + "user-trash-full" => undef, + "weather-clear" => undef, + "weather-clear-night" => undef, + "weather-few-clouds" => undef, + "weather-few-clouds-night" => undef, + "weather-fog" => undef, + "weather-overcast" => undef, + "weather-severe-alert" => undef, + "weather-showers" => undef, + "weather-showers-scattered" => undef, + "weather-snow" => undef, + "weather-storm" => undef, ); sub check_file ($) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit brasero for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package brasero for openSUSE:Factory checked in at 2012-03-16 13:09:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brasero (Old) and /work/SRC/openSUSE:Factory/.brasero.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brasero", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/brasero/brasero.changes 2012-02-21 12:15:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brasero.new/brasero.changes 2012-03-16 13:09:52.000000000 +0100 @@ -1,0 +2,26 @@ +Mon Mar 5 20:26:13 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + Correct CD cover dimensions (bgo#660918). + + Call gettext() where translated string array items are used. + + Add a fix for optical drive not selected by default. + + Update categories in brasero.desktop + + Use g_mkdtemp() rather than mkdtemp() (bgo#623890) + + Support build against tracker 0.13/0.14 + + Build fixes (including bgo#641650) + + Documentation improvements. + + Updated translations. +- Drop brasero-tracker-0.14.patch: fixed upstream +- Remove hack to change categories in brasero.desktop: fixed + upstream. +- Remove gnome-common BuildRequires and call to gnome-autogen.sh: + they were only needed for above patch. + +------------------------------------------------------------------- +Mon Mar 5 16:55:01 UTC 2012 - reddwarf(a)opensuse.org + +- Enable libburnia plugins: + + Add pkgconfig(lbburn-1) and pkgconfig(libisofs-1) BuildRequires + + Pass --enable-libburnia to configure + +------------------------------------------------------------------- Old: ---- brasero-3.2.0.tar.bz2 brasero-tracker-0.14.patch New: ---- brasero-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brasero.spec ++++++ --- /var/tmp/diff_new_pack.GqIKLE/_old 2012-03-16 13:09:53.000000000 +0100 +++ /var/tmp/diff_new_pack.GqIKLE/_new 2012-03-16 13:09:53.000000000 +0100 @@ -17,18 +17,14 @@ Name: brasero -Version: 3.2.0 +Version: 3.3.91 Release: 0 Summary: CD/DVD burning application for GNOME License: GPL-2.0+ Group: Productivity/Multimedia/CD/Record Url: http://gnome.org/projects/brasero -Source: http://download.gnome.org/sources/brasero/3.2/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM brasero-tracker-0.14.patch bgo#667852 vuntz(a)opensuse.org -- Support tracker 0.13/0.14 -Patch0: brasero-tracker-0.14.patch +Source: http://download.gnome.org/sources/brasero/3.3/%{name}-%{version}.tar.xz BuildRequires: fdupes -# needed for patch0 -BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -176,19 +172,17 @@ %prep %setup -q translation-update-upstream -%patch0 -p1 %build -# needed for patch0 -NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --disable-scrollkeeper \ --enable-search \ --enable-playlist \ --enable-nautilus \ - --enable-introspection -make %{?jobs:-j%jobs} V=1 + --enable-introspection \ + --enable-libburnia +make %{?_smp_flags} V=1 %install %makeinstall @@ -196,9 +190,7 @@ %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif find %{buildroot} -type f -name "*.la" -delete -print -# bnc#722215, bgo#661134: avoid brasero appearing twice in menus; build will fail when editing categories can be removed -grep -q "Categories=GNOME;AudioVideo;DiscBurning;Core;Utility;" %{buildroot}%{_datadir}/applications/%{name}.desktop -%suse_update_desktop_file -r %{name} GTK GNOME AudioVideo DiscBurning +%suse_update_desktop_file %{name} %suse_update_desktop_file brasero-nautilus %find_lang %{name} %{?no_lang_C} %fdupes $RPM_BUILD_ROOT -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluez-hcidump for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package bluez-hcidump for openSUSE:Factory checked in at 2012-03-16 13:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez-hcidump (Old) and /work/SRC/openSUSE:Factory/.bluez-hcidump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bluez-hcidump", Maintainer is "ACho(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bluez-hcidump/bluez-hcidump.changes 2011-12-30 08:45:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bluez-hcidump.new/bluez-hcidump.changes 2012-03-16 13:09:48.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 8 21:15:22 UTC 2012 - seife+obs(a)b1-systems.com + +- update to version 2.3: + - Fix issue with UUID-128 attribute decoding. + - Add support for OBEX over L2CAP decoding. + +------------------------------------------------------------------- Old: ---- bluez-hcidump-2.2.tar.bz2 New: ---- bluez-hcidump-2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-hcidump.spec ++++++ --- /var/tmp/diff_new_pack.ceileu/_old 2012-03-16 13:09:49.000000000 +0100 +++ /var/tmp/diff_new_pack.ceileu/_new 2012-03-16 13:09:49.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package bluez-hcidump # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2011 B1 Systems GmbH, Vohburg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011-2012 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: bluez-devel >= 4.70 BuildRequires: pkgconfig Url: http://www.bluez.org -Version: 2.2 +Version: 2.3 Release: 0 Summary: HCI Dumper for Debugging Bluetooth Connections License: GPL-2.0+ ++++++ bluez-hcidump-2.2.tar.bz2 -> bluez-hcidump-2.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/ChangeLog new/bluez-hcidump-2.3/ChangeLog --- old/bluez-hcidump-2.2/ChangeLog 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/ChangeLog 2012-02-29 19:23:20.000000000 +0100 @@ -1,3 +1,7 @@ +ver 2.3: + Fix issue with UUID-128 attribute decoding. + Add support for OBEX over L2CAP decoding. + ver 2.2: Fix issue with L2CAP CID matching. Add support for L2CAP extended window size decoding. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/Makefile.in new/bluez-hcidump-2.3/Makefile.in --- old/bluez-hcidump-2.2/Makefile.in 2011-12-22 01:19:24.000000000 +0100 +++ new/bluez-hcidump-2.3/Makefile.in 2012-02-29 19:23:33.000000000 +0100 @@ -41,7 +41,7 @@ ChangeLog INSTALL NEWS depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/config.h.in new/bluez-hcidump-2.3/config.h.in --- old/bluez-hcidump-2.2/config.h.in 2011-12-22 01:19:22.000000000 +0100 +++ new/bluez-hcidump-2.3/config.h.in 2012-02-29 19:23:31.000000000 +0100 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/configure new/bluez-hcidump-2.3/configure --- old/bluez-hcidump-2.2/configure 2011-12-22 01:19:25.000000000 +0100 +++ new/bluez-hcidump-2.3/configure 2012-02-29 19:23:34.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for bluez-hcidump 2.2. +# Generated by GNU Autoconf 2.63 for bluez-hcidump 2.3. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='bluez-hcidump' PACKAGE_TARNAME='bluez-hcidump' -PACKAGE_VERSION='2.2' -PACKAGE_STRING='bluez-hcidump 2.2' +PACKAGE_VERSION='2.3' +PACKAGE_STRING='bluez-hcidump 2.3' PACKAGE_BUGREPORT='' ac_default_prefix=/usr/local @@ -1253,7 +1253,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bluez-hcidump 2.2 to adapt to many kinds of systems. +\`configure' configures bluez-hcidump 2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bluez-hcidump 2.2:";; + short | recursive ) echo "Configuration of bluez-hcidump 2.3:";; esac cat <<\_ACEOF @@ -1410,7 +1410,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bluez-hcidump configure 2.2 +bluez-hcidump configure 2.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1424,7 +1424,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bluez-hcidump $as_me 2.2, which was +It was created by bluez-hcidump $as_me 2.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2274,7 +2274,7 @@ # Define the identity of the package. PACKAGE='bluez-hcidump' - VERSION='2.2' + VERSION='2.3' cat >>confdefs.h <<_ACEOF @@ -4084,7 +4084,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bluez-hcidump $as_me 2.2, which was +This file was extended by bluez-hcidump $as_me 2.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4147,7 +4147,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -bluez-hcidump config.status 2.2 +bluez-hcidump config.status 2.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/configure.ac new/bluez-hcidump-2.3/configure.ac --- old/bluez-hcidump-2.2/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/bluez-hcidump-2.3/configure.ac 2012-02-29 19:23:20.000000000 +0100 @@ -0,0 +1,36 @@ +AC_PREREQ(2.60) +AC_INIT(bluez-hcidump, 2.3) + +AM_INIT_AUTOMAKE([foreign subdir-objects]) +AM_CONFIG_HEADER(config.h) + +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +AM_MAINTAINER_MODE + +AC_PREFIX_DEFAULT(/usr/local) + +COMPILER_FLAGS + +AC_LANG_C + +AC_PROG_CC +AC_PROG_CC_PIE +AC_PROG_INSTALL + +AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], + [disable code optimization through compiler]), [ + if (test "${enableval}" = "no"); then + CFLAGS="$CFLAGS -O0" + fi +]) + +AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], + [enable compiling with debugging information]), [ + if (test "${enableval}" = "yes" && + test "${ac_cv_prog_cc_g}" = "yes"); then + CFLAGS="$CFLAGS -g" + fi +]) + +AC_OUTPUT(Makefile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/configure.in new/bluez-hcidump-2.3/configure.in --- old/bluez-hcidump-2.2/configure.in 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -AC_PREREQ(2.60) -AC_INIT(bluez-hcidump, 2.2) - -AM_INIT_AUTOMAKE([foreign subdir-objects]) -AM_CONFIG_HEADER(config.h) - -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -AM_MAINTAINER_MODE - -AC_PREFIX_DEFAULT(/usr/local) - -COMPILER_FLAGS - -AC_LANG_C - -AC_PROG_CC -AC_PROG_CC_PIE -AC_PROG_INSTALL - -AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], - [disable code optimization through compiler]), [ - if (test "${enableval}" = "no"); then - CFLAGS="$CFLAGS -O0" - fi -]) - -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], - [enable compiling with debugging information]), [ - if (test "${enableval}" = "yes" && - test "${ac_cv_prog_cc_g}" = "yes"); then - CFLAGS="$CFLAGS -g" - fi -]) - -AC_OUTPUT(Makefile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/lib/bluetooth.h new/bluez-hcidump-2.3/lib/bluetooth.h --- old/bluez-hcidump-2.2/lib/bluetooth.h 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/lib/bluetooth.h 2012-02-29 19:23:20.000000000 +0100 @@ -63,6 +63,7 @@ #define BT_SECURITY 4 struct bt_security { uint8_t level; + uint8_t key_size; }; #define BT_SECURITY_SDP 0 #define BT_SECURITY_LOW 1 @@ -76,6 +77,33 @@ #define BT_FLUSHABLE_OFF 0 #define BT_FLUSHABLE_ON 1 +#define BT_CHANNEL_POLICY 10 + +/* BR/EDR only (default policy) + * AMP controllers cannot be used. + * Channel move requests from the remote device are denied. + * If the L2CAP channel is currently using AMP, move the channel to BR/EDR. + */ +#define BT_CHANNEL_POLICY_BREDR_ONLY 0 + +/* BR/EDR Preferred + * Allow use of AMP controllers. + * If the L2CAP channel is currently on AMP, move it to BR/EDR. + * Channel move requests from the remote device are allowed. + */ +#define BT_CHANNEL_POLICY_BREDR_PREFERRED 1 + +/* AMP Preferred + * Allow use of AMP controllers + * If the L2CAP channel is currently on BR/EDR and AMP controller + * resources are available, initiate a channel move to AMP. + * Channel move requests from the remote device are allowed. + * If the L2CAP socket has not been connected yet, try to create + * and configure the channel directly on an AMP controller rather + * than BR/EDR. + */ +#define BT_CHANNEL_POLICY_AMP_PREFERRED 2 + /* Connection and socket states */ enum { BT_CONNECTED = 1, /* Equal to TCP_ESTABLISHED to make net code happy */ @@ -126,64 +154,64 @@ } while(0) #if __BYTE_ORDER == __LITTLE_ENDIAN -static inline uint64_t bt_get_le64(void *ptr) +static inline uint64_t bt_get_le64(const void *ptr) { - return bt_get_unaligned((uint64_t *) ptr); + return bt_get_unaligned((const uint64_t *) ptr); } -static inline uint64_t bt_get_be64(void *ptr) +static inline uint64_t bt_get_be64(const void *ptr) { - return bswap_64(bt_get_unaligned((uint64_t *) ptr)); + return bswap_64(bt_get_unaligned((const uint64_t *) ptr)); } -static inline uint32_t bt_get_le32(void *ptr) +static inline uint32_t bt_get_le32(const void *ptr) { - return bt_get_unaligned((uint32_t *) ptr); + return bt_get_unaligned((const uint32_t *) ptr); } -static inline uint32_t bt_get_be32(void *ptr) +static inline uint32_t bt_get_be32(const void *ptr) { - return bswap_32(bt_get_unaligned((uint32_t *) ptr)); + return bswap_32(bt_get_unaligned((const uint32_t *) ptr)); } -static inline uint16_t bt_get_le16(void *ptr) +static inline uint16_t bt_get_le16(const void *ptr) { - return bt_get_unaligned((uint16_t *) ptr); + return bt_get_unaligned((const uint16_t *) ptr); } -static inline uint16_t bt_get_be16(void *ptr) +static inline uint16_t bt_get_be16(const void *ptr) { - return bswap_16(bt_get_unaligned((uint16_t *) ptr)); + return bswap_16(bt_get_unaligned((const uint16_t *) ptr)); } #elif __BYTE_ORDER == __BIG_ENDIAN -static inline uint64_t bt_get_le64(void *ptr) +static inline uint64_t bt_get_le64(const void *ptr) { - return bswap_64(bt_get_unaligned((uint64_t *) ptr)); + return bswap_64(bt_get_unaligned((const uint64_t *) ptr)); } -static inline uint64_t bt_get_be64(void *ptr) +static inline uint64_t bt_get_be64(const void *ptr) { - return bt_get_unaligned((uint64_t *) ptr); + return bt_get_unaligned((const uint64_t *) ptr); } -static inline uint32_t bt_get_le32(void *ptr) +static inline uint32_t bt_get_le32(const void *ptr) { - return bswap_32(bt_get_unaligned((uint32_t *) ptr)); + return bswap_32(bt_get_unaligned((const uint32_t *) ptr)); } -static inline uint32_t bt_get_be32(void *ptr) +static inline uint32_t bt_get_be32(const void *ptr) { - return bt_get_unaligned((uint32_t *) ptr); + return bt_get_unaligned((const uint32_t *) ptr); } -static inline uint16_t bt_get_le16(void *ptr) +static inline uint16_t bt_get_le16(const void *ptr) { - return bswap_16(bt_get_unaligned((uint16_t *) ptr)); + return bswap_16(bt_get_unaligned((const uint16_t *) ptr)); } -static inline uint16_t bt_get_be16(void *ptr) +static inline uint16_t bt_get_be16(const void *ptr) { - return bt_get_unaligned((uint16_t *) ptr); + return bt_get_unaligned((const uint16_t *) ptr); } #else #error "Unknown byte order" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/lib/hci.c new/bluez-hcidump-2.3/lib/hci.c --- old/bluez-hcidump-2.2/lib/hci.c 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/lib/hci.c 2012-02-29 19:23:20.000000000 +0100 @@ -860,7 +860,7 @@ static int __other_bdaddr(int dd, int dev_id, long arg) { - struct hci_dev_info di = { dev_id: dev_id }; + struct hci_dev_info di = { .dev_id = dev_id }; if (ioctl(dd, HCIGETDEVINFO, (void *) &di)) return 0; @@ -873,7 +873,7 @@ static int __same_bdaddr(int dd, int dev_id, long arg) { - struct hci_dev_info di = { dev_id: dev_id }; + struct hci_dev_info di = { .dev_id = dev_id }; if (ioctl(dd, HCIGETDEVINFO, (void *) &di)) return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/lib/hci.h new/bluez-hcidump-2.3/lib/hci.h --- old/bluez-hcidump-2.2/lib/hci.h 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/lib/hci.h 2012-02-29 19:23:20.000000000 +0100 @@ -276,7 +276,9 @@ #define LMP_EXT_FEAT 0x80 /* Extended LMP features */ -#define LMP_HOST_LE 0x02 +#define LMP_HOST_SSP 0x01 +#define LMP_HOST_LE 0x02 +#define LMP_HOST_LE_BREDR 0x04 /* Link policies */ #define HCI_LP_RSWITCH 0x0001 @@ -1239,6 +1241,14 @@ } __attribute__ ((packed)) write_best_effort_flush_timeout_rp; #define WRITE_BEST_EFFORT_FLUSH_TIMEOUT_RP_SIZE 1 +#define OCF_READ_LE_HOST_SUPPORTED 0x006C +typedef struct { + uint8_t status; + uint8_t le; + uint8_t simul; +} __attribute__ ((packed)) read_le_host_supported_rp; +#define READ_LE_HOST_SUPPORTED_RP_SIZE 3 + #define OCF_WRITE_LE_HOST_SUPPORTED 0x006D typedef struct { uint8_t le; @@ -2270,6 +2280,7 @@ #define HCI_CHANNEL_RAW 0 #define HCI_CHANNEL_CONTROL 1 +#define HCI_CHANNEL_MONITOR 2 struct hci_filter { uint32_t type_mask; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/lib/l2cap.h new/bluez-hcidump-2.3/lib/l2cap.h --- old/bluez-hcidump-2.2/lib/l2cap.h 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/lib/l2cap.h 2012-02-29 19:23:20.000000000 +0100 @@ -5,6 +5,7 @@ * Copyright (C) 2000-2001 Qualcomm Incorporated * Copyright (C) 2002-2003 Maxim Krasnyansky <maxk(a)qualcomm.com> * Copyright (C) 2002-2010 Marcel Holtmann <marcel(a)holtmann.org> + * Copyright (c) 2012 Code Aurora Forum. All rights reserved. * * * This program is free software; you can redistribute it and/or modify @@ -82,6 +83,12 @@ #define L2CAP_ECHO_RSP 0x09 #define L2CAP_INFO_REQ 0x0a #define L2CAP_INFO_RSP 0x0b +#define L2CAP_CREATE_REQ 0x0c +#define L2CAP_CREATE_RSP 0x0d +#define L2CAP_MOVE_REQ 0x0e +#define L2CAP_MOVE_RSP 0x0f +#define L2CAP_MOVE_CFM 0x10 +#define L2CAP_MOVE_CFM_RSP 0x11 /* L2CAP extended feature mask */ #define L2CAP_FEAT_FLOWCTL 0x00000001 @@ -270,6 +277,44 @@ #define L2CAP_IR_SUCCESS 0x0000 #define L2CAP_IR_NOTSUPP 0x0001 +typedef struct { + uint16_t psm; + uint16_t scid; + uint8_t id; +} __attribute__ ((packed)) l2cap_create_req; +#define L2CAP_CREATE_REQ_SIZE 5 + +typedef struct { + uint16_t dcid; + uint16_t scid; + uint16_t result; + uint16_t status; +} __attribute__ ((packed)) l2cap_create_rsp; +#define L2CAP_CREATE_RSP_SIZE 8 + +typedef struct { + uint16_t icid; + uint8_t id; +} __attribute__ ((packed)) l2cap_move_req; +#define L2CAP_MOVE_REQ_SIZE 3 + +typedef struct { + uint16_t icid; + uint16_t result; +} __attribute__ ((packed)) l2cap_move_rsp; +#define L2CAP_MOVE_RSP_SIZE 4 + +typedef struct { + uint16_t icid; + uint16_t result; +} __attribute__ ((packed)) l2cap_move_cfm; +#define L2CAP_MOVE_CFM_SIZE 4 + +typedef struct { + uint16_t icid; +} __attribute__ ((packed)) l2cap_move_cfm_rsp; +#define L2CAP_MOVE_CFM_RSP_SIZE 2 + #ifdef __cplusplus } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/parser/att.c new/bluez-hcidump-2.3/parser/att.c --- old/bluez-hcidump-2.2/parser/att.c 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/parser/att.c 2012-02-29 19:23:20.000000000 +0100 @@ -292,6 +292,21 @@ printf("start 0x%4.4x, end 0x%4.4x\n", start, end); } +static void print_uuid128(struct frame *frm) +{ + uint8_t uuid[16]; + int i; + + for (i = 0; i < 16; i++) + uuid[15 - i] = get_u8(frm); + + for (i = 0; i < 16; i++) { + printf("%02x", uuid[i]); + if (i == 3 || i == 5 || i == 7 || i == 9) + printf("-"); + } +} + static void att_find_info_resp_dump(int level, struct frame *frm) { uint8_t fmt = get_u8(frm); @@ -313,15 +328,10 @@ while (frm->len > 0) { uint16_t handle = btohs(htons(get_u16(frm))); - int i; p_indent(level + 1, frm); printf("handle 0x%4.4x, uuid ", handle); - for (i = 0; i < 16; i++) { - printf("%02x", get_u8(frm)); - if (i == 3 || i == 5 || i == 7 || i == 9) - printf("-"); - } + print_uuid128(frm); printf("\n"); } } @@ -359,7 +369,6 @@ { uint16_t start = btohs(htons(get_u16(frm))); uint16_t end = btohs(htons(get_u16(frm))); - int i; p_indent(level, frm); printf("start 0x%4.4x, end 0x%4.4x\n", start, end); @@ -369,11 +378,7 @@ printf("type-uuid 0x%4.4x\n", btohs(htons(get_u16(frm)))); } else if (frm->len == 16) { printf("type-uuid "); - for (i = 0; i < 16; i++) { - printf("%02x", get_u8(frm)); - if (i == 3 || i == 5 || i == 7 || i == 9) - printf("-"); - } + print_uuid128(frm); printf("\n"); } else { printf("malformed uuid (expected 2 or 16 octets)\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/parser/l2cap.c new/bluez-hcidump-2.3/parser/l2cap.c --- old/bluez-hcidump-2.2/parser/l2cap.c 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/parser/l2cap.c 2012-02-29 19:23:20.000000000 +0100 @@ -1090,6 +1090,13 @@ raw_dump(level + 1, frm); break; + case SDP_UUID_OBEX: + if (!p_filter(FILT_OBEX)) + obex_dump(level, frm); + else + raw_dump(level + 1, frm); + break; + default: if (p_filter(FILT_L2CAP)) break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-hcidump-2.2/src/hcidump.c new/bluez-hcidump-2.3/src/hcidump.c --- old/bluez-hcidump-2.2/src/hcidump.c 2011-12-22 01:18:58.000000000 +0100 +++ new/bluez-hcidump-2.3/src/hcidump.c 2012-02-29 19:23:20.000000000 +0100 @@ -855,7 +855,7 @@ " -R, --raw Dump raw data\n" " -C, --cmtp=psm PSM for CMTP\n" " -H, --hcrp=psm PSM for HCRP\n" - " -O, --obex=channel Channel for OBEX\n" + " -O, --obex=port Channel/PSM for OBEX\n" " -P, --ppp=channel Channel for PPP\n" " -D, --pppdump=file Extract PPP traffic\n" " -A, --audio=file Extract SCO audio data\n" @@ -904,6 +904,7 @@ int defpsm = 0; int defcompid = DEFAULT_COMPID; int opt, pppdump_fd = -1, audio_fd = -1; + uint16_t obex_port; while ((opt=getopt_long(argc, argv, "i:l:p:m:w:r:d:taxXRC:H:O:P:D:A:YZ46hv", main_options, NULL)) != -1) { switch(opt) { @@ -970,7 +971,11 @@ break; case 'O': - set_proto(0, 0, atoi(optarg), SDP_UUID_OBEX); + obex_port = atoi(optarg); + if (obex_port > 31) + set_proto(0, obex_port, 0, SDP_UUID_OBEX); + else + set_proto(0, 0, obex_port, SDP_UUID_OBEX); break; case 'P': -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit baobab for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package baobab for openSUSE:Factory checked in at 2012-03-16 13:09:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baobab (Old) and /work/SRC/openSUSE:Factory/.baobab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "baobab", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/baobab/baobab.changes 2012-02-28 19:20:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.baobab.new/baobab.changes 2012-03-16 13:09:40.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 9 19:06:46 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.3: + + Misc bugfixes. + + Updated translations. + +------------------------------------------------------------------- Old: ---- baobab-3.3.2.tar.xz New: ---- baobab-3.3.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baobab.spec ++++++ --- /var/tmp/diff_new_pack.21w7Ll/_old 2012-03-16 13:09:41.000000000 +0100 +++ /var/tmp/diff_new_pack.21w7Ll/_new 2012-03-16 13:09:41.000000000 +0100 @@ -18,7 +18,7 @@ Name: baobab -Version: 3.3.2 +Version: 3.3.3 Release: 0 # FIXME: the %%{_datadir}/help/$locale/ files be found by %%find_lang Summary: Disk Usage Analyzer -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit banshee for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package banshee for openSUSE:Factory checked in at 2012-03-16 13:09:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/banshee (Old) and /work/SRC/openSUSE:Factory/.banshee.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "banshee", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/banshee/banshee.changes 2012-02-21 12:15:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.banshee.new/banshee.changes 2012-03-16 13:09:36.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 8 20:52:06 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 2.3.6: + + Allow primary sources to marked as temporary (bgo#548366). + + LibraryWatcher: avoid importing incomplete files (bgo#666981). + + Updated translations. + +------------------------------------------------------------------- Old: ---- banshee-2.3.5.tar.xz New: ---- banshee-2.3.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee.spec ++++++ --- /var/tmp/diff_new_pack.17kuVT/_old 2012-03-16 13:09:37.000000000 +0100 +++ /var/tmp/diff_new_pack.17kuVT/_new 2012-03-16 13:09:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: banshee -Version: 2.3.5 +Version: 2.3.6 Release: 0 #FIXME enable pkgconfig(mono-upnp) BuildRequires when mono-upnp enters Factory (sr#105529) Summary: A media playback and management application @@ -64,9 +64,9 @@ BuildRequires: pkgconfig(xrandr) >= 1.1.1 BuildRequires: pkgconfig(xxf86vm) >= 1.0.1 Requires: %{name}-core = %{version} +Provides: %{name}-1 = %{version} Provides: %{name}-client = %{version} Provides: %{name}-client-classic = %{version} -Provides: %{name}-1 = %{version} Obsoletes: %{name}-1 < %{version} # We merged client-classic in the main package Provides: %{name}-1-client-classic = %{version} @@ -166,8 +166,8 @@ %package backend-platform-gnome Summary: GNOME platform support for Banshee Group: Productivity/Multimedia/Sound/Players -Requires: %{name}-core = %{version} Requires: %{name}-backend-platform-unix = %{version} +Requires: %{name}-core = %{version} Provides: %{name}-1-backend-platform-gnome = %{version} Obsoletes: %{name}-1-backend-platform-gnome < %{version} @@ -279,9 +279,9 @@ # /usr/bin/muinshee is a symlink to /usr/bin/banshee (bnc#736777) Requires: %{name} = %{version} Requires: %{name}-core = %{version} +Provides: %{name}-1-client-muinshee = %{version} Provides: %{name}-client = %{version} Provides: %{name}-client-muinshee = %{version} -Provides: %{name}-1-client-muinshee = %{version} Obsoletes: %{name}-1-client-muinshee < %{version} %description -n muinshee -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit at-spi2-atk for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package at-spi2-atk for openSUSE:Factory checked in at 2012-03-16 13:09:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at-spi2-atk (Old) and /work/SRC/openSUSE:Factory/.at-spi2-atk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "at-spi2-atk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/at-spi2-atk/at-spi2-atk.changes 2012-02-28 19:20:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.at-spi2-atk.new/at-spi2-atk.changes 2012-03-16 13:09:34.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 6 08:31:37 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.3.91: + + Have GetIndexInParent() return a signed int, per the spec. + + Send a DoAction reply message before invoking atk (works around + atk_action_do_action potentially not returning right away for + gtk). + +------------------------------------------------------------------- Old: ---- at-spi2-atk-2.3.90.tar.xz New: ---- at-spi2-atk-2.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-atk.spec ++++++ --- /var/tmp/diff_new_pack.meJzkf/_old 2012-03-16 13:09:35.000000000 +0100 +++ /var/tmp/diff_new_pack.meJzkf/_new 2012-03-16 13:09:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: at-spi2-atk -Version: 2.3.90 +Version: 2.3.91 Release: 0 Summary: Assistive Technology Service Provider Interface - GTK+ module License: GPL-2.0+ @@ -47,8 +47,8 @@ Provides: %{name} = %{version} Obsoletes: %{name} < %{version} # The library that was shipped with at-spi2-atk was removed. -Obsoletes: libcspi0 <= 0.1.1 Obsoletes: libcspi-devel <= 0.1.1 +Obsoletes: libcspi0 <= 0.1.1 %description common AT-SPI is a general interface for applications to make use of the -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit atheme for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package atheme for openSUSE:Factory checked in at 2012-03-16 13:09:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atheme (Old) and /work/SRC/openSUSE:Factory/.atheme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "atheme", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/atheme/atheme.changes 2012-03-05 17:58:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.atheme.new/atheme.changes 2012-03-16 13:09:19.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 18 01:25:28 UTC 2012 - jengelh(a)medozas.de + +- Update to new upstream release 6.0.9 +* ircd/inspircd: Fix end-of-burst detection. +* ircd/ts6: Mark +S services as UF_IMMUNE. +* ircd/p10: Recognize umode +k as providing kick immunity. +* ircd/plexus: Fix real hostname showing up as vhost. +* backend/opensex: Cleanly handle no OpenSEX DB existing on startup + +------------------------------------------------------------------- Old: ---- atheme-services-6.0.8.tar.xz New: ---- atheme-services-6.0.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atheme.spec ++++++ --- /var/tmp/diff_new_pack.Z9nNS2/_old 2012-03-16 13:09:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Z9nNS2/_new 2012-03-16 13:09:20.000000000 +0100 @@ -16,7 +16,7 @@ # Name: atheme -Version: 6.0.8 +Version: 6.0.9 Release: 0 %define pkg_name atheme-services # @@ -34,7 +34,8 @@ # Url: http://www.atheme.net/ #Git-Clone: git://git.atheme.org/atheme -Source: http://distfiles.atheme.org/atheme-services-%{version}.tar.xz +#DL-URL: http://atheme.net/downloads/atheme-services-6.0.9.tar.bz2 +Source: %name-services-%version.tar.xz Source1: atheme.init Patch1: atheme-lockmodes.diff Patch2: atheme-config.diff -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at 2012-03-16 13:09:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old) and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2012-03-13 09:32:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2012-03-16 13:09:14.000000000 +0100 @@ -2 +2 @@ -Tue Mar 13 06:40:08 CET 2012 - autobuild(a)suse.de +Thu Mar 15 06:40:19 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-03-13 +- automated update on 2012-03-15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.e61h58/_old 2012-03-16 13:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.e61h58/_new 2012-03-16 13:09:16.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Summary: Ethercodes Data for arpwatch -Version: 2012.3.13 +Version: 2012.3.15 Release: 1 Source0: http://standards.ieee.org/regauth/oui/oui.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt ++++++ --- /var/tmp/diff_new_pack.e61h58/_old 2012-03-16 13:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.e61h58/_new 2012-03-16 13:09:16.000000000 +0100 @@ -63230,8 +63230,8 @@ Singapore 380118 SINGAPORE -00-27-04 (hex) Accelerated Concepts, LLC -002704 (base 16) Accelerated Concepts, LLC +00-27-04 (hex) Accelerated Concepts, Inc +002704 (base 16) Accelerated Concepts, Inc 4017 W Dr Martin Luther King Jr Blvd Tampa FL 33614 UNITED STATES @@ -65113,6 +65113,12 @@ Markdorf 88677 GERMANY +00-36-FE (hex) SuperVision +0036FE (base 16) SuperVision + po box 3472 + palos verdes CA 90274 + UNITED STATES + 00-37-6D (hex) Murata Manufacturing Co., Ltd. 00376D (base 16) Murata Manufacturing Co., Ltd. 1-10-1,Higashikotari @@ -74342,10 +74348,10 @@ WILMINGTON MA 01887 UNITED STATES -00-A0-96 (hex) MITUMI ELECTRIC CO., LTD. -00A096 (base 16) MITUMI ELECTRIC CO., LTD. - 8-8-2, KOKURYO-CHO - CHOFU-SHI TOKYO 182 +00-A0-96 (hex) MITSUMI ELECTRIC CO., LTD. +00A096 (base 16) MITSUMI ELECTRIC CO., LTD. + 2-11-2, Tsurumaki + Tama-shi Tokyo 206-8567 JAPAN 00-A0-97 (hex) JC INFORMATION SYSTEMS @@ -81775,11 +81781,11 @@ LAFAYETTE CA 94549 UNITED STATES -08-00-8A (hex) PERFORMANCE TECHNOLOGY -08008A (base 16) PERFORMANCE TECHNOLOGY - 801 LINCOLN CENTER - 7800 1H10 WEST - SAN ANTONIO TX 78230 +08-00-8A (hex) PerfTech, Inc. +08008A (base 16) PerfTech, Inc. + 613 NW Loop 410 + Suite 520 + SAN ANTONIO TX 78216 UNITED STATES 08-00-8B (hex) PYRAMID TECHNOLOGY CORP. @@ -81819,6 +81825,12 @@ MARINA DEL REY CA 90292-6695 UNITED STATES +08-0C-C9 (hex) Mission Technology Group, dba Magma +080CC9 (base 16) Mission Technology Group, dba Magma + 9918 Via Pasar + San Diego CA 92126 + UNITED STATES + 08-0D-84 (hex) GECO, Inc. 080D84 (base 16) GECO, Inc. 1754 N. 48th St. @@ -82298,6 +82310,13 @@ JAIPUR RAJASTHAN 302022 INDIA +0C-B4-EF (hex) Digience Co.,Ltd. +0CB4EF (base 16) Digience Co.,Ltd. + 204 Building for Growth, Gumi Electronics&Information Technology Research Institute, 17 Cheomdangieop-1ro, + Sandong-myeon, Gumi-si, + Gumi Gyeongbuk + KOREA, REPUBLIC OF + 0C-BF-15 (hex) Genetec 0CBF15 (base 16) Genetec 2280 boul Alfred-Nobel @@ -86007,6 +86026,13 @@ Hangzhou Zhejiang 310023 CHINA +3C-97-0E (hex) Wistron InfoComm(Kunshan)Co.,Ltd. +3C970E (base 16) Wistron InfoComm(Kunshan)Co.,Ltd. + 168# First Avence, + Kunshan Export Processing Zone + Kunshan JiangSu 215300 + CHINA + 3C-98-BF (hex) Quest Controls, Inc. 3C98BF (base 16) Quest Controls, Inc. 208 9th Street Dr. West @@ -86895,6 +86921,12 @@ Chester CT 06412 UNITED STATES +44-D1-5E (hex) Shanghai Kingto Information Technology Ltd +44D15E (base 16) Shanghai Kingto Information Technology Ltd + No.738 Guangji RD.3F shanghai.china + shanghai 200434 + CHINA + 44-D2-CA (hex) Anvia TV Oy 44D2CA (base 16) Anvia TV Oy PO Box 29 @@ -87911,6 +87943,12 @@ Tokyo 141-0001 JAPAN +54-5E-BD (hex) NL Technologies +545EBD (base 16) NL Technologies + 33 Laird Drive + Toronto ON M4G3S8 + CANADA + 54-5F-A9 (hex) Teracom Limited 545FA9 (base 16) Teracom Limited B-84, Sector - 60, @@ -88825,6 +88863,12 @@ Wilmington MA 01887 UNITED STATES +60-89-B1 (hex) Key Digital Systems +6089B1 (base 16) Key Digital Systems + 521 E 3rd Street + Mount Vernon NY 10553 + UNITED STATES + 60-89-B7 (hex) KAEL M�HENDISLIK ELEKTRONIK TICARET SANAYI Limited �irketi 6089B7 (base 16) KAEL M�HENDISLIK ELEKTRONIK TICARET SANAYI Limited �irketi Atat�rk Mah. 78 sokak ,No:10, B�y�kalan Mevkii, @@ -88995,6 +89039,12 @@ Bruz 35170 FRANCE +64-0E-94 (hex) Pluribus Networks, Inc. +640E94 (base 16) Pluribus Networks, Inc. + 1808 Embarcadero Rd Suite B + Palo Alto CA 94303 + UNITED STATES + 64-0F-28 (hex) 2wire 640F28 (base 16) 2wire 1764 Automation Parkway @@ -90029,6 +90079,12 @@ Oulu Ou 90230 FINLAND +6C-E9-83 (hex) Gastron Co., LTD. +6CE983 (base 16) Gastron Co., LTD. + #75-10, Palgok2-dong, Sangnok-gu, + Ansan-city Kyunggi-do 426-190 + KOREA, REPUBLIC OF + 6C-F0-49 (hex) GIGA-BYTE TECHNOLOGY CO.,LTD. 6CF049 (base 16) GIGA-BYTE TECHNOLOGY CO.,LTD. No.215,Nan-Ping Road, @@ -94407,6 +94463,12 @@ Oulu 90230 FINLAND +A0-F4-50 (hex) HTC Corporation +A0F450 (base 16) HTC Corporation + No. 23, Xinghua Rd., Taoyuan City + Taoyuan County Taiwan 330 + TAIWAN, REPUBLIC OF CHINA + A4-01-30 (hex) ABIsystems Co., LTD A40130 (base 16) ABIsystems Co., LTD 308 ACE Techno Tower8 191-7 Guro-dong @@ -97606,6 +97668,12 @@ Dachau Bavaria 85221 GERMANY +C8-BB-D3 (hex) Embrane +C8BBD3 (base 16) Embrane + 2350 Mission College Blvd., Ste 703 + Santa Clara CA 95054 + UNITED STATES + C8-BC-C8 (hex) Apple, Inc. C8BCC8 (base 16) Apple, Inc. 1 Infinite Loop @@ -100245,6 +100313,12 @@ Gothenburg 417 55 SWEDEN +E8-99-C4 (hex) HTC Corporation +E899C4 (base 16) HTC Corporation + No. 23, Xinghua Rd., Taoyuan City + Taoyuan County Taiwan 330 + TAIWAN, REPUBLIC OF CHINA + E8-9A-8F (hex) Quanta Computer Inc. E89A8F (base 16) Quanta Computer Inc. 211, Wen Hwa 2nd Rd.,Kuei Shan, Tao Yuan @@ -101074,6 +101148,13 @@ Cupertino CA 95014 UNITED STATES +F0-FD-A0 (hex) Acurix Networks LP +F0FDA0 (base 16) Acurix Networks LP + PO Box 3838 + Shortland St + Auckland AKL 1021 + NEW ZEALAND + F4-03-21 (hex) BeNeXt B.V. F40321 (base 16) BeNeXt B.V. Ter Gouwstraat 3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit anjuta for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package anjuta for openSUSE:Factory checked in at 2012-03-16 13:09:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/anjuta (Old) and /work/SRC/openSUSE:Factory/.anjuta.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "anjuta", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/anjuta/anjuta.changes 2012-02-28 19:20:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.anjuta.new/anjuta.changes 2012-03-16 13:09:03.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Mar 5 21:53:50 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + Automatically add a callback when user double-clicks a signal + in the glade signal editor (bgo#670149). + + Documentation improvements. + + Several other code changes. + + Bugs fixed: bgo#627089, bgo#662955, bgo#670483, bgo#670537, + bgo#670656, bgo#670789, bgo#670830. + + Updated translations. +- No longer delete generated .c files: they are no longer part of + the tarballs. + +------------------------------------------------------------------- Old: ---- anjuta-3.3.90.tar.xz New: ---- anjuta-3.3.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta.spec ++++++ --- /var/tmp/diff_new_pack.Cv8Z7S/_old 2012-03-16 13:09:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Cv8Z7S/_new 2012-03-16 13:09:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: anjuta -Version: 3.3.90 +Version: 3.3.91 Release: 0 Summary: Versatile Integrated Development Environment for GNOME License: GPL-2.0+ @@ -44,7 +44,6 @@ BuildRequires: subversion-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -# Needed because we drop some generated .c files, see %%prep BuildRequires: vala %ifnarch ia64 s390 s390x BuildRequires: valgrind-devel @@ -152,9 +151,6 @@ %lang_package %prep %setup -q -# Remove 'pre-built' .c files built with 'older' vala versions, see bgo#670537 -rm plugins/language-support-vala/{locator,plugin,provider,report}.c -rm plugins/symbol-db/anjuta-tags/ctags-visitor.c translation-update-upstream %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit analyzeMFT for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package analyzeMFT for openSUSE:Factory checked in at 2012-03-16 13:08:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/analyzeMFT (Old) and /work/SRC/openSUSE:Factory/.analyzeMFT.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "analyzeMFT", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.analyzeMFT.new/analyzeMFT.changes 2012-03-16 13:08:57.000000000 +0100 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Sat Feb 18 23:12:46 UTC 2012 - Greg.Freemyer(a)gmail.com + +- initial package submission + + A Python tool to deconstruct the Windows NTFS $MFT file + New: ---- analyzeMFT-v1.7.py.tar.gz analyzeMFT.changes analyzeMFT.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ analyzeMFT.spec ++++++ # # spec file for package analyzeMFT # # Copyright (c) 2011 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/ # Name: analyzeMFT Version: 1.7 Release: 0 License: CPL-1.0 Summary: A Python tool to deconstruct the Windows NTFS $MFT file Url: http://code.google.com/p/opensourceforensics/wiki/analyzeMFT Group: Development/Libraries/Python #Source: http://opensourceforensics.googlecode.com/files/analyzeMFT-v1.7.py.tar.gz Source: analyzeMFT-v1.7.py.tar.gz BuildArch: noarch BuildRequires: python-devel Requires: python Requires: python-tk BuildRoot: %{_tmppath}/%{name}-%{version}-build %description analyzeMFT.py is designed to fully parse the MFT file from an NTFS filesystem and present the results as accurately as possible in a format that allows further analysis with other tools. At present, it parses the attributes from a $MFT file to produce the following output: Record Number Good - if the entry is valid Active - if the entry is active Record type - the type of record Record Sequence - the sequence number for the record Parent Folder Record Number Parent Folder Sequence Number For the standard information attribute: Creation date Modification date Access date Entry date For up to four file name records: File name Creation date Modification date Access date Entry date Object ID Birth Volume ID Birth Object ID Birth Domain ID And flags to show if each of the following attributes is present: Standard Information, Attribute List, Filename, Object ID, Volume Name, Volume Info, Data, Index Root, Index Allocation, Bitmap, Reparse Point, EA Information, EA, Property Set, Logged Utility Stream Notes/Log - Field used to log any significant events or observations relating to this record std-fn-shift - Populated if anomaly detection is turned on. Y/N. Y indicates that the FN create date is later than the STD create date. usec-zero - Populated if anomaly detection is turned on. Y/N. Y indicates that the STD create date's microsecond value is zero. For each entry in the MFT a record is written to an output file in CSV format. Major contributions from Matt Sabourin. %prep %setup -q %build %install install -Dpm 0755 %{name}-v%{version}.py %{buildroot}%{_bindir}/%{name} %files %defattr(-,root,root) %doc api.txt README %{_bindir}/%{name} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit almanah for openSUSE:Factory
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package almanah for openSUSE:Factory checked in at 2012-03-16 13:08:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/almanah (Old) and /work/SRC/openSUSE:Factory/.almanah.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "almanah", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/almanah/almanah.changes 2012-01-17 16:03:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.almanah.new/almanah.changes 2012-03-16 13:08:49.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Mar 3 17:15:10 UTC 2012 - dimstar(a)opensuse.org + +- Add X-SuSE-DesktopUtility to the categories of almanah in order + to fix the build. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ almanah.spec ++++++ --- /var/tmp/diff_new_pack.L0i8ht/_old 2012-03-16 13:08:50.000000000 +0100 +++ /var/tmp/diff_new_pack.L0i8ht/_new 2012-03-16 13:08:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package almanah # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,14 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: almanah Version: 0.8.0 +Release: 0 # FIXME: on update, check if gtkspell support has moved to GTK+ 3 -Release: 1 -License: GPL-3.0+ Summary: GTK+ application to allow you to keep a diary of your life -Url: https://live.gnome.org/Almanah_Diary +License: GPL-3.0+ Group: Productivity/Office/Other +Url: https://live.gnome.org/Almanah_Diary Source: http://ftp.acc.umu.se/pub/gnome/sources/almanah/0.8/%{name}-%{version}.tar.… # PATCH-FIX-UPSTREAM almanah-largefile.patch bgo#666801 vuntz(a)opensuse.org -- Fix build because of missing check for largefile support Patch0: almanah-largefile.patch @@ -36,10 +37,10 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libecal-1.2) BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libedataserverui-3.0) -BuildRequires: pkgconfig(gtk+-3.0) Requires: evolution-data-server Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,7 +65,7 @@ %install %make_install -%suse_update_desktop_file %{name} +%suse_update_desktop_file %{name} X-SuSE-DesktopUtility %find_lang %{name} %{?no_lang_C} %post -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit poppler for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 16 Mar '12

16 Mar '12

Hello community, here is the log from the commit of package poppler for openSUSE:12.1:Update:Test checked in at 2012-03-16 12:43:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/poppler (Old) and /work/SRC/openSUSE:12.1:Update:Test/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poppler", Maintainer is "BiLi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/poppler/poppler-qt.changes 2012-03-16 12:43:12.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.poppler.new/poppler-qt.changes 2012-03-16 12:43:13.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 08:26:13 UTC 2012 - vuntz(a)opensuse.org + +- Add poppler-broken-hints-table.patch: fix wrong page order in + some PDF files (bnc#748257, fdo#46459). + +------------------------------------------------------------------- poppler.changes: same change New: ---- poppler-broken-hints-table.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.tN2YnZ/_old 2012-03-16 12:43:13.000000000 +0100 +++ /var/tmp/diff_new_pack.tN2YnZ/_new 2012-03-16 12:43:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package poppler-qt # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -21,7 +21,7 @@ Name: poppler-qt %define _name poppler Version: 0.18.0 -Release: 1 +Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 %define poppler_soname 18 @@ -30,12 +30,14 @@ %define poppler_qt4_soname 3 %define poppler_api 0.18 Url: http://poppler.freedesktop.org/ -Group: System/Libraries -License: GPLv2+ Summary: PDF Rendering Library +License: GPL-2.0+ +Group: System/Libraries Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.gz -BuildRequires: gobject-introspection-devel +# PATCH-FIX-UPSTREAM poppler-broken-hints-table.patch bnc#748257 fdo#46459 vuntz(a)opensuse.org -- Fix wrong page order in some PDF files +Patch0: poppler-broken-hints-table.patch BuildRequires: gcc-c++ +BuildRequires: gobject-introspection-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel %if %build_qt @@ -57,9 +59,9 @@ %package -n libpoppler%{poppler_soname} -License: GPLv2 -Group: System/Libraries Summary: PDF Rendering Library +License: GPL-2.0 +Group: System/Libraries # Last appeared in OpenSUSE 10.3: Provides: poppler = %{version} Obsoletes: poppler < %{version} @@ -70,18 +72,18 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-cpp%{poppler_cpp_soname} -License: GPLv2 -Group: System/Libraries Summary: PDF Rendering Library +License: GPL-2.0 +Group: System/Libraries %description -n libpoppler-cpp%{poppler_cpp_soname} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-glib%{poppler_glib_soname} -License: GPLv2+ -Group: System/Libraries Summary: PDF Rendering Library - GLib Wrapper +License: GPL-2.0+ +Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-glib = %{version} @@ -94,9 +96,9 @@ %if %build_qt %package -n libpoppler-qt4-%{poppler_qt4_soname} -License: GPLv2+ -Group: System/Libraries Summary: PDF Rendering Library - Qt4 Wrapper +License: GPL-2.0+ +Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-qt4 = %{version} @@ -108,9 +110,9 @@ %endif %package tools -License: GPLv2 -Group: Productivity/Publishing/PDF Summary: PDF Rendering Library Tools +License: GPL-2.0 +Group: Productivity/Publishing/PDF Requires: libpoppler%{poppler_soname} >= %{version} # last version in openSUSE 11.1/SLE11 Provides: xpdf-tools = 3.02 @@ -122,9 +124,9 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-devel -License: GPLv2 -Group: Development/Libraries/C and C++ Summary: PDF rendering library +License: GPL-2.0 +Group: Development/Libraries/C and C++ Requires: libpoppler%{poppler_soname} = %{version} Requires: libstdc++-devel # Last appeared in OpenSUSE 10.3: @@ -136,9 +138,9 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-glib-devel -License: GPLv2 -Group: Development/Libraries/C and C++ Summary: PDF rendering library - GLib Wrapper +License: GPL-2.0 +Group: Development/Libraries/C and C++ Requires: libpoppler-glib%{poppler_glib_soname} = %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-devel:%{_libdir}/libpoppler-glib.so @@ -156,9 +158,9 @@ %if %build_qt %package -n libpoppler-qt4-devel -License: GPLv2+ -Group: Development/Libraries/C and C++ Summary: PDF rendering library - Qt4 Wrapper +License: GPL-2.0+ +Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version} Requires: libqt4-devel @@ -172,6 +174,7 @@ %prep %setup -q -n poppler-%{version} +%patch0 -p1 %build %configure\ ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.tN2YnZ/_old 2012-03-16 12:43:13.000000000 +0100 +++ /var/tmp/diff_new_pack.tN2YnZ/_new 2012-03-16 12:43:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package poppler # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -21,7 +21,7 @@ Name: poppler %define _name poppler Version: 0.18.0 -Release: 1 +Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 %define poppler_soname 18 @@ -30,12 +30,14 @@ %define poppler_qt4_soname 3 %define poppler_api 0.18 Url: http://poppler.freedesktop.org/ -Group: System/Libraries -License: GPLv2+ Summary: PDF Rendering Library +License: GPL-2.0+ +Group: System/Libraries Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.gz -BuildRequires: gobject-introspection-devel +# PATCH-FIX-UPSTREAM poppler-broken-hints-table.patch bnc#748257 fdo#46459 vuntz(a)opensuse.org -- Fix wrong page order in some PDF files +Patch0: poppler-broken-hints-table.patch BuildRequires: gcc-c++ +BuildRequires: gobject-introspection-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel %if %build_qt @@ -57,9 +59,9 @@ %package -n libpoppler%{poppler_soname} -License: GPLv2 -Group: System/Libraries Summary: PDF Rendering Library +License: GPL-2.0 +Group: System/Libraries # Last appeared in OpenSUSE 10.3: Provides: poppler = %{version} Obsoletes: poppler < %{version} @@ -70,18 +72,18 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-cpp%{poppler_cpp_soname} -License: GPLv2 -Group: System/Libraries Summary: PDF Rendering Library +License: GPL-2.0 +Group: System/Libraries %description -n libpoppler-cpp%{poppler_cpp_soname} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-glib%{poppler_glib_soname} -License: GPLv2+ -Group: System/Libraries Summary: PDF Rendering Library - GLib Wrapper +License: GPL-2.0+ +Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-glib = %{version} @@ -94,9 +96,9 @@ %if %build_qt %package -n libpoppler-qt4-%{poppler_qt4_soname} -License: GPLv2+ -Group: System/Libraries Summary: PDF Rendering Library - Qt4 Wrapper +License: GPL-2.0+ +Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-qt4 = %{version} @@ -108,9 +110,9 @@ %endif %package tools -License: GPLv2 -Group: Productivity/Publishing/PDF Summary: PDF Rendering Library Tools +License: GPL-2.0 +Group: Productivity/Publishing/PDF Requires: libpoppler%{poppler_soname} >= %{version} # last version in openSUSE 11.1/SLE11 Provides: xpdf-tools = 3.02 @@ -122,9 +124,9 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-devel -License: GPLv2 -Group: Development/Libraries/C and C++ Summary: PDF rendering library +License: GPL-2.0 +Group: Development/Libraries/C and C++ Requires: libpoppler%{poppler_soname} = %{version} Requires: libstdc++-devel # Last appeared in OpenSUSE 10.3: @@ -136,9 +138,9 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-glib-devel -License: GPLv2 -Group: Development/Libraries/C and C++ Summary: PDF rendering library - GLib Wrapper +License: GPL-2.0 +Group: Development/Libraries/C and C++ Requires: libpoppler-glib%{poppler_glib_soname} = %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-devel:%{_libdir}/libpoppler-glib.so @@ -156,9 +158,9 @@ %if %build_qt %package -n libpoppler-qt4-devel -License: GPLv2+ -Group: Development/Libraries/C and C++ Summary: PDF rendering library - Qt4 Wrapper +License: GPL-2.0+ +Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version} Requires: libqt4-devel @@ -172,6 +174,7 @@ %prep %setup -q -n poppler-%{version} +%patch0 -p1 %build %configure\ ++++++ poppler-broken-hints-table.patch ++++++ >From c9780f867ee62c388483829c4e16804045567c87 Mon Sep 17 00:00:00 2001 From: Hib Eris <hib(a)hiberis.nl> Date: Tue, 28 Feb 2012 11:38:07 +0100 Subject: [PATCH] [Backported to 0.18.4] Only use Hints table when there are no parse errors Fixes bug #46459. Backported to 0.18.4 from: 81fde76643e6cd9114ae92d22704fbc405a02974 --- poppler/Hints.cc | 5 ++++- poppler/Parser.cc | 29 +++++++++++++++++++++++------ poppler/Parser.h | 6 ++++-- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/poppler/Hints.cc b/poppler/Hints.cc index 4f0c959..e76ffca 100644 --- a/poppler/Hints.cc +++ b/poppler/Hints.cc @@ -60,6 +60,8 @@ Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, Security nPages = 0; } + memset(pageLength, 0, nPages * sizeof(Guint)); + memset(pageOffset, 0, nPages * sizeof(Guint)); memset(numSharedObject, 0, nPages * sizeof(Guint)); memset(pageObjectNum, 0, nPages * sizeof(int)); @@ -131,6 +133,7 @@ void Hints::readTables(BaseStream *str, Linearization *linearization, XRef *xref parser = new Parser(xref, new Lexer(xref, memStream), gTrue); int num, gen; + std::set<int> fetchOriginatorNums; if (parser->getObj(&obj)->isInt() && (num = obj.getInt(), obj.free(), parser->getObj(&obj)->isInt()) && (gen = obj.getInt(), obj.free(), parser->getObj(&obj)->isCmd("obj")) && @@ -138,7 +141,7 @@ void Hints::readTables(BaseStream *str, Linearization *linearization, XRef *xref secHdlr ? secHdlr->getFileKey() : (Guchar *)NULL, secHdlr ? secHdlr->getEncAlgorithm() : cryptRC4, secHdlr ? secHdlr->getFileKeyLength() : 0, - num, gen)->isStream())) { + num, gen, &fetchOriginatorNums, gTrue)->isStream())) { Stream *hintsStream = obj.getStream(); Dict *hintsDict = obj.streamGetDict(); diff --git a/poppler/Parser.cc b/poppler/Parser.cc index 34a8286..8bf820b 100644 --- a/poppler/Parser.cc +++ b/poppler/Parser.cc @@ -66,7 +66,8 @@ Object *Parser::getObj(Object *obj, std::set<int> *fetchOriginatorNums) Object *Parser::getObj(Object *obj, Guchar *fileKey, CryptAlgorithm encAlgorithm, int keyLength, - int objNum, int objGen, std::set<int> *fetchOriginatorNums) { + int objNum, int objGen, std::set<int> *fetchOriginatorNums, + GBool strict) { char *key; Stream *str; Object obj2; @@ -91,8 +92,10 @@ Object *Parser::getObj(Object *obj, Guchar *fileKey, while (!buf1.isCmd("]") && !buf1.isEOF()) obj->arrayAdd(getObj(&obj2, fileKey, encAlgorithm, keyLength, objNum, objGen, fetchOriginatorNums)); - if (buf1.isEOF()) + if (buf1.isEOF()) { error(getPos(), "End of file inside array"); + if (strict) goto err; + } shift(); // dictionary or stream @@ -102,6 +105,7 @@ Object *Parser::getObj(Object *obj, Guchar *fileKey, while (!buf1.isCmd(">>") && !buf1.isEOF()) { if (!buf1.isName()) { error(getPos(), "Dictionary key must be a name object"); + if (strict) goto err; shift(); } else { // buf1 might go away in shift(), so construct the key @@ -109,18 +113,22 @@ Object *Parser::getObj(Object *obj, Guchar *fileKey, shift(); if (buf1.isEOF() || buf1.isError()) { gfree(key); + if (strict && buf1.isError()) goto err; break; } obj->dictAdd(key, getObj(&obj2, fileKey, encAlgorithm, keyLength, objNum, objGen, fetchOriginatorNums)); } } - if (buf1.isEOF()) + if (buf1.isEOF()) { error(getPos(), "End of file inside dictionary"); + if (strict) goto err; + } // stream objects are not allowed inside content streams or // object streams if (allowStreams && buf2.isCmd("stream")) { if ((str = makeStream(obj, fileKey, encAlgorithm, keyLength, - objNum, objGen, fetchOriginatorNums))) { + objNum, objGen, fetchOriginatorNums, + strict))) { obj->initStream(str); } else { obj->free(); @@ -170,11 +178,18 @@ Object *Parser::getObj(Object *obj, Guchar *fileKey, } return obj; + +err: + obj->free(); + obj->initError(); + return obj; + } Stream *Parser::makeStream(Object *dict, Guchar *fileKey, CryptAlgorithm encAlgorithm, int keyLength, - int objNum, int objGen, std::set<int> *fetchOriginatorNums) { + int objNum, int objGen, std::set<int> *fetchOriginatorNums, + GBool strict) { Object obj; BaseStream *baseStr; Stream *str; @@ -192,6 +207,7 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey, } else { error(getPos(), "Bad 'Length' attribute in stream"); obj.free(); + if (strict) return NULL; length = 0; } @@ -221,7 +237,8 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey, if (buf1.isCmd("endstream")) { shift(); } else { - error(getPos(), "Missing 'endstream'"); + error(getPos(), "Missing 'endstream' or incorrect stream length"); + if (strict) return NULL; if (xref) { // shift until we find the proper endstream or we change to another object or reach eof while (!buf1.isCmd("endstream") && xref->getNumEntry(lexer->getPos()) == objNum && !buf1.isEOF()) { diff --git a/poppler/Parser.h b/poppler/Parser.h index 3d8a831..4fb3330 100644 --- a/poppler/Parser.h +++ b/poppler/Parser.h @@ -49,7 +49,8 @@ public: Object *getObj(Object *obj, Guchar *fileKey, CryptAlgorithm encAlgorithm, int keyLength, - int objNum, int objGen, std::set<int> *fetchOriginatorNums); + int objNum, int objGen, std::set<int> *fetchOriginatorNums, + GBool strict = gFalse); Object *getObj(Object *obj, std::set<int> *fetchOriginatorNums); @@ -69,7 +70,8 @@ private: Stream *makeStream(Object *dict, Guchar *fileKey, CryptAlgorithm encAlgorithm, int keyLength, - int objNum, int objGen, std::set<int> *fetchOriginatorNums); + int objNum, int objGen, std::set<int> *fetchOriginatorNums, + GBool strict); void shift(int objNum = -1); }; -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-libxcb for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 15 Mar '12

15 Mar '12

Hello community, here is the log from the commit of package xorg-x11-libxcb for openSUSE:12.1:Update:Test checked in at 2012-03-15 21:51:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/xorg-x11-libxcb (Old) and /work/SRC/openSUSE:12.1:Update:Test/.xorg-x11-libxcb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-libxcb", Maintainer is "sndirsch(a)suse.com" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.xorg-x11-libxcb.new/xorg-x11-libxcb.changes 2012-03-15 21:51:10.000000000 +0100 @@ -0,0 +1,202 @@ +------------------------------------------------------------------- +Fri Mar 2 15:16:44 UTC 2012 - johannesobermayr(a)gmx.de + +- update to release 1.8 + * required for newer Mesa + +------------------------------------------------------------------- +Tue Dec 21 02:49:39 UTC 2010 - sndirsch(a)novell.com + +- bumped version number to 7.6_1.7 + +------------------------------------------------------------------- +Sat Sep 4 19:03:26 UTC 2010 - sndirsch(a)novell.com + +- update to release 1.7 +- bumped version number to 7.5_1.7 +- fixed Summary/Group entries in -devel package + +------------------------------------------------------------------- +Sat Jul 3 07:16:57 UTC 2010 - jengelh(a)medozas.de + +- use gcc instead of ld, so that -m32/-m64 is passed to the linker + +------------------------------------------------------------------- +Fri Apr 2 18:09:02 CEST 2010 - sndirsch(a)suse.de + +- bumped version number to 7.5 + +------------------------------------------------------------------- +Mon Dec 14 18:42:16 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Fri Dec 4 22:15:53 CET 2009 - sndirsch(a)suse.de + +- libxcb 1.5 + +------------------------------------------------------------------- +Tue Dec 1 21:31:02 CET 2009 - sndirsch(a)suse.de + +- libxcb-1.4_2009-10-15_e82c34c.diff + * update to git commit e82c34c (2009-10-15); required for XvMC + support in xf86-video-intel 2.10 RC1 + +------------------------------------------------------------------- +Thu Jul 16 07:43:30 CEST 2009 - sndirsch(a)suse.de + +- libxcb 1.4 + * Add majorCode, minorCode and resourceID fields to X generic + error + * Fix precedence bug: wrong length for big-requests preceded by + sync + * Fix libxcb-randr version info + +------------------------------------------------------------------- +Fri May 29 17:31:34 CEST 2009 - sndirsch(a)suse.de + +- libxcb 1.3 + * various issues fixed +- obsoletes commit-beccb0b.diff + +------------------------------------------------------------------- +Sat May 16 09:49:06 CEST 2009 - sndirsch(a)suse.de + +- commit-beccb0b.diff + * kludgily hand-merged xid fixes (bnc #423740, bfo #20254) + +------------------------------------------------------------------- +Thu Apr 30 21:53:45 CEST 2009 - eich(a)suse.de + +- pack .la files in devel package + +------------------------------------------------------------------- +Thu Apr 30 18:21:11 CEST 2009 - sndirsch(a)suse.de + +- reenabled build of static libs on openSUSE <= 11.1 + +------------------------------------------------------------------- +Tue Apr 21 20:36:43 CEST 2009 - crrodriguez(a)suse.de + +- remove static libraries and "la" files + +------------------------------------------------------------------- +Mon Mar 2 21:13:44 CET 2009 - sndirsch(a)suse.de + +- create fake libxcb-xlib.so.0 instead of faking the Provides for + it + +------------------------------------------------------------------- +Mon Mar 2 17:58:55 CET 2009 - ro(a)suse.de + +- extend last fix to baselibs.conf + +------------------------------------------------------------------- +Mon Mar 2 11:45:16 CET 2009 - sndirsch(a)suse.de + +- fake provide libxcb-xlib.so.0 + +------------------------------------------------------------------- +Sun Mar 1 19:07:51 CET 2009 - sndirsch(a)suse.de + +- libxcb 1.2 +- obsoletes always-sloppy.diff + +------------------------------------------------------------------- +Thu Sep 11 14:22:34 CEST 2008 - sndirsch(a)suse.de + +- bumped release number to 7.4 + +------------------------------------------------------------------- +Mon Jul 21 14:40:13 CEST 2008 - sndirsch(a)suse.de + +- back to libxcb 1.1, since libxcb 1.2-pre requires python for + building, which requires xorg-x11-libxcb for building + ==> autobuild loop + + +------------------------------------------------------------------- +Fri Jul 18 17:08:20 CEST 2008 - sndirsch(a)suse.de + +- libxcb 1.1.90.1 + +------------------------------------------------------------------- +Thu Apr 10 12:54:45 CEST 2008 - ro(a)suse.de + +- added baselibs.conf file to build xxbit packages + for multilib support + +------------------------------------------------------------------- +Fri Feb 29 16:23:28 CET 2008 - dmueller(a)suse.de + +- add missing %postun ldconfig script + +------------------------------------------------------------------- +Mon Nov 5 14:58:18 CET 2007 - sndirsch(a)suse.de + +- always-sloppy.diff + * This patch prints out warnings only, the assert() is completely + gone now. As programs with this error typically trigger it + several times, each warning is printed only once. (Bug #251087) + +------------------------------------------------------------------- +Mon Nov 5 09:40:14 CET 2007 - sndirsch(a)suse.de + +- xcb-proto 1.1 + * In the eleven months since XCB's 1.0 release, a few portability + and correctness bugs have been found in libxcb. This release + fixes those, adds nicer handling of Xlib locking bugs, updates + pure-XCB extension support for RandR to version 1.2 and DAMAGE + to version 1.1, and enhances the libxcb documentation. +- obsoletes sloppy-lock.diff, xcb_parse_display.diff + +------------------------------------------------------------------- +Sat Sep 29 12:24:12 CEST 2007 - sndirsch(a)suse.de + +- bumped version to 7.3 + +------------------------------------------------------------------- +Tue Jul 3 17:40:34 CEST 2007 - sndirsch(a)suse.de + +- xcb_parse_display.diff: + * "Attempt to include more of the original display parsing. The + fix only attempts to address the unix: and [protocol/][host]: + issue. It doesn't even make the attempt to mimic the behavior + of the old code in libX11/src/ConnDis.c:_X11TransConnectDisplay(). + The patch is yet untested, it however does compile." + (Bug #289007) + * "Discovered two errors in my fix. One isn't likely to concern + us as it's related to DECnet transport, the other one is real." + (Bug #289007) + * "This patch should fix the problem with artefacts from Bug + #257830 which still had been in the tree." (Bug #289007) + * "fix segfault" (Bug #289007) + * "fix condition" (Bug #289007) + +------------------------------------------------------------------- +Tue May 29 15:21:21 CEST 2007 - sndirsch(a)suse.de + +- added "%post -p /sbin/ldconfig" to specfile to make rpmlint happy + +------------------------------------------------------------------- +Fri Apr 27 11:16:25 CEST 2007 - sndirsch(a)suse.de + +- bug-262309_xcb-xauthlocalhostname.diff: + * add code, which checks for XAUTHLOCALHOSTNAME now also for + libxcb, since Xtranssock.c has been replaced by XCB as + transport layer (Bug #262309) + +------------------------------------------------------------------- +Sun Mar 4 13:41:15 CET 2007 - sndirsch(a)suse.de + +- sloppy-lock.diff: + * workaround for "xcb_xlib.c:50: xcb_xlib_unlock: Assertion + `c->xlib.lock' failed"; set LIBXCB_ALLOW_SLOPPY_LOCK to enable + it (Bug #251087) + ++++ 5 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update:Test/.xorg-x11-libxcb.new/xorg-x11-libxcb.changes New: ---- _link baselibs.conf bug-262309_xcb-xauthlocalhostname.diff libxcb-1.8.tar.bz2 libxcb-xlib.la xorg-x11-libxcb.changes xorg-x11-libxcb.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libxcb.spec ++++++ # # spec file for package xorg-x11-libxcb # # Copyright (c) 2012 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: xorg-x11-libxcb %define dirsuffix 1.8 BuildRequires: libxslt pkgconfig python-base python-xml xorg-x11-libXau-devel xorg-x11-proto-devel #%ifarch ppc64 s390x x86_64 #Provides: libxcb-xlib.so.0()(64bit) #%else #Provides: libxcb-xlib.so.0 #%endif Url: http://xorg.freedesktop.org/ Version: 7.6_%{dirsuffix} Release: 1 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries Summary: X.Org xcb library Source: libxcb-%{dirsuffix}.tar.bz2 Source1: libxcb-xlib.la Source2: baselibs.conf Patch1: bug-262309_xcb-xauthlocalhostname.diff %description This package contains the X.Org xcb library. Authors: -------- Bart Massey Jamey Sharp Josh Triplett %package devel License: MIT License (or similar) Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/X11 Requires: xorg-x11-proto-devel xorg-x11-libXau-devel %{name} = %{version} AutoReqProv: on %description devel This package contains all necessary include files and libraries needed to develop applications that require these. Authors: -------- Bart Massey Jamey Sharp Josh Triplett %prep %setup -q -n libxcb-%{dirsuffix} %patch1 -p0 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" autoreconf -fi %configure \ %if %suse_version > 1110 --disable-static \ %endif --with-pic --docdir=%{_docdir}/%{name} make %{?jobs:-j %jobs} %install make install DESTDIR=$RPM_BUILD_ROOT # create fake libxcb-xlib.so.0 > xcb-xlib.c gcc -Wall -ansi -pedantic -c xcb-xlib.c -fPIC gcc -shared -Wl,-soname,libxcb-xlib.so.0 \ -o $RPM_BUILD_ROOT%{_libdir}/libxcb-xlib.so.0 xcb-xlib.o %if %suse_version <= 1110 ar cru $RPM_BUILD_ROOT%{_libdir}/libxcb-xlib.a xcb-xlib.o ranlib $RPM_BUILD_ROOT%{_libdir}/libxcb-xlib.a sed 's/LIB/%{_lib}/g' $RPM_SOURCE_DIR/libxcb-xlib.la \ > $RPM_BUILD_ROOT%{_libdir}/libxcb-xlib.la %else %{__rm} -f %{buildroot}%{_libdir}/*.la %endif %clean rm -rf "$RPM_BUILD_ROOT" %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_libdir}/*.so.* %files devel %defattr(-,root,root) %doc %{_docdir}/%{name} /usr/include/xcb/ %if %suse_version <= 1110 %{_libdir}/*.a %{_libdir}/*.la %endif %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog ++++++ _link ++++++ <link project="openSUSE:12.1" baserev="310f49cc31f493e560e6f3657087c527"> <patches> <branch/> </patches> </link> ++++++ baselibs.conf ++++++ xorg-x11-libxcb #targettype 32bit provides "libxcb-xlib.so.0" #targettype 64bit provides "libxcb-xlib.so.0()(64bit)" xorg-x11-libxcb-devel ++++++ bug-262309_xcb-xauthlocalhostname.diff ++++++ --- src/xcb_auth.c.orig 2009-05-29 17:48:24.000000000 +0200 +++ src/xcb_auth.c 2009-05-29 17:56:01.000000000 +0200 @@ -100,2 +100,3 @@ static Xauth *get_authptr(struct sockadd int dispbuflen; + Xauth *authptr = NULL; @@ -143,6 +143,16 @@ static Xauth *get_authptr(struct sockadd - return XauGetBestAuthByAddr (family, - (unsigned short) addrlen, addr, - (unsigned short) dispbuflen, dispbuf, - N_AUTH_PROTOS, authnames, authnameslen); + authptr = XauGetBestAuthByAddr (family, + (unsigned short) addrlen, addr, + (unsigned short) dispbuflen, dispbuf, + N_AUTH_PROTOS, authnames, authnameslen); + // && !phostname + if ((!authptr || !authptr->data_length) && family == FamilyLocal) { + if ( (addr = getenv("XAUTHLOCALHOSTNAME")) ) { + authptr = XauGetBestAuthByAddr (family, + (unsigned short) strlen(addr), addr, + (unsigned short) dispbuflen, dispbuf, + N_AUTH_PROTOS, authnames, authnameslen); + } + } + return authptr; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cifs-utils for openSUSE:11.4
by root＠hilbert.suse.de 15 Mar '12

15 Mar '12

Hello community, here is the log from the commit of package cifs-utils for openSUSE:11.4 checked in at Thu Mar 15 21:50:53 CET 2012. -------- --- old-versions/11.4/UPDATES/all/cifs-utils/cifs-utils.changes 2012-02-22 14:42:06.000000000 +0100 +++ 11.4/cifs-utils/cifs-utils.changes 2012-03-09 10:05:03.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 8 20:12:19 CET 2012 - sjayaraman(a)suse.de + +- mount.cifs: Properly update mtab during remount; (bnc#747906). + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- mount.cifs-handle-errors-in-del_mtab.patch mount.cifs-properly-update-mtab.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cifs-utils.spec ++++++ --- /var/tmp/diff_new_pack.ebBGPV/_old 2012-03-15 21:50:32.000000000 +0100 +++ /var/tmp/diff_new_pack.ebBGPV/_new 2012-03-15 21:50:32.000000000 +0100 @@ -20,7 +20,7 @@ Name: cifs-utils Version: 4.9 -Release: 1.<RELEASE2> +Release: 1.<RELEASE5> License: GPLv3+ Group: System/Filesystems Url: http://www.samba.org/linux-cifs/cifs-utils/ @@ -28,6 +28,8 @@ Source1: cifs.init Source2: mkinitrd_scripts_boot-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh +Patch1: mount.cifs-properly-update-mtab.patch +Patch2: mount.cifs-handle-errors-in-del_mtab.patch %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd %else @@ -53,6 +55,8 @@ %prep %setup -q +%patch1 -p0 +%patch2 -p0 %build %{?suse_update_config:%{suse_update_config -f}} ++++++ mount.cifs-handle-errors-in-del_mtab.patch ++++++ commit 92be8b6775958814d39fb19247ff85947a2e4f9e Author: Jeff Layton <jlayton(a)samba.org> Date: Mon Jan 16 13:22:28 2012 -0500 mount.cifs: handle errors from rename() in del_mtab The new del_mtab code ignored errors from rename(). Make it handle that error as well like it does other errors. Fixes bnc#747906. Cc: Carlos Maiolino <cmaiolino(a)redhat.com> Signed-off-by: Jeff Layton <jlayton(a)samba.org> --- mount.cifs.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) Index: mount.cifs.c =================================================================== --- mount.cifs.c.orig +++ mount.cifs.c @@ -1592,7 +1592,11 @@ del_mtab(char *mountpoint) endmntent(mntmtab); - rename(mtabtmpfile, MOUNTED); + if (rename(mtabtmpfile, MOUNTED)) { + fprintf(stderr, "del_mtab: error %d when renaming mtab in place\n", errno); + rc = EX_FILEIO; + goto del_mtab_error; + } del_mtab_exit: unlock_mtab(); ++++++ mount.cifs-properly-update-mtab.patch ++++++ commit f46dd7661cfb87257c95081fc2071c934bfbbb16 Author: Carlos Maiolino <cmaiolino(a)redhat.com> Date: Mon, 16 Jan 2012 12:29:49 -0500 mount.cifs: Properly update mtab during remount During a remount of a cifs filesystem, the mtab file is not properly updated, which leads to a doubled entry of the same filesystem in the /etc/mtab file. This patch adds a new function del_mtab() which is called before the add_mtab() in case the fs is being remounted. The del_mtab() function will delete from the mtab, the old entry from the filesystem which is being remounted, and then, calls add_mtab() to add an updated entry to the mtab file. Fixes bnc#747906. Signed-off-by: Carlos Maiolino <cmaiolino(a)redhat.com> --- mount.cifs.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 98 insertions(+), 1 deletions(-) Index: mount.cifs.c =================================================================== --- mount.cifs.c.orig +++ mount.cifs.c @@ -42,6 +42,7 @@ #include <fcntl.h> #include <limits.h> #include <paths.h> +#include <libgen.h> #include <sys/mman.h> #include <sys/wait.h> #ifdef HAVE_LIBCAP_NG @@ -159,6 +160,7 @@ #define OPT_NOMAND 28 #define OPT_CRUID 29 +#define MNT_TMP_FILE "/.mtab.cifs.XXXXXX" /* struct for holding parsed mount info for use by privleged process */ struct parsed_mount_info { @@ -1523,6 +1525,87 @@ add_mtab_exit: return rc; } +static int +del_mtab(char *mountpoint) +{ + int tmprc, rc = 0; + FILE *mnttmp, *mntmtab; + struct mntent *mountent; + char *mtabfile, *mtabdir, *mtabtmpfile; + + mtabfile = strdup(MOUNTED); + mtabdir = dirname(mtabfile); + mtabdir = realloc(mtabdir, strlen(mtabdir) + strlen(MNT_TMP_FILE) + 2); + if (!mtabdir) { + fprintf(stderr, "del_mtab: cannot determine current mtab path"); + rc = EX_FILEIO; + goto del_mtab_exit; + } + + mtabtmpfile = strcat(mtabdir, MNT_TMP_FILE); + if (!mtabtmpfile) { + fprintf(stderr, "del_mtab: cannot allocate memory to tmp file"); + rc = EX_FILEIO; + goto del_mtab_exit; + } + + atexit(unlock_mtab); + rc = lock_mtab(); + if (rc) { + fprintf(stderr, "del_mtab: cannot lock mtab"); + rc = EX_FILEIO; + goto del_mtab_exit; + } + + mtabtmpfile = mktemp(mtabtmpfile); + if (!mtabtmpfile) { + fprintf(stderr, "del_mtab: cannot setup tmp file destination"); + rc = EX_FILEIO; + goto del_mtab_exit; + } + + mntmtab = setmntent(MOUNTED, "r"); + if (!mntmtab) { + fprintf(stderr, "del_mtab: could not update mount table\n"); + rc = EX_FILEIO; + goto del_mtab_exit; + } + + mnttmp = setmntent(mtabtmpfile, "w"); + if (!mnttmp) { + fprintf(stderr, "del_mtab: could not update mount table\n"); + endmntent(mntmtab); + rc = EX_FILEIO; + goto del_mtab_exit; + } + + while ((mountent = getmntent(mntmtab)) != NULL) { + if (!strcmp(mountent->mnt_dir, mountpoint)) + continue; + rc = addmntent(mnttmp, mountent); + if (rc) { + fprintf(stderr, "del_mtab: unable to add mount entry to mtab\n"); + rc = EX_FILEIO; + goto del_mtab_error; + } + } + + endmntent(mntmtab); + + rename(mtabtmpfile, MOUNTED); + +del_mtab_exit: + unlock_mtab(); + free(mtabdir); + return rc; + +del_mtab_error: + if (unlink(mtabtmpfile)) + fprintf(stderr, "del_mtab: failed to delete tmp file - %s\n", + strerror(errno)); + goto del_mtab_exit; +} + /* have the child drop root privileges */ static int drop_child_privs(void) @@ -1940,8 +2023,15 @@ mount_retry: } do_mtab: - if (!parsed_info->nomtab && !mtab_unusable()) + if (!parsed_info->nomtab && !mtab_unusable()) { + if (parsed_info->flags & MS_REMOUNT) { + rc = del_mtab(mountpoint); + if (rc) + goto mount_exit; + } + rc = add_mtab(orig_dev, mountpoint, parsed_info->flags, fstype); + } mount_exit: if (parsed_info) { continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠hilbert.suse.de 15 Mar '12

15 Mar '12

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2012-03-15 15:58:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2012-03-08 19:44:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2012-03-15 15:58:40.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Mar 15 14:42:55 UTC 2012 - coolo(a)suse.com + +- make it build for i586 too, so we can have it in M2 + +------------------------------------------------------------------- +Thu Mar 15 13:54:04 CET 2012 - snwint(a)suse.de + +- make vbox package optional +- add yast.ssh link (bnc #745340) + +------------------------------------------------------------------- +Thu Mar 15 12:29:24 CET 2012 - snwint(a)suse.de + +- disable vbox + +------------------------------------------------------------------- +Wed Mar 14 15:35:12 CET 2012 - snwint(a)suse.de + +- build fails on dangling symlinks +- adjust to package changes + +------------------------------------------------------------------- Old: ---- installation-images-13.32.tar.bz2 New: ---- installation-images-13.34.tar.bz2 new.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.q5NzVV/_old 2012-03-15 15:58:42.000000000 +0100 +++ /var/tmp/diff_new_pack.q5NzVV/_new 2012-03-15 15:58:42.000000000 +0100 @@ -19,9 +19,10 @@ Name: installation-images -%define has_sles 0 -%define build_xen 1 -%define has_vnc 1 +%define with_sles 0 +%define with_xen 1 +%define with_vnc 1 +%define with_vbox 0 BuildRequires: Mesa BuildRequires: Mesa-libEGL1 BuildRequires: aaa_base @@ -214,7 +215,7 @@ BuildRequires: yast2-tune BuildRequires: yast2-update BuildRequires: yast2-users -%if %has_vnc +%if %with_vnc BuildRequires: xorg-x11-Xvnc %endif # kmps @@ -224,7 +225,7 @@ BuildRequires: ftp BuildRequires: ipw-firmware BuildRequires: tftp -%if %{build_xen} +%if %with_xen BuildRequires: kernel-xen BuildRequires: xen-kmp-default %else @@ -240,7 +241,7 @@ BuildRequires: xorg-x11-driver-input BuildRequires: xorg-x11-driver-video BuildRequires: xorg-x11-driver-video-unichrome -%if %has_vnc +%if %with_vnc BuildRequires: tightvnc %endif %endif @@ -249,10 +250,10 @@ BuildRequires: xorg-x11-driver-video-radeonhd %endif %ifarch ppc ppc64 +BuildRequires: kernel-ppc64 BuildRequires: lilo BuildRequires: pdisk BuildRequires: powerpc-utils -BuildRequires: kernel-ppc64 %endif %ifarch %ix86 x86_64 BuildRequires: acpica @@ -268,9 +269,10 @@ BuildRequires: lilo BuildRequires: memtest86+ BuildRequires: syslinux +%if %with_vbox BuildRequires: virtualbox-guest-kmp-default -BuildRequires: virtualbox-guest-tools BuildRequires: virtualbox-guest-x11 +%endif BuildRequires: yast2-vm %endif %ifarch %ix86 @@ -300,14 +302,14 @@ %endif %ifarch %ix86 x86_64 BuildRequires: bootsplash +BuildRequires: bootsplash-branding-openSUSE BuildRequires: gfxboot-branding-openSUSE BuildRequires: yast2-qt-branding-openSUSE -BuildRequires: bootsplash-branding-openSUSE -%if %has_sles -BuildRequires: gfxboot-branding-SLED -BuildRequires: gfxboot-branding-SLES +%if %with_sles BuildRequires: bootsplash-branding-SLED BuildRequires: bootsplash-branding-SLES +BuildRequires: gfxboot-branding-SLED +BuildRequires: gfxboot-branding-SLES %endif %endif %ifnarch s390 s390x @@ -316,7 +318,7 @@ %ifarch %ix86 x86_64 ia64 #BuildRequires: brocade-bfa-kmp-default %endif -%if %has_sles +%if %with_sles BuildRequires: yast2-theme-SLE %endif BuildRequires: desktop-data-openSUSE @@ -333,9 +335,10 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.32 +Version: 13.34 Release: 0 -Source: installation-images-13.32.tar.bz2 +Source: installation-images-13.34.tar.bz2 +Patch0: new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -398,6 +401,7 @@ %prep %setup +%patch0 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build @@ -413,15 +417,15 @@ # export instsys_complain_root=2 # beta only: ignore non-critical errors # export debug=ignore -%if %has_sles +%if %with_sles make %else make THEMES=openSUSE %endif %ifarch %ix86 x86_64 -%if %{build_xen} +%if %with_xen # build xen initrd & kernel -%if %has_sles +%if %with_sles image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules %else image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules THEMES=openSUSE @@ -430,7 +434,7 @@ %endif %endif %ifarch ppc ppc64 -%if %has_sles +%if %with_sles image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 make initrd+modules+gefrickel %else image=initrd-ppc64 kernel=kernel-ppc64 MOD_CFG=ppc64 make initrd+modules+gefrickel THEMES=openSUSE @@ -441,13 +445,13 @@ BUILD_DISTRIBUTION_NAME="%distribution" export BUILD_DISTRIBUTION_NAME test ! -z "$BUILD_DISTRIBUTION_NAME" -%if %has_sles +%if %with_sles make install DESTDIR=%{buildroot} %else make install DESTDIR=%{buildroot} THEMES=openSUSE %endif # make debuginfo DESTDIR=%{buildroot} -%if %has_sles +%if %with_sles make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd %else make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=openSUSE @@ -456,7 +460,7 @@ install -d -m 755 %{buildroot}/usr/sbin install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin %ifarch %ix86 -%if %{build_xen} +%if %with_xen # xenpae compat gefrickel (bnc #397065) for i in %{buildroot}/branding/*/CD1/boot/i386/initrd-xen ; do [ -f "$i" ] && ln -s initrd-xen ${i}pae ++++++ installation-images-13.32.tar.bz2 -> installation-images-13.34.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/VERSION new/installation-images-13.34/VERSION --- old/installation-images-13.32/VERSION 2012-02-27 13:11:46.000000000 +0100 +++ new/installation-images-13.34/VERSION 2012-03-15 13:53:59.000000000 +0100 @@ -1 +1 @@ -13.32 +13.34 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/bin/mk_image new/installation-images-13.34/bin/mk_image --- old/installation-images-13.32/bin/mk_image 2012-02-09 14:33:06.000000000 +0100 +++ new/installation-images-13.34/bin/mk_image 2012-03-14 13:56:59.000000000 +0100 @@ -92,7 +92,7 @@ if(!$ENV{nolinkcheck}) { print "checking for dangling symlinks...\n"; if(check_link $tmpdir) { - if(1 || $debug =~ /\bignore\b/) { + if($debug =~ /\bignore\b/) { warn "$Script: please fix symlinks\n"; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/changelog new/installation-images-13.34/changelog --- old/installation-images-13.32/changelog 2012-02-27 13:11:50.000000000 +0100 +++ new/installation-images-13.34/changelog 2012-03-15 13:54:03.000000000 +0100 @@ -1,4 +1,12 @@ -2012-02-27: HEAD +2012-03-15: HEAD + - make vbox package optional + - add yast.ssh link (bnc #745340) + +2012-03-14: 13.33 + - build fails on dangling symlinks + - adjust to package changes + +2012-02-27: 13.32 - adjust to package changes 2012-02-22: 13.31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/data/initrd/initrd.file_list new/installation-images-13.34/data/initrd/initrd.file_list --- old/installation-images-13.32/data/initrd/initrd.file_list 2012-02-22 14:31:36.000000000 +0100 +++ new/installation-images-13.34/data/initrd/initrd.file_list 2012-03-14 13:59:21.000000000 +0100 @@ -270,7 +270,7 @@ /lib*/libwrap.so.* dhcpcd: - /sbin/dhcpcd + / libnl-1_1: /lib*/libnl.so.* @@ -284,7 +284,7 @@ /sbin/route iproute2: - /sbin/ip + /usr/sbin/ip ethtool: /usr/sbin/ethtool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/data/root/etc/inst_setup new/installation-images-13.34/data/root/etc/inst_setup --- old/installation-images-13.32/data/root/etc/inst_setup 2012-02-09 10:24:01.000000000 +0100 +++ new/installation-images-13.34/data/root/etc/inst_setup 2012-03-15 10:16:11.000000000 +0100 @@ -224,7 +224,7 @@ cat <<EOF *** login using 'ssh -X root@${hostname}' *** - *** run '$yast' to start the installation *** + *** run '${yast}.ssh' to start the installation *** EOF while true ; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/data/root/root.file_list new/installation-images-13.34/data/root/root.file_list --- old/installation-images-13.32/data/root/root.file_list 2012-02-27 12:58:21.000000000 +0100 +++ new/installation-images-13.34/data/root/root.file_list 2012-03-15 13:53:04.000000000 +0100 @@ -214,7 +214,7 @@ / ?hdparm: - /sbin/hdparm + /usr/sbin/hdparm smartmontools: /usr/sbin/smartctl @@ -323,6 +323,7 @@ /var r /usr/lib/YaST2/servers_non_y2/ag_cron s /usr/lib/YaST2/startup/YaST2.First-Stage /sbin/yast + s /usr/lib/YaST2/startup/YaST2.First-Stage /sbin/yast.ssh r /usr/lib/YaST2/bin/yast2 yast2-add-on: @@ -670,9 +671,6 @@ liblzma*: / -iproute2: - /sbin/ip - libnscd: / @@ -1008,11 +1006,9 @@ /usr/lib*/xorg/modules/*.uc endif - if arch eq 'i386' || arch eq 'x86_64' - virtualbox-guest-x11: - /etc - /usr/lib*/xorg/modules - endif + ?virtualbox-guest-x11: + /etc + /usr/lib*/xorg/modules xterm: /usr/share/X11/app-defaults/XTerm @@ -1200,6 +1196,8 @@ Mesa: /usr/lib*/dri/swrast_dri.so + /usr/lib*/dri/libdricore.so + /usr/lib*/dri/libglsl.so Mesa-libEGL*: / @@ -1318,8 +1316,11 @@ libgmodule-2_0-*: / -#libxcb-render*: -# / +libxcb-render*: + / + +libxcb-shape*: + / libltdl*: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.32/etc/module.config new/installation-images-13.34/etc/module.config --- old/installation-images-13.32/etc/module.config 2012-02-15 11:28:16.000000000 +0100 +++ new/installation-images-13.34/etc/module.config 2012-03-14 14:04:00.000000000 +0100 @@ -244,6 +244,8 @@ vmxnet3,VMware vmxnet3 virtual NIC xen-vnif,"Xen Network" +kernel/drivers/net/hyperv/.* +kernel/drivers/net/team/.* kernel/drivers/net/ethernet/.* kernel/drivers/net/fddi/.* kernel/drivers/net/tokenring/.* ++++++ new.patch ++++++ Index: installation-images-13.34/data/root/root.file_list =================================================================== --- installation-images-13.34.orig/data/root/root.file_list 2012-03-15 13:53:04.000000000 +0100 +++ installation-images-13.34/data/root/root.file_list 2012-03-15 15:30:44.866629201 +0100 @@ -45,8 +45,11 @@ r /etc/issue libelf0: / +libkmod*: + / + systemd: - /usr/<lib> + / libdb-*: / Index: installation-images-13.34/bin/mk_image =================================================================== --- installation-images-13.34.orig/bin/mk_image 2012-03-14 13:56:59.000000000 +0100 +++ installation-images-13.34/bin/mk_image 2012-03-15 15:22:10.443928444 +0100 @@ -179,6 +179,7 @@ sub check_link if($x =~ /^\//) { next if $x =~ m#^/lbin/#; next if $x =~ m#^/proc/#; + next if $x =~ m#^/dev/#; next if -e "$dir$x"; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-xulrunner192 for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:12.1:Update:Test checked in at 2012-03-14 17:51:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/mozilla-xulrunner192 (Old) and /work/SRC/openSUSE:12.1:Update:Test/.mozilla-xulrunner192.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-xulrunner192", Maintainer is "PCerny(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/mozilla-xulrunner192/mozilla-xulrunner192.changes 2012-02-16 18:11:22.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.mozilla-xulrunner192.new/mozilla-xulrunner192.changes 2012-03-14 17:51:14.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Mar 6 22:49:39 UTC 2012 - wr(a)rosenauer.org + +- security update to 1.9.2.28 (bnc#750044) + * MFSA 2011-55/CVE-2011-3658 (bmo#708186) + nsSVGValue out-of-bounds access + * MFSA 2012-13/CVE-2012-0455 (bmo#704354) + XSS with Drag and Drop and Javascript: URL + * MFSA 2012-14/CVE-2012-0456/CVE-2012-0457 (bmo#711653, #720103) + SVG issues found with Address Sanitizer + * MFSA 2012-16/CVE-2012-0458 + Escalation of privilege with Javascript: URL as home page + * MFSA 2012-19/CVE-2012-0461/CVE-2012-0462/CVE-2012-0464/ + CVE-2012-0463 + Miscellaneous memory safety hazards + +------------------------------------------------------------------- Old: ---- l10n-1.9.2.27.tar.bz2 xulrunner-source-1.9.2.27.tar.bz2 New: ---- l10n-1.9.2.28.tar.bz2 xulrunner-source-1.9.2.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.L4wziA/_old 2012-03-14 17:51:17.000000000 +0100 +++ /var/tmp/diff_new_pack.L4wziA/_new 2012-03-14 17:51:17.000000000 +0100 @@ -45,12 +45,12 @@ %else BuildRequires: wireless-tools %endif -Version: 1.9.2.27 +Version: 1.9.2.28 Release: 0 -%define releasedate 2012021500 -%define version_internal 1.9.2.27 +%define releasedate 2012030600 +%define version_internal 1.9.2.28 %define apiversion 1.9.2 -%define uaweight 192270 +%define uaweight 192280 Summary: Mozilla Runtime Environment 1.9.2 License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Productivity/Other ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.L4wziA/_old 2012-03-14 17:51:18.000000000 +0100 +++ /var/tmp/diff_new_pack.L4wziA/_new 2012-03-14 17:51:18.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6_27_RELEASE" -VERSION="1.9.2.27" +RELEASE_TAG="FIREFOX_3_6_28_RELEASE" +VERSION="1.9.2.28" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.27.tar.bz2 -> l10n-1.9.2.28.tar.bz2 ++++++ /work/SRC/openSUSE:12.1:Update:Test/mozilla-xulrunner192/l10n-1.9.2.27.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.mozilla-xulrunner192.new/l10n-1.9.2.28.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.2.27.tar.bz2 -> xulrunner-source-1.9.2.28.tar.bz2 ++++++ /work/SRC/openSUSE:12.1:Update:Test/mozilla-xulrunner192/xulrunner-source-1.9.2.27.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.mozilla-xulrunner192.new/xulrunner-source-1.9.2.28.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-nss for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package mozilla-nss for openSUSE:12.1:Update:Test checked in at 2012-03-14 17:50:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/mozilla-nss (Old) and /work/SRC/openSUSE:12.1:Update:Test/.mozilla-nss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nss", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/mozilla-nss/mozilla-nss.changes 2011-12-21 18:32:19.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.mozilla-nss.new/mozilla-nss.changes 2012-03-14 17:50:19.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Feb 23 15:06:34 UTC 2012 - wr(a)rosenauer.org + +- update to 3.13.3 RTM + - distrust Trustwave's MITM certificates (bmo#724929) + - fix generic blacklisting mechanism (bmo#727204) + +------------------------------------------------------------------- +Thu Feb 16 08:48:42 UTC 2012 - wr(a)rosenauer.org + +- update to 3.13.2 RTM + * requirement with Gecko >= 11 +- removed obsolete patches + * ckbi-1.88 + * pkcs11n-header-fix.patch + +------------------------------------------------------------------- Old: ---- ckbi-1_88.patch nss-3.13.1.tar.bz2 pkcs11n-header-fix.patch New: ---- nss-3.13.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nss.spec ++++++ --- /var/tmp/diff_new_pack.pbS4d0/_old 2012-03-14 17:50:20.000000000 +0100 +++ /var/tmp/diff_new_pack.pbS4d0/_new 2012-03-14 17:50:20.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package mozilla-nss # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2006-2011 Wolfgang Rosenauer +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006-2012 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ %if %suse_version > 1030 BuildRequires: sqlite3-devel %endif -Version: 3.13.1 +Version: 3.13.3 Release: 0 # bug437293 %ifarch ppc64 @@ -53,13 +53,11 @@ Source9: pkcs11.txt #Source10: PayPalEE.cert Patch1: nss-opt.patch -Patch3: system-nspr.patch -Patch4: char.patch -Patch5: nss-no-rpath.patch -Patch6: renegotiate-transitional.patch -Patch9: malloc.patch -Patch10: ckbi-1_88.patch -Patch11: pkcs11n-header-fix.patch +Patch2: system-nspr.patch +Patch3: char.patch +Patch4: nss-no-rpath.patch +Patch5: renegotiate-transitional.patch +Patch6: malloc.patch %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) PreReq: mozilla-nspr >= %nspr_ver PreReq: libfreebl3 >= %{nss_softokn_fips_version} @@ -166,15 +164,13 @@ %setup -n nss-%{version} -q cd mozilla %patch1 +%patch2 %patch3 %patch4 %patch5 -%patch6 %if %suse_version > 1110 -%patch9 +%patch6 %endif -%patch10 -p1 -%patch11 # additional CA certificates #cd security/nss/lib/ckfw/builtins #cat %{SOURCE2} >> certdata.txt ++++++ nss-3.13.1.tar.bz2 -> nss-3.13.3.tar.bz2 ++++++ ++++ 8961 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-nspr for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:12.1:Update:Test checked in at 2012-03-14 17:48:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/mozilla-nspr (Old) and /work/SRC/openSUSE:12.1:Update:Test/.mozilla-nspr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nspr", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/mozilla-nspr/mozilla-nspr.changes 2012-03-14 17:48:17.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.mozilla-nspr.new/mozilla-nspr.changes 2012-03-14 17:48:19.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 16 08:22:35 UTC 2012 - wr(a)rosenauer.org + +- update to version 4.9 RTM +- added testsuite in %check + +------------------------------------------------------------------- Old: ---- nspr-4.8.9.tar.bz2 New: ---- nspr-4.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.QFRd2t/_old 2012-03-14 17:48:19.000000000 +0100 +++ /var/tmp/diff_new_pack.QFRd2t/_new 2012-03-14 17:48:19.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package mozilla-nspr # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2011 Wolfgang Rosenauer +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2012 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ # - Name: mozilla-nspr -Version: 4.8.9 -Release: 1 -License: MPLv1.1 or GPLv2+ or LGPLv2.1+ +Version: 4.9.0 +Release: 0 Summary: Netscape Portable Runtime +License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ +Group: System/Libraries Url: http://www.mozilla.org/projects/nspr/ BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -31,7 +31,6 @@ Obsoletes: mozilla-nspr-64bit %endif # -Group: System/Libraries Source: ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar… Source1: baselibs.conf Patch: pkgconfig.patch @@ -45,7 +44,6 @@ %package devel -License: MPLv1.1 or GPLv2+ or LGPLv2.1+ Summary: Netscape Portable Runtime development files Group: Development/Libraries/Other Requires: mozilla-nspr = %{version} @@ -98,6 +96,16 @@ # #31667 chmod -x %{buildroot}%{_includedir}/nspr4/prvrsion.h +%check +# Run test suite +perl ./mozilla/nsprpub/pr/tests/runtests.pl 2>&1 | tee output.log +TEST_FAILURES=`grep -c FAILED ./output.log` || : +if [ $TEST_FAILURES -ne 0 ]; then + echo "error: test suite returned failure(s)" + exit 1 +fi +echo "test suite completed" + %clean rm -rf %{buildroot} ++++++ nspr-4.8.9.tar.bz2 -> nspr-4.9.0.tar.bz2 ++++++ ++++ 8052 lines of diff (skipped) ++++++ pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.QFRd2t/_old 2012-03-14 17:48:19.000000000 +0100 +++ /var/tmp/diff_new_pack.QFRd2t/_new 2012-03-14 17:48:19.000000000 +0100 @@ -1,7 +1,7 @@ -diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in nspr-4.5.99/mozilla/nsprpub/config/Makefile.in ---- nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in 2005-05-03 11:16:45.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/config/Makefile.in 2005-05-18 12:05:53.000000000 +0200 -@@ -52,9 +52,9 @@ +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/config/Makefile.in nspr-4.9.0.new/mozilla/nsprpub/config/Makefile.in +--- nspr-4.9.0/mozilla/nsprpub/config/Makefile.in 2009-05-20 21:54:24.000000000 +0200 ++++ nspr-4.9.0.new/mozilla/nsprpub/config/Makefile.in 2012-02-04 11:24:45.216139811 +0100 +@@ -52,9 +52,9 @@ VISIBILITY_FLAGS = # autoconf.mk must be deleted last (from the top-level directory) # because it is included by every makefile. @@ -13,7 +13,7 @@ include $(topsrcdir)/config/config.mk -@@ -139,6 +139,7 @@ +@@ -135,6 +135,7 @@ endef export:: $(TARGETS) rm -f $(dist_bindir)/nspr-config @@ -21,9 +21,9 @@ ifdef WRAP_SYSTEM_INCLUDES export:: -diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in nspr-4.5.99/mozilla/nsprpub/config/mozilla-nspr.pc.in ---- nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ nspr-4.5.99/mozilla/nsprpub/config/nspr.pc.in 2005-05-18 12:03:36.000000000 +0200 +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/config/nspr.pc.in nspr-4.9.0.new/mozilla/nsprpub/config/nspr.pc.in +--- nspr-4.9.0/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/config/nspr.pc.in 2012-02-04 11:24:45.216139811 +0100 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -37,25 +37,25 @@ +Cflags: -I${includedir} + + -diff -urN nspr-4.5.99.old/mozilla/nsprpub/configure nspr-4.5.99/mozilla/nsprpub/configure ---- nspr-4.5.99.old/mozilla/nsprpub/configure 2005-05-13 09:33:07.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/configure 2005-05-18 12:07:00.000000000 +0200 -@@ -5718,6 +5718,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -urN nspr-4.5.99.old/mozilla/nsprpub/configure.in nspr-4.5.99/mozilla/nsprpub/configure.in ---- nspr-4.5.99.old/mozilla/nsprpub/configure.in 2005-05-13 09:33:07.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/configure.in 2005-05-18 12:06:42.000000000 +0200 -@@ -2569,6 +2569,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/configure nspr-4.9.0.new/mozilla/nsprpub/configure +--- nspr-4.9.0/mozilla/nsprpub/configure 2012-02-04 10:59:12.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/configure 2012-02-04 11:26:29.135863171 +0100 +@@ -6694,6 +6694,7 @@ MAKEFILES=" + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++ config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/configure.in nspr-4.9.0.new/mozilla/nsprpub/configure.in +--- nspr-4.9.0/mozilla/nsprpub/configure.in 2012-02-04 10:59:12.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/configure.in 2012-02-04 11:26:01.873276991 +0100 +@@ -3357,6 +3357,7 @@ MAKEFILES=" + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++ config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chmsee for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

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(a)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(a)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(a)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(a)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(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-xulrunner192 for openSUSE:11.4
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:11.4 checked in at Wed Mar 14 17:41:22 CET 2012. -------- --- old-versions/11.4/UPDATES/all/mozilla-xulrunner192/mozilla-xulrunner192.changes 2012-02-16 13:07:07.000000000 +0100 +++ 11.4/mozilla-xulrunner192/mozilla-xulrunner192.changes 2012-03-14 08:36:16.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Mar 6 22:49:39 UTC 2012 - wr(a)rosenauer.org + +- security update to 1.9.2.28 (bnc#750044) + * MFSA 2011-55/CVE-2011-3658 (bmo#708186) + nsSVGValue out-of-bounds access + * MFSA 2012-13/CVE-2012-0455 (bmo#704354) + XSS with Drag and Drop and Javascript: URL + * MFSA 2012-14/CVE-2012-0456/CVE-2012-0457 (bmo#711653, #720103) + SVG issues found with Address Sanitizer + * MFSA 2012-16/CVE-2012-0458 + Escalation of privilege with Javascript: URL as home page + * MFSA 2012-19/CVE-2012-0461/CVE-2012-0462/CVE-2012-0464/ + CVE-2012-0463 + Miscellaneous memory safety hazards + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- l10n-1.9.2.27.tar.bz2 xulrunner-source-1.9.2.27.tar.bz2 New: ---- l10n-1.9.2.28.tar.bz2 xulrunner-source-1.9.2.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.clAzqW/_old 2012-03-14 17:37:38.000000000 +0100 +++ /var/tmp/diff_new_pack.clAzqW/_new 2012-03-14 17:37:38.000000000 +0100 @@ -47,12 +47,12 @@ %else BuildRequires: wireless-tools %endif -Version: 1.9.2.27 +Version: 1.9.2.28 Release: 0.<RELEASE2> -%define releasedate 2012021500 -%define version_internal 1.9.2.27 +%define releasedate 2012030600 +%define version_internal 1.9.2.28 %define apiversion 1.9.2 -%define uaweight 192270 +%define uaweight 192280 Summary: Mozilla Runtime Environment 1.9.2 License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Productivity/Other ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.clAzqW/_old 2012-03-14 17:37:38.000000000 +0100 +++ /var/tmp/diff_new_pack.clAzqW/_new 2012-03-14 17:37:38.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6_27_RELEASE" -VERSION="1.9.2.27" +RELEASE_TAG="FIREFOX_3_6_28_RELEASE" +VERSION="1.9.2.28" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.27.tar.bz2 -> l10n-1.9.2.28.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/mozilla-xulrunner192/l10n-1.9.2.27.tar.bz2 11.4/mozilla-xulrunner192/l10n-1.9.2.28.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.2.27.tar.bz2 -> xulrunner-source-1.9.2.28.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/mozilla-xulrunner192/xulrunner-source-1.9.2.27.tar.bz2 11.4/mozilla-xulrunner192/xulrunner-source-1.9.2.28.tar.bz2 differ: char 11, line 1 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-nss for openSUSE:11.4
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package mozilla-nss for openSUSE:11.4 checked in at Wed Mar 14 17:37:29 CET 2012. -------- --- old-versions/11.4/UPDATES/all/mozilla-nss/mozilla-nss.changes 2011-12-18 16:59:30.000000000 +0100 +++ 11.4/mozilla-nss/mozilla-nss.changes 2012-02-23 16:08:17.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Feb 23 15:06:34 UTC 2012 - wr(a)rosenauer.org + +- update to 3.13.3 RTM + - distrust Trustwave's MITM certificates (bmo#724929) + - fix generic blacklisting mechanism (bmo#727204) + +------------------------------------------------------------------- +Thu Feb 16 08:48:42 UTC 2012 - wr(a)rosenauer.org + +- update to 3.13.2 RTM + * requirement with Gecko >= 11 +- removed obsolete patches + * ckbi-1.88 + * pkcs11n-header-fix.patch + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- ckbi-1_88.patch nss-3.13.1.tar.bz2 pkcs11n-header-fix.patch New: ---- nss-3.13.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nss.spec ++++++ --- /var/tmp/diff_new_pack.gkFCr9/_old 2012-03-14 17:37:06.000000000 +0100 +++ /var/tmp/diff_new_pack.gkFCr9/_new 2012-03-14 17:37:06.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package mozilla-nss # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2006-2011 Wolfgang Rosenauer +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006-2012 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ %if %suse_version > 1030 BuildRequires: sqlite3-devel %endif -Version: 3.13.1 +Version: 3.13.3 Release: 0.<RELEASE2> # bug437293 %ifarch ppc64 @@ -53,13 +53,11 @@ Source9: pkcs11.txt #Source10: PayPalEE.cert Patch1: nss-opt.patch -Patch3: system-nspr.patch -Patch4: char.patch -Patch5: nss-no-rpath.patch -Patch6: renegotiate-transitional.patch -Patch9: malloc.patch -Patch10: ckbi-1_88.patch -Patch11: pkcs11n-header-fix.patch +Patch2: system-nspr.patch +Patch3: char.patch +Patch4: nss-no-rpath.patch +Patch5: renegotiate-transitional.patch +Patch6: malloc.patch %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) PreReq: mozilla-nspr >= %nspr_ver PreReq: libfreebl3 >= %{nss_softokn_fips_version} @@ -172,15 +170,13 @@ %setup -n nss-%{version} -q cd mozilla %patch1 +%patch2 %patch3 %patch4 %patch5 -%patch6 %if %suse_version > 1110 -%patch9 +%patch6 %endif -%patch10 -p1 -%patch11 # additional CA certificates #cd security/nss/lib/ckfw/builtins #cat %{SOURCE2} >> certdata.txt ++++++ nss-3.13.1.tar.bz2 -> nss-3.13.3.tar.bz2 ++++++ ++++ 8961 lines of diff (skipped) continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-nspr for openSUSE:11.4
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:11.4 checked in at Wed Mar 14 17:36:59 CET 2012. -------- --- old-versions/11.4/UPDATES/all/mozilla-nspr/mozilla-nspr.changes 2011-08-12 22:28:25.000000000 +0200 +++ 11.4/mozilla-nspr/mozilla-nspr.changes 2012-02-17 09:34:28.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Feb 16 08:22:35 UTC 2012 - wr(a)rosenauer.org + +- update to version 4.9 RTM +- added testsuite in %check + +------------------------------------------------------------------- +Wed Sep 21 09:01:27 UTC 2011 - wr(a)rosenauer.org + +- some spec file cleanup +- override the build time detection and use the last change time + instead to incorporate into the build + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- nspr-4.8.9.tar.bz2 New: ---- nspr-4.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.6JTafj/_old 2012-03-14 17:36:45.000000000 +0100 +++ /var/tmp/diff_new_pack.6JTafj/_new 2012-03-14 17:36:45.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package mozilla-nspr # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2011 Wolfgang Rosenauer +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2012 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: mozilla-nspr -BuildRequires: gcc-c++ pkg-config -License: MPLv1.1 or GPLv2+ or LGPLv2.1+ -Version: 4.8.9 -Release: 1.<RELEASE2> +Version: 4.9.0 +Release: 0.<RELEASE2> Summary: Netscape Portable Runtime +License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ +Group: System/Libraries Url: http://www.mozilla.org/projects/nspr/ +BuildRequires: gcc-c++ +BuildRequires: pkg-config # bug437293 %ifarch ppc64 Obsoletes: mozilla-nspr-64bit %endif # -Group: System/Libraries Source: ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar… Source1: baselibs.conf -Patch3: pkgconfig.patch +Patch: pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,7 +45,7 @@ %package devel -License: MPLv1.1 or GPLv2+ or LGPLv2.1+ + Summary: Netscape Portable Runtime development files Group: Development/Libraries/Other Requires: mozilla-nspr = %{version} @@ -65,11 +65,16 @@ %prep %setup -n nspr-%{version} -q cd mozilla -%patch3 -p2 +%patch -p2 %build +# set buildtime to "last-modification-time" +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +BUILD_STRING="$(date -u -d "${modified}" "+%%F %%T")" +BUILD_TIME="$(date -u -d "${modified}" "+%%s000000")" +# cd mozilla/nsprpub -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" ./configure --enable-optimize="$CFLAGS" \ --disable-debug \ %ifarch x86_64 @@ -78,23 +83,33 @@ --libdir=%{_libdir} \ --includedir=%{_includedir}/nspr4 \ --prefix=%{_prefix} -make %{?jobs:-j%jobs} +make SH_DATE="$BUILD_STRING" SH_NOW="$BUILD_TIME" %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/nspr -mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig -mkdir -p $RPM_BUILD_ROOT%{_includedir}/nspr4 -cp mozilla/nsprpub/config/nspr-config $RPM_BUILD_ROOT%{_bindir}/ -cp mozilla/nsprpub/config/nspr.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig -cp -L mozilla/nsprpub/dist/lib/*.so $RPM_BUILD_ROOT/%{_libdir} -cp -L mozilla/nsprpub/dist/lib/*.a $RPM_BUILD_ROOT/%{_libdir}/nspr/ -cp -rL mozilla/nsprpub/dist/include/nspr/* $RPM_BUILD_ROOT/%{_includedir}/nspr4/ +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_libdir}/nspr +mkdir -p %{buildroot}%{_libdir}/pkgconfig +mkdir -p %{buildroot}%{_includedir}/nspr4 +cp mozilla/nsprpub/config/nspr-config %{buildroot}%{_bindir}/ +cp mozilla/nsprpub/config/nspr.pc %{buildroot}%{_libdir}/pkgconfig +cp -L mozilla/nsprpub/dist/lib/*.so %{buildroot}%{_libdir} +cp -L mozilla/nsprpub/dist/lib/*.a %{buildroot}%{_libdir}/nspr/ +cp -rL mozilla/nsprpub/dist/include/nspr/* %{buildroot}%{_includedir}/nspr4/ # #31667 -chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h +chmod -x %{buildroot}%{_includedir}/nspr4/prvrsion.h + +%check +# Run test suite +perl ./mozilla/nsprpub/pr/tests/runtests.pl 2>&1 | tee output.log +TEST_FAILURES=`grep -c FAILED ./output.log` || : +if [ $TEST_FAILURES -ne 0 ]; then + echo "error: test suite returned failure(s)" + exit 1 +fi +echo "test suite completed" %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig ++++++ nspr-4.8.9.tar.bz2 -> nspr-4.9.0.tar.bz2 ++++++ ++++ 8052 lines of diff (skipped) ++++++ pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.6JTafj/_old 2012-03-14 17:36:46.000000000 +0100 +++ /var/tmp/diff_new_pack.6JTafj/_new 2012-03-14 17:36:46.000000000 +0100 @@ -1,7 +1,7 @@ -diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in nspr-4.5.99/mozilla/nsprpub/config/Makefile.in ---- nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in 2005-05-03 11:16:45.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/config/Makefile.in 2005-05-18 12:05:53.000000000 +0200 -@@ -52,9 +52,9 @@ +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/config/Makefile.in nspr-4.9.0.new/mozilla/nsprpub/config/Makefile.in +--- nspr-4.9.0/mozilla/nsprpub/config/Makefile.in 2009-05-20 21:54:24.000000000 +0200 ++++ nspr-4.9.0.new/mozilla/nsprpub/config/Makefile.in 2012-02-04 11:24:45.216139811 +0100 +@@ -52,9 +52,9 @@ VISIBILITY_FLAGS = # autoconf.mk must be deleted last (from the top-level directory) # because it is included by every makefile. @@ -13,7 +13,7 @@ include $(topsrcdir)/config/config.mk -@@ -139,6 +139,7 @@ +@@ -135,6 +135,7 @@ endef export:: $(TARGETS) rm -f $(dist_bindir)/nspr-config @@ -21,9 +21,9 @@ ifdef WRAP_SYSTEM_INCLUDES export:: -diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in nspr-4.5.99/mozilla/nsprpub/config/mozilla-nspr.pc.in ---- nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ nspr-4.5.99/mozilla/nsprpub/config/nspr.pc.in 2005-05-18 12:03:36.000000000 +0200 +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/config/nspr.pc.in nspr-4.9.0.new/mozilla/nsprpub/config/nspr.pc.in +--- nspr-4.9.0/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/config/nspr.pc.in 2012-02-04 11:24:45.216139811 +0100 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -37,25 +37,25 @@ +Cflags: -I${includedir} + + -diff -urN nspr-4.5.99.old/mozilla/nsprpub/configure nspr-4.5.99/mozilla/nsprpub/configure ---- nspr-4.5.99.old/mozilla/nsprpub/configure 2005-05-13 09:33:07.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/configure 2005-05-18 12:07:00.000000000 +0200 -@@ -5718,6 +5718,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -urN nspr-4.5.99.old/mozilla/nsprpub/configure.in nspr-4.5.99/mozilla/nsprpub/configure.in ---- nspr-4.5.99.old/mozilla/nsprpub/configure.in 2005-05-13 09:33:07.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/configure.in 2005-05-18 12:06:42.000000000 +0200 -@@ -2569,6 +2569,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/configure nspr-4.9.0.new/mozilla/nsprpub/configure +--- nspr-4.9.0/mozilla/nsprpub/configure 2012-02-04 10:59:12.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/configure 2012-02-04 11:26:29.135863171 +0100 +@@ -6694,6 +6694,7 @@ MAKEFILES=" + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++ config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/configure.in nspr-4.9.0.new/mozilla/nsprpub/configure.in +--- nspr-4.9.0/mozilla/nsprpub/configure.in 2012-02-04 10:59:12.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/configure.in 2012-02-04 11:26:01.873276991 +0100 +@@ -3357,6 +3357,7 @@ MAKEFILES=" + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++ config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird for openSUSE:11.4
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:11.4 checked in at Wed Mar 14 17:36:40 CET 2012. -------- --- old-versions/11.4/UPDATES/all/MozillaThunderbird/MozillaThunderbird.changes 2012-02-16 12:46:00.000000000 +0100 +++ 11.4/MozillaThunderbird/MozillaThunderbird.changes 2012-03-14 08:40:51.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Mar 6 22:34:26 UTC 2012 - wr(a)rosenauer.org + +- security update to 3.1.20 (bnc#750044) + * MFSA 2011-55/CVE-2011-3658 (bmo#708186) + nsSVGValue out-of-bounds access + * MFSA 2012-13/CVE-2012-0455 (bmo#704354) + XSS with Drag and Drop and Javascript: URL + * MFSA 2012-14/CVE-2012-0456/CVE-2012-0457 (bmo#711653, #720103) + SVG issues found with Address Sanitizer + * MFSA 2012-16/CVE-2012-0458 + Escalation of privilege with Javascript: URL as home page + * MFSA 2012-19/CVE-2012-0461/CVE-2012-0462/CVE-2012-0464/ + CVE-2012-0463 + Miscellaneous memory safety hazards + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- l10n-3.1.19.tar.bz2 thunderbird-3.1.19-source.tar.bz2 New: ---- l10n-3.1.20.tar.bz2 thunderbird-3.1.20-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.2pwdrH/_old 2012-03-14 17:18:51.000000000 +0100 +++ /var/tmp/diff_new_pack.2pwdrH/_new 2012-03-14 17:18:51.000000000 +0100 @@ -25,10 +25,10 @@ BuildRequires: nss-shared-helper-devel %endif License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ -%define mainversion 3.1.19 +%define mainversion 3.1.20 Version: %{mainversion} Release: 0.<RELEASE2> -%define releasedate 2012021500 +%define releasedate 2012030600 Provides: thunderbird = %{version} Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.2pwdrH/_old 2012-03-14 17:18:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2pwdrH/_new 2012-03-14 17:18:52.000000000 +0100 @@ -2,8 +2,8 @@ BRANCH="releases/comm-1.9.2" # comm-central -RELEASE_TAG="THUNDERBIRD_3_1_19_RELEASE" -VERSION="3.1.19" +RELEASE_TAG="THUNDERBIRD_3_1_20_RELEASE" +VERSION="3.1.20" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ l10n-3.1.19.tar.bz2 -> l10n-3.1.20.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/MozillaThunderbird/l10n-3.1.19.tar.bz2 11.4/MozillaThunderbird/l10n-3.1.20.tar.bz2 differ: char 11, line 1 ++++++ thunderbird-3.1.19-source.tar.bz2 -> thunderbird-3.1.20-source.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/MozillaThunderbird/thunderbird-3.1.19-source.tar.bz2 11.4/MozillaThunderbird/thunderbird-3.1.20-source.tar.bz2 differ: char 11, line 1 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2012-03-14 14:12:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2012-03-12 08:53:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2012-03-14 14:12:23.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 16:09:52 UTC 2012 - werner(a)suse.de + +- Oops add missed double quote (bnc#752061) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.ARsNV5/_old 2012-03-14 14:12:25.000000000 +0100 +++ /var/tmp/diff_new_pack.ARsNV5/_new 2012-03-14 14:12:25.000000000 +0100 @@ -22,10 +22,23 @@ Version: 12.1 Release: 0 Url: http://gitorious.org/opensuse/aaa_base -Provides: bin bootutls etc skeleng skelger Provides: aaa_skel = %{version}-%{release} +Provides: bin +Provides: bootutls +Provides: etc +Provides: skeleng +Provides: skelger Obsoletes: aaa_skel < %{version} -Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc +Requires: /bin/login +Requires: /bin/mktemp +Requires: /usr/bin/find +Requires: /usr/bin/tput +Requires: /usr/bin/xargs +Requires: cpio +Requires: distribution-release +Requires: filesystem +Requires: mingetty +Requires: psmisc Recommends: cron logrotate netcfg udev net-tools aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Summary: SUSE Linux Base Package ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/profile new/aaa_base/files/etc/profile --- old/aaa_base/files/etc/profile 2012-03-09 17:58:01.000000000 +0100 +++ new/aaa_base/files/etc/profile 2012-03-13 17:09:23.000000000 +0100 @@ -53,7 +53,7 @@ # path () { - command -p ${1+$@"} + command -p ${1+"$@"} } # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 14 Mar '12

14 Mar '12

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at 2012-03-14 14:07:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xen (Old) and /work/SRC/openSUSE:Factory/.xen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xen", Maintainer is "CARNOLD(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xen/xen.changes 2012-02-28 14:16:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xen.new/xen.changes 2012-03-14 14:07:59.000000000 +0100 @@ -1,0 +2,43 @@ +Wed Mar 14 12:53:53 CET 2012 - ohering(a)suse.de + +- use BuildRequires: gcc46 only in sles11sp2 to avoid issues + when gcc47 and newer is the distro default + +------------------------------------------------------------------- +Mon Feb 27 16:05:19 MST 2012 - jfehlig(a)suse.com + +- bnc#745880 - cpuid setting is not preserved across xend restarts + xend-cpuid.patch + +------------------------------------------------------------------- +Mon Feb 27 15:40:02 MST 2012 - jfehlig(a)suse.com + +- Rename 2XXXX-vif-bridge.patch -> vif-bridge-tap-fix.patch + +------------------------------------------------------------------- +Mon Feb 27 08:16:43 MST 2012 - carnold(a)novell.com + +- bnc#747331 - XEN: standard "newburn" kernel QA stress test on guest + (+ smartd on Dom0?) freezes the guest + 24883-x86-guest-walk-not-present.patch +- bnc#745367 - MCE bank handling during migration + 24781-x86-vmce-mcg_ctl.patch + 24886-x86-vmce-mcg_ctl-default.patch + 24887-x86-vmce-sr.patch +- bnc#744771 - L3: VM with passed through PCI card fails to reboot + under dom0 load + 24888-pci-release-devices.patch +- Upstream patches from Jan + 24517-VT-d-fault-softirq.patch + 24527-AMD-Vi-fault-softirq.patch + 24535-x86-vMSI-misc.patch + 24615-VESA-lfb-flush.patch + 24690-x86-PCI-SERR-no-deadlock.patch + 24701-gnttab-map-grant-ref-recovery.patch + 24742-gnttab-misc.patch + 24780-x86-paging-use-clear_guest.patch + 24805-x86-MSI-X-dom0-ro.patch + ioemu-9869-MSI-X-init.patch + ioemu-9873-MSI-X-fix-unregister_iomem.patch + +------------------------------------------------------------------- @@ -11,0 +55,6 @@ + +------------------------------------------------------------------- +Wed Feb 8 10:16:59 MST 2012 - jfehlig(a)suse.com + +- bnc#745005 - Update vif configuration examples in xmexample* + Updated xen-xmexample.diff Old: ---- 2XXXX-vif-bridge.patch ioemu-MSI-X-fix-unregister_iomem.patch New: ---- 24517-VT-d-fault-softirq.patch 24527-AMD-Vi-fault-softirq.patch 24535-x86-vMSI-misc.patch 24615-VESA-lfb-flush.patch 24690-x86-PCI-SERR-no-deadlock.patch 24701-gnttab-map-grant-ref-recovery.patch 24742-gnttab-misc.patch 24780-x86-paging-use-clear_guest.patch 24781-x86-vmce-mcg_ctl.patch 24805-x86-MSI-X-dom0-ro.patch 24883-x86-guest-walk-not-present.patch 24886-x86-vmce-mcg_ctl-default.patch 24887-x86-vmce-sr.patch 24888-pci-release-devices.patch ioemu-9869-MSI-X-init.patch ioemu-9873-MSI-X-fix-unregister_iomem.patch vif-bridge-tap-fix.patch xend-cpuid.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.T9SERf/_old 2012-03-14 14:08:05.000000000 +0100 +++ /var/tmp/diff_new_pack.T9SERf/_new 2012-03-14 14:08:05.000000000 +0100 @@ -27,7 +27,7 @@ %define with_stubdom 1 # EFI requires gcc46 or newer # its available in 12.1 or >= sles11sp2 -%if %suse_version > 1140 || %suse_version == 1110 +%if %suse_version == 1110 %define with_gcc46 1 %else %define with_gcc46 0 @@ -101,7 +101,7 @@ BuildRequires: module-init-tools BuildRequires: xorg-x11 %endif -Version: 4.1.2_13 +Version: 4.1.2_15 Release: 0 PreReq: %insserv_prereq %fillup_prereq Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) @@ -345,14 +345,29 @@ Patch24459: 24459-libxl-vifname.patch Patch24466: 24466-libxc_Only_retry_mapping_pages_when_ENOENT_is_returned.patch Patch24478: 24478-libxl_add_feature_flag_to_xenstore_for_XS_RESET_WATCHES.patch +Patch24517: 24517-VT-d-fault-softirq.patch +Patch24527: 24527-AMD-Vi-fault-softirq.patch +Patch24535: 24535-x86-vMSI-misc.patch Patch24566: 24566-tools-libxc_fix_error_handling_in_xc_mem_paging_load.patch Patch24586: 24586-x86-mm_Properly_account_for_paged_out_pages.patch Patch24609: 24609-tools-libxc_handle_fallback_in_linux_privcmd_map_foreign_bulk_properly.patch Patch24610: 24610-xenpaging_make_file_op_largefile_aware.patch +Patch24615: 24615-VESA-lfb-flush.patch +Patch24690: 24690-x86-PCI-SERR-no-deadlock.patch +Patch24701: 24701-gnttab-map-grant-ref-recovery.patch +Patch24742: 24742-gnttab-misc.patch +Patch24780: 24780-x86-paging-use-clear_guest.patch +Patch24781: 24781-x86-vmce-mcg_ctl.patch +Patch24805: 24805-x86-MSI-X-dom0-ro.patch +Patch24883: 24883-x86-guest-walk-not-present.patch +Patch24886: 24886-x86-vmce-mcg_ctl-default.patch +Patch24887: 24887-x86-vmce-sr.patch +Patch24888: 24888-pci-release-devices.patch # Upstream qemu patches Patch100: ioemu-9868-MSI-X.patch -Patch101: ioemu-MSI-X-fix-unregister_iomem.patch -Patch102: cve-2012-0029-qemu-xen-unstable.patch +Patch101: ioemu-9869-MSI-X-init.patch +Patch102: ioemu-9873-MSI-X-fix-unregister_iomem.patch +Patch103: cve-2012-0029-qemu-xen-unstable.patch # Our patches Patch300: xen-config.diff Patch301: xend-config.diff @@ -409,9 +424,9 @@ Patch378: log-guest-console.patch Patch379: xend-migration-domname-fix.patch Patch380: xm-create-maxmem.patch -# Sent upstream and tentatively ACK'ed, but not yet committed -Patch381: 2XXXX-vif-bridge.patch +Patch381: vif-bridge-tap-fix.patch Patch382: xencommons-xenstored-root.patch +Patch383: xend-cpuid.patch # Patches for snapshot support Patch400: snapshot-ioemu-save.patch Patch401: snapshot-ioemu-restore.patch @@ -1053,14 +1068,29 @@ %patch24459 -p1 %patch24466 -p1 %patch24478 -p1 +%patch24517 -p1 +%patch24527 -p1 +%patch24535 -p1 %patch24566 -p1 %patch24586 -p1 %patch24609 -p1 %patch24610 -p1 +%patch24615 -p1 +%patch24690 -p1 +%patch24701 -p1 +%patch24742 -p1 +%patch24780 -p1 +%patch24781 -p1 +%patch24805 -p1 +%patch24883 -p1 +%patch24886 -p1 +%patch24887 -p1 +%patch24888 -p1 # Qemu %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 # Our patches %patch300 -p1 %patch301 -p1 @@ -1118,6 +1148,7 @@ %patch380 -p1 %patch381 -p1 %patch382 -p1 +%patch383 -p1 %patch400 -p1 %patch401 -p1 %patch402 -p1 ++++++ 24517-VT-d-fault-softirq.patch ++++++ References: bnc#712051, CVE-2011-3131 # HG changeset patch # User Dario Faggioli <dario.faggioli(a)citrix.com> # Date 1326798686 0 # Node ID a7ae457c327cd790704643e0ed4def3e717b47b3 # Parent 2913ccc6d70f15ffcc15c7e066c9269b15a30a09 Move IOMMU faults handling into softirq for VT-d. Dealing with interrupts from VT-d IOMMU(s) is deferred to a softirq-tasklet, raised by the actual IRQ handler. Since a new interrupt is not generated, even if further faults occur, until we cleared all the pending ones, there's no need of disabling IRQs, as the hardware does it by its own. Notice that this may cause the log to overflow, but none of the existing entry will be overwritten. Signed-off-by: Dario Faggioli <dario.faggioli(a)citrix.com> Committed-by: Keir Fraser <keir(a)xen.org> --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -53,6 +53,8 @@ bool_t __read_mostly untrusted_msi; int nr_iommus; +static struct tasklet vtd_fault_tasklet; + static void setup_dom0_devices(struct domain *d); static void setup_dom0_rmrr(struct domain *d); @@ -866,10 +868,8 @@ static void iommu_fault_status(u32 fault } #define PRIMARY_FAULT_REG_LEN (16) -static void iommu_page_fault(int irq, void *dev_id, - struct cpu_user_regs *regs) +static void __do_iommu_page_fault(struct iommu *iommu) { - struct iommu *iommu = dev_id; int reg, fault_index; u32 fault_status; unsigned long flags; @@ -943,6 +943,37 @@ clear_overflow: } } +static void do_iommu_page_fault(unsigned long data) +{ + struct acpi_drhd_unit *drhd; + + if ( list_empty(&acpi_drhd_units) ) + { + INTEL_IOMMU_DEBUG("no device found, something must be very wrong!\n"); + return; + } + + /* + * No matter from whom the interrupt came from, check all the + * IOMMUs present in the system. This allows for having just one + * tasklet (instead of one per each IOMMUs) and should be more than + * fine, considering how rare the event of a fault should be. + */ + for_each_drhd_unit ( drhd ) + __do_iommu_page_fault(drhd->iommu); +} + +static void iommu_page_fault(int irq, void *dev_id, + struct cpu_user_regs *regs) +{ + /* + * Just flag the tasklet as runnable. This is fine, according to VT-d + * specs since a new interrupt won't be generated until we clear all + * the faults that caused this one to happen. + */ + tasklet_schedule(&vtd_fault_tasklet); +} + static void dma_msi_unmask(unsigned int irq) { struct iommu *iommu = irq_to_iommu[irq]; @@ -2083,6 +2114,8 @@ int __init intel_vtd_setup(void) iommu_hap_pt_share = FALSE; } + softirq_tasklet_init(&vtd_fault_tasklet, do_iommu_page_fault, 0); + if ( !iommu_qinval && iommu_intremap ) { iommu_intremap = 0; ++++++ 24527-AMD-Vi-fault-softirq.patch ++++++ References: bnc#712051, CVE-2011-3131 # HG changeset patch # User Dario Faggioli <dario.faggioli(a)citrix.com> # Date 1327054832 0 # Node ID 028230eb2359f33da48b3b7f85173a1b49b9c7d6 # Parent d600a3d7faeeee3cf947bf1658b873e966fc0f16 iommu: Move IOMMU faults handling into softirq for AMD-Vi. Dealing with interrupts from AMD-Vi IOMMU(s) is deferred to a softirq-tasklet, raised by the actual IRQ handler. To avoid more interrupts being generated (because of further faults), they must be masked in the IOMMU within the low level IRQ handler and enabled back in the tasklet body. Notice that this may cause the log to overflow, but none of the existing entry will be overwritten. Signed-off-by: Dario Faggioli <dario.faggioli(a)citrix.com> Committed-by: Keir Fraser <keir(a)xen.org> --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -33,6 +33,8 @@ static int nr_amd_iommus; static long amd_iommu_cmd_buffer_entries = IOMMU_CMD_BUFFER_DEFAULT_ENTRIES; static long amd_iommu_event_log_entries = IOMMU_EVENT_LOG_DEFAULT_ENTRIES; +static struct tasklet amd_iommu_irq_tasklet; + unsigned short ivrs_bdf_entries; struct ivrs_mappings *ivrs_mappings; struct list_head amd_iommu_head; @@ -517,34 +519,70 @@ static void parse_event_log_entry(u32 en } } +static void do_amd_iommu_irq(unsigned long data) +{ + struct amd_iommu *iommu; + + if ( !iommu_found() ) + { + AMD_IOMMU_DEBUG("no device found, something must be very wrong!\n"); + return; + } + + /* + * No matter from where the interrupt came from, check all the + * IOMMUs present in the system. This allows for having just one + * tasklet (instead of one per each IOMMUs). + */ + for_each_amd_iommu ( iommu ) + { + u32 entry; + unsigned long flags; + int of; + + spin_lock_irqsave(&iommu->lock, flags); + amd_iommu_read_event_log(iommu); + + /* check event overflow */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + of = get_field_from_reg_u32(entry, + IOMMU_STATUS_EVENT_OVERFLOW_MASK, + IOMMU_STATUS_EVENT_OVERFLOW_SHIFT); + + /* reset event log if event overflow */ + if ( of ) + amd_iommu_reset_event_log(iommu); + + /* reset interrupt status bit */ + entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); + set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, entry, + IOMMU_STATUS_EVENT_LOG_INT_MASK, + IOMMU_STATUS_EVENT_LOG_INT_SHIFT, &entry); + writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + spin_unlock_irqrestore(&iommu->lock, flags); + } +} + static void amd_iommu_page_fault(int irq, void *dev_id, struct cpu_user_regs *regs) { u32 entry; unsigned long flags; - int of; struct amd_iommu *iommu = dev_id; spin_lock_irqsave(&iommu->lock, flags); - amd_iommu_read_event_log(iommu); - /*check event overflow */ + /* Silence interrupts from both event logging */ entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - of = get_field_from_reg_u32(entry, - IOMMU_STATUS_EVENT_OVERFLOW_MASK, - IOMMU_STATUS_EVENT_OVERFLOW_SHIFT); - - /* reset event log if event overflow */ - if ( of ) - amd_iommu_reset_event_log(iommu); - - /* reset interrupt status bit */ - entry = readl(iommu->mmio_base + IOMMU_STATUS_MMIO_OFFSET); - set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, entry, + set_field_in_reg_u32(IOMMU_CONTROL_DISABLED, entry, IOMMU_STATUS_EVENT_LOG_INT_MASK, IOMMU_STATUS_EVENT_LOG_INT_SHIFT, &entry); writel(entry, iommu->mmio_base+IOMMU_STATUS_MMIO_OFFSET); + spin_unlock_irqrestore(&iommu->lock, flags); + + /* It is the tasklet that will clear the logs and re-enable interrupts */ + tasklet_schedule(&amd_iommu_irq_tasklet); } static int set_iommu_interrupt_handler(struct amd_iommu *iommu) @@ -689,6 +727,8 @@ static int __init amd_iommu_init_one(str printk("AMD-Vi: IOMMU %d Enabled.\n", nr_amd_iommus ); nr_amd_iommus++; + softirq_tasklet_init(&amd_iommu_irq_tasklet, do_amd_iommu_irq, 0); + return 0; error_out: ++++++ 24535-x86-vMSI-misc.patch ++++++ # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1327311317 0 # Node ID fb81b807c1540eb5797b3daa4bddff99363b20ef # Parent eca719b621a1201528bfec25fb1786ec21c0c9d3 x86/vMSI: miscellaneous fixes This addresses a number of problems in msixtbl_{read,write}(): - address alignment was not checked, allowing for memory corruption in the hypervisor (write case) or returning of hypervisor private data to the guest (read case) - the interrupt mask bit was permitted to be written by the guest (while Xen's interrupt flow control routines need to control it) - MAX_MSIX_TABLE_{ENTRIES,PAGES} were pointlessly defined to plain numbers (making it unobvious why they have these values, and making the latter non-portable) - MAX_MSIX_TABLE_PAGES was also off by one (failing to account for a non-zero table offset); this was also affecting host MSI-X code - struct msixtbl_entry's table_flags[] was one element larger than necessary due to improper open-coding of BITS_TO_LONGS() - msixtbl_read() unconditionally accessed the physical table, even though the data was only needed in a quarter of all cases - various calculations were done unnecessarily for both of the rather distinct code paths in msixtbl_read() Additionally it is unclear on what basis MAX_MSIX_ACC_ENTRIES was chosen to be 3. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Committed-by: Keir Fraser <keir(a)xen.org> --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -158,7 +158,7 @@ struct msixtbl_entry struct pci_dev *pdev; unsigned long gtable; /* gpa of msix table */ unsigned long table_len; - unsigned long table_flags[MAX_MSIX_TABLE_ENTRIES / BITS_PER_LONG + 1]; + unsigned long table_flags[BITS_TO_LONGS(MAX_MSIX_TABLE_ENTRIES)]; #define MAX_MSIX_ACC_ENTRIES 3 struct { uint32_t msi_ad[3]; /* Shadow of address low, high and data */ @@ -185,17 +185,14 @@ static struct msixtbl_entry *msixtbl_fin static void __iomem *msixtbl_addr_to_virt( struct msixtbl_entry *entry, unsigned long addr) { - int idx, nr_page; + unsigned int idx, nr_page; - if ( !entry ) + if ( !entry || !entry->pdev ) return NULL; nr_page = (addr >> PAGE_SHIFT) - (entry->gtable >> PAGE_SHIFT); - if ( !entry->pdev ) - return NULL; - idx = entry->pdev->msix_table_idx[nr_page]; if ( !idx ) return NULL; @@ -208,37 +205,34 @@ static int msixtbl_read( struct vcpu *v, unsigned long address, unsigned long len, unsigned long *pval) { - unsigned long offset, val; + unsigned long offset; struct msixtbl_entry *entry; void *virt; - int nr_entry, index; + unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; - rcu_read_lock(&msixtbl_rcu_lock); + if ( len != 4 || (address & 3) ) + return r; - if ( len != 4 ) - goto out; + rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); - virt = msixtbl_addr_to_virt(entry, address); - if ( !virt ) - goto out; - - nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); - if ( nr_entry >= MAX_MSIX_ACC_ENTRIES && - offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) - goto out; - val = readl(virt); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) { + nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; + if ( nr_entry >= MAX_MSIX_ACC_ENTRIES ) + goto out; index = offset / sizeof(uint32_t); *pval = entry->gentries[nr_entry].msi_ad[index]; } else { - *pval = val; + virt = msixtbl_addr_to_virt(entry, address); + if ( !virt ) + goto out; + *pval = readl(virt); } r = X86EMUL_OKAY; @@ -253,13 +247,13 @@ static int msixtbl_write(struct vcpu *v, unsigned long offset; struct msixtbl_entry *entry; void *virt; - int nr_entry, index; + unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; - rcu_read_lock(&msixtbl_rcu_lock); + if ( len != 4 || (address & 3) ) + return r; - if ( len != 4 ) - goto out; + rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; @@ -284,9 +278,22 @@ static int msixtbl_write(struct vcpu *v, if ( !virt ) goto out; + /* Do not allow the mask bit to be changed. */ +#if 0 /* XXX + * As the mask bit is the only defined bit in the word, and as the + * host MSI-X code doesn't preserve the other bits anyway, doing + * this is pointless. So for now just discard the write (also + * saving us from having to determine the matching irq_desc). + */ + spin_lock_irqsave(&desc->lock, flags); + orig = readl(virt); + val &= ~PCI_MSIX_VECTOR_BITMASK; + val |= orig & PCI_MSIX_VECTOR_BITMASK; writel(val, virt); - r = X86EMUL_OKAY; + spin_unlock_irqrestore(&desc->lock, flags); +#endif + r = X86EMUL_OKAY; out: rcu_read_unlock(&msixtbl_rcu_lock); return r; --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -119,12 +119,6 @@ int msi_free_irq(struct msi_desc *entry) extern const struct hw_interrupt_type pci_msi_type; -#define PCI_MSIX_ENTRY_SIZE 16 -#define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET 0 -#define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET 4 -#define PCI_MSIX_ENTRY_DATA_OFFSET 8 -#define PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET 12 - #define msi_control_reg(base) (base + PCI_MSI_FLAGS) #define msi_lower_address_reg(base) (base + PCI_MSI_ADDRESS_LO) #define msi_upper_address_reg(base) (base + PCI_MSI_ADDRESS_HI) --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -12,6 +12,8 @@ #include <xen/list.h> #include <xen/spinlock.h> #include <xen/irq.h> +#include <xen/pci_regs.h> +#include <xen/pfn.h> /* * The PCI interface treats multi-function devices as independent @@ -30,8 +32,10 @@ #define PCI_BDF(b,d,f) ((((b) & 0xff) << 8) | PCI_DEVFN(d,f)) #define PCI_BDF2(b,df) ((((b) & 0xff) << 8) | ((df) & 0xff)) -#define MAX_MSIX_TABLE_ENTRIES 2048 -#define MAX_MSIX_TABLE_PAGES 8 +#define MAX_MSIX_TABLE_ENTRIES (PCI_MSIX_FLAGS_QSIZE + 1) +#define MAX_MSIX_TABLE_PAGES PFN_UP(MAX_MSIX_TABLE_ENTRIES * \ + PCI_MSIX_ENTRY_SIZE + \ + (~PCI_MSIX_BIRMASK & (PAGE_SIZE - 1))) struct pci_dev_info { unsigned is_extfn; unsigned is_virtfn; --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -305,6 +305,12 @@ #define PCI_MSIX_PBA 8 #define PCI_MSIX_BIRMASK (7 << 0) +#define PCI_MSIX_ENTRY_SIZE 16 +#define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET 0 +#define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET 4 +#define PCI_MSIX_ENTRY_DATA_OFFSET 8 +#define PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET 12 + #define PCI_MSIX_VECTOR_BITMASK (1 << 0) /* CompactPCI Hotswap Register */ ++++++ 24615-VESA-lfb-flush.patch ++++++ # HG changeset patch # User Andrew Cooper <andrew.cooper3(a)citrix.com> # Date 1327758145 0 # Node ID ac9f32525376922fdf5b9efac7a1fe0ff866cc76 # Parent f8c2cf24a26cc6cdaaad9140e4b1dfc54f07bab3 vesa: flush lfb after zeroing If Xen is going to relinquish the VGA console, flush the linear frame buffer after zeroing it in vesa_endboot(). Failing to do so in some circumstances leads to the actual linear framebuffer on the graphics card still containing the output of the Xen boot console can lead to ugly graphics output when dom0 is setting up the graphics card for its own use. While the patch is quite large, it is mostly just code motion to prevent having to forward declare lfb_flush(). The only functional change to vesa_endboot() is to insert a call to lbf_flush(). Signed-off-by: Andrew Cooper <andrew.cooper3(a)citrix.com> Committed-by: Keir Fraser <keir(a)xen.org> --- a/xen/drivers/video/vesa.c +++ b/xen/drivers/video/vesa.c @@ -153,24 +153,6 @@ void __init vesa_init(void) xfree(line_len); } -void __init vesa_endboot(bool_t keep) -{ - if ( keep ) - { - xpos = 0; - vga_puts = vesa_scroll_puts; - } - else - { - unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; - for ( i = 0; i < vlfb_info.height; i++ ) - memset(lfb + i * vlfb_info.bytes_per_line, 0, - vlfb_info.width * bpp); - } - - xfree(line_len); -} - #if defined(CONFIG_X86) #include <asm/mtrr.h> @@ -217,6 +199,25 @@ static void lfb_flush(void) #endif +void __init vesa_endboot(bool_t keep) +{ + if ( keep ) + { + xpos = 0; + vga_puts = vesa_scroll_puts; + } + else + { + unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; + for ( i = 0; i < vlfb_info.height; i++ ) + memset(lfb + i * vlfb_info.bytes_per_line, 0, + vlfb_info.width * bpp); + lfb_flush(); + } + + xfree(line_len); +} + /* Render one line of text to given linear framebuffer line. */ static void vesa_show_line( const unsigned char *text_line, ++++++ 24690-x86-PCI-SERR-no-deadlock.patch ++++++ # HG changeset patch # User David Vrabel <david.vrabel(a)citrix.com> # Date 1328196538 0 # Node ID dcc6d57e4c07728693c685a2cfa7f094ef726267 # Parent 7091b2e4cc2cff07ad1bf24ba7b9506bae071fa8 x86: avoid deadlock after a PCI SERR NMI If a PCI System Error (SERR) is asserted it causes an NMI. If this NMI occurs while the CPU is in printk() then Xen may deadlock as pci_serr_error() calls console_force_unlock() which screws up the console lock. printk() isn't safe to call from NMI context so defer the diagnostic message to a softirq. Signed-off-by: David Vrabel <david.vrabel(a)citrix.com> Tested-by: George Dunlap <george.dunlap(a)eu.citrix.com> Committed-by: Keir Fraser <keir(a)xen.org> --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3137,6 +3137,11 @@ static void nmi_mce_softirq(void) st->vcpu = NULL; } +static void pci_serr_softirq(void) +{ + printk("\n\nNMI - PCI system error (SERR)\n"); +} + void async_exception_cleanup(struct vcpu *curr) { int trap; @@ -3223,10 +3228,11 @@ static void nmi_dom0_report(unsigned int static void pci_serr_error(struct cpu_user_regs *regs) { - console_force_unlock(); - printk("\n\nNMI - PCI system error (SERR)\n"); - outb((inb(0x61) & 0x0f) | 0x04, 0x61); /* clear-and-disable the PCI SERR error line. */ + + /* Would like to print a diagnostic here but can't call printk() + from NMI context -- raise a softirq instead. */ + raise_softirq(PCI_SERR_SOFTIRQ); } static void io_check_error(struct cpu_user_regs *regs) @@ -3529,6 +3535,7 @@ void __init trap_init(void) cpu_init(); open_softirq(NMI_MCE_SOFTIRQ, nmi_mce_softirq); + open_softirq(PCI_SERR_SOFTIRQ, pci_serr_softirq); } long register_guest_nmi_callback(unsigned long address) --- a/xen/include/asm-x86/softirq.h +++ b/xen/include/asm-x86/softirq.h @@ -6,6 +6,7 @@ #define VCPU_KICK_SOFTIRQ (NR_COMMON_SOFTIRQS + 2) #define MACHINE_CHECK_SOFTIRQ (NR_COMMON_SOFTIRQS + 3) -#define NR_ARCH_SOFTIRQS 4 +#define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) +#define NR_ARCH_SOFTIRQS 5 #endif /* __ASM_SOFTIRQ_H__ */ ++++++ 24701-gnttab-map-grant-ref-recovery.patch ++++++ # HG changeset patch # User Haoyu Zhang <haoyu.zhang(a)huawei.com> # Date 1328563421 28800 # Node ID 3574f4d67843733ccaabab5f8ebb859c99d7314a # Parent 5bd5830dea13f2a80a1b9728d3e61c34661fe764 Fix error recovery path in __gnttab_map_grant_ref In file grant_table.c function __gnttab_map_grant_ref, if __get_paged_frame failed, the effect of _set_status previously called should be rollback, so the flag GTF_reading and _GTF_writing will be recovered. Signed-off-by: Haoyu Zhang <haoyu.zhang(a)huawei.com> Signed-off-by: Liang Wang <hzwangliang.wang(a)huawei.com> Acked-by: Andres Lagar-Cavilla <andres(a)lagarcavilla.org> Committed-by: Keir Fraser <keir(a)xen.org> --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -566,7 +566,7 @@ __gnttab_map_grant_ref( gfn = sha1 ? sha1->frame : sha2->full_page.frame; rc = __get_paged_frame(gfn, &frame, !!(op->flags & GNTMAP_readonly), rd); if ( rc != GNTST_okay ) - goto unlock_out; + goto unlock_out_clear; act->gfn = gfn; act->domid = ld->domain_id; act->frame = frame; @@ -722,6 +722,7 @@ __gnttab_map_grant_ref( act->pin -= (op->flags & GNTMAP_readonly) ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; + unlock_out_clear: if ( !(op->flags & GNTMAP_readonly) && !(act->pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) ) gnttab_clear_flag(_GTF_writing, status); ++++++ 24742-gnttab-misc.patch ++++++ # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1328801956 -3600 # Node ID 9fc810bb814558bc5c8f9d086af7576516e07244 # Parent fb71a97fe339282965d584663236ce71a2400659 gnttab: miscellaneous fixes - _GTF_* constants name bit positions, so binary arithmetic on them is wrong - gnttab_clear_flag() cannot (on x86 and ia64 at least) simply use clear_bit(), as that may access more than the two bytes that are intended to be accessed Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Keir Fraser <keir(a)xen.org> --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -389,7 +389,8 @@ static int _set_status_v2(domid_t domid (id != domid) || (!readonly && (flags & GTF_readonly)) ) { - gnttab_clear_flag(_GTF_reading | _GTF_writing, status); + gnttab_clear_flag(_GTF_writing, status); + gnttab_clear_flag(_GTF_reading, status); PIN_FAIL(done, GNTST_general_error, "Unstable flags (%x) or dom (%d). (expected dom %d) " "(r/w: %d)\n", @@ -1704,14 +1705,14 @@ __release_grant_for_copy( under the domain's grant table lock. */ /* Only safe on transitive grants. Even then, note that we don't attempt to drop any pin on the referent grant. */ -static void __fixup_status_for_pin(struct active_grant_entry *act, +static void __fixup_status_for_pin(const struct active_grant_entry *act, uint16_t *status) { if ( !(act->pin & GNTPIN_hstw_mask) ) - *status &= ~_GTF_writing; + *status &= ~GTF_writing; if ( !(act->pin & GNTPIN_hstr_mask) ) - *status &= ~_GTF_reading; + *status &= ~GTF_reading; } /* Grab a frame number from a grant entry and update the flags and pin --- a/xen/include/asm-ia64/grant_table.h +++ b/xen/include/asm-ia64/grant_table.h @@ -5,6 +5,8 @@ #ifndef __ASM_GRANT_TABLE_H__ #define __ASM_GRANT_TABLE_H__ +#include <asm/intrinsics.h> + #define INITIAL_NR_GRANT_FRAMES 1 // for grant map/unmap @@ -82,9 +84,19 @@ int guest_physmap_add_page(struct domain #define gnttab_mark_dirty(d, f) ((void)f) -static inline void gnttab_clear_flag(unsigned long nr, uint16_t *addr) +static inline void gnttab_clear_flag(unsigned int nr, volatile uint16_t *st) { - clear_bit(nr, addr); + /* + * Note that this cannot be clear_bit(), as the access must be + * confined to the specified 2 bytes. + */ + uint16_t mask = ~(1 << nr), old; + CMPXCHG_BUGCHECK_DECL + + do { + CMPXCHG_BUGCHECK(st); + old = *st; + } while (cmpxchg_rel(st, old, old & mask) != old); } #define gnttab_host_mapping_get_page_type(op, ld, rd) \ --- a/xen/include/asm-x86/grant_table.h +++ b/xen/include/asm-x86/grant_table.h @@ -48,9 +48,13 @@ int replace_grant_host_mapping( #define gnttab_mark_dirty(d, f) paging_mark_dirty((d), (f)) -static inline void gnttab_clear_flag(unsigned long nr, uint16_t *addr) +static inline void gnttab_clear_flag(unsigned int nr, uint16_t *st) { - clear_bit(nr, (unsigned long *)addr); + /* + * Note that this cannot be clear_bit(), as the access must be + * confined to the specified 2 bytes. + */ + asm volatile ("lock btrw %1,%0" : "=m" (*st) : "Ir" (nr), "m" (*st)); } /* Foreign mappings of HHVM-guest pages do not modify the type count. */ ++++++ 24780-x86-paging-use-clear_guest.patch ++++++ # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1329134942 -3600 # Node ID e953d536d3c6e344cf310f63ead9feda87cc67b0 # Parent 9ad1e42c341bc78463b6f6610a6300f75b535fbb x86/paging: use clear_guest() for zero-filling guest buffers While static arrays of all zeros may be tolerable (but are simply inefficient now that we have the necessary infrastructure), using on- stack arrays for this purpose (particularly when their size doesn't have an upper limit enforced) is calling for eventual problems (even if the code can be reached via administrative interfaces only). Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Tim Deegan <tim(a)xen.org> (Include necessary prerequisite bits from 24543:d6cdbc4fe078 "Introduce clear_user and clear_guest".) --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2163,6 +2163,86 @@ static enum hvm_copy_result __hvm_copy( return HVMCOPY_okay; } +static enum hvm_copy_result __hvm_clear(paddr_t addr, int size) +{ + struct vcpu *curr = current; + struct p2m_domain *p2m = p2m_get_hostp2m(curr->domain); + unsigned long gfn, mfn; + p2m_type_t p2mt; + char *p; + int count, todo = size; + uint32_t pfec = PFEC_page_present | PFEC_write_access; + + /* + * XXX Disable for 4.1.0: PV-on-HVM drivers will do grant-table ops + * such as query_size. Grant-table code currently does copy_to/from_guest + * accesses under the big per-domain lock, which this test would disallow. + * The test is not needed until we implement sleeping-on-waitqueue when + * we access a paged-out frame, and that's post 4.1.0 now. + */ +#if 0 + /* + * If the required guest memory is paged out, this function may sleep. + * Hence we bail immediately if called from atomic context. + */ + if ( in_atomic() ) + return HVMCOPY_unhandleable; +#endif + + while ( todo > 0 ) + { + count = min_t(int, PAGE_SIZE - (addr & ~PAGE_MASK), todo); + + gfn = paging_gva_to_gfn(curr, addr, &pfec); + if ( gfn == INVALID_GFN ) + { + if ( pfec == PFEC_page_paged ) + return HVMCOPY_gfn_paged_out; + if ( pfec == PFEC_page_shared ) + return HVMCOPY_gfn_shared; + return HVMCOPY_bad_gva_to_gfn; + } + + mfn = mfn_x(gfn_to_mfn_unshare(p2m, gfn, &p2mt, 0)); + + if ( p2m_is_paging(p2mt) ) + { + p2m_mem_paging_populate(p2m, gfn); + return HVMCOPY_gfn_paged_out; + } + if ( p2m_is_shared(p2mt) ) + return HVMCOPY_gfn_shared; + if ( p2m_is_grant(p2mt) ) + return HVMCOPY_unhandleable; + if ( !p2m_is_ram(p2mt) ) + return HVMCOPY_bad_gfn_to_mfn; + ASSERT(mfn_valid(mfn)); + + p = (char *)map_domain_page(mfn) + (addr & ~PAGE_MASK); + + if ( p2mt == p2m_ram_ro ) + { + static unsigned long lastpage; + if ( xchg(&lastpage, gfn) != gfn ) + gdprintk(XENLOG_DEBUG, "guest attempted write to read-only" + " memory page. gfn=%#lx, mfn=%#lx\n", + gfn, mfn); + } + else + { + memset(p, 0x00, count); + paging_mark_dirty(curr->domain, mfn); + } + + unmap_domain_page(p); + + addr += count; + todo -= count; + } + + return HVMCOPY_okay; +} + enum hvm_copy_result hvm_copy_to_guest_phys( paddr_t paddr, void *buf, int size) { @@ -2249,6 +2329,23 @@ unsigned long copy_to_user_hvm(void *to, return rc ? len : 0; /* fake a copy_to_user() return code */ } +unsigned long clear_user_hvm(void *to, unsigned int len) +{ + int rc; + +#ifdef __x86_64__ + if ( !current->arch.hvm_vcpu.hcall_64bit && + is_compat_arg_xlat_range(to, len) ) + { + memset(to, 0x00, len); + return 0; + } +#endif + + rc = __hvm_clear((unsigned long)to, len); + return rc ? len : 0; /* fake a copy_to_user() return code */ +} + unsigned long copy_from_user_hvm(void *to, const void *from, unsigned len) { int rc; --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -21,11 +21,11 @@ */ #include <xen/init.h> +#include <xen/guest_access.h> #include <asm/paging.h> #include <asm/shadow.h> #include <asm/p2m.h> #include <asm/hap.h> -#include <asm/guest_access.h> #include <xen/numa.h> #include <xsm/xsm.h> @@ -450,26 +450,30 @@ int paging_log_dirty_op(struct domain *d (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); i2++ ) { - static unsigned long zeroes[PAGE_SIZE/BYTES_PER_LONG]; unsigned int bytes = PAGE_SIZE; l1 = ((l2 && mfn_valid(l2[i2])) ? - map_domain_page(mfn_x(l2[i2])) : zeroes); + map_domain_page(mfn_x(l2[i2])) : NULL); if ( unlikely(((sc->pages - pages + 7) >> 3) < bytes) ) bytes = (unsigned int)((sc->pages - pages + 7) >> 3); if ( likely(peek) ) { - if ( copy_to_guest_offset(sc->dirty_bitmap, pages >> 3, - (uint8_t *)l1, bytes) != 0 ) + if ( (l1 ? copy_to_guest_offset(sc->dirty_bitmap, + pages >> 3, (uint8_t *)l1, + bytes) + : clear_guest_offset(sc->dirty_bitmap, + pages >> 3, bytes)) != 0 ) { rv = -EFAULT; goto out; } } - if ( clean && l1 != zeroes ) - clear_page(l1); pages += bytes << 3; - if ( l1 != zeroes ) + if ( l1 ) + { + if ( clean ) + clear_page(l1); unmap_domain_page(l1); + } } if ( l2 ) unmap_domain_page(l2); @@ -529,12 +533,9 @@ int paging_log_dirty_range(struct domain if ( !d->arch.paging.log_dirty.fault_count && !d->arch.paging.log_dirty.dirty_count ) { - int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; - unsigned long zeroes[size]; - memset(zeroes, 0x00, size * BYTES_PER_LONG); - rv = 0; - if ( copy_to_guest_offset(dirty_bitmap, 0, (uint8_t *) zeroes, - size * BYTES_PER_LONG) != 0 ) + unsigned int size = BITS_TO_LONGS(nr); + + if ( clear_guest(dirty_bitmap, size * BYTES_PER_LONG) != 0 ) rv = -EFAULT; goto out; } @@ -562,11 +563,10 @@ int paging_log_dirty_range(struct domain (pages < nr) && (i2 < LOGDIRTY_NODE_ENTRIES); i2++ ) { - static unsigned long zeroes[PAGE_SIZE/BYTES_PER_LONG]; unsigned int bytes = PAGE_SIZE; uint8_t *s; l1 = ((l2 && mfn_valid(l2[i2])) ? - map_domain_page(mfn_x(l2[i2])) : zeroes); + map_domain_page(mfn_x(l2[i2])) : NULL); s = ((uint8_t*)l1) + (b1 >> 3); bytes -= b1 >> 3; @@ -574,9 +574,18 @@ int paging_log_dirty_range(struct domain if ( likely(((nr - pages + 7) >> 3) < bytes) ) bytes = (unsigned int)((nr - pages + 7) >> 3); + if ( !l1 ) + { + if ( clear_guest_offset(dirty_bitmap, pages >> 3, + bytes) != 0 ) + { + rv = -EFAULT; + goto out; + } + } /* begin_pfn is not 32K aligned, hence we have to bit * shift the bitmap */ - if ( b1 & 0x7 ) + else if ( b1 & 0x7 ) { int i, j; uint32_t *l = (uint32_t*) s; @@ -620,11 +629,12 @@ int paging_log_dirty_range(struct domain } } - if ( l1 != zeroes ) - clear_page(l1); pages += bytes << 3; - if ( l1 != zeroes ) + if ( l1 ) + { + clear_page(l1); unmap_domain_page(l1); + } b1 = b1 & 0x7; } b2 = 0; --- a/xen/arch/x86/usercopy.c +++ b/xen/arch/x86/usercopy.c @@ -110,6 +110,42 @@ copy_to_user(void __user *to, const void return n; } +#define __do_clear_user(addr,size) \ +do { \ + long __d0; \ + __asm__ __volatile__( \ + "0: rep; stosl\n" \ + " movl %2,%0\n" \ + "1: rep; stosb\n" \ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3: lea 0(%2,%0,4),%0\n" \ + " jmp 2b\n" \ + ".previous\n" \ + _ASM_EXTABLE(0b,3b) \ + _ASM_EXTABLE(1b,2b) \ + : "=&c"(size), "=&D" (__d0) \ + : "r"(size & 3), "0"(size / 4), "1"((long)addr), "a"(0)); \ +} while (0) + +/** + * clear_user: - Zero a block of memory in user space. + * @to: Destination address, in user space. + * @n: Number of bytes to zero. + * + * Zero a block of memory in user space. + * + * Returns number of bytes that could not be cleared. + * On success, this will be zero. + */ +unsigned long +clear_user(void __user *to, unsigned n) +{ + if ( access_ok(to, n) ) + __do_clear_user(to, n); + return n; +} + /** * copy_from_user: - Copy a block of data from user space. * @to: Destination address, in kernel space. --- a/xen/include/asm-x86/guest_access.h +++ b/xen/include/asm-x86/guest_access.h @@ -21,6 +21,10 @@ (is_hvm_vcpu(current) ? \ copy_from_user_hvm((dst), (src), (len)) : \ copy_from_user((dst), (src), (len))) +#define raw_clear_guest(dst, len) \ + (is_hvm_vcpu(current) ? \ + clear_user_hvm((dst), (len)) : \ + clear_user((dst), (len))) #define __raw_copy_to_guest(dst, src, len) \ (is_hvm_vcpu(current) ? \ copy_to_user_hvm((dst), (src), (len)) : \ @@ -29,6 +33,10 @@ (is_hvm_vcpu(current) ? \ copy_from_user_hvm((dst), (src), (len)) : \ __copy_from_user((dst), (src), (len))) +#define __raw_clear_guest(dst, len) \ + (is_hvm_vcpu(current) ? \ + clear_user_hvm((dst), (len)) : \ + clear_user((dst), (len))) /* Is the guest handle a NULL reference? */ #define guest_handle_is_null(hnd) ((hnd).p == NULL) @@ -69,6 +77,11 @@ raw_copy_from_guest(_d, _s+(off), sizeof(*_d)*(nr));\ }) +#define clear_guest_offset(hnd, off, nr) ({ \ + void *_d = (hnd).p; \ + raw_clear_guest(_d+(off), nr); \ +}) + /* Copy sub-field of a structure to guest context via a guest handle. */ #define copy_field_to_guest(hnd, ptr, field) ({ \ const typeof(&(ptr)->field) _s = &(ptr)->field; \ @@ -110,6 +123,11 @@ __raw_copy_from_guest(_d, _s+(off), sizeof(*_d)*(nr));\ }) +#define __clear_guest_offset(hnd, off, nr) ({ \ + void *_d = (hnd).p; \ + __raw_clear_guest(_d+(off), nr); \ +}) + #define __copy_field_to_guest(hnd, ptr, field) ({ \ const typeof(&(ptr)->field) _s = &(ptr)->field; \ void *_d = &(hnd).p->field; \ --- a/xen/include/asm-x86/hvm/guest_access.h +++ b/xen/include/asm-x86/hvm/guest_access.h @@ -2,6 +2,7 @@ #define __ASM_X86_HVM_GUEST_ACCESS_H__ unsigned long copy_to_user_hvm(void *to, const void *from, unsigned len); +unsigned long clear_user_hvm(void *to, unsigned int len); unsigned long copy_from_user_hvm(void *to, const void *from, unsigned len); #endif /* __ASM_X86_HVM_GUEST_ACCESS_H__ */ --- a/xen/include/asm-x86/uaccess.h +++ b/xen/include/asm-x86/uaccess.h @@ -16,6 +16,7 @@ #endif unsigned long copy_to_user(void *to, const void *from, unsigned len); +unsigned long clear_user(void *to, unsigned len); unsigned long copy_from_user(void *to, const void *from, unsigned len); /* Handles exceptions in both to and from, but doesn't do access_ok */ unsigned long __copy_to_user_ll(void *to, const void *from, unsigned n); --- a/xen/include/xen/guest_access.h +++ b/xen/include/xen/guest_access.h @@ -15,10 +15,16 @@ #define copy_from_guest(ptr, hnd, nr) \ copy_from_guest_offset(ptr, hnd, 0, nr) +#define clear_guest(hnd, nr) \ + clear_guest_offset(hnd, 0, nr) + #define __copy_to_guest(hnd, ptr, nr) \ __copy_to_guest_offset(hnd, 0, ptr, nr) #define __copy_from_guest(ptr, hnd, nr) \ __copy_from_guest_offset(ptr, hnd, 0, nr) +#define __clear_guest(hnd, nr) \ + __clear_guest_offset(hnd, 0, nr) + #endif /* __XEN_GUEST_ACCESS_H__ */ ++++++ 24781-x86-vmce-mcg_ctl.patch ++++++ References: bnc#745367 # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1329135150 -3600 # Node ID 6ae5506e49abbe07b3b84c56cda114f59beb7ebe # Parent e953d536d3c6e344cf310f63ead9feda87cc67b0 x86/vMCE: MC{G,i}_CTL handling adjustments - g_mcg_cap was read to determine whether MCG_CTL exists before it got initialized - h_mci_ctrl[] and dom_vmce()->mci_ctl[] both got initialized via memset() with an inappropriate size (hence causing a [minor?] information leak) Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Keir Fraser <keir(a)xen.org> --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -29,7 +29,7 @@ invbool_param("mce", mce_disabled); bool_t __read_mostly mce_broadcast = 0; bool_t is_mc_panic; unsigned int __read_mostly nr_mce_banks; -int __read_mostly firstbank; +unsigned int __read_mostly firstbank; static void intpose_init(void); static void mcinfo_clear(struct mc_info *); @@ -646,7 +646,7 @@ int mce_available(struct cpuinfo_x86 *c) * Check if bank 0 is usable for MCE. It isn't for AMD K7, * and Intel P6 family before model 0x1a. */ -int mce_firstbank(struct cpuinfo_x86 *c) +unsigned int mce_firstbank(struct cpuinfo_x86 *c) { if (c->x86 == 6) { if (c->x86_vendor == X86_VENDOR_AMD) --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -52,13 +52,13 @@ int is_vmce_ready(struct mcinfo_bank *ba int unmmap_broken_page(struct domain *d, mfn_t mfn, unsigned long gfn); u64 mce_cap_init(void); -extern int firstbank; +extern unsigned int firstbank; int intel_mce_rdmsr(uint32_t msr, uint64_t *val); int intel_mce_wrmsr(uint32_t msr, uint64_t val); int mce_available(struct cpuinfo_x86 *c); -int mce_firstbank(struct cpuinfo_x86 *c); +unsigned int mce_firstbank(struct cpuinfo_x86 *c); /* Helper functions used for collecting error telemetry */ struct mc_info *x86_mcinfo_getptr(void); void mc_panic(char *s); --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -39,7 +39,7 @@ int vmce_init_msr(struct domain *d) return -ENOMEM; } memset(dom_vmce(d)->mci_ctl, ~0, - sizeof(dom_vmce(d)->mci_ctl)); + nr_mce_banks * sizeof(*dom_vmce(d)->mci_ctl)); dom_vmce(d)->mcg_status = 0x0; dom_vmce(d)->mcg_cap = g_mcg_cap; @@ -437,7 +437,7 @@ int vmce_domain_inject( int vmce_init(struct cpuinfo_x86 *c) { u64 value; - int i; + unsigned int i; if ( !h_mci_ctrl ) { @@ -448,17 +448,17 @@ int vmce_init(struct cpuinfo_x86 *c) return -ENOMEM; } /* Don't care banks before firstbank */ - memset(h_mci_ctrl, 0xff, sizeof(h_mci_ctrl)); + memset(h_mci_ctrl, ~0, + min(firstbank, nr_mce_banks) * sizeof(*h_mci_ctrl)); for (i = firstbank; i < nr_mce_banks; i++) rdmsrl(MSR_IA32_MCx_CTL(i), h_mci_ctrl[i]); } - if (g_mcg_cap & MCG_CTL_P) - rdmsrl(MSR_IA32_MCG_CTL, h_mcg_ctl); - rdmsrl(MSR_IA32_MCG_CAP, value); /* For Guest vMCE usage */ g_mcg_cap = value & ~MCG_CMCI_P; + if (value & MCG_CTL_P) + rdmsrl(MSR_IA32_MCG_CTL, h_mcg_ctl); return 0; } ++++++ 24805-x86-MSI-X-dom0-ro.patch ++++++ # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1329303884 -3600 # Node ID 618cbd27bac06fe39b1c6f28ded6d4d7f444e7bd # Parent 0ba87b95e80bae059fe70b4b117dcc409f2471ef x86: don't allow Dom0 to map MSI-X table writably With the traditional qemu tree fixed to not use PROT_WRITE anymore in the mmap() call for this region, and with the upstream qemu tree not being capable of handling passthrough, yet, there's no need to treat Dom specially here anymore. This continues to leave unaddressed the case where PV guests map the MSI-X table page(s) before setting up the first MSI-X interrupt (see the original c/s 22182:68cc3c514a0a description for options). Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Keir Fraser <keir(a)xen.org> --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -835,7 +835,7 @@ get_page_from_l1e( return -EINVAL; } - if ( !(l1f & _PAGE_RW) || IS_PRIV(pg_owner) || + if ( !(l1f & _PAGE_RW) || !rangeset_contains_singleton(mmio_ro_ranges, mfn) ) return 0; dprintk(XENLOG_G_WARNING, ++++++ 24883-x86-guest-walk-not-present.patch ++++++ References: bnc#747331 # HG changeset patch # User Tim Deegan <tim(a)xen.org> # Date 1329992967 0 # Node ID adcd6ab160fae996d53c6843da0c5728ca8a8bd3 # Parent 3d4955cbcb67a1c41e6b71af783b0921a3f7b081 x86/mm: Don't check for invalid bits in non-present PTEs. If _PAGE_PRESENT is clean in a pagetable entry, any pattern of bits is valid in the rest of the entry. OSes that special-case PFEC_invalid_bits (since it should never happen) will be confused by our setting it in this way. Signed-off-by: Tim Deegan <tim(a)xen.org> --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -162,8 +162,11 @@ guest_walk_tables(struct vcpu *v, struct l4p = (guest_l4e_t *) top_map; gw->l4e = l4p[guest_l4_table_offset(va)]; gflags = guest_l4e_get_flags(gw->l4e) ^ iflags; + if ( !(gflags & _PAGE_PRESENT) ) { + rc |= _PAGE_PRESENT; + goto out; + } rc |= ((gflags & mflags) ^ mflags); - if ( rc & _PAGE_PRESENT ) goto out; /* Map the l3 table */ l3p = map_domain_gfn(p2m, @@ -176,9 +179,11 @@ guest_walk_tables(struct vcpu *v, struct /* Get the l3e and check its flags*/ gw->l3e = l3p[guest_l3_table_offset(va)]; gflags = guest_l3e_get_flags(gw->l3e) ^ iflags; - rc |= ((gflags & mflags) ^ mflags); - if ( rc & _PAGE_PRESENT ) + if ( !(gflags & _PAGE_PRESENT) ) { + rc |= _PAGE_PRESENT; goto out; + } + rc |= ((gflags & mflags) ^ mflags); #else /* PAE only... */ @@ -213,9 +218,11 @@ guest_walk_tables(struct vcpu *v, struct #endif /* All levels... */ gflags = guest_l2e_get_flags(gw->l2e) ^ iflags; - rc |= ((gflags & mflags) ^ mflags); - if ( rc & _PAGE_PRESENT ) + if ( !(gflags & _PAGE_PRESENT) ) { + rc |= _PAGE_PRESENT; goto out; + } + rc |= ((gflags & mflags) ^ mflags); pse = (guest_supports_superpages(v) && (guest_l2e_get_flags(gw->l2e) & _PAGE_PSE)); @@ -277,6 +284,10 @@ guest_walk_tables(struct vcpu *v, struct goto out; gw->l1e = l1p[guest_l1_table_offset(va)]; gflags = guest_l1e_get_flags(gw->l1e) ^ iflags; + if ( !(gflags & _PAGE_PRESENT) ) { + rc |= _PAGE_PRESENT; + goto out; + } rc |= ((gflags & mflags) ^ mflags); } ++++++ 24886-x86-vmce-mcg_ctl-default.patch ++++++ References: bnc#745367 # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1330070623 -3600 # Node ID e80b0bb4470b944a5b52a91c0ec85a1d65d18c55 # Parent 0c3d19f40ab145d101de84051c3e00eef17fa1cb x86/vMCE: don't advertise features we don't support ... or even know of. Apart from CMCI, which was masked off already, this now also suppresses the advertising of extended state registers (reading of which would likely be meaningless in a guest and represent an information leak). Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Keir Fraser <keir(a)xen.org> --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -456,7 +456,7 @@ int vmce_init(struct cpuinfo_x86 *c) rdmsrl(MSR_IA32_MCG_CAP, value); /* For Guest vMCE usage */ - g_mcg_cap = value & ~MCG_CMCI_P; + g_mcg_cap = value & (MCG_CAP_COUNT | MCG_CTL_P | MCG_TES_P | MCG_SER_P); if (value & MCG_CTL_P) rdmsrl(MSR_IA32_MCG_CTL, h_mcg_ctl); --- a/xen/arch/x86/cpu/mcheck/x86_mca.h +++ b/xen/arch/x86/cpu/mcheck/x86_mca.h @@ -30,12 +30,13 @@ /* Bitfield of the MSR_IA32_MCG_CAP register */ -#define MCG_SER_P (1UL<<24) #define MCG_CAP_COUNT 0x00000000000000ffULL -#define MCG_CTL_P 0x0000000000000100ULL -#define MCG_EXT_P (1UL<<9) -#define MCG_EXT_CNT (16) -#define MCG_CMCI_P (1UL<<10) +#define MCG_CTL_P (1ULL<<8) +#define MCG_EXT_P (1ULL<<9) +#define MCG_CMCI_P (1ULL<<10) +#define MCG_TES_P (1ULL<<11) +#define MCG_EXT_CNT 16 +#define MCG_SER_P (1ULL<<24) /* Other bits are reserved */ /* Bitfield of the MSR_IA32_MCG_STATUS register */ ++++++ 24887-x86-vmce-sr.patch ++++++ References: bnc#745367 # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1330070874 -3600 # Node ID 35d855e520038bf5814f53d105dc4adf58a670f2 # Parent e80b0bb4470b944a5b52a91c0ec85a1d65d18c55 x86/vMCE: save/restore MCA capabilities This allows migration to a host with less MCA banks than the source host had, while without this patch accesses to the excess banks' MSRs caused #GP-s in the guest after migration (and it depended on the guest kernel whether this would be fatal). A fundamental question is whether we should also save/restore MCG_CTL and MCi_CTL, as the HVM save record would better be defined to the complete state that needs saving from the beginning (I'm unsure whether the save/restore logic allows for future extension of an existing record). Of course, this change is expected to make migration from new to older Xen impossible (again I'm unsure what the save/restore logic does with records it doesn't even know about). The (trivial) tools side change may seem unrelated, but the code should have been that way from the beginning to allow the hypervisor to look at currently unused ext_vcpucontext fields without risking to read garbage when those fields get a meaning assigned in the future. This isn't being enforced here - should it be? (Obviously, for backwards compatibility, the hypervisor must assume these fields to be clear only when the extended context's size exceeds the old original one.) A future addition to this change might be to allow configuration of the number of banks and other MCA capabilities for a guest before it starts (i.e. to not inherits the values seen on the first host it runs on). Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Keir Fraser <keir(a)xen.org> --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -1766,6 +1766,7 @@ int xc_domain_save(xc_interface *xch, in domctl.cmd = XEN_DOMCTL_get_ext_vcpucontext; domctl.domain = dom; + memset(&domctl.u, 0, sizeof(domctl.u)); domctl.u.ext_vcpucontext.vcpu = i; if ( xc_domctl(xch, &domctl) < 0 ) { --- a/tools/misc/xen-hvmctx.c +++ b/tools/misc/xen-hvmctx.c @@ -375,6 +375,13 @@ static void dump_viridian(void) (unsigned long long) p.guest_os_id); } +static void dump_vmce_vcpu(void) +{ + HVM_SAVE_TYPE(VMCE_VCPU) p; + READ(p); + printf(" VMCE_VCPU: caps %" PRIx64 "\n", p.caps); +} + int main(int argc, char **argv) { int entry, domid; @@ -440,6 +447,7 @@ int main(int argc, char **argv) case HVM_SAVE_CODE(PMTIMER): dump_pmtimer(); break; case HVM_SAVE_CODE(MTRR): dump_mtrr(); break; case HVM_SAVE_CODE(VIRIDIAN): dump_viridian(); break; + case HVM_SAVE_CODE(VMCE_VCPU): dump_vmce_vcpu(); break; case HVM_SAVE_CODE(END): break; default: printf(" ** Don't understand type %u: skipping\n", --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -3,6 +3,7 @@ #define _MCE_H #include <xen/init.h> +#include <xen/sched.h> #include <xen/smp.h> #include <asm/types.h> #include <asm/traps.h> @@ -54,8 +55,8 @@ int unmmap_broken_page(struct domain *d, u64 mce_cap_init(void); extern unsigned int firstbank; -int intel_mce_rdmsr(uint32_t msr, uint64_t *val); -int intel_mce_wrmsr(uint32_t msr, uint64_t val); +int intel_mce_rdmsr(const struct vcpu *, uint32_t msr, uint64_t *val); +int intel_mce_wrmsr(struct vcpu *, uint32_t msr, uint64_t val); int mce_available(struct cpuinfo_x86 *c); unsigned int mce_firstbank(struct cpuinfo_x86 *c); @@ -169,18 +170,20 @@ int vmce_domain_inject(struct mcinfo_ban extern int vmce_init(struct cpuinfo_x86 *c); -static inline int mce_vendor_bank_msr(uint32_t msr) +static inline int mce_vendor_bank_msr(const struct vcpu *v, uint32_t msr) { if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && - msr >= MSR_IA32_MC0_CTL2 && msr < (MSR_IA32_MC0_CTL2 + nr_mce_banks) ) + msr >= MSR_IA32_MC0_CTL2 && + msr < MSR_IA32_MCx_CTL2(v->arch.mcg_cap & MCG_CAP_COUNT) ) return 1; return 0; } -static inline int mce_bank_msr(uint32_t msr) +static inline int mce_bank_msr(const struct vcpu *v, uint32_t msr) { - if ( (msr >= MSR_IA32_MC0_CTL && msr < MSR_IA32_MCx_CTL(nr_mce_banks)) || - mce_vendor_bank_msr(msr) ) + if ( (msr >= MSR_IA32_MC0_CTL && + msr < MSR_IA32_MCx_CTL(v->arch.mcg_cap & MCG_CAP_COUNT)) || + mce_vendor_bank_msr(v, msr) ) return 1; return 0; } --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -1322,11 +1322,12 @@ enum mcheck_type intel_mcheck_init(struc } /* intel specific MCA MSR */ -int intel_mce_wrmsr(uint32_t msr, uint64_t val) +int intel_mce_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) { int ret = 0; - if (msr >= MSR_IA32_MC0_CTL2 && msr < (MSR_IA32_MC0_CTL2 + nr_mce_banks)) + if ( msr >= MSR_IA32_MC0_CTL2 && + msr < MSR_IA32_MCx_CTL2(v->arch.mcg_cap & MCG_CAP_COUNT) ) { mce_printk(MCE_QUIET, "We have disabled CMCI capability, " "Guest should not write this MSR!\n"); @@ -1336,11 +1337,12 @@ int intel_mce_wrmsr(uint32_t msr, uint64 return ret; } -int intel_mce_rdmsr(uint32_t msr, uint64_t *val) +int intel_mce_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) { int ret = 0; - if (msr >= MSR_IA32_MC0_CTL2 && msr < (MSR_IA32_MC0_CTL2 + nr_mce_banks)) + if ( msr >= MSR_IA32_MC0_CTL2 && + msr < MSR_IA32_MCx_CTL2(v->arch.mcg_cap & MCG_CAP_COUNT) ) { mce_printk(MCE_QUIET, "We have disabled CMCI capability, " "Guest should not read this MSR!\n"); --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -10,6 +10,7 @@ #include <xen/delay.h> #include <xen/smp.h> #include <xen/mm.h> +#include <xen/hvm/save.h> #include <asm/processor.h> #include <public/sysctl.h> #include <asm/system.h> @@ -42,7 +43,6 @@ int vmce_init_msr(struct domain *d) nr_mce_banks * sizeof(*dom_vmce(d)->mci_ctl)); dom_vmce(d)->mcg_status = 0x0; - dom_vmce(d)->mcg_cap = g_mcg_cap; dom_vmce(d)->mcg_ctl = ~(uint64_t)0x0; dom_vmce(d)->nr_injection = 0; @@ -61,21 +61,41 @@ void vmce_destroy_msr(struct domain *d) dom_vmce(d) = NULL; } -static int bank_mce_rdmsr(struct domain *d, uint32_t msr, uint64_t *val) +void vmce_init_vcpu(struct vcpu *v) { - int bank, ret = 1; - struct domain_mca_msrs *vmce = dom_vmce(d); + v->arch.mcg_cap = g_mcg_cap; +} + +int vmce_restore_vcpu(struct vcpu *v, uint64_t caps) +{ + if ( caps & ~g_mcg_cap & ~MCG_CAP_COUNT & ~MCG_CTL_P ) + { + dprintk(XENLOG_G_ERR, "%s restore: unsupported MCA capabilities" + " %#" PRIx64 " for d%d:v%u (supported: %#Lx)\n", + is_hvm_vcpu(v) ? "HVM" : "PV", caps, v->domain->domain_id, + v->vcpu_id, g_mcg_cap & ~MCG_CAP_COUNT); + return -EPERM; + } + + v->arch.mcg_cap = caps; + return 0; +} + +static int bank_mce_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) +{ + int ret = 1; + unsigned int bank = (msr - MSR_IA32_MC0_CTL) / 4; + struct domain_mca_msrs *vmce = dom_vmce(v->domain); struct bank_entry *entry; - bank = (msr - MSR_IA32_MC0_CTL) / 4; - if ( bank >= nr_mce_banks ) - return -1; + *val = 0; switch ( msr & (MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: - *val = vmce->mci_ctl[bank] & - (h_mci_ctrl ? h_mci_ctrl[bank] : ~0UL); + if ( bank < nr_mce_banks ) + *val = vmce->mci_ctl[bank] & + (h_mci_ctrl ? h_mci_ctrl[bank] : ~0UL); mce_printk(MCE_VERBOSE, "MCE: rdmsr MC%u_CTL 0x%"PRIx64"\n", bank, *val); break; @@ -126,7 +146,7 @@ static int bank_mce_rdmsr(struct domain switch ( boot_cpu_data.x86_vendor ) { case X86_VENDOR_INTEL: - ret = intel_mce_rdmsr(msr, val); + ret = intel_mce_rdmsr(v, msr, val); break; default: ret = 0; @@ -145,13 +165,13 @@ static int bank_mce_rdmsr(struct domain */ int vmce_rdmsr(uint32_t msr, uint64_t *val) { - struct domain *d = current->domain; - struct domain_mca_msrs *vmce = dom_vmce(d); + const struct vcpu *cur = current; + struct domain_mca_msrs *vmce = dom_vmce(cur->domain); int ret = 1; *val = 0; - spin_lock(&dom_vmce(d)->lock); + spin_lock(&vmce->lock); switch ( msr ) { @@ -162,39 +182,38 @@ int vmce_rdmsr(uint32_t msr, uint64_t *v "MCE: rdmsr MCG_STATUS 0x%"PRIx64"\n", *val); break; case MSR_IA32_MCG_CAP: - *val = vmce->mcg_cap; + *val = cur->arch.mcg_cap; mce_printk(MCE_VERBOSE, "MCE: rdmsr MCG_CAP 0x%"PRIx64"\n", *val); break; case MSR_IA32_MCG_CTL: /* Always 0 if no CTL support */ - *val = vmce->mcg_ctl & h_mcg_ctl; + if ( cur->arch.mcg_cap & MCG_CTL_P ) + *val = vmce->mcg_ctl & h_mcg_ctl; mce_printk(MCE_VERBOSE, "MCE: rdmsr MCG_CTL 0x%"PRIx64"\n", *val); break; default: - ret = mce_bank_msr(msr) ? bank_mce_rdmsr(d, msr, val) : 0; + ret = mce_bank_msr(cur, msr) ? bank_mce_rdmsr(cur, msr, val) : 0; break; } - spin_unlock(&dom_vmce(d)->lock); + spin_unlock(&vmce->lock); return ret; } -static int bank_mce_wrmsr(struct domain *d, u32 msr, u64 val) +static int bank_mce_wrmsr(struct vcpu *v, u32 msr, u64 val) { - int bank, ret = 1; - struct domain_mca_msrs *vmce = dom_vmce(d); + int ret = 1; + unsigned int bank = (msr - MSR_IA32_MC0_CTL) / 4; + struct domain_mca_msrs *vmce = dom_vmce(v->domain); struct bank_entry *entry = NULL; - bank = (msr - MSR_IA32_MC0_CTL) / 4; - if ( bank >= nr_mce_banks ) - return -EINVAL; - switch ( msr & (MSR_IA32_MC0_CTL | 3) ) { case MSR_IA32_MC0_CTL: - vmce->mci_ctl[bank] = val; + if ( bank < nr_mce_banks ) + vmce->mci_ctl[bank] = val; break; case MSR_IA32_MC0_STATUS: /* Give the first entry of the list, it corresponds to current @@ -202,9 +221,9 @@ static int bank_mce_wrmsr(struct domain * the guest, this node will be deleted. * Only error bank is written. Non-error banks simply return. */ - if ( !list_empty(&dom_vmce(d)->impact_header) ) + if ( !list_empty(&vmce->impact_header) ) { - entry = list_entry(dom_vmce(d)->impact_header.next, + entry = list_entry(vmce->impact_header.next, struct bank_entry, list); if ( entry->bank == bank ) entry->mci_status = val; @@ -228,7 +247,7 @@ static int bank_mce_wrmsr(struct domain switch ( boot_cpu_data.x86_vendor ) { case X86_VENDOR_INTEL: - ret = intel_mce_wrmsr(msr, val); + ret = intel_mce_wrmsr(v, msr, val); break; default: ret = 0; @@ -247,9 +266,9 @@ static int bank_mce_wrmsr(struct domain */ int vmce_wrmsr(u32 msr, u64 val) { - struct domain *d = current->domain; + struct vcpu *cur = current; struct bank_entry *entry = NULL; - struct domain_mca_msrs *vmce = dom_vmce(d); + struct domain_mca_msrs *vmce = dom_vmce(cur->domain); int ret = 1; if ( !g_mcg_cap ) @@ -266,7 +285,7 @@ int vmce_wrmsr(u32 msr, u64 val) vmce->mcg_status = val; mce_printk(MCE_VERBOSE, "MCE: wrmsr MCG_STATUS %"PRIx64"\n", val); /* For HVM guest, this is the point for deleting vMCE injection node */ - if ( d->is_hvm && (vmce->nr_injection > 0) ) + if ( is_hvm_vcpu(cur) && (vmce->nr_injection > 0) ) { vmce->nr_injection--; /* Should be 0 */ if ( !list_empty(&vmce->impact_header) ) @@ -293,7 +312,7 @@ int vmce_wrmsr(u32 msr, u64 val) ret = -1; break; default: - ret = mce_bank_msr(msr) ? bank_mce_wrmsr(d, msr, val) : 0; + ret = mce_bank_msr(cur, msr) ? bank_mce_wrmsr(cur, msr, val) : 0; break; } @@ -301,6 +320,46 @@ int vmce_wrmsr(u32 msr, u64 val) return ret; } +static int vmce_save_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) +{ + struct vcpu *v; + int err = 0; + + for_each_vcpu( d, v ) { + struct hvm_vmce_vcpu ctxt = { + .caps = v->arch.mcg_cap + }; + + err = hvm_save_entry(VMCE_VCPU, v->vcpu_id, h, &ctxt); + if ( err ) + break; + } + + return err; +} + +static int vmce_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) +{ + unsigned int vcpuid = hvm_load_instance(h); + struct vcpu *v; + struct hvm_vmce_vcpu ctxt; + int err; + + if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) + { + dprintk(XENLOG_G_ERR, "HVM restore: dom%d has no vcpu%u\n", + d->domain_id, vcpuid); + err = -EINVAL; + } + else + err = hvm_load_entry(VMCE_VCPU, h, &ctxt); + + return err ?: vmce_restore_vcpu(v, ctxt.caps); +} + +HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt, + vmce_load_vcpu_ctxt, 1, HVMSR_PER_VCPU); + int inject_vmce(struct domain *d) { int cpu = smp_processor_id(); --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -376,6 +376,8 @@ int vcpu_initialise(struct vcpu *v) if ( (rc = xsave_alloc_save_area(v)) != 0 ) return rc; + vmce_init_vcpu(v); + if ( is_hvm_domain(d) ) { if ( (rc = hvm_vcpu_initialise(v)) != 0 ) --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1137,11 +1137,12 @@ long arch_do_domctl( evc->syscall32_callback_eip = 0; evc->syscall32_disables_events = 0; #endif + evc->mcg_cap = v->arch.mcg_cap; } else { ret = -EINVAL; - if ( evc->size != sizeof(*evc) ) + if ( evc->size < offsetof(typeof(*evc), mcg_cap) ) goto ext_vcpucontext_out; #ifdef __x86_64__ fixup_guest_code_selector(d, evc->sysenter_callback_cs); @@ -1160,6 +1161,9 @@ long arch_do_domctl( evc->syscall32_callback_eip ) goto ext_vcpucontext_out; #endif + if ( evc->size >= offsetof(typeof(*evc), mcg_cap) + + sizeof(evc->mcg_cap) ) + ret = vmce_restore_vcpu(v, evc->mcg_cap); } ret = 0; --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -425,6 +425,8 @@ struct arch_vcpu */ uint64_t xcr0_accum; + uint64_t mcg_cap; + /* Current LDT details. */ unsigned long shadow_ldt_mapcnt; spinlock_t shadow_ldt_lock; --- a/xen/include/asm-x86/mce.h +++ b/xen/include/asm-x86/mce.h @@ -16,7 +16,6 @@ struct bank_entry { struct domain_mca_msrs { /* Guest should not change below values after DOM boot up */ - uint64_t mcg_cap; uint64_t mcg_ctl; uint64_t mcg_status; uint64_t *mci_ctl; @@ -28,6 +27,8 @@ struct domain_mca_msrs /* Guest vMCE MSRs virtualization */ extern int vmce_init_msr(struct domain *d); extern void vmce_destroy_msr(struct domain *d); +extern void vmce_init_vcpu(struct vcpu *); +extern int vmce_restore_vcpu(struct vcpu *, uint64_t caps); extern int vmce_wrmsr(uint32_t msr, uint64_t val); extern int vmce_rdmsr(uint32_t msr, uint64_t *val); #endif --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -101,48 +101,40 @@ #define MSR_AMD64_MC0_MASK 0xc0010044 #define MSR_IA32_MC1_CTL 0x00000404 -#define MSR_IA32_MC1_CTL2 0x00000281 #define MSR_IA32_MC1_STATUS 0x00000405 #define MSR_IA32_MC1_ADDR 0x00000406 #define MSR_IA32_MC1_MISC 0x00000407 #define MSR_IA32_MC2_CTL 0x00000408 -#define MSR_IA32_MC2_CTL2 0x00000282 #define MSR_IA32_MC2_STATUS 0x00000409 #define MSR_IA32_MC2_ADDR 0x0000040A #define MSR_IA32_MC2_MISC 0x0000040B -#define MSR_IA32_MC3_CTL2 0x00000283 #define MSR_IA32_MC3_CTL 0x0000040C #define MSR_IA32_MC3_STATUS 0x0000040D #define MSR_IA32_MC3_ADDR 0x0000040E #define MSR_IA32_MC3_MISC 0x0000040F -#define MSR_IA32_MC4_CTL2 0x00000284 #define MSR_IA32_MC4_CTL 0x00000410 #define MSR_IA32_MC4_STATUS 0x00000411 #define MSR_IA32_MC4_ADDR 0x00000412 #define MSR_IA32_MC4_MISC 0x00000413 -#define MSR_IA32_MC5_CTL2 0x00000285 #define MSR_IA32_MC5_CTL 0x00000414 #define MSR_IA32_MC5_STATUS 0x00000415 #define MSR_IA32_MC5_ADDR 0x00000416 #define MSR_IA32_MC5_MISC 0x00000417 -#define MSR_IA32_MC6_CTL2 0x00000286 #define MSR_IA32_MC6_CTL 0x00000418 #define MSR_IA32_MC6_STATUS 0x00000419 #define MSR_IA32_MC6_ADDR 0x0000041A #define MSR_IA32_MC6_MISC 0x0000041B -#define MSR_IA32_MC7_CTL2 0x00000287 #define MSR_IA32_MC7_CTL 0x0000041C #define MSR_IA32_MC7_STATUS 0x0000041D #define MSR_IA32_MC7_ADDR 0x0000041E #define MSR_IA32_MC7_MISC 0x0000041F -#define MSR_IA32_MC8_CTL2 0x00000288 #define MSR_IA32_MC8_CTL 0x00000420 #define MSR_IA32_MC8_STATUS 0x00000421 #define MSR_IA32_MC8_ADDR 0x00000422 @@ -152,6 +144,7 @@ #define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) #define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) #define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) #define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -580,9 +580,15 @@ struct hvm_hw_cpu_xsave { #define CPU_XSAVE_CODE 16 +struct hvm_vmce_vcpu { + uint64_t caps; +}; + +DECLARE_HVM_SAVE_TYPE(VMCE_VCPU, 18, struct hvm_vmce_vcpu); + /* * Largest type-code in use */ -#define HVM_SAVE_CODE_MAX 16 +#define HVM_SAVE_CODE_MAX 18 #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -558,7 +558,7 @@ struct xen_domctl_ext_vcpucontext { uint32_t vcpu; /* * SET: Size of struct (IN) - * GET: Size of struct (OUT) + * GET: Size of struct (OUT, up to 128 bytes) */ uint32_t size; #if defined(__i386__) || defined(__x86_64__) @@ -570,6 +570,7 @@ struct xen_domctl_ext_vcpucontext { uint16_t sysenter_callback_cs; uint8_t syscall32_disables_events; uint8_t sysenter_disables_events; + uint64_aligned_t mcg_cap; #endif }; typedef struct xen_domctl_ext_vcpucontext xen_domctl_ext_vcpucontext_t; ++++++ 24888-pci-release-devices.patch ++++++ References: bnc#744771 # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1330080392 -3600 # Node ID 71159fb049f253030c3820c260d092d4aec6b166 # Parent 35d855e520038bf5814f53d105dc4adf58a670f2 passthrough: release assigned PCI devices earlier during domain shutdown At least with xend, where there's not even a tool stack side attempt to de-assign devices during domain shutdown, this allows immediate re- starts of a domain to work reliably. (There's no apparent reason why c/s 18010:c1577f094ae4 chose to put this in the asynchronous part of domain destruction). Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Keir Fraser <keir(a)xen.org> --- a/xen/arch/ia64/xen/dom0_ops.c +++ b/xen/arch/ia64/xen/dom0_ops.c @@ -330,7 +330,8 @@ long arch_do_domctl(xen_domctl_t *op, XE break; ret = -EINVAL; - if ( unlikely((d = get_domain_by_id(op->domain)) == NULL) ) + if ( unlikely((d = get_domain_by_id(op->domain)) == NULL) || + unlikely(d->is_dying) ) { gdprintk(XENLOG_ERR, "XEN_DOMCTL_assign_device: get_domain_by_id() failed\n"); --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -671,10 +671,8 @@ void arch_domain_destroy(struct domain * free_xenheap_pages(d->shared_info, get_order_from_shift(XSI_SHIFT)); - if ( iommu_enabled && need_iommu(d) ) { - pci_release_devices(d); + if ( iommu_enabled && need_iommu(d) ) iommu_domain_destroy(d); - } tlb_track_destroy(d); @@ -1719,6 +1717,8 @@ int domain_relinquish_resources(struct d switch (d->arch.relres) { case RELRES_not_started: + pci_release_devices(d); + /* Relinquish guest resources for VT-i domain. */ if (is_hvm_domain(d)) vmx_relinquish_guest_resources(d); --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -607,7 +607,6 @@ void arch_domain_destroy(struct domain * hvm_domain_destroy(d); vmce_destroy_msr(d); - pci_release_devices(d); free_domain_pirqs(d); if ( !is_idle_domain(d) ) iommu_domain_destroy(d); @@ -1956,6 +1955,8 @@ int domain_relinquish_resources(struct d switch ( d->arch.relmem ) { case RELMEM_not_started: + pci_release_devices(d); + /* Tear down paging-assistance stuff. */ paging_teardown(d); --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -828,7 +828,8 @@ long arch_do_domctl( break; ret = -EINVAL; - if ( unlikely((d = get_domain_by_id(domctl->domain)) == NULL) ) + if ( unlikely((d = get_domain_by_id(domctl->domain)) == NULL) || + unlikely(d->is_dying) ) { gdprintk(XENLOG_ERR, "XEN_DOMCTL_assign_device: get_domain_by_id() failed\n"); ++++++ blktap-disable-debug-printf.patch ++++++ --- /var/tmp/diff_new_pack.T9SERf/_old 2012-03-14 14:08:05.000000000 +0100 +++ /var/tmp/diff_new_pack.T9SERf/_new 2012-03-14 14:08:05.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/blktap/drivers/blktapctrl.c +Index: xen-4.1.2-testing/tools/blktap/drivers/blktapctrl.c =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/drivers/blktapctrl.c -+++ xen-4.0.2-testing/tools/blktap/drivers/blktapctrl.c +--- xen-4.1.2-testing.orig/tools/blktap/drivers/blktapctrl.c ++++ xen-4.1.2-testing/tools/blktap/drivers/blktapctrl.c @@ -59,6 +59,9 @@ #include "list.h" #include "xs_api.h" /* for xs_fire_next_watch() */ @@ -12,10 +12,10 @@ #define PIDFILE "/var/run/blktapctrl.pid" #define NUM_POLL_FDS 2 -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +Index: xen-4.1.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +--- xen-4.1.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.1.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -48,7 +48,7 @@ #define BLKTAP_CTRL_DIR "/var/run/tap" ++++++ ioemu-9869-MSI-X-init.patch ++++++ # HG changeset patch # User Jan Beulich <jbeulich(a)suse.com> # Date 1325783746 0 # Node ID db6c7b83d4165ada5498339b87031a09f5b79d8a # Parent 11ca857d983420a9f54e4d0e6919f8e6bd5fca48 qemu-xen: fix sequence of operations in pt_msix_init() Checking the return value of mmap() must be done before adjusting the value, otherwise failure may not be detected. Closing the file handle, on the other hand, can be done before checking the return value. Finally, printing the errno value without knowing whether the previous function actually failed is bogus (and superfluous since a subsequent message prints the strerror() representaton anyway). Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Acked-by: Stefano Stabellini <stefano.stabellini(a)eu.citrix.com> committer: Ian Jackson <Ian.Jackson(a)eu.citrix.com> --- a/tools/ioemu-qemu-xen/hw/pt-msi.c +++ b/tools/ioemu-qemu-xen/hw/pt-msi.c @@ -537,7 +537,6 @@ int pt_msix_init(struct pt_dev *dev, int int i, total_entries, table_off, bar_index; struct pci_dev *pd = dev->pci_dev; int fd; - int err; id = pci_read_byte(pd, pos + PCI_CAP_LIST_ID); @@ -585,17 +584,14 @@ int pt_msix_init(struct pt_dev *dev, int dev->msix->phys_iomem_base = mmap(0, total_entries * 16 + dev->msix->table_offset_adjust, PROT_READ, MAP_SHARED | MAP_LOCKED, fd, dev->msix->table_base + table_off - dev->msix->table_offset_adjust); - dev->msix->phys_iomem_base = (void *)((char *)dev->msix->phys_iomem_base + - dev->msix->table_offset_adjust); - err = errno; - PT_LOG("errno = %d\n",err); + close(fd); if ( dev->msix->phys_iomem_base == MAP_FAILED ) { PT_LOG("Error: Can't map physical MSI-X table: %s\n", strerror(errno)); - close(fd); goto error_out; } - close(fd); + + dev->msix->phys_iomem_base += dev->msix->table_offset_adjust; PT_LOG("mapping physical MSI-X table to %lx\n", (unsigned long)dev->msix->phys_iomem_base); ++++++ ioemu-9873-MSI-X-fix-unregister_iomem.patch ++++++ qemu-dm: fix unregister_iomem() References: bnc#744014 This function (introduced quite a long time ago in e7911109f4321e9ba0cc56a253b653600aa46bea - "disable qemu PCI devices in HVM domains") appears to be completely broken, causing the regression reported in http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1805 (due to the newly added caller of it in 56d7747a3cf811910c4cf865e1ebcb8b82502005 - "qemu: clean up MSI-X table handling"). It's unclear how the function can ever have fulfilled its purpose: the value returned by iomem_index() is *not* an index into mmio[]. Additionally, fix two problems: - unregister_iomem() must not clear mmio[].start, otherwise cpu_register_physical_memory() won't be able to re-use the previous slot, thus causing a leak - cpu_unregister_io_memory() must not check mmio[].size, otherwise it won't properly clean up entries (temporarily) squashed through unregister_iomem() Signed-off-by: Jan Beulich <jbeulich(a)suse.com> Tested-by: Stefano Stabellini <stefano.stabellini(a)eu.citrix.com> Tested-by: Yongjie Ren <yongjie.ren(a)intel.com> --- a/tools/ioemu-qemu-xen/i386-dm/exec-dm.c +++ b/tools/ioemu-qemu-xen/i386-dm/exec-dm.c @@ -360,7 +360,7 @@ void cpu_unregister_io_memory(int io_tab int io_index = io_table_address >> IO_MEM_SHIFT; for (i = 0; i < mmio_cnt; i++) { - if (mmio[i].size && mmio[i].io_index == io_index) { + if (mmio[i].io_index == io_index) { mmio[i].start = mmio[i].size = 0; break; } @@ -466,12 +466,16 @@ static int iomem_index(target_phys_addr_ void unregister_iomem(target_phys_addr_t start) { - int index = iomem_index(start); - if (index) { + unsigned int index; + + for (index = 0; index < mmio_cnt; index++) + if (start == mmio[index].start) + break; + if (index < mmio_cnt) { fprintf(logfile, "squash iomem [%lx, %lx).\n", (unsigned long)(mmio[index].start), (unsigned long)(mmio[index].start + mmio[index].size)); - mmio[index].start = mmio[index].size = 0; + mmio[index].size = 0; } } ++++++ pv-driver-build.patch ++++++ --- /var/tmp/diff_new_pack.T9SERf/_old 2012-03-14 14:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.T9SERf/_new 2012-03-14 14:08:06.000000000 +0100 @@ -1,5 +1,3 @@ -Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild -=================================================================== --- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild +++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild @@ -3,3 +3,4 @@ include $(M)/overrides.mk @@ -7,8 +5,23 @@ xen-vbd-objs := blkfront.o vbd.o +xen-vbd-objs += $(patsubst %.c,%.o,$(notdir $(wildcard $(src)/vcd.c))) -Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -=================================================================== +--- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h ++++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h +@@ -161,4 +161,14 @@ typedef irqreturn_t (*irq_handler_t)(int + #define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new))) + #endif + ++#ifdef sync_test_bit ++#define synch_change_bit sync_change_bit ++#define synch_clear_bit sync_clear_bit ++#define synch_set_bit sync_set_bit ++#define synch_test_and_change_bit sync_test_and_change_bit ++#define synch_test_and_clear_bit sync_test_and_clear_bit ++#define synch_test_and_set_bit sync_test_and_set_bit ++#define synch_test_bit sync_test_bit ++#endif ++ + #endif --- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -123,6 +123,7 @@ unsigned long alloc_xen_mmio(unsigned lo ++++++ vif-bridge-tap-fix.patch ++++++ # HG changeset patch # User Jim Fehlig <jfehlig(a)suse.com> # Date 1319581952 21600 # Node ID 74da2a3a1db1476d627f42e4a99e9e720cc6774d # Parent 6c583d35d76dda2236c81d9437ff9d57ab02c006 Prevent vif-bridge from adding user-created tap interfaces to a bridge Exit vif-bridge script if there is no device info in xenstore, preventing it from adding user-created taps to bridges. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> Index: xen-4.1.2-testing/tools/hotplug/Linux/vif-bridge =================================================================== --- xen-4.1.2-testing.orig/tools/hotplug/Linux/vif-bridge +++ xen-4.1.2-testing/tools/hotplug/Linux/vif-bridge @@ -32,6 +32,13 @@ dir=$(dirname "$0") . "$dir/vif-common.sh" +mac=$(xenstore_read_default "$XENBUS_PATH/mac" "") +if [ -z "$mac" ] +then + log debug "No device details in $XENBUS_PATH, exiting." + exit 0 +fi + bridge=${bridge:-} bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge") ++++++ xen-warnings-unused.diff ++++++ --- /var/tmp/diff_new_pack.T9SERf/_old 2012-03-14 14:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.T9SERf/_new 2012-03-14 14:08:06.000000000 +0100 @@ -1,5 +1,7 @@ ---- a/tools/libxc/xc_tmem.c -+++ b/tools/libxc/xc_tmem.c +Index: xen-4.1.2-testing/tools/libxc/xc_tmem.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/libxc/xc_tmem.c ++++ xen-4.1.2-testing/tools/libxc/xc_tmem.c @@ -390,7 +390,8 @@ static int xc_tmem_restore_new_pool( int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) @@ -10,8 +12,10 @@ uint32_t this_max_pools, this_version; uint32_t pool_id; uint32_t minusone; ---- a/tools/libxc/xc_domain_restore.c -+++ b/tools/libxc/xc_domain_restore.c +Index: xen-4.1.2-testing/tools/libxc/xc_domain_restore.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/libxc/xc_domain_restore.c ++++ xen-4.1.2-testing/tools/libxc/xc_domain_restore.c @@ -1087,7 +1087,6 @@ int xc_domain_restore(xc_interface *xch, int vcpuextstate = 0; uint32_t vcpuextstate_size = 0; @@ -28,8 +32,10 @@ n = m = 0; loadpages: ---- a/tools/misc/gtraceview.c -+++ b/tools/misc/gtraceview.c +Index: xen-4.1.2-testing/tools/misc/gtraceview.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/misc/gtraceview.c ++++ xen-4.1.2-testing/tools/misc/gtraceview.c @@ -622,7 +622,8 @@ void crt_init(void) void nr_addch(int nr, int ch) { @@ -40,8 +46,10 @@ getyx(stdscr, y, x); for (i = 0; i < nr; i++) { if (x == COLS-1) ---- a/tools/xcutils/xc_restore.c -+++ b/tools/xcutils/xc_restore.c +Index: xen-4.1.2-testing/tools/xcutils/xc_restore.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/xcutils/xc_restore.c ++++ xen-4.1.2-testing/tools/xcutils/xc_restore.c @@ -19,7 +19,8 @@ int main(int argc, char **argv) { @@ -52,8 +60,10 @@ xc_interface *xch; int io_fd, ret; int superpages; ---- a/tools/firmware/rombios/32bit/tcgbios/tcgbios.c -+++ b/tools/firmware/rombios/32bit/tcgbios/tcgbios.c +Index: xen-4.1.2-testing/tools/firmware/rombios/32bit/tcgbios/tcgbios.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/firmware/rombios/32bit/tcgbios/tcgbios.c ++++ xen-4.1.2-testing/tools/firmware/rombios/32bit/tcgbios/tcgbios.c @@ -1064,7 +1064,7 @@ uint32_t HashLogEvent32(struct hlei *hle uint32_t rc = 0; uint16_t size; @@ -63,8 +73,10 @@ uint32_t hashdataptr; uint32_t hashdatalen; ---- a/tools/console/client/main.c -+++ b/tools/console/client/main.c +Index: xen-4.1.2-testing/tools/console/client/main.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/console/client/main.c ++++ xen-4.1.2-testing/tools/console/client/main.c @@ -277,7 +277,8 @@ int main(int argc, char **argv) }; @@ -75,8 +87,10 @@ struct xs_handle *xs; char *end; console_type type = CONSOLE_INVAL; ---- a/tools/xenstat/xentop/xentop.c -+++ b/tools/xenstat/xentop/xentop.c +Index: xen-4.1.2-testing/tools/xenstat/xentop/xentop.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/xenstat/xentop/xentop.c ++++ xen-4.1.2-testing/tools/xenstat/xentop/xentop.c @@ -272,7 +272,8 @@ static void fail(const char *str) /* Return the row containing the cursor. */ static int current_row(void) @@ -97,9 +111,11 @@ getmaxyx(stdscr, y, x); return y; } ---- a/tools/libxl/libxlu_cfg.c -+++ b/tools/libxl/libxlu_cfg.c -@@ -348,7 +348,7 @@ char *xlu__cfgl_dequote(CfgParseContext +Index: xen-4.1.2-testing/tools/libxl/libxlu_cfg.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/libxl/libxlu_cfg.c ++++ xen-4.1.2-testing/tools/libxl/libxlu_cfg.c +@@ -348,7 +348,7 @@ char *xlu__cfgl_dequote(CfgParseContext #define NUMERIC_CHAR(minlen,maxlen,base,basetext) do{ \ char numbuf[(maxlen)+1], *ep; \ @@ -108,9 +124,11 @@ \ strncpy(numbuf,p,(maxlen)); \ numbuf[(maxlen)]= 0; \ ---- a/tools/libxl/libxl.c -+++ b/tools/libxl/libxl.c -@@ -221,7 +221,7 @@ int libxl_domain_rename(libxl_ctx *ctx, +Index: xen-4.1.2-testing/tools/libxl/libxl.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/libxl/libxl.c ++++ xen-4.1.2-testing/tools/libxl/libxl.c +@@ -221,7 +221,7 @@ int libxl_domain_rename(libxl_ctx *ctx, int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid) { libxl__gc gc = LIBXL_INIT_GC(ctx); @@ -119,7 +137,7 @@ if (libxl__domain_is_hvm(ctx, domid)) { LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Called domain_resume on " -@@ -1291,7 +1291,7 @@ libxl_nicinfo *libxl_list_nics(libxl_ctx +@@ -1297,7 +1297,7 @@ libxl_nicinfo *libxl_list_nics(libxl_ctx { libxl__gc gc = LIBXL_INIT_GC(ctx); char *dompath, *nic_path_fe; @@ -128,7 +146,7 @@ char *val, *tok; unsigned int nb_nics, i; libxl_nicinfo *res, *nics; -@@ -1299,7 +1299,7 @@ libxl_nicinfo *libxl_list_nics(libxl_ctx +@@ -1305,7 +1305,7 @@ libxl_nicinfo *libxl_list_nics(libxl_ctx dompath = libxl__xs_get_dompath(&gc, domid); if (!dompath) goto err; @@ -137,8 +155,10 @@ libxl__sprintf(&gc, "%s/device/vif", dompath), &nb_nics); if (!l) goto err; ---- a/tools/libxl/libxl_pci.c -+++ b/tools/libxl/libxl_pci.c +Index: xen-4.1.2-testing/tools/libxl/libxl_pci.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/libxl/libxl_pci.c ++++ xen-4.1.2-testing/tools/libxl/libxl_pci.c @@ -240,7 +240,7 @@ static int libxl_create_pci_backend(libx flexarray_t *front = NULL; flexarray_t *back = NULL; @@ -157,8 +177,10 @@ LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Creating pci backend"); /* add pci device */ ---- a/tools/libxl/libxl_dom.c -+++ b/tools/libxl/libxl_dom.c +Index: xen-4.1.2-testing/tools/libxl/libxl_dom.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/libxl/libxl_dom.c ++++ xen-4.1.2-testing/tools/libxl/libxl_dom.c @@ -265,14 +265,13 @@ int libxl__build_hvm(libxl_ctx *ctx, uin libxl_domain_build_info *info, libxl_domain_build_state *state) { @@ -183,8 +205,10 @@ out: libxl__free_all(&gc); return 0; ---- a/tools/libxl/libxl_utils.c -+++ b/tools/libxl/libxl_utils.c +Index: xen-4.1.2-testing/tools/libxl/libxl_utils.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/libxl/libxl_utils.c ++++ xen-4.1.2-testing/tools/libxl/libxl_utils.c @@ -531,7 +531,7 @@ int libxl_devid_to_device_disk(libxl_ctx libxl__gc gc = LIBXL_INIT_GC(ctx); char *val; @@ -194,8 +218,10 @@ int rc = ERROR_INVAL; devid_n = libxl__device_disk_dev_number(devid); ---- a/tools/libxl/xl_cmdimpl.c -+++ b/tools/libxl/xl_cmdimpl.c +Index: xen-4.1.2-testing/tools/libxl/xl_cmdimpl.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/libxl/xl_cmdimpl.c ++++ xen-4.1.2-testing/tools/libxl/xl_cmdimpl.c @@ -5448,7 +5448,7 @@ int main_cpupoollist(int argc, char **ar {"cpus", 0, 0, 'c'}, {0, 0, 0, 0} @@ -205,8 +231,10 @@ int opt_cpus = 0; const char *pool = NULL; libxl_cpupoolinfo *poolinfo; ---- a/tools/debugger/gdbsx/gx/gx_comm.c -+++ b/tools/debugger/gdbsx/gx/gx_comm.c +Index: xen-4.1.2-testing/tools/debugger/gdbsx/gx/gx_comm.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/debugger/gdbsx/gx/gx_comm.c ++++ xen-4.1.2-testing/tools/debugger/gdbsx/gx/gx_comm.c @@ -163,7 +163,7 @@ readchar(void) static char buf[BUFSIZ]; static int bufcnt = 0; @@ -216,8 +244,10 @@ if (bufcnt-- > 0) return *bufp++ & 0x7f; ---- a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c -+++ b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c +Index: xen-4.1.2-testing/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c ++++ xen-4.1.2-testing/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c @@ -820,7 +820,7 @@ static int create_suspend_thread(checkpo static void stop_suspend_thread(checkpoint_state* s) @@ -227,8 +257,10 @@ s->done = 1; ---- a/tools/python/xen/lowlevel/netlink/libnetlink.c -+++ b/tools/python/xen/lowlevel/netlink/libnetlink.c +Index: xen-4.1.2-testing/tools/python/xen/lowlevel/netlink/libnetlink.c +=================================================================== +--- xen-4.1.2-testing.orig/tools/python/xen/lowlevel/netlink/libnetlink.c ++++ xen-4.1.2-testing/tools/python/xen/lowlevel/netlink/libnetlink.c @@ -433,7 +433,8 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt nladdr.nl_groups = 0; @@ -239,8 +271,10 @@ int l; status = fread(&buf, 1, sizeof(*h), rtnl); ---- a/xen/arch/x86/msi.c -+++ b/xen/arch/x86/msi.c +Index: xen-4.1.2-testing/xen/arch/x86/msi.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/msi.c ++++ xen-4.1.2-testing/xen/arch/x86/msi.c @@ -799,7 +799,7 @@ static void __pci_disable_msi(struct msi { struct pci_dev *dev; @@ -250,8 +284,10 @@ u8 bus, slot, func; dev = entry->dev; ---- a/xen/common/cpupool.c -+++ b/xen/common/cpupool.c +Index: xen-4.1.2-testing/xen/common/cpupool.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/common/cpupool.c ++++ xen-4.1.2-testing/xen/common/cpupool.c @@ -356,7 +356,7 @@ int cpupool_add_domain(struct domain *d, { struct cpupool *c; @@ -272,9 +308,11 @@ if ( d->cpupool == NULL ) return; ---- a/xen/common/grant_table.c -+++ b/xen/common/grant_table.c -@@ -765,7 +765,7 @@ __gnttab_unmap_common( +Index: xen-4.1.2-testing/xen/common/grant_table.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/common/grant_table.c ++++ xen-4.1.2-testing/xen/common/grant_table.c +@@ -767,7 +767,7 @@ __gnttab_unmap_common( struct domain *ld, *rd; struct active_grant_entry *act; s16 rc = 0; @@ -283,8 +321,10 @@ ld = current->domain; ---- a/xen/common/kexec.c -+++ b/xen/common/kexec.c +Index: xen-4.1.2-testing/xen/common/kexec.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/common/kexec.c ++++ xen-4.1.2-testing/xen/common/kexec.c @@ -573,7 +573,8 @@ static int kexec_exec(XEN_GUEST_HANDLE(v { xen_kexec_exec_t exec; @@ -295,8 +335,10 @@ if ( unlikely(copy_from_guest(&exec, uarg, 1)) ) return -EFAULT; ---- a/xen/drivers/passthrough/vtd/intremap.c -+++ b/xen/drivers/passthrough/vtd/intremap.c +Index: xen-4.1.2-testing/xen/drivers/passthrough/vtd/intremap.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/drivers/passthrough/vtd/intremap.c ++++ xen-4.1.2-testing/xen/drivers/passthrough/vtd/intremap.c @@ -367,7 +367,7 @@ unsigned int io_apic_read_remap_rte( unsigned int ioapic_pin = (reg - 0x10) / 2; int index; @@ -315,8 +357,10 @@ iommu = drhd->iommu; qi_ctrl = iommu_qi_ctrl(iommu); ---- a/xen/common/sched_credit2.c -+++ b/xen/common/sched_credit2.c +Index: xen-4.1.2-testing/xen/common/sched_credit2.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/common/sched_credit2.c ++++ xen-4.1.2-testing/xen/common/sched_credit2.c @@ -1854,7 +1854,8 @@ static void deactivate_runqueue(struct c static void init_pcpu(const struct scheduler *ops, int cpu) @@ -327,9 +371,11 @@ struct csched_private *prv = CSCHED_PRIV(ops); struct csched_runqueue_data *rqd; spinlock_t *old_lock; ---- a/xen/common/unlzo.c -+++ b/xen/common/unlzo.c -@@ -68,7 +68,7 @@ static int INIT parse_header(u8 *input, +Index: xen-4.1.2-testing/xen/common/unlzo.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/common/unlzo.c ++++ xen-4.1.2-testing/xen/common/unlzo.c +@@ -68,7 +68,7 @@ static int INIT parse_header(u8 *input, { int l; u8 *parse = input; @@ -338,8 +384,10 @@ u16 version; /* read magic: 9 first bits */ ---- a/xen/arch/x86/time.c -+++ b/xen/arch/x86/time.c +Index: xen-4.1.2-testing/xen/arch/x86/time.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/time.c ++++ xen-4.1.2-testing/xen/arch/x86/time.c @@ -1009,7 +1009,8 @@ static void local_time_calibration(void) * System timestamps, extrapolated from local and master oscillators, * taken during this calibration and the previous calibration. @@ -350,8 +398,10 @@ s_time_t prev_master_stime, curr_master_stime; /* TSC timestamps taken during this calibration and prev calibration. */ ---- a/xen/arch/x86/cpu/amd.c -+++ b/xen/arch/x86/cpu/amd.c +Index: xen-4.1.2-testing/xen/arch/x86/cpu/amd.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/amd.c ++++ xen-4.1.2-testing/xen/arch/x86/cpu/amd.c @@ -391,7 +391,7 @@ static void __devinit init_amd(struct cp { u32 l, h; @@ -361,9 +411,11 @@ #ifdef CONFIG_SMP unsigned long long value; ---- a/xen/arch/x86/mm/p2m.c -+++ b/xen/arch/x86/mm/p2m.c -@@ -2339,7 +2339,7 @@ p2m_remove_page(struct p2m_domain *p2m, +Index: xen-4.1.2-testing/xen/arch/x86/mm/p2m.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/mm/p2m.c ++++ xen-4.1.2-testing/xen/arch/x86/mm/p2m.c +@@ -2339,7 +2339,7 @@ p2m_remove_page(struct p2m_domain *p2m, unsigned int page_order) { unsigned long i; @@ -381,8 +433,10 @@ int pod_count = 0; int rc = 0; ---- a/xen/arch/x86/hvm/emulate.c -+++ b/xen/arch/x86/hvm/emulate.c +Index: xen-4.1.2-testing/xen/arch/x86/hvm/emulate.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/hvm/emulate.c ++++ xen-4.1.2-testing/xen/arch/x86/hvm/emulate.c @@ -59,7 +59,7 @@ static int hvmemul_do_io( ioreq_t *p = get_ioreq(curr); unsigned long ram_gfn = paddr_to_pfn(ram_gpa); @@ -392,8 +446,10 @@ int rc; /* Check for paged out page */ ---- a/xen/arch/x86/hvm/hvm.c -+++ b/xen/arch/x86/hvm/hvm.c +Index: xen-4.1.2-testing/xen/arch/x86/hvm/hvm.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/hvm/hvm.c ++++ xen-4.1.2-testing/xen/arch/x86/hvm/hvm.c @@ -253,7 +253,8 @@ void hvm_migrate_timers(struct vcpu *v) void hvm_migrate_pirqs(struct vcpu *v) @@ -404,7 +460,7 @@ struct irq_desc *desc; struct domain *d = v->domain; struct hvm_irq_dpci *hvm_irq_dpci = d->arch.hvm_domain.irq.dpci; -@@ -3589,7 +3590,7 @@ long do_hvm_op(unsigned long op, XEN_GUE +@@ -3686,7 +3687,7 @@ long do_hvm_op(unsigned long op, XEN_GUE { p2m_type_t t; p2m_type_t nt; @@ -413,8 +469,10 @@ mfn = gfn_to_mfn_unshare(p2m, pfn, &t, 0); if ( p2m_is_paging(t) ) { ---- a/xen/arch/x86/acpi/cpu_idle.c -+++ b/xen/arch/x86/acpi/cpu_idle.c +Index: xen-4.1.2-testing/xen/arch/x86/acpi/cpu_idle.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/acpi/cpu_idle.c ++++ xen-4.1.2-testing/xen/arch/x86/acpi/cpu_idle.c @@ -276,7 +276,7 @@ static void acpi_processor_ffh_cstate_en static void acpi_idle_do_entry(struct acpi_processor_cx *cx) @@ -424,8 +482,10 @@ switch ( cx->entry_method ) { ---- a/xen/arch/x86/cpu/intel_cacheinfo.c -+++ b/xen/arch/x86/cpu/intel_cacheinfo.c +Index: xen-4.1.2-testing/xen/arch/x86/cpu/intel_cacheinfo.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/intel_cacheinfo.c ++++ xen-4.1.2-testing/xen/arch/x86/cpu/intel_cacheinfo.c @@ -170,7 +170,8 @@ unsigned int __cpuinit init_intel_cachei unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */ unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */ @@ -436,9 +496,11 @@ if (c->cpuid_level > 3) { static int is_initialized; ---- a/xen/arch/x86/mm/mem_sharing.c -+++ b/xen/arch/x86/mm/mem_sharing.c -@@ -375,7 +375,7 @@ int mem_sharing_debug_gfn(struct domain +Index: xen-4.1.2-testing/xen/arch/x86/mm/mem_sharing.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/mm/mem_sharing.c ++++ xen-4.1.2-testing/xen/arch/x86/mm/mem_sharing.c +@@ -375,7 +375,7 @@ int mem_sharing_debug_gfn(struct domain { p2m_type_t p2mt; mfn_t mfn; @@ -447,8 +509,10 @@ mfn = gfn_to_mfn(p2m_get_hostp2m(d), gfn, &p2mt); page = mfn_to_page(mfn); ---- a/xen/arch/x86/hvm/viridian.c -+++ b/xen/arch/x86/hvm/viridian.c +Index: xen-4.1.2-testing/xen/arch/x86/hvm/viridian.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/hvm/viridian.c ++++ xen-4.1.2-testing/xen/arch/x86/hvm/viridian.c @@ -270,7 +270,7 @@ int rdmsr_viridian_regs(uint32_t idx, ui int viridian_hypercall(struct cpu_user_regs *regs) { @@ -458,8 +522,10 @@ uint16_t status = HV_STATUS_SUCCESS; union hypercall_input { ---- a/xen/arch/x86/mm.c -+++ b/xen/arch/x86/mm.c +Index: xen-4.1.2-testing/xen/arch/x86/mm.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/mm.c ++++ xen-4.1.2-testing/xen/arch/x86/mm.c @@ -4914,7 +4914,7 @@ static int ptwr_emulated_update( { unsigned long mfn; @@ -469,8 +535,10 @@ l1_pgentry_t pte, ol1e, nl1e, *pl1e; struct vcpu *v = current; struct domain *d = v->domain; ---- a/xen/arch/x86/x86_64/mm.c -+++ b/xen/arch/x86/x86_64/mm.c +Index: xen-4.1.2-testing/xen/arch/x86/x86_64/mm.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/x86_64/mm.c ++++ xen-4.1.2-testing/xen/arch/x86/x86_64/mm.c @@ -436,7 +436,8 @@ void destroy_m2p_mapping(struct mem_hota static int setup_compat_m2p_table(struct mem_hotadd_info *info) { @@ -481,8 +549,10 @@ l3_pgentry_t *l3_ro_mpt = NULL; l2_pgentry_t *l2_ro_mpt = NULL; struct page_info *l1_pg; ---- a/xen/arch/x86/cpu/mcheck/mce.c -+++ b/xen/arch/x86/cpu/mcheck/mce.c +Index: xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/mce.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/mcheck/mce.c ++++ xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/mce.c @@ -151,7 +151,6 @@ static struct mcinfo_bank *mca_init_bank struct mc_info *mi, int bank) { @@ -499,7 +569,7 @@ if (mib->mc_status & MCi_STATUS_MISCV) mib->mc_misc = mca_rdmsr(MSR_IA32_MCx_MISC(bank)); -@@ -281,7 +279,7 @@ mctelem_cookie_t mcheck_mca_logout(enum +@@ -281,7 +279,7 @@ mctelem_cookie_t mcheck_mca_logout(enum recover = (mc_recoverable_scan)? 1: 0; for (i = 0; i < 32 && i < nr_mce_banks; i++) { @@ -517,8 +587,10 @@ uint64_t hwcr = 0; int intpose; int i; ---- a/xen/common/tmem.c -+++ b/xen/common/tmem.c +Index: xen-4.1.2-testing/xen/common/tmem.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/common/tmem.c ++++ xen-4.1.2-testing/xen/common/tmem.c @@ -1351,7 +1351,8 @@ obj_unlock: static int tmem_evict(void) { @@ -539,8 +611,10 @@ client_t *client = pool->client; int ret = client->frozen ? -EFROZEN : -ENOMEM; ---- a/xen/common/tmem_xen.c -+++ b/xen/common/tmem_xen.c +Index: xen-4.1.2-testing/xen/common/tmem_xen.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/common/tmem_xen.c ++++ xen-4.1.2-testing/xen/common/tmem_xen.c @@ -177,7 +177,7 @@ EXPORT int tmh_copy_from_client(pfp_t *p EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, void **out_va, size_t *out_len, void *cli_va) @@ -578,9 +652,11 @@ tmh->persistent_pool = xmem_pool_create(name, tmh_persistent_pool_page_get, tmh_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); if ( tmh->persistent_pool == NULL ) ---- a/xen/arch/x86/cpu/mcheck/vmce.c -+++ b/xen/arch/x86/cpu/mcheck/vmce.c -@@ -571,7 +571,7 @@ int is_vmce_ready(struct mcinfo_bank *ba +Index: xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/vmce.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/mcheck/vmce.c ++++ xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/vmce.c +@@ -630,7 +630,7 @@ int is_vmce_ready(struct mcinfo_bank *ba */ int unmmap_broken_page(struct domain *d, mfn_t mfn, unsigned long gfn) { @@ -589,9 +665,11 @@ struct p2m_domain *p2m; p2m_type_t pt; ---- a/xen/arch/x86/mm/shadow/multi.c -+++ b/xen/arch/x86/mm/shadow/multi.c -@@ -124,7 +124,7 @@ set_shadow_status(struct vcpu *v, mfn_t +Index: xen-4.1.2-testing/xen/arch/x86/mm/shadow/multi.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/mm/shadow/multi.c ++++ xen-4.1.2-testing/xen/arch/x86/mm/shadow/multi.c +@@ -124,7 +124,7 @@ set_shadow_status(struct vcpu *v, mfn_t /* Put a shadow into the hash table */ { struct domain *d = v->domain; @@ -609,8 +687,10 @@ shadow_l1e_t *sl1p, sl1e; struct page_info *sp; ---- a/xen/arch/x86/domain_build.c -+++ b/xen/arch/x86/domain_build.c +Index: xen-4.1.2-testing/xen/arch/x86/domain_build.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/domain_build.c ++++ xen-4.1.2-testing/xen/arch/x86/domain_build.c @@ -378,8 +378,7 @@ int __init construct_dom0( return rc; @@ -621,9 +701,11 @@ machine = elf_uval(&elf, elf.ehdr, e_machine); switch (CONFIG_PAGING_LEVELS) { case 3: /* x86_32p */ ---- a/xen/arch/x86/traps.c -+++ b/xen/arch/x86/traps.c -@@ -1858,7 +1858,11 @@ static int emulate_privileged_op(struct +Index: xen-4.1.2-testing/xen/arch/x86/traps.c +=================================================================== +--- xen-4.1.2-testing.orig/xen/arch/x86/traps.c ++++ xen-4.1.2-testing/xen/arch/x86/traps.c +@@ -1858,7 +1858,11 @@ static int emulate_privileged_op(struct struct vcpu *v = current; unsigned long *reg, eip = regs->eip; u8 opcode, modrm_reg = 0, modrm_rm = 0, rep_prefix = 0, lock = 0, rex = 0; ++++++ xen-xmexample.diff ++++++ --- /var/tmp/diff_new_pack.T9SERf/_old 2012-03-14 14:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.T9SERf/_new 2012-03-14 14:08:06.000000000 +0100 @@ -4,7 +4,7 @@ =================================================================== --- xen-4.1.2-testing.orig/tools/examples/xmexample1 +++ xen-4.1.2-testing/tools/examples/xmexample1 -@@ -7,11 +7,13 @@ +@@ -7,11 +7,17 @@ #============================================================================ #---------------------------------------------------------------------------- @@ -17,13 +17,31 @@ +kernel = "/boot/vmlinuz-xen" +ramdisk = "/boot/initrd-xen" + -+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS ++# Or use a bootloader instead of kernel/ramdisk to get the kernel from domU FS ++# domUloader bootloader example: +#bootloader = "/usr/lib/xen/boot/domUloader.py" +#bootentry = "hda2:/vmlinuz-xen,/initrd-xen" ++# pygrub bootloader example: ++#bootloader="/usr/bin/pygrub" ++#bootargs="" # The domain build function. Default is 'linux'. #builder='linux' -@@ -131,7 +133,7 @@ disk = [ 'phy:hda1,hda1,w' ] +@@ -49,11 +55,11 @@ name = "ExampleDomain" + # + # or optionally override backend, bridge, ip, mac, script, type, or vifname: + # +-# vif = [ 'mac=00:16:3e:00:00:11, bridge=xenbr0' ] ++# vif = [ 'mac=00:16:3e:00:00:11, bridge=br0' ] + # + # or more than one interface may be configured: + # +-# vif = [ '', 'bridge=xenbr1' ] ++# vif = [ '', 'bridge=br1' ] + + vif = [ '' ] + +@@ -131,7 +137,7 @@ disk = [ 'phy:hda1,hda1,w' ] #hostname= "vm%d" % vmid # Set root device. @@ -32,7 +50,7 @@ # Root device for nfs. #root = "/dev/nfs" -@@ -140,8 +142,8 @@ root = "/dev/hda1 ro" +@@ -140,8 +146,8 @@ root = "/dev/hda1 ro" # Root directory on the nfs server. #nfs_root = '/full/path/to/root/directory' @@ -47,7 +65,7 @@ =================================================================== --- xen-4.1.2-testing.orig/tools/examples/xmexample2 +++ xen-4.1.2-testing/tools/examples/xmexample2 -@@ -35,11 +35,13 @@ xm_vars.var('vmid', +@@ -35,11 +35,17 @@ xm_vars.var('vmid', xm_vars.check() #---------------------------------------------------------------------------- @@ -60,13 +78,31 @@ +kernel = "/boot/vmlinuz-xen" +ramdisk = "/boot/initrd-xen" + -+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS ++# Or use a bootloader instead of kernel/ramdisk to get the kernel from domU FS ++# domUloader bootloader example: +#bootloader = "/usr/lib/xen/boot/domUloader.py" +#bootentry = "hda2:/vmlinuz-xen,/initrd-xen" ++# pygrub bootloader example: ++#bootloader="/usr/bin/pygrub" ++#bootargs="" # The domain build function. Default is 'linux'. #builder='linux' -@@ -167,7 +169,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), +@@ -80,11 +86,11 @@ vcpus = 4 # make your domain a 4-way + # + # or optionally override backend, bridge, ip, mac, script, type, or vifname: + # +-# vif = [ 'mac=00:16:3e:00:00:11, bridge=xenbr0' ] ++# vif = [ 'mac=00:16:3e:00:00:11, bridge=br0' ] + # + # or more than one interface may be configured: + # +-# vif = [ '', 'bridge=xenbr1' ] ++# vif = [ '', 'bridge=br1' ] + + vif = [ '' ] + +@@ -167,7 +173,7 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), #hostname= "vm%d" % vmid # Set root device. @@ -75,7 +111,7 @@ # Root device for nfs. #root = "/dev/nfs" -@@ -176,8 +178,8 @@ root = "/dev/sda1 ro" +@@ -176,8 +182,8 @@ root = "/dev/sda1 ro" # Root directory on the nfs server. #nfs_root = '/full/path/to/root/directory' @@ -90,7 +126,7 @@ =================================================================== --- xen-4.1.2-testing.orig/tools/examples/xmexample3 +++ xen-4.1.2-testing/tools/examples/xmexample3 -@@ -35,11 +35,13 @@ xm_vars.var('vmid', +@@ -35,11 +35,17 @@ xm_vars.var('vmid', xm_vars.check() #---------------------------------------------------------------------------- @@ -102,9 +138,13 @@ -# Optional ramdisk. -#ramdisk = "/boot/initrd.gz" -+# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS ++# Or use a bootloader instead of kernel/ramdisk to get the kernel from domU FS ++# domUloader bootloader example: +#bootloader = "/usr/lib/xen/boot/domUloader.py" +#bootentry = "hda2:/vmlinuz-xen,/initrd-xen" ++# pygrub bootloader example: ++#bootloader="/usr/bin/pygrub" ++#bootargs="" # The domain build function. Default is 'linux'. #builder='linux' @@ -112,7 +152,39 @@ =================================================================== --- xen-4.1.2-testing.orig/tools/examples/xmexample.hvm +++ xen-4.1.2-testing/tools/examples/xmexample.hvm -@@ -78,7 +78,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] +@@ -64,11 +64,26 @@ name = "ExampleHVMDomain" + #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 + #cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 + +-# Optionally define mac and/or bridge for the network interfaces. +-# Random MACs are assigned if not given. +-#vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0, model=ne2k_pci' ] +-# type=ioemu specify the NIC is an ioemu device not netfront +-vif = [ 'type=ioemu, bridge=xenbr0' ] ++#---------------------------------------------------------------------------- ++# Define network interfaces. ++ ++# By default, no network interfaces are configured. You may have one created ++# with sensible defaults using an empty vif clause: ++# ++# vif = [ '' ] ++# ++# or optionally override backend, bridge, ip, mac, script, type, model, ++# or vifname. ++# ++# An emulated RealTek 8139 network interface can be configured with: ++# ++# vif = [ 'mac=00:16:3e:00:00:11, type=ioemu, model=rtl8139, bridge=br0' ] ++# ++# A para-virtual network interface can be configured with: ++# ++# vif = [ 'mac=00:16:3e:00:00:11, type=netfront, bridge=br0' ] ++# ++vif = [ '' ] + + #---------------------------------------------------------------------------- + # Define the disk devices you want the domain to have access to, and +@@ -78,7 +93,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] # and MODE is r for read-only, w for read-write. #disk = [ 'phy:hda1,hda1,r' ] @@ -175,3 +247,93 @@ name=ramdisk vif='' vcpus=1 \ memory=64 root=/dev/ram0 +Index: xen-4.1.2-testing/tools/examples/xmexample.hvm-stubdom +=================================================================== +--- xen-4.1.2-testing.orig/tools/examples/xmexample.hvm-stubdom ++++ xen-4.1.2-testing/tools/examples/xmexample.hvm-stubdom +@@ -55,11 +55,26 @@ name = "xmexample.hvm" + #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 + #cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 + +-# Optionally define mac and/or bridge for the network interfaces. +-# Random MACs are assigned if not given. +-#vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0, model=ne2k_pci' ] +-# type=ioemu specify the NIC is an ioemu device not netfront +-vif = [ 'type=ioemu, bridge=xenbr0' ] ++#---------------------------------------------------------------------------- ++# Define network interfaces. ++ ++# By default, no network interfaces are configured. You may have one created ++# with sensible defaults using an empty vif clause: ++# ++# vif = [ '' ] ++# ++# or optionally override backend, bridge, ip, mac, script, type, model, ++# or vifname. ++# ++# An emulated RealTek 8139 network interface can be configured with: ++# ++# vif = [ 'mac=00:16:3e:00:00:11, type=ioemu, model=rtl8139, bridge=br0' ] ++# ++# A para-virtual network interface can be configured with: ++# ++# vif = [ 'mac=00:16:3e:00:00:11, type=netfront, bridge=br0' ] ++# ++vif = [ '' ] + + #---------------------------------------------------------------------------- + # Define the disk devices you want the domain to have access to, and +Index: xen-4.1.2-testing/tools/examples/xmexample.pv-grub +=================================================================== +--- xen-4.1.2-testing.orig/tools/examples/xmexample.pv-grub ++++ xen-4.1.2-testing/tools/examples/xmexample.pv-grub +@@ -53,11 +53,11 @@ name = "ExampleDomain" + # + # or optionally override backend, bridge, ip, mac, script, type, or vifname: + # +-# vif = [ 'mac=00:16:3e:00:00:11, bridge=xenbr0' ] ++# vif = [ 'mac=00:16:3e:00:00:11, bridge=br0' ] + # + # or more than one interface may be configured: + # +-# vif = [ '', 'bridge=xenbr1' ] ++# vif = [ '', 'bridge=br1' ] + + vif = [ '' ] + +Index: xen-4.1.2-testing/tools/examples/xmexample.vti +=================================================================== +--- xen-4.1.2-testing.orig/tools/examples/xmexample.vti ++++ xen-4.1.2-testing/tools/examples/xmexample.vti +@@ -40,11 +40,26 @@ name = "ExampleVTIDomain" + # In Windows OS, smaller size shows better performance. + #vhpt = 23 + +-# Optionally define mac and/or bridge for the network interfaces. +-# Random MACs are assigned if not given. +-#vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0, model=ne2k_pci' ] +-# type=ioemu specify the NIC is an ioemu device not netfront +-vif = [ 'type=ioemu, bridge=xenbr0' ] ++#---------------------------------------------------------------------------- ++# Define network interfaces. ++ ++# By default, no network interfaces are configured. You may have one created ++# with sensible defaults using an empty vif clause: ++# ++# vif = [ '' ] ++# ++# or optionally override backend, bridge, ip, mac, script, type, model, ++# or vifname. ++# ++# An emulated RealTek 8139 network interface can be configured with: ++# ++# vif = [ 'mac=00:16:3e:00:00:11, type=ioemu, model=rtl8139, bridge=br0' ] ++# ++# A para-virtual network interface can be configured with: ++# ++# vif = [ 'mac=00:16:3e:00:00:11, type=netfront, bridge=br0' ] ++# ++vif = [ '' ] + + #---------------------------------------------------------------------------- + # Define the disk devices you want the domain to have access to, and ++++++ xend-cpuid.patch ++++++ Only add cpuid and cpuid_check to sexpr once When converting a XendConfig object to sexpr, cpuid and cpuid_check were being emitted twice in the resulting sexpr. The first conversion writes incorrect sexpr, causing parsing of the sexpr to fail when xend is restarted and domain sexpr files in /var/lib/xend/domains/<dom-uuid> are read and parsed. This patch skips the first conversion, and uses only the custom cpuid{_check} conversion methods called later. It is not pretty, but is the least invasive fix in this complex code. Index: xen-4.1.2-testing/tools/python/xen/xend/XendConfig.py =================================================================== --- xen-4.1.2-testing.orig/tools/python/xen/xend/XendConfig.py +++ xen-4.1.2-testing/tools/python/xen/xend/XendConfig.py @@ -1125,6 +1125,10 @@ class XendConfig(dict): else: for name, typ in XENAPI_CFG_TYPES.items(): if name in self and self[name] not in (None, []): + # Skip cpuid and cpuid_check. Custom conversion + # methods for these are called below. + if name in ("cpuid", "cpuid_check"): + continue if typ == dict: s = self[name].items() elif typ == list: ++++++ xenpaging.autostart.patch ++++++ --- /var/tmp/diff_new_pack.T9SERf/_old 2012-03-14 14:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.T9SERf/_new 2012-03-14 14:08:06.000000000 +0100 @@ -49,7 +49,7 @@ =================================================================== --- xen-4.1.2-testing.orig/tools/examples/xmexample.hvm +++ xen-4.1.2-testing/tools/examples/xmexample.hvm -@@ -127,6 +127,15 @@ disk = [ 'file:/var/lib/xen/images/disk. +@@ -142,6 +142,15 @@ disk = [ 'file:/var/lib/xen/images/disk. # Device Model to be used device_model = 'qemu-dm' ++++++ xenpaging.mem_event-use-wait_queue.patch ++++++ --- /var/tmp/diff_new_pack.T9SERf/_old 2012-03-14 14:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.T9SERf/_new 2012-03-14 14:08:06.000000000 +0100 @@ -53,11 +53,9 @@ xen/include/xen/sched.h | 17 +++- 6 files changed, 179 insertions(+), 81 deletions(-) -Index: xen-4.1.2-testing/xen/arch/x86/hvm/hvm.c -=================================================================== ---- xen-4.1.2-testing.orig/xen/arch/x86/hvm/hvm.c -+++ xen-4.1.2-testing/xen/arch/x86/hvm/hvm.c -@@ -3915,8 +3915,8 @@ static int hvm_memory_event_traps(long p +--- a/xen/arch/x86/hvm/hvm.c ++++ b/xen/arch/x86/hvm/hvm.c +@@ -4013,8 +4013,8 @@ static int hvm_memory_event_traps(long p if ( (p & HVMPME_onchangeonly) && (value == old) ) return 1; @@ -68,10 +66,8 @@ return rc; memset(&req, 0, sizeof(req)); -Index: xen-4.1.2-testing/xen/arch/x86/mm/mem_event.c -=================================================================== ---- xen-4.1.2-testing.orig/xen/arch/x86/mm/mem_event.c -+++ xen-4.1.2-testing/xen/arch/x86/mm/mem_event.c +--- a/xen/arch/x86/mm/mem_event.c ++++ b/xen/arch/x86/mm/mem_event.c @@ -23,6 +23,7 @@ #include <asm/domain.h> @@ -324,10 +320,8 @@ } break; -Index: xen-4.1.2-testing/xen/arch/x86/mm/mem_sharing.c -=================================================================== ---- xen-4.1.2-testing.orig/xen/arch/x86/mm/mem_sharing.c -+++ xen-4.1.2-testing/xen/arch/x86/mm/mem_sharing.c +--- a/xen/arch/x86/mm/mem_sharing.c ++++ b/xen/arch/x86/mm/mem_sharing.c @@ -292,44 +292,32 @@ static void mem_sharing_audit(void) #endif @@ -349,15 +343,15 @@ - req.type = MEM_EVENT_TYPE_SHARED; - - if(must_succeed) -- { ++ if ( v->domain != d ) + { - /* We do not support 'must_succeed' any more. External operations such - * as grant table mappings may fail with OOM condition! - */ - BUG(); - } - else -+ if ( v->domain != d ) - { +- { - /* All foreign attempts to unshare pages should be handled through - * 'must_succeed' case. */ - ASSERT(v->domain->domain_id == d->domain_id); @@ -388,7 +382,7 @@ } unsigned int mem_sharing_get_nr_saved_mfns(void) -@@ -692,14 +680,14 @@ gfn_found: +@@ -692,14 +680,14 @@ gfn_found: if(ret == 0) goto private_page_found; old_page = page; @@ -405,10 +399,8 @@ return -ENOMEM; } -Index: xen-4.1.2-testing/xen/arch/x86/mm/p2m.c -=================================================================== ---- xen-4.1.2-testing.orig/xen/arch/x86/mm/p2m.c -+++ xen-4.1.2-testing/xen/arch/x86/mm/p2m.c +--- a/xen/arch/x86/mm/p2m.c ++++ b/xen/arch/x86/mm/p2m.c @@ -2988,21 +2988,13 @@ int p2m_mem_paging_evict(struct p2m_doma */ void p2m_mem_paging_drop_page(struct p2m_domain *p2m, unsigned long gfn) @@ -464,7 +456,7 @@ } void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long gla, -@@ -3240,7 +3232,7 @@ void p2m_mem_access_check(unsigned long +@@ -3240,7 +3232,7 @@ void p2m_mem_access_check(unsigned long p2m_unlock(p2m); /* Otherwise, check if there is a memory event listener, and send the message along */ @@ -473,7 +465,7 @@ if ( res < 0 ) { /* No listener */ -@@ -3250,7 +3242,7 @@ void p2m_mem_access_check(unsigned long +@@ -3250,7 +3242,7 @@ void p2m_mem_access_check(unsigned long "Memory access permissions failure, no mem_event listener: pausing VCPU %d, dom %d\n", v->vcpu_id, d->domain_id); @@ -497,10 +489,8 @@ } #endif /* __x86_64__ */ -Index: xen-4.1.2-testing/xen/include/asm-x86/mem_event.h -=================================================================== ---- xen-4.1.2-testing.orig/xen/include/asm-x86/mem_event.h -+++ xen-4.1.2-testing/xen/include/asm-x86/mem_event.h +--- a/xen/include/asm-x86/mem_event.h ++++ b/xen/include/asm-x86/mem_event.h @@ -24,13 +24,13 @@ #ifndef __MEM_EVENT_H__ #define __MEM_EVENT_H__ @@ -520,10 +510,8 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE(void) u_domctl); -Index: xen-4.1.2-testing/xen/include/xen/sched.h -=================================================================== ---- xen-4.1.2-testing.orig/xen/include/xen/sched.h -+++ xen-4.1.2-testing/xen/include/xen/sched.h +--- a/xen/include/xen/sched.h ++++ b/xen/include/xen/sched.h @@ -26,6 +26,7 @@ #include <xen/cpumask.h> #include <xen/nodemask.h> ++++++ xenpaging.p2m_is_paged.patch ++++++ --- /var/tmp/diff_new_pack.T9SERf/_old 2012-03-14 14:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.T9SERf/_new 2012-03-14 14:08:06.000000000 +0100 @@ -83,7 +83,17 @@ return HVMCOPY_gfn_paged_out; } if ( p2m_is_shared(p2mt) ) -@@ -3497,7 +3500,8 @@ long do_hvm_op(unsigned long op, XEN_GUE +@@ -2208,7 +2211,8 @@ static enum hvm_copy_result __hvm_clear( + + if ( p2m_is_paging(p2mt) ) + { +- p2m_mem_paging_populate(p2m, gfn); ++ if ( p2m_do_populate(p2mt) ) ++ p2m_mem_paging_populate(p2m, gfn); + return HVMCOPY_gfn_paged_out; + } + if ( p2m_is_shared(p2mt) ) +@@ -3594,7 +3598,8 @@ long do_hvm_op(unsigned long op, XEN_GUE mfn_t mfn = gfn_to_mfn(p2m, pfn, &t); if ( p2m_is_paging(t) ) { @@ -93,7 +103,7 @@ rc = -EINVAL; goto param_fail3; -@@ -3594,7 +3598,8 @@ long do_hvm_op(unsigned long op, XEN_GUE +@@ -3691,7 +3696,8 @@ long do_hvm_op(unsigned long op, XEN_GUE mfn = gfn_to_mfn_unshare(p2m, pfn, &t, 0); if ( p2m_is_paging(t) ) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bundle-lang-common for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at 2012-03-13 16:02:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bundle-lang-common (Old) and /work/SRC/openSUSE:Factory/.bundle-lang-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bundle-lang-common", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.changes 2012-02-01 11:52:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.changes 2012-03-13 16:02:28.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 13:42:13 UTC 2012 - coolo(a)suse.com + +- update package list + +------------------------------------------------------------------- bundle-lang-gnome-extras.changes: same change bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ ++++ 2250 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.spec ++++ and /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.spec bundle-lang-gnome-extras.spec: same change bundle-lang-gnome.spec: same change bundle-lang-kde.spec: same change ++++++ bundle-lang.spec.in ++++++ --- /var/tmp/diff_new_pack.ums0a5/_old 2012-03-13 16:02:35.000000000 +0100 +++ /var/tmp/diff_new_pack.ums0a5/_new 2012-03-13 16:02:35.000000000 +0100 @@ -27,6 +27,7 @@ #!BuildIgnore: NetworkManager-pptp #!BuildIgnore: NetworkManager-vpnc #!BuildIgnore: NetworkManager-openconnect +#!BuildIgnore: virtualbox-host-kmp-default License: license Group: group Version: 12.1 ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.ums0a5/_old 2012-03-13 16:02:35.000000000 +0100 +++ /var/tmp/diff_new_pack.ums0a5/_new 2012-03-13 16:02:35.000000000 +0100 @@ -23,6 +23,7 @@ balsa-lang gnome-extras banshee-community-extensions-common-lang gnome-extras banshee-core-lang gnome-extras +banshee-extension-doubanfm-lang gnome-extras baobab-lang gnome bash-lang common blueproximity-lang gnome-extras @@ -208,9 +209,7 @@ jhbuild-lang gnome-extras json-glib-lang gnome k3b-lang kde -kdebase4-openSUSE-lang kde krb5-auth-dialog-lang gnome-extras -ktorrent-lang kde kwebkitpart-lang kde libbonobo-lang gnome libbonoboui-lang gnome-extras @@ -240,10 +239,10 @@ libgweather-lang gnome libinfinity-lang gnome-extras libiptcdata-lang gnome -libktorrent3-lang kde libpeas-lang gnome libpurple-lang gnome libpurple-plugin-bot-sentry-lang gnome-extras +libpurple-plugin-openfetion-lang gnome-extras libpurple-plugin-skype-lang gnome-extras libwebkitgtk2-lang gnome libwebkitgtk3-lang gnome @@ -300,10 +299,12 @@ smuxi-server-lang gnome-extras sound-juicer-lang gnome-extras sparkleshare-lang gnome-extras +spice-gtk-lang gnome-extras swell-foop-lang gnome synapse-lang gnome-extras system-config-printer-common-lang gnome tar-lang common +tasks-lang gnome-extras tasque-lang gnome-extras tilda-lang gnome-extras tomboy-lang gnome @@ -324,6 +325,7 @@ vte-lang gnome vte2-lang gnome-extras wdiff-lang common +weather-wallpaper-lang gnome-extras x-tile-lang gnome-extras xchat-gnome-lang gnome-extras xchat-lang gnome ++++++ update-list.sh ++++++ --- /var/tmp/diff_new_pack.ums0a5/_old 2012-03-13 16:02:35.000000000 +0100 +++ /var/tmp/diff_new_pack.ums0a5/_new 2012-03-13 16:02:35.000000000 +0100 @@ -134,7 +134,7 @@ cp -lf bundle-lang-common.changes bundle-lang-$changes.changes done -osc service run +osc service localrun format_spec_file echo "CHECKING" for spec in bundle-lang-gnome-extras bundle-lang-gnome bundle-lang-kde bundle-lang-common; do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit expat for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package expat for openSUSE:12.1:Update:Test checked in at 2012-03-13 15:15:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/expat (Old) and /work/SRC/openSUSE:12.1:Update:Test/.expat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "expat", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/expat/expat.changes 2012-03-08 18:33:57.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.expat.new/expat.changes 2012-03-13 15:15:25.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 12 13:46:28 UTC 2012 - vdziewiecki(a)suse.com + +-Fixed VUL0: CVE-2012-1147 - Resource leak in readfilemap.c. (bnc#751464) +-Fixed VUL0: CVE-2012-1148 - Memory leak in poolGrow. (bnc#751465) +- + +------------------------------------------------------------------- +Fri Mar 9 14:53:13 UTC 2012 - vdziewiecki(a)suse.com + + +------------------------------------------------------------------- New: ---- expat-CVE-2012-1147.patch expat-CVE-2012-1148.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ expat.spec ++++++ --- /var/tmp/diff_new_pack.tJw710/_old 2012-03-13 15:15:25.000000000 +0100 +++ /var/tmp/diff_new_pack.tJw710/_new 2012-03-13 15:15:25.000000000 +0100 @@ -34,6 +34,8 @@ Patch0: %{name}-CVE-2009-2625.patch Patch1: %{name}-CVE-2009-3560.patch Patch2: %{name}-CVE-2012-0876.patch +Patch3: %{name}-CVE-2012-1147.patch +Patch4: %{name}-CVE-2012-1148.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -127,6 +129,8 @@ %patch0 %patch1 %patch2 -p0 +%patch3 +%patch4 cp %{S:1} . rm -f examples/*.dsp ++++++ expat-CVE-2012-1147.patch ++++++ Index: xmlwf/readfilemap.c =================================================================== --- xmlwf/readfilemap.c.orig +++ xmlwf/readfilemap.c @@ -58,10 +58,12 @@ filemap(const char *name, } if (fstat(fd, &sb) < 0) { perror(name); + close(fd); return 0; } if (!S_ISREG(sb.st_mode)) { fprintf(stderr, "%s: not a regular file\n", name); + close(fd); return 0; } nbytes = sb.st_size; ++++++ expat-CVE-2012-1148.patch ++++++ --- lib/xmlparse.c 2009/12/29 18:42:05 1.166 +++ lib/xmlparse.c 2010/02/25 18:35:36 1.167 @@ -6122,12 +6122,13 @@ } if (pool->blocks && pool->start == pool->blocks->s) { int blockSize = (int)(pool->end - pool->start)*2; - pool->blocks = (BLOCK *) + BLOCK *temp = (BLOCK *) pool->mem->realloc_fcn(pool->blocks, (offsetof(BLOCK, s) + blockSize * sizeof(XML_Char))); - if (pool->blocks == NULL) + if (temp == NULL) return XML_FALSE; + pool->blocks = temp; pool->blocks->size = blockSize; pool->ptr = pool->blocks->s + (pool->ptr - pool->start); pool->start = pool->blocks->s; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit expat for openSUSE:11.4
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package expat for openSUSE:11.4 checked in at Tue Mar 13 15:15:15 CET 2012. -------- --- old-versions/11.4/UPDATES/all/expat/expat.changes 2012-03-08 12:47:44.000000000 +0100 +++ 11.4/expat/expat.changes 2012-03-12 14:48:33.000000000 +0100 @@ -1 +1,13 @@ -Thu Mar 8 11:43:37 UTC 2012 - vdziewiecki(a)suse.com +------------------------------------------------------------------- +Mon Mar 12 13:46:28 UTC 2012 - vdziewiecki(a)suse.com + +-Fixed VUL0: CVE-2012-1147 - Resource leak in readfilemap.c. (bnc#751464) +-Fixed VUL0: CVE-2012-1148 - Memory leak in poolGrow. (bnc#751465) +- + +------------------------------------------------------------------- +Fri Mar 9 14:53:13 UTC 2012 - vdziewiecki(a)suse.com + + +------------------------------------------------------------------- +Thu Mar 8 11:34:58 UTC 2012 - vdziewiecki(a)suse.com @@ -5 +17,15 @@ ------------------------------------------------------------------- + +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/obsolete tags/sections from specfile + (cf. packaging guidelines) +- Use %_smp_mflags for parallel build +- Add libexpat-devel to baselibs + +------------------------------------------------------------------- +Fri Feb 25 16:01:01 UTC 2011 - prusnak(a)opensuse.org + +- fix license (MIT) in spec file + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- expat-CVE-2012-1147.patch expat-CVE-2012-1148.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ expat.spec ++++++ --- /var/tmp/diff_new_pack.cV1ABR/_old 2012-03-13 15:15:03.000000000 +0100 +++ /var/tmp/diff_new_pack.cV1ABR/_new 2012-03-13 15:15:03.000000000 +0100 @@ -19,7 +19,7 @@ Name: expat Version: 2.0.1 -Release: 102.<RELEASE103> +Release: 102.<RELEASE105> Url: http://expat.sourceforge.net/ # bug437293 %ifarch ppc64 @@ -35,6 +35,9 @@ Patch0: %{name}-CVE-2009-2625.patch Patch1: %{name}-CVE-2009-3560.patch Patch2: %{name}-CVE-2012-0876.patch +Patch3: %{name}-CVE-2012-1147.patch +Patch4: %{name}-CVE-2012-1148.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -47,7 +50,7 @@ xmltok/xmltok.h. The directory xmlparse contains an XML parser library that is built on top of the xmltok library. The interface is documented in xmlparse/xmlparse.h. The directory sample contains a simple example -program using this interface. The directory sample/build.bat is a batch +program using this interface. The file sample/build.bat is a batch file to build the example using Visual C++. The directory xmlwf contains the xmlwf application, which uses the xmlparse library. The arguments to xmlwf are one or more files to check for well-formedness. @@ -61,15 +64,9 @@ internal subset or it is declared as stand-alone in the XML declaration). - - -Authors: --------- - James Clark <jjc(a)jclark.com> - %package -n libexpat1 + Summary: XML Parser Toolkit -License: MPL .. Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -86,7 +83,7 @@ xmltok/xmltok.h. The directory xmlparse contains an XML parser library that is built on top of the xmltok library. The interface is documented in xmlparse/xmlparse.h. The directory sample contains a simple example -program using this interface. The directory sample/build.bat is a batch +program using this interface. The file sample/build.bat is a batch file to build the example using Visual C++. The directory xmlwf contains the xmlwf application, which uses the xmlparse library. The arguments to xmlwf are one or more files to check for well-formedness. @@ -100,15 +97,9 @@ internal subset or it is declared as stand-alone in the XML declaration). - - -Authors: --------- - James Clark <jjc(a)jclark.com> - %package -n libexpat-devel + Summary: XML Parser Toolkit -License: MPL .. Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libexpat1 = %{version} @@ -122,7 +113,7 @@ xmltok/xmltok.h. The directory xmlparse contains an XML parser library that is built on top of the xmltok library. The interface is documented in xmlparse/xmlparse.h. The directory sample contains a simple example -program using this interface. The directory sample/build.bat is a batch +program using this interface. The file sample/build.bat is a batch file to build the example using Visual C++. The directory xmlwf contains the xmlwf application, which uses the xmlparse library. The arguments to xmlwf are one or more files to check for well-formedness. @@ -136,23 +127,19 @@ internal subset or it is declared as stand-alone in the XML declaration). - - -Authors: --------- - James Clark <jjc(a)jclark.com> - %prep %setup -q %patch0 %patch1 -%patch2 +%patch2 -p0 +%patch3 +%patch4 cp %{S:1} . rm -f examples/*.dsp %build %configure --disable-static --with-pic --libdir=/%{_lib} -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -167,9 +154,6 @@ %check make check -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libexpat1 -p /sbin/ldconfig %postun -n libexpat1 -p /sbin/ldconfig ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.cV1ABR/_old 2012-03-13 15:15:03.000000000 +0100 +++ /var/tmp/diff_new_pack.cV1ABR/_new 2012-03-13 15:15:03.000000000 +0100 @@ -2,3 +2,6 @@ libexpat1 obsoletes "expat-<targettype>" provides "expat-<targettype>" +libexpat-devel + requires -libexpat-<targettype> + requires "libexpat1-<targettype> = <version>" ++++++ expat-CVE-2012-1147.patch ++++++ Index: xmlwf/readfilemap.c =================================================================== --- xmlwf/readfilemap.c.orig +++ xmlwf/readfilemap.c @@ -58,10 +58,12 @@ filemap(const char *name, } if (fstat(fd, &sb) < 0) { perror(name); + close(fd); return 0; } if (!S_ISREG(sb.st_mode)) { fprintf(stderr, "%s: not a regular file\n", name); + close(fd); return 0; } nbytes = sb.st_size; ++++++ expat-CVE-2012-1148.patch ++++++ --- lib/xmlparse.c 2009/12/29 18:42:05 1.166 +++ lib/xmlparse.c 2010/02/25 18:35:36 1.167 @@ -6122,12 +6122,13 @@ } if (pool->blocks && pool->start == pool->blocks->s) { int blockSize = (int)(pool->end - pool->start)*2; - pool->blocks = (BLOCK *) + BLOCK *temp = (BLOCK *) pool->mem->realloc_fcn(pool->blocks, (offsetof(BLOCK, s) + blockSize * sizeof(XML_Char))); - if (pool->blocks == NULL) + if (temp == NULL) return XML_FALSE; + pool->blocks = temp; pool->blocks->size = blockSize; pool->ptr = pool->blocks->s + (pool->ptr - pool->start); pool->start = pool->blocks->s; continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit v8 for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package v8 for openSUSE:12.1:Update:Test checked in at 2012-03-13 14:04:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/v8 (Old) and /work/SRC/openSUSE:12.1:Update:Test/.v8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "v8", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/v8/v8.changes 2012-02-27 16:46:31.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.v8.new/v8.changes 2012-03-13 14:04:10.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Mar 3 16:16:13 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 3.9.13.0 + * Add code kind check before preparing for OSR. (issue 1900, 115073) + * Pass zone explicitly to zone-allocation on x64 and ARM. (issue 1802) + * Port string construct stub to x64. (issue 849) + * Performance and stability improvements on all platforms. + +------------------------------------------------------------------- Old: ---- v8.3.9.7.0.tar.lzma New: ---- v8.3.9.13.0.tar.lzma ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ v8.spec ++++++ --- /var/tmp/diff_new_pack.8rXcT2/_old 2012-03-13 14:04:11.000000000 +0100 +++ /var/tmp/diff_new_pack.8rXcT2/_new 2012-03-13 14:04:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: v8 -Version: 3.9.7.0 +Version: 3.9.13.0 Release: 0 Summary: JavaScript Engine License: BSD-3-Clause @@ -111,7 +111,7 @@ rm -rf libv8.so rm -rf libv8preparser.so # Now, lets make it right. -g++ %{optflags} -fPIC -o libv8preparser.so.%{sover} -shared -W1,-soname,libv8preparser.so.%{somajor} obj/release/allocation.os obj/release/bignum-dtoa.os obj/release/bignum.os obj/release/cached-powers.os obj/release/conversions.os obj/release/diy-fp.os obj/release/dtoa.os obj/release/fast-dtoa.os obj/release/fixed-dtoa.os obj/release/hashmap.os obj/release/preparse-data.os obj/release/preparser-api.os obj/release/preparser.os obj/release/scanner.os obj/release/strtod.os obj/release/token.os obj/release/unicode.os obj/release/utils.os -lpthread +g++ %{optflags} -fPIC -o libv8preparser.so.%{sover} -shared -W1,-soname,libv8preparser.so.%{somajor} obj/release/allocation.os obj/release/bignum-dtoa.os obj/release/bignum.os obj/release/cached-powers.os obj/release/conversions.os obj/release/diy-fp.os obj/release/dtoa.os obj/release/fast-dtoa.os obj/release/fixed-dtoa.os obj/release/preparse-data.os obj/release/preparser-api.os obj/release/preparser.os obj/release/scanner.os obj/release/strtod.os obj/release/token.os obj/release/unicode.os obj/release/utils.os -lpthread rm obj/release/preparser-api.os %ifarch arm g++ %{optflags} -fPIC -o libv8.so.%{sover} -shared -Wl,-soname,libv8.so.%{somajor} obj/release/*.os obj/release/arm/*.os obj/release/extensions/*.os -lpthread ++++++ buildfix.diff ++++++ --- /var/tmp/diff_new_pack.8rXcT2/_old 2012-03-13 14:04:11.000000000 +0100 +++ /var/tmp/diff_new_pack.8rXcT2/_new 2012-03-13 14:04:11.000000000 +0100 @@ -1,14 +1,14 @@ --- SConstruct 2010-11-14 16:44:36.020000003 +0100 +++ SConstruct 2010-11-14 17:12:37.583000227 +0100 -@@ -292,7 +292,6 @@ +@@ -293,7 +293,6 @@ 'gcc': { 'all': { 'WARNINGFLAGS': ['-Wall', - '-Werror', '-W', '-Wno-unused-parameter', - '-Wnon-virtual-dtor'] -@@ -373,7 +372,7 @@ + '-Woverloaded-virtual', +@@ -391,7 +390,7 @@ DTOA_EXTRA_FLAGS = { 'gcc': { 'all': { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postfix for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package postfix for openSUSE:12.1:Update:Test checked in at 2012-03-13 14:03:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/postfix (Old) and /work/SRC/openSUSE:12.1:Update:Test/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix", Maintainer is "varkoly(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/postfix/postfix.changes 2012-01-12 16:01:14.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.postfix.new/postfix.changes 2012-03-13 14:04:08.000000000 +0100 @@ -1,0 +2,45 @@ +Wed Mar 7 06:31:05 UTC 2012 - varkoly(a)suse.com + +- rcpostfix now updates the aliases too + +------------------------------------------------------------------- +Mon Feb 27 16:35:56 UTC 2012 - chris(a)computersalat.de + +- update to 2.8.8 + Bugfixes: + tlsproxy(8) stored TLS sessions with a serverID of + "tlsproxy" instead of "smtpd", wasting an opportunity for + session reuse. File: tlsproxy/tlsproxy.c. + missing lookup table entry and terminator, causing + proxymap server segfault when postscreen(8) or verify(8) + attempted to access their cache via the proxymap server. + This could never have worked anyway, because the Postfix + 2.8 proxymap protocol does not support cache cleanup. File + util/dict.c. + the Postfix client sqlite + quoting routine returned the unquoted result instead of the + quoted text. The opportunities for misuse are limited, + because Postfix sqlite files are usually owned by root, and + Postfix daemons usually run with non-root privileges so + they can't corrupt the database. Problem reported by Rob + McGee (rob0). File: global/dict_sqlite.c. + the trace service did not + distinguish between notifications for a non-bounce or a + bounce message. This code pre-dates DSN support and should + have been updated when it was re-purposed to handle DSN + SUCCESS notifications. Problem reported by Sabahattin + Gucukoglu. File: bounce/bounce_trace_service.c. +- use latest VDA patch (2.8.5) + +------------------------------------------------------------------- +Wed Jan 25 15:12:38 UTC 2012 - varkoly(a)suse.com + +- bnc#743369 - yast2 mail module does not open the firewall +- Set MD5DIR in SuSEconfig.postfix to avoid warnings + +------------------------------------------------------------------- +Tue Jan 17 11:14:30 UTC 2012 - varkoly(a)suse.com + +- bnc738693 - upgrade from 11.4 enables mysql service for systemd + +------------------------------------------------------------------- Old: ---- postfix-2.8.7.tar.bz2 postfix-vda-v10-2.8.3.patch New: ---- postfix-2.8.8.tar.bz2 postfix-vda-v10-2.8.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.iz15Xv/_old 2012-03-13 14:04:08.000000000 +0100 +++ /var/tmp/diff_new_pack.iz15Xv/_new 2012-03-13 14:04:08.000000000 +0100 @@ -20,7 +20,7 @@ Summary: A fast, secure, and flexible mailer License: IPL-1.0 Group: Productivity/Networking/Email/Servers -Version: 2.8.7 +Version: 2.8.8 Release: 0 Url: http://www.postfix.org/ Source: %{name}-%{version}.tar.bz2 @@ -35,7 +35,7 @@ Patch10: %{name}-2.8.3-main.cf.patch Patch11: %{name}-2.8.3-master.cf.patch Patch12: %{name}-2.8.3-post-install.patch -Patch20: %{name}-vda-v10-2.8.3.patch +Patch20: %{name}-vda-v10-2.8.5.patch Patch21: postfix-2.8.5-ssl-release-buffers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -252,7 +252,7 @@ mkdir -p $RPM_BUILD_ROOT/%{omc_dir} install -m 644 %{name}-SuSE/%{name}.xml $RPM_BUILD_ROOT/%{omc_dir} mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/ -install -m 644 %{name}-SuSE/%{name}-fw $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name} +install -m 644 %{name}-SuSE/%{name}-fw $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/smtp { cat<<EOF # @@ -469,7 +469,7 @@ %config(noreplace) /etc/%{name}/bounce.cf.default %config(noreplace) /etc/%{name}/dynamicmaps.cf %config(noreplace) /etc/%{name}/ldap_aliases.cf -%config /etc/sysconfig/SuSEfirewall2.d/services/%{name} +%config /etc/sysconfig/SuSEfirewall2.d/services/smtp %dir /etc/sasl2/ %config(noreplace) /etc/sasl2/smtpd.conf %config /etc/%{name}/LICENSE ++++++ postfix-2.8.7.tar.bz2 -> postfix-2.8.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/HISTORY new/postfix-2.8.8/HISTORY --- old/postfix-2.8.7/HISTORY 2011-11-05 20:16:53.000000000 +0100 +++ new/postfix-2.8.8/HISTORY 2012-01-31 22:13:45.000000000 +0100 @@ -16695,3 +16695,55 @@ Portability: OpenBSD 5.x is supported. Files: makedefs, util/sys_defs.h. + + Portability: Dovecot now officially supports more socket + types for its authentication server. File: + xsasl/xsasl_dovecot_server.c. + +20111126 + + Bitrot: changes in error reporting to the under-documented + OpenLDAP API. Problem reported by Quanah Gibson-Mount. Fix + by Viktor Dukhovni. File: global/dict_ldap.c. + +20111205 + + Bugfix: tlsproxy(8) stored TLS sessions with a serverID of + "tlsproxy" instead of "smtpd", wasting an opportunity for + session reuse. File: tlsproxy/tlsproxy.c. + +20111211 + + Bugfix: missing lookup table entry and terminator, causing + proxymap server segfault when postscreen(8) or verify(8) + attempted to access their cache via the proxymap server. + This could never have worked anyway, because the Postfix + 2.8 proxymap protocol does not support cache cleanup. File + util/dict.c. + +20111226 + + Bugfix (introduced 20110426): after lookup error with + mailbox_transport_maps, mailbox_command_maps or + fallback_transport_maps, the local delivery agent did not + log the problem before deferring mail, and produced no defer + logfile record. Files: local/mailbox.c, local/unknown.c. + +20120127 + + Bugfix (introduced: Postfix 2.8): the Postfix client sqlite + quoting routine returned the unquoted result instead of the + quoted text. The opportunities for misuse are limited, + because Postfix sqlite files are usually owned by root, and + Postfix daemons usually run with non-root privileges so + they can't corrupt the database. Problem reported by Rob + McGee (rob0). File: global/dict_sqlite.c. + +20120130 + + Bugfix (introduced: Postfix 2.3): the trace service did not + distinguish between notifications for a non-bounce or a + bounce message. This code pre-dates DSN support and should + have been updated when it was re-purposed to handle DSN + SUCCESS notifications. Problem reported by Sabahattin + Gucukoglu. File: bounce/bounce_trace_service.c. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/bounce/bounce_trace_service.c new/postfix-2.8.8/src/bounce/bounce_trace_service.c --- old/postfix-2.8.7/src/bounce/bounce_trace_service.c 2009-04-28 19:27:43.000000000 +0200 +++ new/postfix-2.8.8/src/bounce/bounce_trace_service.c 2012-01-31 02:49:54.000000000 +0100 @@ -83,8 +83,39 @@ BOUNCE_INFO *bounce_info; int bounce_status = 1; VSTREAM *bounce; - VSTRING *new_id = vstring_alloc(10); + int notify_mask = name_mask(VAR_NOTIFY_CLASSES, mail_error_masks, + var_notify_classes); + VSTRING *new_id; int count; + const char *sender; + + /* + * For consistency with fail/delay notifications, send notification for a + * non-bounce message as a single-bounce message, send notification for a + * single-bounce message as a double-bounce message, and drop requests to + * send notification for a double-bounce message. + */ +#define NULL_SENDER MAIL_ADDR_EMPTY /* special address */ + + if (strcasecmp(recipient, mail_addr_double_bounce()) == 0) { + msg_info("%s: not sending trace/success notification for " + "double-bounce message", queue_id); + return (0); + } else if (*recipient == 0) { + if ((notify_mask & MAIL_ERROR_2BOUNCE) != 0) { + recipient = var_2bounce_rcpt; + sender = mail_addr_double_bounce(); + } else { + msg_info("%s: not sending trace/success notification " + "for single-bounce message", queue_id); + if (mail_queue_remove(service, queue_id) && errno != ENOENT) + msg_fatal("remove %s %s: %m", service, queue_id); + return (0); + } + } else { + /* Always send notification for non-bounce message. */ + sender = NULL_SENDER; + } /* * Initialize. Open queue file, bounce log, etc. @@ -126,7 +157,6 @@ bounce_mail_free(bounce_info); return (0); } -#define NULL_SENDER MAIL_ADDR_EMPTY /* special address */ #define NULL_TRACE_FLAGS 0 /* @@ -139,7 +169,8 @@ * there are fewer potential left-over files to remove up when we create * a new queue file. */ - if ((bounce = post_mail_fopen_nowait(NULL_SENDER, recipient, + new_id = vstring_alloc(10); + if ((bounce = post_mail_fopen_nowait(sender, recipient, INT_FILT_MASK_BOUNCE, NULL_TRACE_FLAGS, new_id)) != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/global/dict_ldap.c new/postfix-2.8.8/src/global/dict_ldap.c --- old/postfix-2.8.7/src/global/dict_ldap.c 2010-12-06 14:20:11.000000000 +0100 +++ new/postfix-2.8.8/src/global/dict_ldap.c 2012-01-31 22:26:42.000000000 +0100 @@ -225,6 +225,7 @@ #include "mail_conf.h" #if defined(USE_LDAP_SASL) && defined(LDAP_API_FEATURE_X_OPENLDAP) + /* * SASL headers, for sasl_interact_t. Either SASL v1 or v2 should be fine. */ @@ -242,13 +243,13 @@ #define DICT_LDAP_DO_SASL(d) ((d)->bind == DICT_LDAP_BIND_SASL) static const NAME_CODE bindopt_table[] = { - CONFIG_BOOL_NO, DICT_LDAP_BIND_NONE, - "none", DICT_LDAP_BIND_NONE, - CONFIG_BOOL_YES, DICT_LDAP_BIND_SIMPLE, - "simple", DICT_LDAP_BIND_SIMPLE, + CONFIG_BOOL_NO, DICT_LDAP_BIND_NONE, + "none", DICT_LDAP_BIND_NONE, + CONFIG_BOOL_YES, DICT_LDAP_BIND_SIMPLE, + "simple", DICT_LDAP_BIND_SIMPLE, #ifdef LDAP_API_FEATURE_X_OPENLDAP #if defined(USE_LDAP_SASL) - "sasl", DICT_LDAP_BIND_SASL, + "sasl", DICT_LDAP_BIND_SASL, #endif #endif 0, -1, @@ -292,9 +293,9 @@ #ifdef LDAP_API_FEATURE_X_OPENLDAP #if defined(USE_LDAP_SASL) int sasl; - char *sasl_mechs; - char *sasl_realm; - char *sasl_authz; + char *sasl_mechs; + char *sasl_realm; + char *sasl_authz; int sasl_minssf; #endif int ldap_ssl; @@ -451,28 +452,26 @@ } #if defined(USE_LDAP_SASL) && defined(LDAP_API_FEATURE_X_OPENLDAP) + /* * Context structure for SASL property callback. */ typedef struct bind_props { - char *authcid; - char *passwd; - char *realm; - char *authzid; + char *authcid; + char *passwd; + char *realm; + char *authzid; } bind_props; -static int -ldap_b2_interact(LDAP *ld, unsigned flags, void *props, void *inter) +static int ldap_b2_interact(LDAP *ld, unsigned flags, void *props, void *inter) { sasl_interact_t *in; - bind_props *ctx = (bind_props *)props; + bind_props *ctx = (bind_props *) props; - for (in = inter; in->id != SASL_CB_LIST_END; in++) - { + for (in = inter; in->id != SASL_CB_LIST_END; in++) { in->result = NULL; - switch(in->id) - { + switch (in->id) { case SASL_CB_GETREALM: in->result = ctx->realm; break; @@ -491,6 +490,7 @@ } return LDAP_SUCCESS; } + #endif /* dict_ldap_result - Read and parse LDAP result */ @@ -498,6 +498,7 @@ static int dict_ldap_result(LDAP *ld, int msgid, int timeout, LDAPMessage **res) { struct timeval mytimeval; + int err; mytimeval.tv_sec = timeout; mytimeval.tv_usec = 0; @@ -506,9 +507,12 @@ if (ldap_result(ld, msgid, GET_ALL, &mytimeval, res) == -1) return (dict_ldap_get_errno(ld)); - if (dict_ldap_get_errno(ld) == LDAP_TIMEOUT) { - (void) dict_ldap_abandon(ld, msgid); - return (dict_ldap_set_errno(ld, LDAP_TIMEOUT)); + if ((err = dict_ldap_get_errno(ld)) != LDAP_SUCCESS) { + if (err == LDAP_TIMEOUT) { + (void) dict_ldap_abandon(ld, msgid); + return (dict_ldap_set_errno(ld, LDAP_TIMEOUT)); + } + return err; } return LDAP_SUCCESS; } @@ -529,7 +533,7 @@ vstring_sprintf(minssf, "minssf=%d", dict_ldap->sasl_minssf); if ((rc = ldap_set_option(dict_ldap->ld, LDAP_OPT_X_SASL_SECPROPS, - (char *) minssf)) != LDAP_OPT_SUCCESS) + (char *) minssf)) != LDAP_OPT_SUCCESS) return (rc); props.authcid = dict_ldap->bind_dn; @@ -538,13 +542,14 @@ props.authzid = dict_ldap->sasl_authz; if ((rc = ldap_sasl_interactive_bind_s(dict_ldap->ld, NULL, - dict_ldap->sasl_mechs, NULL, NULL, - LDAP_SASL_QUIET, ldap_b2_interact, - &props)) != LDAP_SUCCESS) + dict_ldap->sasl_mechs, NULL, NULL, + LDAP_SASL_QUIET, ldap_b2_interact, + &props)) != LDAP_SUCCESS) return (rc); return (LDAP_SUCCESS); } + #endif /* dict_ldap_bind_st - Synchronous simple auth with timeout */ @@ -552,6 +557,7 @@ static int dict_ldap_bind_st(DICT_LDAP *dict_ldap) { int rc; + int err = LDAP_SUCCESS; int msgid; LDAPMessage *res; struct berval cred; @@ -567,7 +573,8 @@ return (rc); #define FREE_RESULT 1 - return (ldap_parse_sasl_bind_result(dict_ldap->ld, res, 0, FREE_RESULT)); + rc = ldap_parse_result(dict_ldap->ld, res, &err, 0, 0, 0, 0, FREE_RESULT); + return (rc == LDAP_SUCCESS ? err : rc); } /* search_st - Synchronous search with timeout */ @@ -868,6 +875,7 @@ #define DN_LOG_VAL(dict_ldap) \ ((dict_ldap)->bind_dn[0] ? (dict_ldap)->bind_dn : "empty or implicit") + /* * If this server requires a bind, do so. Thanks to Sam Tardieu for * noticing that the original bind call was broken. @@ -1873,6 +1881,7 @@ #ifdef LDAP_API_FEATURE_X_OPENLDAP #if defined(USE_LDAP_SASL) + /* * SASL options */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/global/dict_sqlite.c new/postfix-2.8.8/src/global/dict_sqlite.c --- old/postfix-2.8.7/src/global/dict_sqlite.c 2010-09-09 17:01:12.000000000 +0200 +++ new/postfix-2.8.8/src/global/dict_sqlite.c 2012-01-27 21:04:41.000000000 +0100 @@ -57,6 +57,12 @@ /* AUTHOR(S) /* Axel Steiner /* ast(a)treibsand.com +/* +/* Adopted and updated by: +/* Wietse Venema +/* IBM T.J. Watson Research +/* P.O. Box 704 +/* Yorktown Heights, NY 10598, USA /*--*/ /* System library. */ @@ -109,7 +115,7 @@ /* Fix 20100616 */ if (quoted_text == 0) msg_fatal("dict_sqlite_quote: out of memory"); - vstring_strcat(result, raw_text); + vstring_strcat(result, quoted_text); sqlite3_free(quoted_text); } @@ -151,6 +157,11 @@ int status; /* + * In case of return without lookup (skipped key, etc.). + */ + dict_errno = 0; + + /* * Don't frustrate future attempts to make Postfix UTF-8 transparent. */ if (!valid_utf_8(name, strlen(name))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/global/mail_version.h new/postfix-2.8.8/src/global/mail_version.h --- old/postfix-2.8.7/src/global/mail_version.h 2011-11-05 20:17:13.000000000 +0100 +++ new/postfix-2.8.8/src/global/mail_version.h 2012-02-01 20:18:16.000000000 +0100 @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20111105" -#define MAIL_VERSION_NUMBER "2.8.7" +#define MAIL_RELEASE_DATE "20120201" +#define MAIL_VERSION_NUMBER "2.8.8" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/global/maps.c new/postfix-2.8.8/src/global/maps.c --- old/postfix-2.8.7/src/global/maps.c 2006-06-15 20:07:15.000000000 +0200 +++ new/postfix-2.8.8/src/global/maps.c 2011-12-27 01:46:44.000000000 +0100 @@ -164,6 +164,11 @@ DICT *dict; /* + * In case of return without map lookup (empty name or no maps). + */ + dict_errno = 0; + + /* * Temp. workaround, for buggy callers that pass zero-length keys when * given partial addresses. */ @@ -189,6 +194,7 @@ *map_name, name, expansion); return (expansion); } else if (dict_errno != 0) { + msg_warn("%s:%s lookup of %s failed", dict->type, dict->name, name); break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/local/mailbox.c new/postfix-2.8.8/src/local/mailbox.c --- old/postfix-2.8.7/src/local/mailbox.c 2011-04-26 21:12:46.000000000 +0200 +++ new/postfix-2.8.8/src/local/mailbox.c 2011-12-25 21:15:55.000000000 +0100 @@ -289,7 +289,8 @@ } else if (dict_errno != 0) { /* Details in the logfile. */ dsb_simple(state.msg_attr.why, "4.3.0", "table lookup failure"); - *statusp = DEL_STAT_DEFER; + *statusp = defer_append(BOUNCE_FLAGS(state.request), + BOUNCE_ATTR(state.msg_attr)); return (YES); } if (*var_mailbox_transport) { @@ -333,7 +334,8 @@ } else if (dict_errno != 0) { /* Details in the logfile. */ dsb_simple(state.msg_attr.why, "4.3.0", "table lookup failure"); - status = DEL_STAT_DEFER; + status = defer_append(BOUNCE_FLAGS(state.request), + BOUNCE_ATTR(state.msg_attr)); } else if (*var_mailbox_command) { status = deliver_command(state, usr_attr, var_mailbox_command); } else if (*var_home_mailbox && LAST_CHAR(var_home_mailbox) == '/') { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/local/unknown.c new/postfix-2.8.8/src/local/unknown.c --- old/postfix-2.8.7/src/local/unknown.c 2011-04-26 21:11:43.000000000 +0200 +++ new/postfix-2.8.8/src/local/unknown.c 2011-12-25 21:16:15.000000000 +0100 @@ -120,7 +120,8 @@ } else if (dict_errno != 0) { /* Details in the logfile. */ dsb_simple(state.msg_attr.why, "4.3.0", "table lookup failure"); - return (DEL_STAT_DEFER); + return (defer_append(BOUNCE_FLAGS(state.request), + BOUNCE_ATTR(state.msg_attr))); } if (*var_fallback_transport) { state.msg_attr.rcpt.offset = -1L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/tlsproxy/tlsproxy.c new/postfix-2.8.8/src/tlsproxy/tlsproxy.c --- old/postfix-2.8.7/src/tlsproxy/tlsproxy.c 2011-02-07 16:32:28.000000000 +0100 +++ new/postfix-2.8.8/src/tlsproxy/tlsproxy.c 2011-12-06 01:28:55.000000000 +0100 @@ -692,7 +692,7 @@ timeout = 0, /* unused */ requirecert = (var_tlsp_tls_req_ccert && var_tlsp_enforce_tls), - serverid = state->service, + serverid = MAIL_SERVICE_SMTPD, /* XXX */ namaddr = state->remote_endpt, cipher_grade = cipher_grade, cipher_exclusions = STR(cipher_exclusions), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/util/dict.c new/postfix-2.8.8/src/util/dict.c --- old/postfix-2.8.7/src/util/dict.c 2010-09-08 23:23:24.000000000 +0200 +++ new/postfix-2.8.8/src/util/dict.c 2011-12-17 23:46:55.000000000 +0100 @@ -536,6 +536,8 @@ "no_unauth", (1 << 13), /* disallow unauthenticated data */ "fold_fix", (1 << 14), /* case-fold with fixed-case key map */ "fold_mul", (1 << 15), /* case-fold with multi-case key map */ + "open_lock", (1 << 16), /* permanent lock upon open */ + 0, }; /* dict_flags_str - convert mask to string for debugging purposes */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/xsasl/xsasl_dovecot_server.c new/postfix-2.8.8/src/xsasl/xsasl_dovecot_server.c --- old/postfix-2.8.7/src/xsasl/xsasl_dovecot_server.c 2010-12-31 02:19:44.000000000 +0100 +++ new/postfix-2.8.8/src/xsasl/xsasl_dovecot_server.c 2011-11-17 22:53:25.000000000 +0100 @@ -371,11 +371,6 @@ { XSASL_DOVECOT_SERVER_IMPL *xp; - if (strchr(path_info, '/') == 0) - msg_warn("when SASL type is \"%s\", SASL path \"%s\" " - "should be a socket pathname", - server_type, path_info); - xp = (XSASL_DOVECOT_SERVER_IMPL *) mymalloc(sizeof(*xp)); xp->xsasl.create = xsasl_dovecot_server_create; xp->xsasl.done = xsasl_dovecot_server_done; ++++++ postfix-SuSE.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/SuSEconfig.postfix new/postfix-SuSE/SuSEconfig.postfix --- old/postfix-SuSE/SuSEconfig.postfix 2011-08-22 11:29:28.000000000 +0200 +++ new/postfix-SuSE/SuSEconfig.postfix 2012-01-25 16:11:32.000000000 +0100 @@ -1203,7 +1203,7 @@ echo "This should not happen. Exit..." exit 1 } - +MD5DIR=/var/adm/SuSEconfig/md5 . $r/lib/YaST/SuSEconfig.functions echo "Reading $r/etc/sysconfig and updating the system..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/postfix.service new/postfix-SuSE/postfix.service --- old/postfix-SuSE/postfix.service 2011-08-12 17:35:38.000000000 +0200 +++ new/postfix-SuSE/postfix.service 2012-01-17 12:14:10.000000000 +0100 @@ -16,7 +16,6 @@ Description=Postfix Mail Transport Agent Requires=var-run.mount nss-lookup.target network.target remote-fs.target syslog.target time-sync.target After=var-run.mount nss-lookup.target network.target remote-fs.target syslog.target time-sync.target -Wants=amavis.service mysql.service cyrus.service ldap.service openslp.service ypbind.service After=amavis.service mysql.service cyrus.service ldap.service openslp.service ypbind.service Before=mail-transfer-agent.target Conflicts=sendmail.service exim.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/rc.postfix new/postfix-SuSE/rc.postfix --- old/postfix-SuSE/rc.postfix 2012-01-12 13:17:54.000000000 +0100 +++ new/postfix-SuSE/rc.postfix 2012-03-07 07:29:40.000000000 +0100 @@ -117,11 +117,17 @@ for i in $POSTFIX_MAP_LIST; do m=/etc/postfix/$i; d=$m.db - test -e "$d" || continue; if [ -e $m -a $m -nt $d ]; then postmap $m; fi done + for i in /etc/aliases /etc/aliases.d/*; do + m=${i/.db//} + d=$m.db + if [ -e $m -a $m -nt $d ]; then + postalias $m; + fi + done } # Shell functions sourced from /etc/rc.status: ++++++ postfix-vda-v10-2.8.3.patch -> postfix-vda-v10-2.8.5.patch ++++++ --- /work/SRC/openSUSE:12.1:Update:Test/postfix/postfix-vda-v10-2.8.3.patch 2011-12-05 15:51:45.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.postfix.new/postfix-vda-v10-2.8.5.patch 2012-03-13 14:04:08.000000000 +0100 @@ -1,6 +1,6 @@ -diff -uNr postfix-2.8.3.orig/README_FILES/VDA_README postfix-2.8.3/README_FILES/VDA_README ---- postfix-2.8.3.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.3/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100 +diff -uNr postfix-2.8.5.orig/README_FILES/VDA_README postfix-2.8.5/README_FILES/VDA_README +--- postfix-2.8.5.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.8.5/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100 @@ -0,0 +1,10 @@ +Postfix VDA patch for maildir++ quota support by + Anderson Nadal <andernadal(a)gmail.com> @@ -12,9 +12,9 @@ +provided by this patch. + + -diff -uNr postfix-2.8.3.orig/src/global/mail_params.h postfix-2.8.3/src/global/mail_params.h ---- postfix-2.8.3.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100 -+++ postfix-2.8.3/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/global/mail_params.h postfix-2.8.5/src/global/mail_params.h +--- postfix-2.8.5.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100 ++++ postfix-2.8.5/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100 @@ -2333,6 +2333,54 @@ #define DEF_VIRT_GID_MAPS "" extern char *var_virt_gid_maps; @@ -70,9 +70,9 @@ #define VAR_VIRT_MINUID "virtual_minimum_uid" #define DEF_VIRT_MINUID 100 extern int var_virt_minimum_uid; -diff -uNr postfix-2.8.3.orig/src/util/file_limit.c postfix-2.8.3/src/util/file_limit.c ---- postfix-2.8.3.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 -+++ postfix-2.8.3/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/util/file_limit.c postfix-2.8.5/src/util/file_limit.c +--- postfix-2.8.5.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 ++++ postfix-2.8.5/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100 @@ -85,7 +85,11 @@ #else struct rlimit rlim; @@ -86,9 +86,9 @@ if (setrlimit(RLIMIT_FSIZE, &rlim) < 0) msg_fatal("setrlimit: %m"); #ifdef SIGXFSZ -diff -uNr postfix-2.8.3.orig/src/virtual/mailbox.c postfix-2.8.3/src/virtual/mailbox.c ---- postfix-2.8.3.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200 -+++ postfix-2.8.3/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/virtual/mailbox.c postfix-2.8.5/src/virtual/mailbox.c +--- postfix-2.8.5.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200 ++++ postfix-2.8.5/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100 @@ -70,6 +70,70 @@ #define YES 1 #define NO 0 @@ -268,9 +268,9 @@ /* * Cleanup. -diff -uNr postfix-2.8.3.orig/src/virtual/maildir.c postfix-2.8.3/src/virtual/maildir.c ---- postfix-2.8.3.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 -+++ postfix-2.8.3/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/virtual/maildir.c postfix-2.8.5/src/virtual/maildir.c +--- postfix-2.8.5.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 ++++ postfix-2.8.5/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100 @@ -63,28 +63,420 @@ #include <mbox_open.h> #include <dsn_util.h> @@ -1256,9 +1256,9 @@ + return (deliver_status); } -diff -uNr postfix-2.8.3.orig/src/virtual/virtual.c postfix-2.8.3/src/virtual/virtual.c ---- postfix-2.8.3.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100 -+++ postfix-2.8.3/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/virtual/virtual.c postfix-2.8.5/src/virtual/virtual.c +--- postfix-2.8.5.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100 ++++ postfix-2.8.5/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100 @@ -335,12 +335,30 @@ char *var_mail_spool_dir; /* XXX dependency fix */ bool var_strict_mbox_owner; @@ -1388,9 +1388,9 @@ MAIL_SERVER_PRIVILEGED, 0); } -diff -uNr postfix-2.8.3.orig/src/virtual/virtual.h postfix-2.8.3/src/virtual/virtual.h ---- postfix-2.8.3.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 -+++ postfix-2.8.3/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/virtual/virtual.h postfix-2.8.5/src/virtual/virtual.h +--- postfix-2.8.5.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 ++++ postfix-2.8.5/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100 @@ -34,6 +34,9 @@ extern MAPS *virtual_mailbox_maps; extern MAPS *virtual_uid_maps; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chromium for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package chromium for openSUSE:12.1:Update:Test checked in at 2012-03-13 14:03:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/chromium (Old) and /work/SRC/openSUSE:12.1:Update:Test/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium", Maintainer is "PRusnak(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/chromium/chromium.changes 2012-02-27 16:45:52.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.chromium.new/chromium.changes 2012-03-13 14:03:52.000000000 +0100 @@ -1,0 +2,76 @@ +Sun Mar 11 08:01:15 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 19.0.1066 + * Fixed Chrome install/update resets Google search preferences + (Issue: 105390) + * Don't trigger accelerated compositing on 3D CSS when using + swiftshader (Issue: 116401) + * Fixed a GPU crash (Issue: 116096) + * More fixes for Back button frequently hangs (Issue: 93427) + * Bastion now works (Issue: 116285) + * Fixed Composited layer sorting irregularity with accelerated + canvas (Issue: 102943) + * Fixed Composited layer sorting irregularity with accelerated + canvas (Issue: 102943) + * Fixed Google Feedback causes render process to use too much + memory (Issue: 114489) + * Fixed after upgrade, some pages are rendered as blank + (Issue: 109888) + * Fixed Pasting text into a single-line text field shouldn't + keep literal newlines (Issue: 106551) +- Security Fixes: + * Critical CVE-2011-3047: Errant plug-in load and GPU process + memory corruption + * Critical CVE-2011-3046: UXSS and bad history navigation. + +------------------------------------------------------------------- +Mon Mar 5 20:53:06 UTC 2012 - vdziewiecki(a)suse.com + +- add Provides: browser(npapi) FATE#313084 + +------------------------------------------------------------------- +Sat Mar 3 16:55:15 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 19.0.1060 + * Fixed NTP signed in state is missing (Issue: 112676) + * Fixed gmail seems to redraw itself (all white) occasionally + (Issue: 111263) + * Focus "OK" button on Javascript dialogs (Issue: 111015) + * Fixed Back button frequently hangs (Issue: 93427) + * Increase the buffer size to fix muted playback rate + (Issue: 108239) + * Fixed Empty span with line-height renders with non-zero height + (Issue: 109811) + * Marked the Certum Trusted Network CA as an issuer of + extended-validation (EV) certificates. + * Fixed importing of bookmarks, history, etc. from Firefox 10+. + * Fixed issues - 114001, 110785, 114168, 114598, 111663, 113636, + 112676 + * Fixed several crashes (Issues: 111376, 108688, 114391) + * Fixed Firefox browser in Import Bookmarks and Settings + drop-down (Issue: 114476) + * Sync: Sessions aren't associating pre-existing tabs + (Issue: 113319) + * Fixed All "Extensions" make an entry under the "NTP Apps" + page (Issue: 113672) ++ Security Fixes (bnc#750407): + * High CVE-2011-3031: Use-after-free in v8 element wrapper. + * High CVE-2011-3032: Use-after-free in SVG value handling. + * High CVE-2011-3033: Buffer overflow in the Skia drawing library. + * High CVE-2011-3034: Use-after-free in SVG document handling. + * High CVE-2011-3035: Use-after-free in SVG use handling. + * High CVE-2011-3036: Bad cast in line box handling. + * High CVE-2011-3037: Bad casts in anonymous block splitting. + * High CVE-2011-3038: Use-after-free in multi-column handling. + * High CVE-2011-3039: Use-after-free in quote handling. + * High CVE-2011-3040: Out-of-bounds read in text handling. + * High CVE-2011-3041: Use-after-free in class attribute handling. + * High CVE-2011-3042: Use-after-free in table section handling. + * High CVE-2011-3043: Use-after-free in flexbox with floats. + * High CVE-2011-3044: Use-after-free with SVG animation elements. +- Remove the external ffmepg headers and start using the ones + delivered with Chromium. Changes to Chromium are no longer in line + with any ffmpeg version :-(. So we can only use the Chromium + ffmpeg headers. + +------------------------------------------------------------------- Old: ---- chromium.19.0.1046.0.svn122684.tar.bz2 ffmpeg-0.6-headers.tar.bz2 New: ---- chromium.19.0.1066.0.svn126066.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.CGwWPo/_old 2012-03-13 14:04:05.000000000 +0100 +++ /var/tmp/diff_new_pack.CGwWPo/_new 2012-03-13 14:04:05.000000000 +0100 @@ -16,11 +16,11 @@ # -%define v8_ver 3.9.7.0 -%define svn_revision 122684 +%define v8_ver 3.9.13.0 +%define svn_revision 126066 Name: chromium -Version: 19.0.1046.0 +Version: 19.0.1066.0 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ @@ -31,7 +31,6 @@ Source1: %{name}.easy Source2: %{name}-rpmlintrc %endif -Source8: ffmpeg-0.6-headers.tar.bz2 Source20: chromium-vendor.patch.in Source30: master_preferences Source31: default_bookmarks.html @@ -42,6 +41,7 @@ Source104: chromium-icons.tar.bz2 Provides: chromium-based-browser = %{version} Provides: chromium-browser = %{version} +Provides: browser(npapi) Obsoletes: chromium-browser < %{version} ## Start Patches @@ -92,6 +92,7 @@ BuildRequires: gcc-c++ BuildRequires: gperf BuildRequires: hunspell-devel +BuildRequires: krb5-devel BuildRequires: libbz2-devel BuildRequires: libevent BuildRequires: libexpat-devel @@ -104,7 +105,6 @@ BuildRequires: lzma BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-nss-devel -BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: pkg-config @@ -113,44 +113,44 @@ %else BuildRequires: perl(Switch) %endif -BuildRequires: pkgconfig(cairo) >= 1.6 -BuildRequires: pkgconfig(dbus-1) BuildRequires: dbus-1-glib-devel -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(xcomposite) -BuildRequires: pkgconfig(xt) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xscrnsaver) -BuildRequires: pkgconfig(xrender) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(x11) BuildRequires: dbus-1-glib-devel +BuildRequires: hicolor-icon-theme +BuildRequires: libelf-devel +BuildRequires: libevent-devel +BuildRequires: libgnome-keyring-devel +BuildRequires: libicu-devel >= 4.0 +BuildRequires: libpulse-devel BuildRequires: python +BuildRequires: python-devel BuildRequires: python-xml +BuildRequires: speex-devel BuildRequires: sqlite3-devel BuildRequires: update-desktop-files BuildRequires: v8-devel = %{v8_ver} BuildRequires: wdiff BuildRequires: zlib-devel -BuildRequires: libpulse-devel -BuildRequires: libelf-devel -BuildRequires: libgnome-keyring-devel -BuildRequires: python-devel -BuildRequires: libevent-devel -BuildRequires: libicu-devel >= 4.0 -BuildRequires: speex-devel -BuildRequires: hicolor-icon-theme +BuildRequires: pkgconfig(cairo) >= 1.6 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(xt) %if 0%{?suse_version} < 1210 BuildRequires: libudev-devel %endif # For NaCl %ifarch x86_64 -BuildRequires: glibc-32bit BuildRequires: gcc-c++-32bit +BuildRequires: glibc-32bit BuildRequires: zlib-32bit %endif @@ -237,11 +237,7 @@ %patch32 -p1 %patch66 -p1 -echo "%{svn_revision}" > src/build/LASTCHANGE.in - -pushd src/third_party/ffmpeg/ -tar xf %{SOURCE8} -popd +echo "svn%{svn_revision}" > src/build/LASTCHANGE.in # apply vendor patch after substitution sed "s:RPM_VERSION:%{version}:" %{SOURCE20} | patch -p0 @@ -275,6 +271,7 @@ -Dlinux_sandbox_chrome_path=%{_libdir}/chromium/chromium \ -Duse_openssl=0 \ -Duse_system_ffmpeg=1 \ +-Dbuild_ffmpegsumo=1 \ -Duse_system_zlib=1 \ -Duse_system_libpng=1 \ -Duse_system_bzip2=1 \ @@ -297,8 +294,9 @@ %endif %ifarch x86_64 -Dtarget_arch=x64 \ --Dlinux_use_gold_flags=0 \ %endif +-Dlinux_use_gold_flags=0 \ +-Dlinux_use_gold_binary=0 \ -Djavascript_engine=v8 #make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release ++++++ chromium-6.0.406.0-system-gyp-v8.patch ++++++ --- /var/tmp/diff_new_pack.CGwWPo/_old 2012-03-13 14:04:05.000000000 +0100 +++ /var/tmp/diff_new_pack.CGwWPo/_new 2012-03-13 14:04:05.000000000 +0100 @@ -52,7 +52,7 @@ =================================================================== --- chromium.orig/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp +++ chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp -@@ -1070,7 +1070,7 @@ +@@ -1054,7 +1054,7 @@ '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', @@ -61,25 +61,25 @@ '<(libjpeg_gyp_path):libjpeg', ], 'include_dirs': [ -@@ -1189,7 +1189,7 @@ - '<(chromium_src_dir)/third_party/ots/ots.gyp:ots', +@@ -1177,7 +1177,7 @@ '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', + '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', '<(libjpeg_gyp_path):libjpeg', ], 'export_dependent_settings': [ -@@ -1207,7 +1207,7 @@ - '<(chromium_src_dir)/third_party/ots/ots.gyp:ots', +@@ -1196,7 +1196,7 @@ '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', + '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', '<(libjpeg_gyp_path):libjpeg', ], # This is needed for mac because of webkit_system_interface. It'd be nice -@@ -1967,7 +1967,7 @@ +@@ -1959,7 +1959,7 @@ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', @@ -88,7 +88,7 @@ ], 'export_dependent_settings': [ 'webcore_bindings', -@@ -1976,7 +1976,7 @@ +@@ -1968,7 +1968,7 @@ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', ++++++ chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.CGwWPo/_old 2012-03-13 14:04:05.000000000 +0100 +++ /var/tmp/diff_new_pack.CGwWPo/_new 2012-03-13 14:04:05.000000000 +0100 @@ -8,15 +8,15 @@ - 'cflags': [ - '<!@(pkg-config --cflags libavcodec libavformat libavutil)', + 'include_dirs': [ -+ 'config', -+ 'ffmpeg-0.6-headers', ++ 'chromium/config', ++ '.', ], 'direct_dependent_settings': { - 'cflags': [ - '<!@(pkg-config --cflags libavcodec libavformat libavutil)', + 'include_dirs': [ -+ 'config', -+ 'ffmpeg-0.6-headers', ++ 'chromium/config', ++ '.', ], }, }, { # else use_system_ffmpeg == 0, add local copy to include path ++++++ chromium.19.0.1046.0.svn122684.tar.bz2 -> chromium.19.0.1066.0.svn126066.tar.bz2 ++++++ /work/SRC/openSUSE:12.1:Update:Test/chromium/chromium.19.0.1046.0.svn122684.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.chromium.new/chromium.19.0.1066.0.svn126066.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zypper for openSUSE:11.4
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package zypper for openSUSE:11.4 checked in at Tue Mar 13 14:03:24 CET 2012. -------- --- old-versions/11.4/UPDATES/all/zypper/zypper.changes 2011-07-25 11:49:42.000000000 +0200 +++ 11.4/zypper/zypper.changes 2012-01-10 19:08:38.000000000 +0100 @@ -1,0 +2,22 @@ +Tue Jan 10 18:53:36 CET 2012 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Tue Jan 10 18:41:12 CET 2012 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Tue Jan 10 13:24:48 CET 2012 - ma(a)suse.de + +- Return nonzero (104 - INF_CAP_NOT_FOUND) when query matches no + package (bnc#719690) +- version 1.5.9 + +------------------------------------------------------------------- +Sun Nov 27 01:13:52 CET 2011 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- zypper-1.5.7.tar.bz2 New: ---- zypper-1.5.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.sq4H0E/_old 2012-03-13 14:03:09.000000000 +0100 +++ /var/tmp/diff_new_pack.sq4H0E/_new 2012-03-13 14:03:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package zypper # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -36,8 +36,8 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command line software manager using libzypp -Version: 1.5.7 -Release: 0.<RELEASE4> +Version: 1.5.9 +Release: 0.<RELEASE2> Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Url: http://en.opensuse.org/Zypper ++++++ zypper-1.5.7.tar.bz2 -> zypper-1.5.9.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/zypper/zypper-1.5.7.tar.bz2 11.4/zypper/zypper-1.5.9.tar.bz2 differ: char 11, line 1 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit logrotate for openSUSE:11.4
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package logrotate for openSUSE:11.4 checked in at Tue Mar 13 14:03:07 CET 2012. -------- --- old-versions/11.4/UPDATES/all/logrotate/logrotate.changes 2012-01-31 16:13:15.000000000 +0100 +++ 11.4/logrotate/logrotate.changes 2012-03-12 16:13:42.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 12 15:11:56 UTC 2012 - vcizek(a)suse.com + +- fix a typo in logrotate-3.7.9-su.diff patch (bnc#751358) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logrotate.spec ++++++ --- /var/tmp/diff_new_pack.wXXX4N/_old 2012-03-13 14:02:35.000000000 +0100 +++ /var/tmp/diff_new_pack.wXXX4N/_new 2012-03-13 14:02:35.000000000 +0100 @@ -24,7 +24,7 @@ BuildRequires: libselinux-devel Summary: Rotate, Compress, Remove, and Mail System Log Files Version: 3.7.9 -Release: 6.<RELEASE9> +Release: 6.<RELEASE11> License: GPLv2+ Group: System/Base Source: %{name}-%{version}.tar.bz2 ++++++ logrotate-3.7.9-su.diff ++++++ --- /var/tmp/diff_new_pack.wXXX4N/_old 2012-03-13 14:02:35.000000000 +0100 +++ /var/tmp/diff_new_pack.wXXX4N/_new 2012-03-13 14:02:35.000000000 +0100 @@ -281,7 +281,7 @@ if (!debug) { - if ((fdcurr = open(currLog, (flags & LOG_FLAG_COPY) ? O_RDONLY : O_RDWR)) < 0) { -+ if ((fdcurr = open(currLog, ((flags & LOG_FLAG_COPY) ? O_RDONLY : O_RDWR)) | O_NOFOLLOW) < 0) { ++ if ((fdcurr = open(currLog, ((flags & LOG_FLAG_COPY) ? O_RDONLY : O_RDWR) | O_NOFOLLOW)) < 0) { message(MESS_ERROR, "error opening %s: %s\n", currLog, strerror(errno)); return 1; continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzypp for openSUSE:11.4
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package libzypp for openSUSE:11.4 checked in at Tue Mar 13 14:03:05 CET 2012. -------- --- old-versions/11.4/UPDATES/all/libzypp/libzypp.changes 2011-10-13 13:18:13.000000000 +0200 +++ 11.4/libzypp/libzypp.changes 2012-03-02 11:02:02.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Mar 1 18:31:03 CET 2012 - ma(a)suse.de + +- Apply soft locks by name and not per package (bnc#749418) +- version 8.13.3 (10) + +------------------------------------------------------------------- +Mon Jan 16 16:28:21 CET 2012 - ma(a)suse.de + +- CheckAccessDeleted: avoid duplicate entries for the same PID (bnc#716972) +- version 8.13.2 (10) + +------------------------------------------------------------------- +Tue Jan 10 18:41:02 CET 2012 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- libzypp-8.13.1.tar.bz2 New: ---- libzypp-8.13.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.mbRZ5t/_old 2012-03-13 14:02:05.000000000 +0100 +++ /var/tmp/diff_new_pack.mbRZ5t/_new 2012-03-13 14:02:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libzypp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -23,7 +23,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 8.13.1 +Version: 8.13.3 Release: 0.<RELEASE2> Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-8.13.1.tar.bz2 -> libzypp-8.13.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.13.1/VERSION.cmake new/libzypp-8.13.3/VERSION.cmake --- old/libzypp-8.13.1/VERSION.cmake 2011-10-13 13:10:00.000000000 +0200 +++ new/libzypp-8.13.3/VERSION.cmake 2012-03-02 09:26:25.000000000 +0100 @@ -45,24 +45,24 @@ # ================================================== #======= -# - Update version according to your changes, -# but based on 'LAST RELEASED:' below. I.e -# there's no need to increase LIBZYPP_MINOR -# if it already differs from 'LAST RELEASED:'. -# # - MOST IMPORTANT: -# Before you submitt to autobuild, rmember the -# new version in 'LAST RELEASED:', and add a -# note in the changes file. +# - Before you submitt to git: +# - Remember the new version in 'LAST RELEASED:' +# - State the new version in the changes file by adding a line +# "- version MAJOR.MINOR.PATCH (COMPATMINOR)" +# - Commit changes and version files together in a separate +# commit using -m 'changes MAJOR.MINOR.PATCH (COMPATMINOR)' +# - Tag the above commit with 'MAJOR.MINOR.PATCH' using +# -m "tagging MAJOR.MINOR.PATCH". # -# - Consider calling ./mkChangelog to edit the -# changes file. See './mkChangelog -h' for help. +# - Consider calling ./mkChangelog to assist you. +# See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "8") SET(LIBZYPP_COMPATMINOR "10") SET(LIBZYPP_MINOR "13") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "3") # -# LAST RELEASED: 8.13.1 (10) +# LAST RELEASED: 8.13.3 (10) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.13.1/mkChangelog new/libzypp-8.13.3/mkChangelog --- old/libzypp-8.13.1/mkChangelog 2011-10-13 13:10:00.000000000 +0200 +++ new/libzypp-8.13.3/mkChangelog 2012-03-02 09:26:25.000000000 +0100 @@ -1,80 +1,42 @@ #! /bin/bash -# + +function Recho() { echo -e "\e[0;31m""$@""\e[0m"; } +function Gecho() { echo -e "\e[0;32m""$@""\e[0m"; } +function Becho() { echo -e "\e[0;34m""$@""\e[0m"; } function errexit() { exec >&2 - echo "Error: $@" + Recho "Error: $@" exit 1 } -export LC_ALL="" -EDITOR=${EDITOR:-vi} - -TDIR=$(dirname $0) -test -n "$TDIR" && cd $TDIR - -CHANGESFILE=$(ls package/*.changes) -test -f "$CHANGESFILE" || errexit "No changes file '$CHANGESFILE'" - -VERSIONFILE="VERSION.cmake" -test -f "$VERSIONFILE" || errexit "No version file '$VERSIONFILE'" - -LANG="en" - -## Version.cmake tags in getversion() are still zypp specific. - function usage() { exec >&2 -cat <<EOF - -Usage: $(basename $0) [OPTIONS] -Options: -h,-?,--help This page. - -$(basename $0) will load the changes file '$CHANGESFILE' -into your editor (\$EDITOR=$EDITOR), providing a new changes -entry template: + cat <<EOF + Usage: + $(basename $0) [OPTIONS] + + Options: + -h,-?,--help This page. + -n Dryrun. + +Prepare a new changes file entry preloaded with all commits since the last +changes tag and load it into \$EDITOR (vi). If the version file was changed, +optionally submitt and tag the new changes. Otherwise simply leave the changes +in place. - ------------------------------------------------------------------- - Wed Jul 30 18:20:06 CEST 2008 - ma(a)suse.de - - - - #---delete-or-release---# LAST RELEASED: 5.3.2 (2) NEW RELEASE: 5.4.0 (4) - -The line '#---delete-or-release---#...' shows the last version submitted -to autobuild ('# LAST RELEASED:; tag in $VERSIONFILE). And also the current -version, asuming you already updated the $VERSIONFILE according to your changes. -(The number in parenthesis is _COMPATMINOR) - - -- Delete the line if you don't want to submit the package to autobuild. - -- Leave the line in place if you want to submit the package. - - -Closing the editor you are prompted: - - #---delete-or-release---# LAST RELEASED: 5.3.2 (2) NEW RELEASE: 5.4.0 (4) - (a)bort, (c)ontinue, (e)dit : - -Choosing (c)ontinue will write the new changes file. The '#---delete-or-release---#' -line is missing in case you deleted it. It's presence will remind you -that it is going to be converted into: - - - version 5.4.0 - -and the '# LAST RELEASED:; tag in $VERSIONFILE will be updated accordingly. -Now check the result, check in your changes, build the package and submit -to autobuild. - -Released by accident? Don't mind. Nothing bad will happen. If you want to -undo the change, restore the 'LAST RELEASED: ' entry in $VERSIONFILE and -delete the '- version' line in $CHANGESFILE'. +Don't forgett to push created tags as well: git push --tags EOF exit 1 } +DRYRUN=0 + case "$1" in + -[n]*) + DRYRUN=1 + ;; -[hH?]*) usage ;; @@ -83,6 +45,19 @@ ;; esac + +export LC_ALL="" +export LANG="en" +EDITOR=${EDITOR:-vi} + +EMAIL="$(git config --get user.email)" + +CHANGESFILE=$(ls package/*.changes) +test -f "$CHANGESFILE" || errexit "No changes file '$CHANGESFILE'" + +VERSIONFILE="VERSION.cmake" +test -f "$VERSIONFILE" || errexit "No version file '$VERSIONFILE'" + function getversion() { cat "$VERSIONFILE" \ | awk ' @@ -94,66 +69,133 @@ /^ *SET *$ *LIBZYPP_MINOR *"[0-9]+" *$/ {getnum();minor=$0} /^ *SET *$ *LIBZYPP_PATCH *"[0-9]+" *$/ {getnum();patch=$0} /^ *SET *$ *LIBZYPP_COMPATMINOR *"[0-9]+" *$/ {getnum();compatminor=$0} - /^# LAST RELEASED:/ {gsub("^.*RELEASED: *","");gsub(" +$","");gsub(" +\$"," (");lastrelease=$0} + /^# LAST RELEASED:/ { + gsub("^.*RELEASED: *",""); + gsub(" +$",""); + lastcompat=$0 + gsub(".*\\(","",lastcompat) + gsub("\$.*","",lastcompat) + gsub(" +\\(.*",""); + lastrelease=$0 + } END { thisrelease = major"."minor"."patch" ("compatminor")" - if ( thisrelease == lastrelease ) - print "#---delete-or-release---# LAST RELEASED: "lastrelease" UNCHANGED RELEASE: "thisrelease - else - print "#---delete-or-release---# LAST RELEASED: "lastrelease" NEW RELEASE: "thisrelease + printf "LAST_RELEASE='%s'\n", lastrelease + printf "LAST_COMPAT='%s'\n", lastcompat + printf "THIS_RELEASE='%s'\n", major"."minor"."patch + printf "THIS_COMPAT='%s'\n", compatminor } ' } -test -r /etc/sysconfig/mail && source /etc/sysconfig/mail -EMAIL="${USER}@${FROM_HEADER:-$(hostname -f)}" +function sameVersion() { + test "$LAST_RELEASE" == "$THIS_RELEASE" -a "$LAST_COMPAT" == "$THIS_COMPAT" +} + +function getchanges() { + git log --no-merges --pretty=format:'- %s' "$LAST_RELEASE"..HEAD | grep -v 'po.tar.bz2' +} + +function newchangesentry() { + echo "-------------------------------------------------------------------" + echo "$(date) - $EMAIL" + echo "" + echo "$(getchanges)" + sameVersion || { + echo "- version $THIS_RELEASE ($THIS_COMPAT)" + } + echo "" +} + +git status --porcelain | grep '^[^ ?]' | grep -v "$VERSIONFILE\|$CHANGESFILE" && { + Becho "!!! Files other than version and changes are added to the index." + Becho "!!! Doing dryrun..." + DRYRUN=1 +} +if [ "$DRYRUN" == "1" ]; then + eval $(getversion) + newchangesentry + sameVersion && { + Becho "!!! Version is unchanged at $LAST_RELEASE ($LAST_COMPAT)." + } + exit 0 +fi -GOTVERSION="$(getversion)" +# check version file +# +while true; do + # $LAST_RELEASE + # $LAST_COMPAT + # $THIS_RELEASE + # $THIS_COMPAT + eval $(getversion) + sameVersion && { + newchangesentry + Becho "!!! Version is unchanged at $LAST_RELEASE ($LAST_COMPAT)." + read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (e)dit version: ")" RES + echo + case "$RES" in + [eE]*) + $EDITOR $VERSIONFILE + continue + ;; + [cC]) + Becho "!!! Leave $VERSIONFILE untouched" + break + ;; + *) + errexit "aborted" + ;; + esac + } + break +done + +# prepare changes file +# TMPFILE=$(mktemp) -exec 3>&1- -exec >$TMPFILE -echo "-------------------------------------------------------------------" -echo "$(date) - $EMAIL" -echo "" -echo "- " -echo "$GOTVERSION" -echo "" -cat $CHANGESFILE -exec >&3 +trap " [ -f \"$TMPFILE\" ] && /bin/rm -f -- \"$TMPFILE\" " 0 1 2 3 13 15 +{ newchangesentry; cat $CHANGESFILE; } >$TMPFILE RES=e while [ "$RES" == "e" ]; do $EDITOR $TMPFILE echo - NEWREL=$(grep '#---delete-or-release---#' $TMPFILE) - test -n "$NEWREL" && echo "$NEWREL" - read -n 1 -p "(a)bort, (c)ontinue, (e)dit : " RES - echo + awk '{print}/^----------/{n=n+1; if ( n == 2 ) exit 0; }' $TMPFILE + read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (s)ubmitt, (e)dit : ")" RES echo case "$RES" in [eE]*) RES=e ;; - [cC]) - test -n "$NEWREL" && { - echo "Remember new release in $VERSIONFILE" - sed -i 's/^.*#---delete-or-release---#.*RELEASE:/- version/' $TMPFILE - NEWREL=$(sed 's/^.*#---delete-or-release---#.*RELEASE:/# LAST RELEASED:/' <<<"$NEWREL") - sed -i "s/^# LAST RELEASED:.*$/$NEWREL/" $VERSIONFILE + [cCsS]) + Becho "!!! Store new $CHANGESFILE" + mv $TMPFILE $CHANGESFILE + + test "$RES" == "s" && { + if [ "$LAST_RELEASE" == "$THIS_RELEASE" ]; then + git add "$CHANGESFILE" && git commit -m "changes" + else + Becho "!!! Remember new version $THIS_RELEASE in $VERSIONFILE" + sed -i "s/^# LAST RELEASED:.*$/# LAST RELEASED: $THIS_RELEASE ($THIS_COMPAT)/" $VERSIONFILE + if git add "$CHANGESFILE" "$VERSIONFILE" \ + && git commit -m "changes $THIS_RELEASE ($THIS_COMPAT)" \ + && git tag -m "tagging $THIS_RELEASE" "$THIS_RELEASE" HEAD; then + Becho "!!!" + Becho "!!! Do not forget to push the commit and the tag: $(Gecho git push --tags origin HEAD)" + Becho "!!!" + else + Recho "!!!" + Recho "!!! Commit failed. Check manually. (git reset HEAD~)" + Recho "!!!" + exit 9 + fi + fi } - - echo "Store new $CHANGESFILE" - cp $TMPFILE $CHANGESFILE - - echo "$(sed 's/^.*#---delete-or-release---#.*RELEASE:/# CURRENT RELEASE:/' <<<"$GOTVERSION")" - awk '{print}/^----------/{n=n+1; if ( n == 2 ) exit 0; }' $CHANGESFILE - ;; *) - echo "Leave $CHANGESFILE untouched" + Becho "!!! Leave $CHANGESFILE untouched" ;; esac done - -rm -f $TMPFILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.13.1/package/libzypp.changes new/libzypp-8.13.3/package/libzypp.changes --- old/libzypp-8.13.1/package/libzypp.changes 2011-10-13 13:10:00.000000000 +0200 +++ new/libzypp-8.13.3/package/libzypp.changes 2012-03-02 09:26:25.000000000 +0100 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Thu Mar 1 18:31:03 CET 2012 - ma(a)suse.de + +- Apply soft locks by name and not per package (bnc#749418) +- version 8.13.3 (10) + +------------------------------------------------------------------- +Mon Jan 16 16:28:21 CET 2012 - ma(a)suse.de + +- CheckAccessDeleted: avoid duplicate entries for the same PID (bnc#716972) +- version 8.13.2 (10) + +------------------------------------------------------------------- +Tue Jan 10 18:41:02 CET 2012 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Thu Oct 13 12:21:19 CEST 2011 - ma(a)suse.de - Must not differ between type nfs and nfs4 when checking the mount diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.13.1/zypp/misc/CheckAccessDeleted.cc new/libzypp-8.13.3/zypp/misc/CheckAccessDeleted.cc --- old/libzypp-8.13.1/zypp/misc/CheckAccessDeleted.cc 2011-10-13 13:10:00.000000000 +0200 +++ new/libzypp-8.13.3/zypp/misc/CheckAccessDeleted.cc 2012-03-02 09:26:25.000000000 +0100 @@ -12,6 +12,7 @@ #include <iostream> #include "zypp/base/LogTools.h" #include "zypp/base/String.h" +#include "zypp/base/Tr1hash.h" #include "zypp/base/Exception.h" #include "zypp/PathInfo.h" @@ -39,23 +40,27 @@ // (ftkn).filedescriptor type linkcount filename // ///////////////////////////////////////////////////////////////// + + /** lsof output line + files extracted so far for this PID */ + typedef std::pair<std::string,std::tr1::unordered_set<std::string> > CacheEntry; + /** Add \c cache to \c data if the process is accessing deleted files. * \c pid string in \c cache is the proc line \c (pcuLR), \c iles * are lready in place. Always clear the \c cache.files! */ - inline void addDataIf( std::vector<CheckAccessDeleted::ProcInfo> & data_r, CheckAccessDeleted::ProcInfo & cache_r ) + inline void addDataIf( std::vector<CheckAccessDeleted::ProcInfo> & data_r, const CacheEntry & cache_r ) { - if ( cache_r.files.empty() ) + const std::tr1::unordered_set<std::string> & filelist( cache_r.second ); + + if ( filelist.empty() ) return; // at least one file access so keep it: data_r.push_back( CheckAccessDeleted::ProcInfo() ); CheckAccessDeleted::ProcInfo & pinfo( data_r.back() ); + pinfo.files.insert( pinfo.files.begin(), filelist.begin(), filelist.end() ); - std::string pline; - cache_r.pid.swap( pline ); - cache_r.files.swap( pinfo.files ); // clears cache.files - + const std::string & pline( cache_r.first ); for_( ch, pline.begin(), pline.end() ) { switch ( *ch ) @@ -87,16 +92,16 @@ if ( ! command.empty() ) pinfo.command = command.basename(); } - //MIL << " Take " << pinfo << endl; } - /** Add line to cache if it refers to a deleted executable or library file: + + /** Add file to cache if it refers to a deleted executable or library file: * - Either the link count \c(k) is \c 0, or no link cout is present. * - The type \c (t) is set to \c REG or \c DEL * - The filedescriptor \c (f) is set to \c txt, \c mem or \c DEL */ - inline void addCacheIf( CheckAccessDeleted::ProcInfo & cache_r, const std::string & line_r, bool verbose_r ) + inline void addCacheIf( CacheEntry & cache_r, const std::string & line_r, bool verbose_r ) { const char * f = 0; const char * t = 0; @@ -159,12 +164,8 @@ return; } } - - if ( std::find( cache_r.files.begin(), cache_r.files.end(), n ) == cache_r.files.end() ) - { - // Add if no duplicate - cache_r.files.push_back( n ); - } + // Add if no duplicate + cache_r.second.insert( n ); } ///////////////////////////////////////////////////////////////// } // namespace @@ -173,7 +174,6 @@ CheckAccessDeleted::size_type CheckAccessDeleted::check( bool verbose_r ) { _data.clear(); - std::vector<ProcInfo> data; static const char* argv[] = { @@ -181,20 +181,22 @@ }; ExternalProgram prog( argv, ExternalProgram::Discard_Stderr ); - CheckAccessDeleted::ProcInfo cache; + // cachemap: PID => (deleted files) + std::map<pid_t,CacheEntry> cachemap; + pid_t cachepid; for( std::string line = prog.receiveLine(); ! line.empty(); line = prog.receiveLine() ) { + // NOTE: line contains '\0' separeated fields! if ( line[0] == 'p' ) { - addDataIf( data, cache ); - cache.pid = line; // + str::strtonum( line.c_str()+1, cachepid ); // line is "p<PID>\0...." + cachemap[cachepid].first.swap( line ); } else { - addCacheIf( cache, line, verbose_r ); + addCacheIf( cachemap[cachepid], line, verbose_r ); } } - addDataIf( data, cache ); int ret = prog.close(); if ( ret != 0 ) @@ -204,6 +206,11 @@ ZYPP_THROW( err ); } + std::vector<ProcInfo> data; + for_( it, cachemap.begin(), cachemap.end() ) + { + addDataIf( data, (*it).second ); + } _data.swap( data ); return _data.size(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.13.1/zypp/solver/detail/SATResolver.cc new/libzypp-8.13.3/zypp/solver/detail/SATResolver.cc --- old/libzypp-8.13.1/zypp/solver/detail/SATResolver.cc 2011-10-13 13:10:00.000000000 +0200 +++ new/libzypp-8.13.3/zypp/solver/detail/SATResolver.cc 2012-03-02 09:26:25.000000000 +0100 @@ -623,7 +623,7 @@ // Add rules for parallel installable resolvables with different versions for_( it, sat::Pool::instance().multiversionBegin(), sat::Pool::instance().multiversionEnd() ) { - queue_push( &(_jobQueue), SOLVER_NOOBSOLETES | SOLVABLE_NAME ); + queue_push( &(_jobQueue), SOLVER_NOOBSOLETES | SOLVER_SOLVABLE_NAME ); queue_push( &(_jobQueue), it->id() ); } @@ -1385,7 +1385,7 @@ void SATResolver::setLocks() { - for (PoolItemList::const_iterator iter = _items_to_lock.begin(); iter != _items_to_lock.end(); iter++) { + for (PoolItemList::const_iterator iter = _items_to_lock.begin(); iter != _items_to_lock.end(); ++iter) { sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); if (iter->status().isInstalled()) { MIL << "Lock installed item " << *iter << endl; @@ -1398,16 +1398,20 @@ } } - for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter != _items_to_keep.end(); iter++) { - sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); + std::set<IdString> unifiedByName; + for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter != _items_to_keep.end(); ++iter) { if (iter->status().isInstalled()) { MIL << "Keep installed item " << *iter << endl; - queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE | SOLVER_WEAK); - queue_push( &(_jobQueue), ident ); + queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE | SOLVER_WEAK ); + queue_push( &(_jobQueue), (*iter)->satSolvable().id() ); } else { - MIL << "Keep NOT installed item " << *iter << ident << endl; - queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | SOLVER_WEAK | MAYBE_CLEANDEPS ); - queue_push( &(_jobQueue), ident ); + IdString ident( (*iter)->satSolvable().ident() ); + MIL << "Keep NOT installed name " << ident << " (" << *iter << ")" << endl; + if ( unifiedByName.insert( ident ).second ) + { + queue_push( &(_jobQueue), SOLVER_ERASE | SOLVER_SOLVABLE_NAME | SOLVER_WEAK | MAYBE_CLEANDEPS ); + queue_push( &(_jobQueue), ident.id() ); + } } } } @@ -1417,13 +1421,13 @@ CapabilitySet system_requires = SystemCheck::instance().requiredSystemCap(); CapabilitySet system_conflicts = SystemCheck::instance().conflictSystemCap(); - for (CapabilitySet::const_iterator iter = system_requires.begin(); iter != system_requires.end(); iter++) { + for (CapabilitySet::const_iterator iter = system_requires.begin(); iter != system_requires.end(); ++iter) { queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE_PROVIDES ); queue_push( &(_jobQueue), iter->id() ); MIL << "SYSTEM Requires " << *iter << endl; } - for (CapabilitySet::const_iterator iter = system_conflicts.begin(); iter != system_conflicts.end(); iter++) { + for (CapabilitySet::const_iterator iter = system_conflicts.begin(); iter != system_conflicts.end(); ++iter) { queue_push( &(_jobQueue), SOLVER_ERASE | SOLVER_SOLVABLE_PROVIDES | MAYBE_CLEANDEPS ); queue_push( &(_jobQueue), iter->id() ); MIL << "SYSTEM Conflicts " << *iter << endl; @@ -1440,7 +1444,7 @@ if ( (*it)->isSystem() ) { Capability archrule( (*it)->arch(), rpm.c_str(), Capability::PARSED ); - queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVABLE_NAME | SOLVER_ESSENTIAL ); + queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE_NAME | SOLVER_ESSENTIAL ); queue_push( &(_jobQueue), archrule.id() ); } continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit acpid for openSUSE:11.4
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package acpid for openSUSE:11.4 checked in at Tue Mar 13 14:02:23 CET 2012. -------- --- old-versions/11.4/all/acpid/acpid.changes 2010-12-22 04:41:24.000000000 +0100 +++ 11.4/acpid/acpid.changes 2011-12-28 11:57:18.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 28 11:56:57 CET 2011 - hmacht(a)suse.de + +- add acpid-set-umask-for-scripts.patch: Set umask for running + scripts (bnc#735282, CVE-2011-4578) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/acpid Destination is old-versions/11.4/UPDATES/all/acpid calling whatdependson for 11.4-i586 New: ---- acpid-set-umask-for-scripts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.12peqI/_old 2012-03-13 14:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.12peqI/_new 2012-03-13 14:01:28.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package acpid (Version 2.0.7) +# spec file for package acpid # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -21,7 +21,7 @@ Name: acpid Url: http://tedfelix.com/linux/acpid-netlink.html Version: 2.0.7 -Release: 1 +Release: 7.<RELEASE8> License: GPLv2+ Group: System/Daemons AutoReqProv: on @@ -37,6 +37,7 @@ Source7: power_button Source8: acpid.service Patch1: acpid-makefile.patch +Patch2: acpid-set-umask-for-scripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 @@ -60,6 +61,7 @@ %prep %setup -q %patch1 -p0 +%patch2 -p1 cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} . %build ++++++ acpid-set-umask-for-scripts.patch ++++++ Index: acpid-2.0.7/event.c =================================================================== --- acpid-2.0.7.orig/event.c +++ acpid-2.0.7/event.c @@ -641,6 +641,7 @@ do_cmd_rule(struct rule *rule, const cha if (acpid_debug && logevents) { fprintf(stdout, "BEGIN HANDLER MESSAGES\n"); } + umask(0077); execl("/bin/sh", "/bin/sh", "-c", action, NULL); /* should not get here */ acpid_log(LOG_ERR, "execl(): %s\n", strerror(errno)); continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2012-03-13 11:24:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2012-01-27 15:20:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2012-03-13 11:24:43.000000000 +0100 @@ -1,0 +2,31 @@ +Fri Mar 2 23:14:20 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- +Mon Feb 27 11:52:01 UTC 2012 - saschpe(a)suse.de + +- Local service run of spec formatter broke it + +------------------------------------------------------------------- +Mon Feb 27 11:04:20 UTC 2012 - saschpe(a)suse.de + +- The 'factory-auto' review script doesn't like macros in Name: + +------------------------------------------------------------------- +Mon Jan 30 14:07:45 UTC 2012 - giecrilj(a)stegny.2a.pl + +- update documentation (bnc#743337) +- move meinproc4_simple to doc +- mark doc as GFDL +- unmark config in /usr/share (config is in /etc) +- reinstate checkXML.1 (why was it killed?) +- remove kde4-doxygen.sh (build time only script) + +------------------------------------------------------------------- +Mon Jan 30 10:31:47 UTC 2012 - toddrme2178(a)gmail.com + +- Fixed aspell detection + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2012-01-31 10:21:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2012-03-13 11:24:44.000000000 +0100 @@ -1,0 +2,26 @@ +Fri Mar 2 23:14:20 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- +Mon Feb 27 11:52:01 UTC 2012 - saschpe(a)suse.de + +- Local service run of spec formatter broke it + +------------------------------------------------------------------- +Mon Feb 27 11:04:20 UTC 2012 - saschpe(a)suse.de + +- The 'factory-auto' review script doesn't like macros in Name: + +------------------------------------------------------------------- +Mon Jan 30 14:07:45 UTC 2012 - giecrilj(a)stegny.2a.pl + +- update documentation (bnc#743337) +- move meinproc4_simple to doc +- mark doc as GFDL +- unmark config in /usr/share (config is in /etc) +- reinstate checkXML.1 (why was it killed?) +- remove kde4-doxygen.sh (build time only script) + +------------------------------------------------------------------- Old: ---- kdelibs-4.8.0.tar.bz2 New: ---- kdelibs-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.ugVg5H/_old 2012-03-13 11:24:46.000000000 +0100 +++ /var/tmp/diff_new_pack.ugVg5H/_new 2012-03-13 11:24:46.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdelibs4-apidocs -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: KDE 4 API documentation License: LGPL-2.1+ @@ -53,8 +53,8 @@ %install mkdir -p %{buildroot}%{_kde4_htmldir}/en cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_htmldir}/en/kdelibs4-apidocs + find %{buildroot} -name installdox | xargs rm -f %fdupes %{buildroot}%{_kde4_htmldir}/en/kdelibs4-apidocs - find %{buildroot}%{_kde4_htmldir}/en/kdelibs4-apidocs -iname "installdox" | xargs chmod -x %kde_post_install %clean ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.ugVg5H/_old 2012-03-13 11:24:46.000000000 +0100 +++ /var/tmp/diff_new_pack.ugVg5H/_new 2012-03-13 11:24:46.000000000 +0100 @@ -15,7 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +# a hack for building apidoc, currently unused and unneeded (rev.312) +%bcond_with gendoxygen + +# This is KDE revision number, setting it to a higher value will enable more features +# e.g. 420117248 enables kconfig_compiler.1 +%define kderev 0 + Name: kdelibs4 +Version: 4.8.1 +Release: 0 BuildRequires: OpenEXR-devel BuildRequires: alsa-devel BuildRequires: aspell @@ -32,6 +42,7 @@ BuildRequires: flex BuildRequires: giflib-devel BuildRequires: grantlee-devel +BuildRequires: help2man %if 0%{?kdelibs_is_fully_gplv3_compatible} BuildRequires: herqq-devel %endif @@ -62,10 +73,8 @@ BuildRequires: utempter %endif BuildRequires: xz-devel -Version: 4.8.0 -Release: 0 -%if %suse_version > 1140 -%define brandingversion 4.7 +%if %suse_version > 1210 +%define brandingversion 4.8 %endif %if %suse_version == 1130 %define brandingversion 11.3 @@ -73,6 +82,9 @@ %if %suse_version == 1140 %define brandingversion 11.4 %endif +%if %suse_version == 1210 +%define brandingversion 12.1 +%endif Summary: KDE Base Libraries License: LGPL-2.1+ Group: System/GUI/KDE @@ -140,6 +152,10 @@ This package contains the basic packages for a K Desktop Environment branding. +# KDE 292715 292723 292725 292764 292765 +# kconfig_compiler pending upstream <URL: http://lists.kde.org/?l=kde-doc-english&m=132791095310563&w=2 > +%define kde_auto_man nepomuk-rcgen kde4-config kunittestmodrunner kfilemetadatareader meinproc4 + %prep %setup -q -n kdelibs-%{version} %patch0 -p1 @@ -183,6 +199,13 @@ -DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=%{_sysconfdir}" %cmake_kde4 -d build -- -DKDE_DISTRIBUTION_TEXT="%distribution" $EXTRA_FLAGS %make_jobs + mkdir man1 + for f in %kde_auto_man + do o="man1/$f.1" +# no pipe: abort on fail + help2man>"$o" "bin/$f.shell" + gzip "$o" + done %install cd build @@ -190,13 +213,16 @@ chmod +x %{buildroot}%{_kde4_appsdir}/kconf_update/ksslcertificatemanager.upd.sh %create_subdir_filelist -d kdecore -v kdecore.devel %create_subdir_filelist -d kpty -f kdecore -v kdecore.devel + install -ma=r '-t%{buildroot}%{_kde4_mandir}/man1/' man1/*.1.gz cd .. %create_exclude_filelist + %if %{with gendoxygen} install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh + %endif mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \ %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu.kde4 - rm %{buildroot}%{_mandir}/man1/checkXML.1 + : rm %{buildroot}%{_mandir}/man1/checkXML.1 mv %{buildroot}%{_mandir}/man7/kdeoptions.7 \ %{buildroot}%{_mandir}/man7/kde4options.7 mv %{buildroot}%{_mandir}/man7/qtoptions.7 \ @@ -225,13 +251,9 @@ %verifyscript %verify_permissions -e %{_kde4_libexecdir}/start_kdeinit -%clean - rm -rf %{buildroot} - rm -rf filelists - %package doc Summary: Documentation for KDE Base Libraries -License: LGPL-2.1+ +License: LGPL-2.1+ and SUSE-GFDL-1.2+ Group: System/GUI/KDE %define regcat /usr/bin/sgml-register-catalog PreReq: %{regcat} @@ -251,8 +273,15 @@ %defattr(-,root,root) %doc %lang(en) %{_kde4_htmldir}/en/kioslave %{_kde4_appsdir}/ksgmltools2 -%{_kde4_bindir}/kde4-doxygen.sh %{_kde4_bindir}/meinproc4 +%{_kde4_bindir}/meinproc4_simple +%doc COPYING.LIB COPYING.DOC +%doc %{_kde4_mandir}/man1/meinproc4.1.gz + +%if %{with gendoxygen} +%{_kde4_bindir}/kde4-doxygen.sh +%doc %{_kde4_mandir}/man1/kde4-doxygen.sh.1.gz +%endif %package -n libkdecore4 Summary: KDE Core Libraries @@ -294,9 +323,9 @@ %files -n kdelibs4-core -f filelists/kdecore %defattr(-,root,root) -%doc COPYING COPYING.DOC COPYING.LIB README -%config %{_kde4_configdir}/kdebug.areas -%config %{_kde4_configdir}/kdebugrc +%doc COPYING.LIB +%{_kde4_configdir}/kdebug.areas +%{_kde4_configdir}/kdebugrc %config %{_kde4_sysconfdir}/dbus-1/system.d/org.kde.auth.conf %config %{_kde4_sysconfdir}/kde4rc @@ -309,6 +338,8 @@ %exclude %{_kde4_libdir}/libkdefakes.so.* %exclude %{_kde4_libdir}/libkpty.so.* +%doc %{_kde4_mandir}/man1/kde4-config.1.gz + %package -n libkdecore4-devel Summary: KDE Core Libraries: Build Environment License: LGPL-2.1+ @@ -325,10 +356,15 @@ %files -n libkdecore4-devel -f filelists/kdecore.devel %defattr(-,root,root) -%doc COPYING COPYING.DOC COPYING.LIB README +%doc COPYING.LIB README %{_kde4_bindir}/kconfig_compiler %{_kde4_includedir}/kdemacros.h +#pending upstream +%if %{kderev} >= 420117248 +%doc %{_kde4_mandir}/man1/kconfig_compiler.1.gz +%endif + %package -n libkde4 Summary: KDE Base Libraries License: LGPL-2.1+ @@ -357,7 +393,7 @@ %files -n libkde4 %defattr(-,root,root) -%doc COPYING COPYING.DOC COPYING.LIB README +%doc COPYING.LIB %{_datadir}/locale/all_languages %{_kde4_libdir}/libkcmutils.so.* %{_kde4_libdir}/libkde3support.so.* @@ -447,11 +483,13 @@ %{_kde4_libdir}/*.so %{_kde4_libdir}/kde4/plugins/script/libkrossqtsplugin.so +%doc COPYING.LIB README + %files -f filelists/exclude %defattr(-,root,root) %verify(not mode caps) %attr(4755,root,root) %{_kde4_libexecdir}/start_kdeinit -%config %{_kde4_configdir}/* +%{_kde4_configdir}/* %config %{_kde4_sysconfdir}/xdg/menus/applications.menu.kde4 %dir %{_datadir}/autostart @@ -473,8 +511,8 @@ %exclude %{_kde4_appsdir}/kdeui/about/body-background.jpg %endif %exclude %{_kde4_appsdir}/ksgmltools2 -%exclude %{_kde4_bindir}/kde4-doxygen.sh %exclude %{_kde4_bindir}/meinproc4 +%exclude %{_kde4_bindir}/meinproc4_simple %exclude %{_kde4_libdir}/kde4/plugins/script/libkrossqtsplugin.so %{_datadir}/autostart/kdesktop.desktop @@ -493,12 +531,25 @@ %{_kde4_iconsdir}/hicolor/*/actions/presence_online.* %{_kde4_iconsdir}/hicolor/*/actions/presence_unknown.* %{_kde4_libdir}/libkdeinit4_*.so + %doc %{_kde4_mandir}/man*/* +%exclude %{_kde4_mandir}/man1/kde4-config.1.gz +%exclude %{_kde4_mandir}/man1/meinproc4.1.gz + +%if %{kderev} >= 420117248 +%exclude %{_kde4_mandir}/man1/kconfig_compiler.1.gz +%endif + %{_kde4_modulesdir}/* %{_kde4_servicesdir}/* %{_kde4_servicetypesdir}/* %{_kde4_sysconfdir}/xdg/menus/applications.menu.kde4 +%if %{with gendoxygen} +%exclude %{_kde4_mandir}/man1/kde4-doxygen.sh.1.gz +%exclude %{_kde4_bindir}/kde4-doxygen.sh +%endif + # IMPORTANT: When this is obsolete, do not just remove this, but create # a separate package (for backwards compatibility). ++++++ kdelibs-4.8.0.tar.bz2 -> kdelibs-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zypper for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2012-03-13 09:40:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper", Maintainer is "ma(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2012-02-29 14:13:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2012-03-13 09:40:20.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Mar 1 01:13:54 CET 2012 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Sun Feb 26 01:14:12 CET 2012 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper-1.7.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.7.0.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.7.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit thttpd for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package thttpd for openSUSE:Factory checked in at 2012-03-13 09:40:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thttpd (Old) and /work/SRC/openSUSE:Factory/.thttpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "thttpd", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes 2011-11-25 10:21:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes 2012-03-13 09:40:03.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 31 13:07:43 UTC 2012 - vcizek(a)suse.com + +- fixed build and added -fpie for makeweb + +------------------------------------------------------------------- New: ---- thttpd-2.25b-x86_64_machine_not_recognized.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thttpd.spec ++++++ --- /var/tmp/diff_new_pack.oxYYke/_old 2012-03-13 09:40:05.000000000 +0100 +++ /var/tmp/diff_new_pack.oxYYke/_new 2012-03-13 09:40:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package thttpd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,14 +16,11 @@ # - Name: thttpd -License: BSD-3-Clause -Group: Productivity/Networking/Web/Servers Provides: http_daemon PreReq: %fillup_prereq %insserv_prereq permissions Version: 2.25b -Release: 173 +Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-SuSE.tar.bz2 Patch0: %{name}-%{version}-configure.patch @@ -39,9 +36,12 @@ Patch10: %{name}-%{version}-zerolen.patch Patch11: %{name}-%{version}-strcpy.patch Patch12: thttpd-2.25b-getline.patch +Patch13: thttpd-2.25b-x86_64_machine_not_recognized.patch Url: http://www.acme.com/software/thttpd/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Small and very simple webserver +License: BSD-3-Clause +Group: Productivity/Networking/Web/Servers BuildRequires: libtool %description @@ -75,6 +75,7 @@ %patch10 %patch11 %patch12 +%patch13 -p1 %build # update server root path @@ -85,7 +86,6 @@ s@__VERSION__@%{version}@g" SuSE/etc/init.d/thttpd chmod 744 SuSE/etc/init.d/thttpd chmod 644 SuSE/etc/thttpd.conf -%{suse_update_config} mv aclocal.m4 acinclude.m4 libtoolize --force aclocal --force ++++++ thttpd-2.25b-pie.patch ++++++ --- /var/tmp/diff_new_pack.oxYYke/_old 2012-03-13 09:40:05.000000000 +0100 +++ /var/tmp/diff_new_pack.oxYYke/_new 2012-03-13 09:40:05.000000000 +0100 @@ -1,7 +1,17 @@ ---- extras/Makefile.in -+++ extras/Makefile.in -@@ -60,10 +60,10 @@ - $(CC) $(CFLAGS) -DWEBDIR=\"$(WEBDIR)\" -c makeweb.c +Index: extras/Makefile.in +=================================================================== +--- extras/Makefile.in.orig 2012-01-31 14:03:08.735817916 +0100 ++++ extras/Makefile.in 2012-01-31 14:05:10.222510744 +0100 +@@ -54,16 +54,16 @@ + all: makeweb htpasswd + + makeweb: makeweb.o +- $(CC) $(LDFLAGS) makeweb.o -o makeweb $(LIBS) $(NETLIBS) ++ $(CC) $(LDFLAGS) -pie makeweb.o -o makeweb $(LIBS) $(NETLIBS) + + makeweb.o: makeweb.c ../config.h +- $(CC) $(CFLAGS) -DWEBDIR=\"$(WEBDIR)\" -c makeweb.c ++ $(CC) $(CFLAGS) $(F_PIE) -DWEBDIR=\"$(WEBDIR)\" -c makeweb.c htpasswd: htpasswd.o - $(CC) $(LDFLAGS) $(STATICFLAG) htpasswd.o -o htpasswd $(LIBS) ++++++ thttpd-2.25b-x86_64_machine_not_recognized.patch ++++++ Index: thttpd-2.25b/config.sub =================================================================== --- thttpd-2.25b.orig/config.sub 1998-05-09 03:12:58.000000000 +0200 +++ thttpd-2.25b/config.sub 2012-01-31 13:56:25.647548490 +0100 @@ -15,7 +15,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License +38# You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. @@ -164,6 +164,9 @@ i[3456]86) basic_machine=$basic_machine-pc ;; + x86_64-*) + basic_machine=$basic_machine-pc + ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sweeper for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package sweeper for openSUSE:Factory checked in at 2012-03-13 09:39:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sweeper (Old) and /work/SRC/openSUSE:Factory/.sweeper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sweeper", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/sweeper/sweeper.changes 2012-03-05 18:02:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sweeper.new/sweeper.changes 2012-03-13 09:39:58.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:27:59 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- sweeper-4.8.0.tar.bz2 New: ---- sweeper-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sweeper.spec ++++++ --- /var/tmp/diff_new_pack.qDWFKu/_old 2012-03-13 09:40:00.000000000 +0100 +++ /var/tmp/diff_new_pack.qDWFKu/_new 2012-03-13 09:40:00.000000000 +0100 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: sweeper -Version: 4.8.0 +Version: 4.8.1 Release: 0 -License: LGPL-2.1+ Summary: KDE Privacy Utility -Url: http://www.kde.org +License: LGPL-2.1+ Group: System/GUI/KDE +Url: http://www.kde.org Source0: sweeper-%{version}.tar.bz2 Patch0: 4_7_BRANCH.diff Patch1: desktop-files.diff ++++++ sweeper-4.8.0.tar.bz2 -> sweeper-4.8.1.tar.bz2 ++++++ Files old/sweeper-4.8.0/doc/index.cache.bz2 and new/sweeper-4.8.1/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit superkaramba for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package superkaramba for openSUSE:Factory checked in at 2012-03-13 09:39:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/superkaramba (Old) and /work/SRC/openSUSE:Factory/.superkaramba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "superkaramba", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/superkaramba/superkaramba.changes 2012-01-31 10:22:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.superkaramba.new/superkaramba.changes 2012-03-13 09:39:56.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:27:52 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- superkaramba-4.8.0.tar.bz2 New: ---- superkaramba-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ superkaramba.spec ++++++ --- /var/tmp/diff_new_pack.eJock7/_old 2012-03-13 09:39:58.000000000 +0100 +++ /var/tmp/diff_new_pack.eJock7/_new 2012-03-13 09:39:58.000000000 +0100 @@ -30,7 +30,7 @@ BuildRequires: pcsc-lite BuildRequires: python-devel BuildRequires: xz-devel -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Superkaramba allows you to have (interactive) desktop widgets License: GPL-2.0+ ++++++ superkaramba-4.8.0.tar.bz2 -> superkaramba-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit step for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package step for openSUSE:Factory checked in at 2012-03-13 09:39:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/step (Old) and /work/SRC/openSUSE:Factory/.step.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "step", Maintainer is "step" Changes: -------- --- /work/SRC/openSUSE:Factory/step/step.changes 2012-02-01 10:00:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.step.new/step.changes 2012-03-13 09:39:54.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:27:47 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- step-4.8.0.tar.bz2 New: ---- step-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ step.spec ++++++ --- /var/tmp/diff_new_pack.w36oxK/_old 2012-03-13 09:39:56.000000000 +0100 +++ /var/tmp/diff_new_pack.w36oxK/_new 2012-03-13 09:39:56.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: step BuildRequires: avogadro-devel BuildRequires: boost-devel @@ -37,7 +38,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: An interactive physics simulator License: GPL-2.0+ ++++++ step-4.8.0.tar.bz2 -> step-4.8.1.tar.bz2 ++++++ Files old/step-4.8.0/doc/index.cache.bz2 and new/step-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/step-4.8.0/step/step.desktop new/step-4.8.1/step/step.desktop --- old/step-4.8.0/step/step.desktop 2012-01-10 15:15:31.000000000 +0100 +++ new/step-4.8.1/step/step.desktop 2012-02-29 23:57:02.000000000 +0100 @@ -47,6 +47,7 @@ Name[pt]=Step Name[pt_BR]=Step Name[ru]=Step +Name[sk]=Step Name[sv]=Step Name[tr]=Step Name[ug]=قەدەم @@ -91,6 +92,7 @@ GenericName[pt]=Simulador de Física Interactivo GenericName[pt_BR]=Simulador de Física interativo GenericName[ru]=Интерактивный физический симулятор +GenericName[sk]=Interaktívny fyzikálny simulátor GenericName[sv]=Interaktiv fysiksimulator GenericName[tr]=Etkileşimli Fizik Öykünücüsü GenericName[uk]=Інтерактивний фізичний імітатор @@ -138,6 +140,7 @@ Comment[pt_BR]=Simula experimentos de física Comment[ro]=Simulează experimente fizice Comment[ru]=Симуляция физических экспериментов +Comment[sk]=Simulácia fyzikálnych experimentov Comment[sv]=Simulera fysikexperiment Comment[tr]=Fizik deneylerine öykün Comment[ug]=فىزىكا تەجرىبىسىنى تەقلىدلەش -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit soprano for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package soprano for openSUSE:Factory checked in at 2012-03-13 09:39:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/soprano (Old) and /work/SRC/openSUSE:Factory/.soprano.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "soprano", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/soprano/soprano-backend-sesame.changes 2011-12-06 18:02:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.soprano.new/soprano-backend-sesame.changes 2012-03-13 09:39:52.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 5 22:01:06 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to 2.7.5: + * Be less strict when converting a string to a QDateTime: + + Allow an empty time part, ie. "2011-10-04". + + Allow the usage of a space instead of "T" to separate date from time. + * Fixed URI parsing in the SparqlModel. + * Fixed an endless loop in the VirtuosoModel destruction which can happen in + rare error cases. + * Fixed serialization of non-string literal values. + * Support Turtle result encoding in the SPARQL model. + +------------------------------------------------------------------- soprano-backend-virtuoso.changes: same change soprano.changes: same change Old: ---- soprano-2.7.4.tar.bz2 New: ---- soprano-2.7.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soprano-backend-sesame.spec ++++++ --- /var/tmp/diff_new_pack.MT6FyF/_old 2012-03-13 09:39:53.000000000 +0100 +++ /var/tmp/diff_new_pack.MT6FyF/_new 2012-03-13 09:39:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package soprano-backend-sesame # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,16 +16,15 @@ # - Name: soprano-backend-sesame Summary: Sesame backend for Soprano License: LGPL-2.1+ +Group: System/Libraries # COMMON1-BEGIN # COMMON1-BEGIN -Version: 2.7.4 -Release: 1 +Version: 2.7.5 +Release: 0 Url: http://soprano.sourceforge.net/ -Group: System/Libraries Source0: http://downloads.sourceforge.net/soprano/soprano-%{version}.tar.bz2 Source100: baselibs.conf BuildRequires: cmake @@ -44,8 +43,8 @@ BuildRequires: libsoprano-devel Requires: java Requires: libsoprano4 = %{version} -Provides: soprano_backend = %{version} Provides: backend-sesame2 = %{version} +Provides: soprano_backend = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,9 +74,6 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/soprano/plugins/sesame2backend.desktop %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %{_datadir}/soprano/sesame2/ ++++++ soprano-backend-virtuoso.spec ++++++ --- /var/tmp/diff_new_pack.MT6FyF/_old 2012-03-13 09:39:53.000000000 +0100 +++ /var/tmp/diff_new_pack.MT6FyF/_new 2012-03-13 09:39:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package soprano-backend-virtuoso # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,16 +16,15 @@ # - Name: soprano-backend-virtuoso Summary: Virtuoso backend for Soprano License: GPL-2.0+ +Group: System/Libraries # COMMON1-BEGIN # COMMON1-BEGIN -Version: 2.7.4 -Release: 1 +Version: 2.7.5 +Release: 0 Url: http://soprano.sourceforge.net/ -Group: System/Libraries Source0: http://downloads.sourceforge.net/soprano/soprano-%{version}.tar.bz2 Source100: baselibs.conf BuildRequires: cmake @@ -44,8 +43,8 @@ BuildRequires: libsoprano-devel Requires: libsoprano4 = %{version} Requires: virtuoso-server -Provides: soprano_backend = %{version} Provides: backend-virtuso = %{version} +Provides: soprano_backend = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,9 +73,6 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/soprano/plugins/virtuosobackend.desktop %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %{_libdir}/soprano/libsoprano_virtuosobackend.so ++++++ soprano.spec ++++++ --- /var/tmp/diff_new_pack.MT6FyF/_old 2012-03-13 09:39:54.000000000 +0100 +++ /var/tmp/diff_new_pack.MT6FyF/_new 2012-03-13 09:39:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package soprano # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,15 +16,14 @@ # - Name: soprano Summary: C++/Qt based interface library for RDF License: LGPL-2.1+ and GPL-2.0+ +Group: System/Libraries # COMMON1-BEGIN -Version: 2.7.4 -Release: 1 +Version: 2.7.5 +Release: 0 Url: http://soprano.sourceforge.net/ -Group: System/Libraries Source0: http://downloads.sourceforge.net/soprano/soprano-%{version}.tar.bz2 Source100: baselibs.conf BuildRequires: cmake @@ -57,8 +56,8 @@ # COMMON2-END %package backend-redland -License: LGPL-2.1+ Summary: Redland backend for Soprano +License: LGPL-2.1+ Group: System/Libraries Requires: libsoprano4 = %{version} Provides: soprano_backend = %{version} @@ -67,8 +66,8 @@ This package provides a Redland based backend for Soprano. %package -n libsoprano4 -License: LGPL-2.1+ Summary: C++/Qt based interface library for RDF +License: LGPL-2.1+ Group: System/Libraries %requires_ge libqt4 @@ -80,8 +79,8 @@ subroject of Nepomuk, the semantic desktop initiative. %package -n libsoprano-devel -License: LGPL-2.1+ Summary: Developer files for Soprano +License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libraptor-devel @@ -116,9 +115,6 @@ %postun -n libsoprano4 -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB ChangeLog README TODO ++++++ soprano-2.7.4.tar.bz2 -> soprano-2.7.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/CMakeLists.txt new/soprano-2.7.5/CMakeLists.txt --- old/soprano-2.7.4/CMakeLists.txt 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/CMakeLists.txt 2012-03-03 19:44:20.000000000 +0100 @@ -1,13 +1,17 @@ project(soprano) cmake_minimum_required(VERSION 2.6.4) +# disable warning about shadowing CMakeParseArguments.cmake +if(POLICY CMP0017) + cmake_policy(SET CMP0017 NEW) +endif(POLICY CMP0017) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) ################## Soprano version ################################ set(CMAKE_SOPRANO_VERSION_MAJOR 2) set(CMAKE_SOPRANO_VERSION_MINOR 7) -set(CMAKE_SOPRANO_VERSION_RELEASE 4) +set(CMAKE_SOPRANO_VERSION_RELEASE 5) set(CMAKE_SOPRANO_VERSION_STRING "${CMAKE_SOPRANO_VERSION_MAJOR}.${CMAKE_SOPRANO_VERSION_MINOR}.${CMAKE_SOPRANO_VERSION_RELEASE}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/ChangeLog new/soprano-2.7.5/ChangeLog --- old/soprano-2.7.4/ChangeLog 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/ChangeLog 2012-03-03 19:44:20.000000000 +0100 @@ -1,3 +1,12 @@ +2.7.5 + * Be less strict when converting a string to a QDateTime: + - Allow an empty time part, ie. "2011-10-04". + - Allow the usage of a space instead of "T" to separate date from time. + * Fixed URI parsing in the SparqlModel. + * Fixed an endless loop in the VirtuosoModel destruction which can happen in rare error cases. + * Fixed serialization of non-string literal values. + * Support Turtle result encoding in the SPARQL model. + 2.7.4 * Enabled large file support (_FILE_OFFSET_BITS=64) to fix large DB file locking on 32bit machines. * Do not use an event loop when waiting for Virtuoso to initialize. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/README new/soprano-2.7.5/README --- old/soprano-2.7.4/README 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/README 2012-03-03 19:44:20.000000000 +0100 @@ -1,4 +1,4 @@ -Soprano 2.6 +Soprano 2.7 =========== Soprano (formally known as QRDF) is a library which provides a nice Qt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/backends/virtuoso/odbcconnectionpool.cpp new/soprano-2.7.5/backends/virtuoso/odbcconnectionpool.cpp --- old/soprano-2.7.4/backends/virtuoso/odbcconnectionpool.cpp 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/backends/virtuoso/odbcconnectionpool.cpp 2012-03-03 19:44:20.000000000 +0100 @@ -130,17 +130,19 @@ } Connection* conn = d->createConnection(); - d->m_openConnections.insert( QThread::currentThread(), conn ); - // using the cleanup slot rather than deleteLater to not depend on any event loop - connect( QThread::currentThread(), SIGNAL( finished() ), - conn, SLOT( cleanup() ), - Qt::DirectConnection ); - connect( QThread::currentThread(), SIGNAL( terminated() ), - conn, SLOT( cleanup() ), - Qt::DirectConnection ); - connect( QThread::currentThread(), SIGNAL( destroyed() ), - conn, SLOT( cleanup() ), - Qt::DirectConnection ); + if(conn) { + d->m_openConnections.insert( QThread::currentThread(), conn ); + // using the cleanup slot rather than deleteLater to not depend on any event loop + connect( QThread::currentThread(), SIGNAL( finished() ), + conn, SLOT( cleanup() ), + Qt::DirectConnection ); + connect( QThread::currentThread(), SIGNAL( terminated() ), + conn, SLOT( cleanup() ), + Qt::DirectConnection ); + connect( QThread::currentThread(), SIGNAL( destroyed() ), + conn, SLOT( cleanup() ), + Qt::DirectConnection ); + } return conn; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/backends/virtuoso/virtuosocontroller.cpp new/soprano-2.7.5/backends/virtuoso/virtuosocontroller.cpp --- old/soprano-2.7.4/backends/virtuoso/virtuosocontroller.cpp 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/backends/virtuoso/virtuosocontroller.cpp 2012-03-03 19:44:20.000000000 +0100 @@ -39,6 +39,7 @@ #include <sys/types.h> #include <signal.h> #include <sys/wait.h> +#include <unistd.h> #endif Q_DECLARE_METATYPE( QProcess::ExitStatus ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/client/sparql/sparqlmodel.cpp new/soprano-2.7.5/client/sparql/sparqlmodel.cpp --- old/soprano-2.7.4/client/sparql/sparqlmodel.cpp 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/client/sparql/sparqlmodel.cpp 2012-03-03 19:44:20.000000000 +0100 @@ -162,6 +162,15 @@ // graph result return new StatementIteratorQueryResultBackend( it ); } + + // also try parsing as Turtle - the default result form by dbpedia. FIXME: simply ask for a specific serialization instead + else if ( const Soprano::Parser* parser = Soprano::PluginManager::instance()->discoverParserForSerialization( Soprano::SerializationTurtle ) ) { + Soprano::StatementIterator it = parser->parseString( data, QUrl(), Soprano::SerializationTurtle ); + if ( it.isValid() ) { + // graph result + return new StatementIteratorQueryResultBackend( it ); + } + } } return Soprano::QueryResultIterator(); @@ -339,7 +348,7 @@ { // we cannot use a construct query due to missing graph support QString query = QString( "select * where { %1 }" ).arg( statementToConstructGraphPattern( partial, true ) ); - qDebug() << "List Statements Query" << query; + return executeQuery( query, Query::QueryLanguageSparql ) .iterateStatementsFromBindings( partial.subject().isValid() ? QString() : QString( 's' ), partial.predicate().isValid() ? QString() : QString( 'p' ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/client/sparql/sparqlprotocol.cpp new/soprano-2.7.5/client/sparql/sparqlprotocol.cpp --- old/soprano-2.7.4/client/sparql/sparqlprotocol.cpp 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/client/sparql/sparqlprotocol.cpp 2012-03-03 19:44:20.000000000 +0100 @@ -82,7 +82,7 @@ int id = get( url.toEncoded(), buffer ); m_resultsData[id] = buffer; - qDebug() << Q_FUNC_INFO << url << id; +// qDebug() << Q_FUNC_INFO << url << id; return id; } @@ -102,7 +102,7 @@ delete m_resultsData[id]; m_resultsData.remove( id ); - qDebug() << Q_FUNC_INFO << data; +// qDebug() << Q_FUNC_INFO << data; return data; } @@ -119,7 +119,7 @@ void Soprano::Client::SparqlProtocol::slotRequestFinished( int id, bool error ) { - qDebug() << Q_FUNC_INFO << id << error; +// qDebug() << Q_FUNC_INFO << id << error; // we ignore all the other requests such as setting the user and so on if ( m_resultsData.contains( id ) ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/client/sparql/sparqlxmlresultparser.cpp new/soprano-2.7.5/client/sparql/sparqlxmlresultparser.cpp --- old/soprano-2.7.4/client/sparql/sparqlxmlresultparser.cpp 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/client/sparql/sparqlxmlresultparser.cpp 2012-03-03 19:44:20.000000000 +0100 @@ -174,7 +174,7 @@ } Uri result = Uri(); - result.setUri(element.text()); + result.setUri(QUrl::fromEncoded(element.text().toUtf8())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/data/testdata.h new/soprano-2.7.5/data/testdata.h --- old/soprano-2.7.4/data/testdata.h 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/data/testdata.h 2012-03-03 19:44:20.000000000 +0100 @@ -1,3 +1,6 @@ + +#include <QDateTime> + static QList<Soprano::Statement> testData( bool withContext ) { @@ -23,6 +26,10 @@ QUrl("http://soprano.sf.net/test#author"), QUrl("http://soprano.sf.net/testdata/SebastianTrueg"), withContext ? mainContext : Node() ) ); + sl.append( Soprano::Statement( QUrl("http://soprano.sf.net/testdata/Soprano"), + QUrl("http://soprano.sf.net/test#creationDate"), + LiteralValue(QDateTime::currentDateTime()), + withContext ? mainContext : Node() ) ); sl.append( Soprano::Statement( QUrl("http://soprano.sf.net/testdata/DanieleGaldi"), QUrl("http://soprano.sf.net/test#name"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/serializers/raptor/raptorserializer.cpp new/soprano-2.7.5/serializers/raptor/raptorserializer.cpp --- old/soprano-2.7.4/serializers/raptor/raptorserializer.cpp 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/serializers/raptor/raptorserializer.cpp 2012-03-03 19:44:20.000000000 +0100 @@ -61,50 +61,42 @@ } }*/ - raptor_term * convertNode( raptor_world * world, const Soprano::Node& node) + raptor_term* convertNode( raptor_world * world, const Soprano::Node& node) { - raptor_term * answer = 0; - /* According to documentation, raptor_new_term family takes copy of - * all given input parameters - */ - if ( node.isResource() ) { - raptor_uri * uri = raptor_new_uri(world, ( const unsigned char* )node.uri().toEncoded().data() ); - answer = raptor_new_term_from_uri(world,uri); + raptor_term* term = 0; + // According to documentation, raptor_new_term family creates deep copies of + // all given input parameters + if ( node.isResource() ) { + raptor_uri* uri = raptor_new_uri(world, ( const unsigned char* )node.uri().toEncoded().data() ); + term = raptor_new_term_from_uri(world, uri); raptor_free_uri(uri); } else if ( node.isBlank() ) { - answer = raptor_new_term_from_blank( - world, (const unsigned char*)node.identifier().toUtf8().data() ); + term = raptor_new_term_from_blank(world, (const unsigned char*)node.identifier().toUtf8().data() ); } else if ( node.isLiteral() ) { - // Because QByteArray.data() is valid as long as QByteArray itself is - // alive, we store langBA ( and others _x_BA untill function exits - - //const unsigned char * literal = 0; - QByteArray langBA; - const unsigned char * lang = 0; - raptor_uri * datatype = 0; + QByteArray lang; + raptor_uri* datatype = 0; if ( node.literal().isPlain() ) { - if ( !node.language().isEmpty() ) - langBA = node.language().toUtf8(); - lang = ( const unsigned char* )( langBA.constData() ); + lang = node.language().toUtf8(); } else { datatype = raptor_new_uri( world, ( const unsigned char* )node.dataType().toEncoded().data() ); } - // Now we costructs statement - answer = raptor_new_term_from_literal(world,(const unsigned char*)node.literal().toByteArray().constData(),datatype,lang); - - // And free unnecessary resources - if ( datatype) - raptor_free_uri(datatype); + term = raptor_new_term_from_literal(world, + reinterpret_cast<const unsigned char*>(node.literal().toString().toUtf8().constData()), + datatype, + reinterpret_cast<const unsigned char*>(lang.constData())); + if( datatype ) { + raptor_free_uri( datatype ); + } } - return answer; + return term; } @@ -331,7 +323,7 @@ * we can ignore Q value in this case * Acording to documentation, this array can have zero elements */ - for( int mt_number = 0; mt_number < serializer_descr->mime_types_count; + for( unsigned int mt_number = 0; mt_number < serializer_descr->mime_types_count; mt_number++) { const char * mime_type_N = serializer_descr->mime_types[mt_number].mime_type; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/soprano-2.7.4/soprano/datetime.cpp new/soprano-2.7.5/soprano/datetime.cpp --- old/soprano-2.7.4/soprano/datetime.cpp 2011-12-02 16:27:49.000000000 +0100 +++ new/soprano-2.7.5/soprano/datetime.cpp 2012-03-03 19:44:20.000000000 +0100 @@ -181,20 +181,29 @@ QDateTime Soprano::DateTime::fromDateTimeString( const QString& s ) { + // we support both the standard form and the often seen form which uses + // a space instead of the T. int pos = s.indexOf('T'); - if( pos > 0 ) { - QDate date = fromDateString( s.mid( 0, pos ) ); - if( !date.isValid() ) - return QDateTime(); - QTime time = fromTimeString( s.mid( pos+1 ) ); - if( !time.isValid() ) - return QDateTime(); - return QDateTime( date, time, Qt::UTC ); + if(pos < 0) { + pos = s.indexOf(' '); } - else { + + QDate date = fromDateString( s.mid( 0, pos ) ); + if( !date.isValid() ) { qDebug() << Q_FUNC_INFO << " invalid formatted datetime string: " << s << endl; return QDateTime(); } + + QTime time; + if( pos > 0 ) { + time = fromTimeString( s.mid( pos+1 ) ); + if( !time.isValid() ) { + qDebug() << Q_FUNC_INFO << " invalid formatted datetime string: " << s << endl; + return QDateTime(); + } + } + + return QDateTime( date, time, Qt::UTC ); } ++++++ soprano-backend-sesame.spec.in ++++++ --- /var/tmp/diff_new_pack.MT6FyF/_old 2012-03-13 09:39:54.000000000 +0100 +++ /var/tmp/diff_new_pack.MT6FyF/_new 2012-03-13 09:39:54.000000000 +0100 @@ -20,6 +20,7 @@ Name: soprano-backend-sesame Summary: Sesame backend for Soprano License: LGPL-2.1+ +Group: System/Libraries # COMMON1-BEGIN # COMMON1-END BuildRequires: java-devel @@ -54,9 +55,6 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/soprano/plugins/sesame2backend.desktop %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %{_datadir}/soprano/sesame2/ ++++++ soprano-backend-virtuoso.spec.in ++++++ --- /var/tmp/diff_new_pack.MT6FyF/_old 2012-03-13 09:39:54.000000000 +0100 +++ /var/tmp/diff_new_pack.MT6FyF/_new 2012-03-13 09:39:54.000000000 +0100 @@ -20,6 +20,7 @@ Name: soprano-backend-virtuoso Summary: Virtuoso backend for Soprano License: GPL-2.0+ +Group: System/Libraries # COMMON1-BEGIN # COMMON1-END BuildRequires: libiodbc-devel @@ -53,9 +54,6 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/soprano/plugins/virtuosobackend.desktop %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %{_libdir}/soprano/libsoprano_virtuosobackend.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sblim-sfcc for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package sblim-sfcc for openSUSE:Factory checked in at 2012-03-13 09:39:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-sfcc (Old) and /work/SRC/openSUSE:Factory/.sblim-sfcc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sblim-sfcc", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-sfcc/sblim-sfcc.changes 2012-02-10 17:19:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sblim-sfcc.new/sblim-sfcc.changes 2012-03-13 09:39:44.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 5 14:40:37 UTC 2012 - kkaempf(a)suse.com + +- Fix RHEL6 build + +------------------------------------------------------------------- +Mon Mar 5 13:58:19 UTC 2012 - kkaempf(a)suse.com + +- fix build, force autotools, add Group field to subpackages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-sfcc.spec ++++++ --- /var/tmp/diff_new_pack.9CKGlH/_old 2012-03-13 09:39:52.000000000 +0100 +++ /var/tmp/diff_new_pack.9CKGlH/_new 2012-03-13 09:39:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sblim-sfcc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: sblim-sfcc Version: 2.2.3 Release: 0 @@ -48,6 +50,7 @@ %package devel Summary: Small Footprint CIM Client Library Requires: %{name} = %{version} glibc-devel +Group: Development/Other %description devel Small Footprint CIM Client Library (sfcc) Header Files and Link @@ -60,6 +63,7 @@ %patch16 -p1 %build +# autoconfiscate sh %{S:1} export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --disable-static --with-pic @@ -68,7 +72,6 @@ %if 0%{?rhel_version} >= 500 || 0%{?centos_version} >= 500 %if 0%{?rhel_version} < 600 || 0%{?centos_version} < 600 rm -f libtool; ln -s /usr/bin/libtool . -(cd mofc; rm -f libtool; ln -s /usr/bin/libtool .) %endif %endif ++++++ autoconfiscate.sh ++++++ --- /var/tmp/diff_new_pack.9CKGlH/_old 2012-03-13 09:39:52.000000000 +0100 +++ /var/tmp/diff_new_pack.9CKGlH/_new 2012-03-13 09:39:52.000000000 +0100 @@ -1,6 +1,7 @@ #!/bin/sh -aclocal && -autoheader && -libtoolize && -automake -af && -autoconf +set -e +aclocal --force +autoheader -f +test -x `which glibtoolize` && glibtoolize || libtoolize -f +automake -af +autoconf -f -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ruby-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package ruby-qt4 for openSUSE:Factory checked in at 2012-03-13 09:39:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-qt4 (Old) and /work/SRC/openSUSE:Factory/.ruby-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby-qt4", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-qt4/ruby-qt4.changes 2012-01-27 15:24:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ruby-qt4.new/ruby-qt4.changes 2012-03-13 09:39:36.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:27:08 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- qtruby-4.8.0.tar.bz2 New: ---- qtruby-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-qt4.spec ++++++ --- /var/tmp/diff_new_pack.ydAAvM/_old 2012-03-13 09:39:37.000000000 +0100 +++ /var/tmp/diff_new_pack.ydAAvM/_new 2012-03-13 09:39:37.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ruby-qt4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: QtRuby kdebindings library License: LGPL-2.1+ ++++++ qtruby-4.8.0.tar.bz2 -> qtruby-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ruby-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package ruby-kde4 for openSUSE:Factory checked in at 2012-03-13 09:39:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-kde4 (Old) and /work/SRC/openSUSE:Factory/.ruby-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby-kde4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-kde4/ruby-kde4.changes 2012-01-27 15:24:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ruby-kde4.new/ruby-kde4.changes 2012-03-13 09:39:30.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:12 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- korundum-4.8.0.tar.bz2 New: ---- korundum-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-kde4.spec ++++++ --- /var/tmp/diff_new_pack.NRuped/_old 2012-03-13 09:39:31.000000000 +0100 +++ /var/tmp/diff_new_pack.NRuped/_new 2012-03-13 09:39:31.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ruby-kde4 BuildRequires: kate-devel BuildRequires: libjasper-devel @@ -30,7 +31,7 @@ Summary: Korundum Ruby-KDE library License: LGPL-2.1+ Group: Development/Libraries/KDE -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: korundum-%version.tar.bz2 Url: https://projects.kde.org/projects/kde/kdebindings/ruby/korundum ++++++ korundum-4.8.0.tar.bz2 -> korundum-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rocs for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package rocs for openSUSE:Factory checked in at 2012-03-13 09:39:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rocs (Old) and /work/SRC/openSUSE:Factory/.rocs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rocs", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rocs/rocs.changes 2012-02-03 10:26:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rocs.new/rocs.changes 2012-03-13 09:39:25.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:27:26 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- rocs-4.8.0.tar.bz2 New: ---- rocs-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rocs.spec ++++++ --- /var/tmp/diff_new_pack.EmkDz9/_old 2012-03-13 09:39:26.000000000 +0100 +++ /var/tmp/diff_new_pack.EmkDz9/_new 2012-03-13 09:39:26.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rocs -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Graph Theory IDE License: GPL-3.0+ ++++++ rocs-4.8.0.tar.bz2 -> rocs-4.8.1.tar.bz2 ++++++ Files old/rocs-4.8.0/doc/index.cache.bz2 and new/rocs-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/DataStructure.h new/rocs-4.8.1/src/Core/DataStructure.h --- old/rocs-4.8.0/src/Core/DataStructure.h 2011-11-04 15:35:33.000000000 +0100 +++ new/rocs-4.8.1/src/Core/DataStructure.h 2012-03-02 13:26:40.000000000 +0100 @@ -1,4 +1,4 @@ -/* +/* This file is part of Rocs. Copyright 2004-2011 Tomaz Canabrava <tomaz.canabrava(a)gmail.com> Copyright 2010-2011 Wagner Reck <wagner.reck(a)gmail.com> @@ -6,7 +6,7 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either + License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, @@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU Lesser General Public License along with this library. If not, see <http://www.gnu.org/licenses/>. */ @@ -50,7 +50,7 @@ * self pointer to DataStructure */ boost::weak_ptr<DataStructure> q; - + QList< DataPtr > _data; QList< PointerPtr> _pointers; @@ -129,7 +129,7 @@ DataPtr data(const QString& name = i18n("Untitled")); virtual void remove(DataPtr n); - + /** * Unregister pointer from data structure. Do not use this for actual removal of pointer. * To remove a pointer \see Pointer::remove(). @@ -190,12 +190,12 @@ protected: DataPtr addData(DataPtr data); PointerPtr addPointer(PointerPtr pointer); - + protected: DataStructure(Document *parent = 0); - + /** - * overwrites the current DataStructure with all values (Data and Pointer) + * overwrites the current DataStructure with all values (Data and Pointer) * from the given datastructure object. * \param boost::shared_ptr<DataStructure> other * \return void @@ -212,7 +212,7 @@ pi->importStructure(other); return pi; } - + private: boost::shared_ptr<DataStructurePrivate> d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/DataStructurePluginInterface.cpp new/rocs-4.8.1/src/Core/DataStructurePluginInterface.cpp --- old/rocs-4.8.0/src/Core/DataStructurePluginInterface.cpp 2011-10-11 16:46:09.000000000 +0200 +++ new/rocs-4.8.1/src/Core/DataStructurePluginInterface.cpp 2012-03-02 13:26:40.000000000 +0100 @@ -1,10 +1,10 @@ -/* +/* This file is part of Rocs. Copyright 2011 Tomaz Canabrava <tomaz.canabrava(a)gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of + published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -55,3 +55,12 @@ } return QString(); } + + +QString DataStructurePluginInterface::internalName() +{ + if(DataStructurePluginManager::self()->pluginInfo(this).isValid()){ + return DataStructurePluginManager::self()->pluginInfo(this).pluginName(); + } + return QString(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/DataStructurePluginInterface.h new/rocs-4.8.1/src/Core/DataStructurePluginInterface.h --- old/rocs-4.8.0/src/Core/DataStructurePluginInterface.h 2011-09-26 11:45:24.000000000 +0200 +++ new/rocs-4.8.1/src/Core/DataStructurePluginInterface.h 2012-03-02 13:26:40.000000000 +0100 @@ -1,10 +1,10 @@ -/* +/* This file is part of Rocs. Copyright 2011 Tomaz Canabrava <tomaz.canabrava(a)gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of + published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -57,8 +57,17 @@ */ virtual bool canConvertFrom(Document* doc) const = 0; + /** @brief return the translated name to be used in user visible strings + */ QString name(); + /** @brief return the internal name from plugin. + * This string is not translated and should be used to differentiate + * the data structures. It is useful when some piece of code is only + * applicable to some kind of structures + */ + QString internalName(); + virtual QGraphicsItem * dataItem (DataPtr data) const = 0; virtual QGraphicsItem * pointerItem (PointerPtr pointer) const = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/Document.cpp new/rocs-4.8.1/src/Core/Document.cpp --- old/rocs-4.8.0/src/Core/Document.cpp 2011-10-11 16:46:09.000000000 +0200 +++ new/rocs-4.8.1/src/Core/Document.cpp 2012-03-02 13:26:40.000000000 +0100 @@ -1,4 +1,4 @@ -/* +/* This file is part of Rocs. Copyright 2008-2011 Tomaz Canabrava <tomaz.canabrava(a)gmail.com> Copyright 2008 Ugo Sangiori <ugorox(a)gmail.com> @@ -7,7 +7,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of + published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -74,7 +74,7 @@ d->_engineBackend = new QtScriptBackend(this); d->_dataStructureType = DataStructurePluginManager::self()->actualPlugin(); d->_modified = false; - + qDebug() << "------=======------======"; qDebug() << " Document Constructor "; qDebug() << d->_dataStructureType->name(); @@ -363,48 +363,48 @@ /** * A Document Internal format may look like this: - * + * * # '#'s are comments. - * + * * [Document Properties] # Canvas Size and Data Structure initialization. - * Width : [integer] - * Height : [integer] - * DataStructurePlugin : [string] - * + * Width : [integer] + * Height : [integer] + * DataStructurePlugin : [string] + * * # Data Structre Definitions. * # Data Structures are layered, so there can be N of them. * # Every Data and Pointer below a declaration of a DataStructure * # belongs to that data structure. - * - * [DataStructure Name1] - * + * + * [DataStructure Name1] + * * DataColor : [RGB in hex] # Color of newly created Datas ( Nodes ) * Pointercolor : [RBG in Hex] # Color of newly created Datas ( Nodes ) * name : [string] # Name of the data structure acessible in the scripting interface. - * + * * visibility : [bool] # is this DataStructure visible? - * + * * ShowNamesInData : [bool] # should the canvas show the name of the data on the screen? * ShowNamesInNPointers : [bool] # ↑ * ShowValuesInData : [bool] # ↑ * ShowValuesInPointers : [bool] # ↑ - * + * * PluginDefinedProperty1 : propertyValue; # the plugins can define other properties for the data structure. * PluginDefinedProperty1 : propertyValue; * PluginDefinedProperty1 : propertyValue; - * + * * UserDefinedProperty1 : propertyValue1 # the user can define other properties for the data structure. * UserDefinedProperty2 : propertyValue2 * UserDefinedProperty3 : propertyValue3 - * - * [Data 1] + * + * [Data 1] * x : [real] * y : [real] * color : [string in "0xFFFFFF" format] * name : [string] * value : [string] * size : [float] - * + * * property1 : propertyValue1 * property2 : propertyValue2 * property3 : propertyValue3 @@ -416,18 +416,18 @@ * name : [string] * value : [string] * size : [float] - * + * * property1 : propertyValue1 * property2 : propertyValue2 * property3 : propertyValue3 - * + * * [Pointer 1 -> 2] * name : [string] * value : [string] * style : [string] * color : [string in "0xFFFFFF" format] * width : [float] - * + * * property1 : propertyValue1 * property2 : propertyValue2 * property3 : propertyValue3 @@ -445,7 +445,7 @@ QTextStream stream(&saveFile); stream.setCodec("UTF-8"); - + d->_buf = QString("[Document Properties] \n") % QString("top : ") % QString::number(top()) % QChar('\n') % QString("bottom : ") % QString::number(bottom()) % QChar('\n') @@ -453,7 +453,7 @@ % QString("right : ") % QString::number(right()) % QChar('\n') % QString("DataStructurePlugin : ") % DataStructurePluginManager::self()->actualPlugin()->name() % QChar('\n') % QChar('\n'); - + for (int i = 0; i < d->_dataStructures.count(); i++) { DataStructurePtr g = d->_dataStructures.at(i); @@ -544,21 +544,21 @@ continue; } else if(str.startsWith("[Document Properties]")){ - + QString dataLine = in.readLine().simplified(); while (!in.atEnd() && !dataLine.isEmpty()) { /**/ if (dataLine.startsWith("top :")) setTop(dataLine.section(' ',2).toInt()); else if (dataLine.startsWith("bottom :")) setBottom(dataLine.section(' ',2).toInt()); else if (dataLine.startsWith("left :")) setLeft(dataLine.section(' ',2).toInt()); else if (dataLine.startsWith("right :")) setRight(dataLine.section(' ',2).toInt()); - + // TODO: Wagner, How this thing works? else if (dataLine.startsWith("DataStructurePlugin :")){ DataStructurePluginManager::self()->setDataStructurePlugin(dataLine.section(' ',2)); d->_dataStructureType = DataStructurePluginManager::self()->actualPlugin(); } else if ( !dataLine.isEmpty()) break; // go to the last if and finish populating. - dataLine = in.readLine().simplified(); + dataLine = in.readLine().simplified(); } tmpObject = this; } @@ -599,7 +599,7 @@ PointerPtr tmpPointer = tmpDataStructure->addPointer(tmpDataStructure->dataList().at(nameFrom.toInt()), tmpDataStructure->dataList().at(nameTo.toInt())); - + QString dataLine = in.readLine().simplified(); while (!in.atEnd() && !dataLine.isEmpty()) { /**/ if (dataLine.startsWith("width :")) tmpPointer->setWidth(dataLine.section(' ',2).toInt()); @@ -607,7 +607,7 @@ else if (dataLine.startsWith("color :")) tmpPointer->setColor(dataLine.section(' ',2)); else if (dataLine.startsWith("width :")) tmpPointer->setColor(dataLine.section(' ',2).toFloat()); else if (dataLine.startsWith("style :")) tmpPointer->setColor(dataLine.section(' ',2)); - + else if ( !dataLine.isEmpty()) break; // go to the last if and finish populating. dataLine = in.readLine().simplified(); } @@ -638,6 +638,12 @@ return d->_dataStructureType->name(); } +QString Document::dataStructureInternalName() const +{ + return d->_dataStructureType->internalName(); +} + + DataStructurePluginInterface* Document::dataStructurePlugin() const { return d->_dataStructureType; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/Document.h new/rocs-4.8.1/src/Core/Document.h --- old/rocs-4.8.0/src/Core/Document.h 2011-09-26 11:45:24.000000000 +0200 +++ new/rocs-4.8.1/src/Core/Document.h 2012-03-02 13:26:40.000000000 +0100 @@ -1,4 +1,4 @@ -/* +/* This file is part of Rocs. Copyright 2008-2011 Tomaz Canabrava <tomaz.canabrava(a)gmail.com> Copyright 2008 Ugo Sangiori <ugorox(a)gmail.com> @@ -7,7 +7,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of + published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -80,9 +80,12 @@ */ virtual void cleanUpBeforeConvert(); - /** @brief return the name of data structure used to build this document. */ + /** @brief return the translated name of data structure used to build this document. */ QString dataStructureTypeName()const; + /** @brief return the internal name (not translated) of data structure used to build this document.*/ + QString dataStructureInternalName()const; + DataStructurePluginInterface * dataStructurePlugin() const; public slots: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Interface/MainWindow.cpp new/rocs-4.8.1/src/Interface/MainWindow.cpp --- old/rocs-4.8.0/src/Interface/MainWindow.cpp 2011-12-20 20:13:22.000000000 +0100 +++ new/rocs-4.8.1/src/Interface/MainWindow.cpp 2012-03-02 13:26:40.000000000 +0100 @@ -1,4 +1,4 @@ -/* +/* This file is part of Rocs. Copyright 2008-2011 Tomaz Canabrava <tomaz.canabrava(a)gmail.com> Copyright 2008 Ugo Sangiori <ugorox(a)gmail.com> @@ -7,7 +7,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of + published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -128,7 +128,7 @@ DocumentManager::self()->loadDocument(); GraphicsLayout::self()->setViewStyleDataNode(Settings::dataNodeDisplay()); - GraphicsLayout::self()->setViewStyleDataEdge(Settings::dataEdgeDisplay()); + GraphicsLayout::self()->setViewStyleDataEdge(Settings::dataEdgeDisplay()); } MainWindow::~MainWindow() @@ -136,7 +136,7 @@ Settings::setVSplitterSizeTop ( _vSplitter->sizes() [0] ); Settings::setVSplitterSizeBottom ( _vSplitter->sizes() [1] ); Settings::setHSplitterSizeLeft ( _hSplitter->sizes() [0] ); - Settings::setHSplitterSizeRight ( _hSplitter->sizes() [1] ); + Settings::setHSplitterSizeRight ( _hSplitter->sizes() [1] ); Settings::setHScriptSplitterSizeLeft ( _hScriptSplitter->sizes() [0] ); Settings::setHScriptSplitterSizeRight ( _hScriptSplitter->sizes() [1] ); @@ -164,18 +164,18 @@ // setup upper half QWidget *leftPanel = setupWhiteboardPanel(); // graph properties _graphVisualEditor = GraphVisualEditor::self(); // graph editor whiteboard - + _hSplitter = new QSplitter ( this ); _hSplitter->setOrientation( Qt::Horizontal ); _hSplitter->addWidget (leftPanel); _hSplitter->addWidget (_graphVisualEditor); - + // setup lower half QWidget *scriptPanel = setupScriptPanel(); - + _vSplitter->addWidget ( _hSplitter ); _vSplitter->addWidget ( scriptPanel ); - + _hScriptSplitter->setSizes ( QList<int>() << Settings::hScriptSplitterSizeLeft() << Settings::hScriptSplitterSizeRight() << 80 ); _vSplitter->setSizes ( QList<int>() << Settings::vSplitterSizeTop() << Settings::vSplitterSizeBottom() ); _hSplitter->setSizes ( QList<int>() << Settings::hSplitterSizeLeft() << Settings::hSplitterSizeRight() ); @@ -225,10 +225,10 @@ QWidget* MainWindow::setupScriptPanel() -{ +{ _hScriptSplitter = new QSplitter( this ); _hScriptSplitter->setOrientation( Qt::Horizontal ); - + _codeEditor = new CodeEditor ( this ); _txtDebug = new KTextBrowser ( this ); _txtOutput = new KTextBrowser( this ); @@ -240,17 +240,17 @@ _selectListing = new QComboBox; _selectListing->addItem( KIcon ( "accessories-text-editor" ), i18n("Program Messages")); _selectListing->addItem( KIcon ( "tools-report-bug" ), i18n("Debug Messages")); - + QWidget *header = new QWidget( this ); header->setLayout( new QHBoxLayout ); header->layout()->addWidget(new QLabel(i18n("Select output:"))); header->layout()->addWidget(_selectListing); - + QWidget *listingWidget = new QWidget(this); listingWidget->setLayout( new QVBoxLayout ); listingWidget->layout()->addWidget( header ); listingWidget->layout()->addWidget( stackedListing ); - + QToolBar *executeCommands = new QToolBar; executeCommands->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); executeCommands->setOrientation(Qt::Vertical); @@ -259,19 +259,19 @@ _stopScript->setEnabled(false); executeCommands->addAction(_runScript); executeCommands->addAction(_stopScript); - + connect(_runScript, SIGNAL(triggered()), this, SLOT(executeScript())); connect(_stopScript, SIGNAL(triggered()), this, SLOT(stopScript())); connect(_selectListing, SIGNAL(currentIndexChanged(int)), stackedListing, SLOT(setCurrentIndex(int))); - + _hScriptSplitter->addWidget( _codeEditor ); _hScriptSplitter->addWidget( listingWidget ); - + QWidget *scriptInterface = new QWidget( this ); scriptInterface->setLayout( new QHBoxLayout ); scriptInterface->layout()->addWidget( _hScriptSplitter ); scriptInterface->layout()->addWidget( executeCommands ); - + return scriptInterface; } @@ -329,7 +329,7 @@ createAction("", i18n("Download Examples"), "download", SLOT(downloadNewExamples()), this); createAction("", i18n("Upload script"), "upload", SLOT(uploadScript()), this); createAction("document-save", i18n("Save All"), "save-all", Qt::Key_S, SLOT(saveAll()), this); - + createAction("document-save-as", i18n("Possible Includes"), "possible_includes", SLOT(showPossibleIncludes()), this); createAction("document-new", i18n("New Script"), "new-script", SLOT(newScript()), _codeEditor); @@ -346,7 +346,7 @@ // EDIT actions actionCollection()->addAction("delete-selected", new DeleteAction( i18n("Delete"), _graphVisualEditor->scene(), 0) ); - + KStandardAction::quit ( kapp, SLOT ( quit() ), actionCollection() ); } @@ -417,26 +417,26 @@ QList <QAction*> pluginList; QAction* action = 0; unplugActionList ( "DS_plugins" ); - + QList < DataStructurePluginInterface*> avaliablePlugins = DataStructurePluginManager::self()->pluginsList(); - + QActionGroup * group = new QActionGroup(this); - + int count = 0; foreach ( DataStructurePluginInterface* p, avaliablePlugins ) { action = new KAction ( p->name(), this ); action->setData(count++); action->setCheckable(true); - + if (p->name() == DataStructurePluginManager::self()->pluginName()){ action->setChecked(true); } - + action->setActionGroup(group); - + connect ( action, SIGNAL (triggered(bool)), DataStructurePluginManager::self(), SLOT(setDataStructurePlugin())); - + pluginList.append ( action ); } plugActionList ( "DS_plugins", pluginList ); @@ -525,7 +525,7 @@ KMessageBox::sorry ( this, i18n ( "This does not seem to be a graph file." ), i18n ( "Invalid file" ) ); return; } - + DocumentManager::self()->loadDocument(name); } @@ -556,7 +556,7 @@ int MainWindow::saveIfChanged(){ if ( DocumentManager::self()->activeDocument()->isModified() && !_codeEditor->isModified() ){ - const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n ( + const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n ( "Changes on your graph document are unsaved. Do you want to save your changes?" ) ); if ( btnCode == KMessageBox::Yes ){ saveGraph(); @@ -564,7 +564,7 @@ return btnCode; } if ( !DocumentManager::self()->activeDocument()->isModified() && _codeEditor->isModified() ){ - const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n ( + const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n ( "Changes on your script files are unsaved. Do you want to save all unsaved scripts?" ) ); if ( btnCode == KMessageBox::Yes ){ _codeEditor->saveAllScripts(); @@ -572,7 +572,7 @@ return btnCode; } if ( DocumentManager::self()->activeDocument()->isModified() && _codeEditor->isModified() ){ - const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n ( + const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n ( "Changes on your script files and on your graph document are unsaved. Do you want to save your graph document and all unsaved scripts?" ) ); if ( btnCode == KMessageBox::Yes ){ _codeEditor->saveAllScripts(); @@ -655,11 +655,12 @@ _txtDebug->clear(); QString script = text.isEmpty() ? _codeEditor->text() : text; - + QString scriptPath = _codeEditor->document()->url().path(); IncludeManager inc; - script = inc.include(script, _codeEditor->document()->url().path(), - _codeEditor->document()->documentName()); + script = inc.include(script, + scriptPath.isEmpty()? scriptPath : scriptPath.section('/', 0, -2), + _codeEditor->document()->documentName()); QtScriptBackend *engine = DocumentManager::self()->activeDocument()->engineBackend(); if (engine->isRunning() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/AssignValues/rocs_assignvaluesplugin.desktop new/rocs-4.8.1/src/Plugins/AssignValues/rocs_assignvaluesplugin.desktop --- old/rocs-4.8.0/src/Plugins/AssignValues/rocs_assignvaluesplugin.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/AssignValues/rocs_assignvaluesplugin.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -23,6 +23,7 @@ Name[et]=Väärtuste omistamine Name[fi]=Sijoita arvot Name[fr]=Affectation de valeurs +Name[gl]=Asignar valores Name[hu]=Értékhozzárendelés Name[it]=Assegna valori Name[kk]=Мәндерін келтіру @@ -36,6 +37,7 @@ Name[pl]=Przypisz wartości Name[pt]=Atribuir Valores Name[pt_BR]=Atribuir valores +Name[sk]=Priradiť hodnoty Name[sv]=Tilldela värden Name[ug]=تەقسىملەنگەن قىممەتلەر Name[uk]=Додавання значень @@ -52,6 +54,7 @@ Comment[et]=Väärtuste omistamine graafi seostele ja tippudele. Comment[fi]=Sijoita arvot graafin viivoihin ja solmuihin. Comment[fr]=Affecte des valeurs aux arêtes et aux sommets d'un graphe. +Comment[gl]=Asignarvalores aos bordos e nodos do grafo. Comment[hu]=Értékek hozzárendelése a gráf éleihez és csomópontokhoz. Comment[it]=Assegna valori ad archi e nodi di un grafo. Comment[kk]=Графтың қырлары мен төбелерінің әндерін келтіру. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/Graph/rocs_GraphStructure.desktop new/rocs-4.8.1/src/Plugins/DataStructure/Graph/rocs_GraphStructure.desktop --- old/rocs-4.8.0/src/Plugins/DataStructure/Graph/rocs_GraphStructure.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/DataStructure/Graph/rocs_GraphStructure.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -43,6 +43,7 @@ Name[pl]=Graf Name[pt]=Grafo Name[pt_BR]=Grafo +Name[sk]=Graf Name[sv]=Graf Name[ug]=گرافىك Name[uk]=Граф diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListNode.cpp new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListNode.cpp --- old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListNode.cpp 2011-09-26 11:45:24.000000000 +0200 +++ new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListNode.cpp 2012-02-29 23:05:13.000000000 +0100 @@ -44,9 +44,9 @@ return 0; } -void ListNode::pointTo(boost::shared_ptr<ListNode> to ) +void ListNode::pointTo(ListNode* to ) { - addPointer(to); + addPointer(to->getData()); } boost::shared_ptr<ListNode> ListNode::next() const{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListNode.h new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListNode.h --- old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListNode.h 2011-09-26 11:45:24.000000000 +0200 +++ new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListNode.h 2012-02-29 23:05:13.000000000 +0100 @@ -35,7 +35,7 @@ public slots: QScriptValue front(); - void pointTo(boost::shared_ptr<ListNode> to); + void pointTo(ListNode* to); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListStructure.cpp new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListStructure.cpp --- old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListStructure.cpp 2011-12-02 22:31:47.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListStructure.cpp 2012-03-02 13:26:40.000000000 +0100 @@ -102,12 +102,12 @@ if (m_building) { return addData(n);; } - + if (m_begin){ boost::shared_ptr<ListNode> tmp = m_begin; while (tmp->next() != 0) tmp = tmp->next(); - tmp->pointTo(n); + tmp->pointTo(n.get()); }else{ m_begin = n; } @@ -121,6 +121,8 @@ if (m_begin == n){ m_begin = boost::static_pointer_cast<ListNode>(n)->next(); } + foreach(PointerPtr p, n->in_pointers()) + p->remove(); DataStructure::remove(n); arrangeNodes(); } @@ -130,9 +132,9 @@ return m_begin->scriptValue(); } -void Rocs::ListStructure::setBegin(boost::shared_ptr< ListNode > node) +void Rocs::ListStructure::setBegin(Data* node) { - m_begin = node; + m_begin = boost::static_pointer_cast<ListNode>(node->getData()); arrangeNodes(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListStructure.h new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListStructure.h --- old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListStructure.h 2011-09-26 11:45:24.000000000 +0200 +++ new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListStructure.h 2012-02-29 23:05:13.000000000 +0100 @@ -54,7 +54,7 @@ virtual void remove(PointerPtr e); QScriptValue begin(); - void setBegin(boost::shared_ptr<ListNode> node); + void setBegin(Data* node); QScriptValue createNode(const QString &name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/DotFilePlugin/rocs_dotFilePlugin.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/DotFilePlugin/rocs_dotFilePlugin.desktop --- old/rocs-4.8.0/src/Plugins/FilePlugins/DotFilePlugin/rocs_dotFilePlugin.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/FilePlugins/DotFilePlugin/rocs_dotFilePlugin.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -21,6 +21,7 @@ Name[et]=Dot-faili plugin Name[fi]=Dot-tiedostoliitännäinen Name[ga]=Breisán Comhad Dot +Name[gl]=Engadido Punto Ficheiro Name[hu]=DOT-fájl modul Name[it]=Estensione per file Dot Name[kk]=Dot файлдар плагині diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/GMLParser/rocs_GMLParser.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/GMLParser/rocs_GMLParser.desktop --- old/rocs-4.8.0/src/Plugins/FilePlugins/GMLParser/rocs_GMLParser.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/FilePlugins/GMLParser/rocs_GMLParser.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -42,6 +42,7 @@ Name[pt]=Ficheiro GML Name[pt_BR]=Arquivo GML Name[ru]=Файл GML +Name[sk]=Súbor GML Name[sv]=GML-fil Name[ug]=GML ھۆججىتى Name[uk]=Файл GML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/TXTParser/rocs_plaintxtplugin.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/TXTParser/rocs_plaintxtplugin.desktop --- old/rocs-4.8.0/src/Plugins/FilePlugins/TXTParser/rocs_plaintxtplugin.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/FilePlugins/TXTParser/rocs_plaintxtplugin.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -42,6 +42,7 @@ Name[pt]=Ficheiro TXT Name[pt_BR]=Arquivo TXT Name[ru]=Простой текстовый файл +Name[sk]=Súbor TXT Name[sv]=TXT-fil Name[ug]=TXT ھۆججىتى Name[uk]=Файл TXT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/dotParser/rocs_dotParser.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/dotParser/rocs_dotParser.desktop --- old/rocs-4.8.0/src/Plugins/FilePlugins/dotParser/rocs_dotParser.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/FilePlugins/dotParser/rocs_dotParser.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -40,6 +40,7 @@ Name[pt]=Ficheiro do Dot Name[pt_BR]=Arquivo Dot Name[ru]=Файл Dot +Name[sk]=Súbor Dot Name[sv]=Dot-fil Name[uk]=Файл Dot Name[x-test]=xxDot filexx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/kmlParser/rocs_kmlParser.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/kmlParser/rocs_kmlParser.desktop --- old/rocs-4.8.0/src/Plugins/FilePlugins/kmlParser/rocs_kmlParser.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/FilePlugins/kmlParser/rocs_kmlParser.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -43,6 +43,7 @@ Name[pt]=Ficheiro KML Name[pt_BR]=Arquivo KML Name[ru]=Файл KML +Name[sk]=Súbor KML Name[sv]=KML-fil Name[ug]=KML ھۆججىتىنى Name[uk]=Файл KML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop new/rocs-4.8.1/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop --- old/rocs-4.8.0/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -38,6 +38,7 @@ Name[pl]=Generuj graf Name[pt]=Gerar o Grafo Name[pt_BR]=Gerar o grafo +Name[sk]=Generovať graf Name[sv]=Skapa graf Name[uk]=Створення графу Name[x-test]=xxGenerate Graphxx @@ -53,6 +54,7 @@ Comment[et]=Uue graafiku genereerimine mustri järgi. Comment[fi]=Tämä generoi uuden graafin mallin perusteella. Comment[fr]=Cette fonction génère un nouveau graphe à l'aide d'un motif. +Comment[gl]=Isto xera un gráfico novo segundo un padrón. Comment[hu]=Új gráfot készít egy minta alapján. Comment[it]=Questo genera un nuovo grafo secondo uno schema. Comment[kk]=Үлгісі бойынша графты құру. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/TransformEdges/rocs_transformedgesplugin.desktop new/rocs-4.8.1/src/Plugins/TransformEdges/rocs_transformedgesplugin.desktop --- old/rocs-4.8.0/src/Plugins/TransformEdges/rocs_transformedgesplugin.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/Plugins/TransformEdges/rocs_transformedgesplugin.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -22,6 +22,7 @@ Name[et]=Seoste teisendamine Name[fi]=Muunna viivat Name[fr]=Transformations des côtés +Name[gl]=Transformar os bordos Name[hu]=Élek átalakítása Name[it]=Trasforma archi Name[kk]=Қырларын түрлендіру @@ -49,6 +50,7 @@ Comment[et]=Graafi seoste teisendamine vastava reegli järgi. Comment[fi]=Muuntaa graafin viivat säännön mukaan. Comment[fr]=Transforme les côtés d'un graphe à l'aide d'une règle de transformation. +Comment[gl]=Transformar os bordos do grafo segundo unha regra de transformación. Comment[hu]=A gráf éleinek átalakítása egy átalakítási szabály szerint. Comment[it]=Trasforma gli archi di un grafo con una regola di trasformazione. Comment[kk]=Ережесі бойынша графтың қырларын түрлендіру. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/TransformEdges/transformedgestoolsplugin.cpp new/rocs-4.8.1/src/Plugins/TransformEdges/transformedgestoolsplugin.cpp --- old/rocs-4.8.0/src/Plugins/TransformEdges/transformedgestoolsplugin.cpp 2011-09-26 11:45:24.000000000 +0200 +++ new/rocs-4.8.1/src/Plugins/TransformEdges/transformedgestoolsplugin.cpp 2012-03-02 13:26:40.000000000 +0100 @@ -4,7 +4,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of + published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -60,19 +60,19 @@ Document* graphDoc = qobject_cast<Document*> ( doc ); TransformEdgesWidget* dialog = new TransformEdgesWidget(graphDoc, 0); - + QList< DataStructurePtr > dsList = graphDoc->dataStructures(); QStringList dsNames; - + // be sure that only graph-datastructures are accessed by this plugin - if (graphDoc->dataStructureTypeName() == "Graph" ) { - foreach (DataStructurePtr ds, dsList) { - dsNames << ds->name(); - } + if (graphDoc->dataStructureInternalName() == "Graph" ) { + foreach (DataStructurePtr ds, dsList) { + dsNames << ds->name(); + } } - + dialog->addDataStructures(dsNames); - + dialog->show(); return ""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Scripts/IncludeManager.cpp new/rocs-4.8.1/src/Scripts/IncludeManager.cpp --- old/rocs-4.8.0/src/Scripts/IncludeManager.cpp 2011-11-17 21:57:24.000000000 +0100 +++ new/rocs-4.8.1/src/Scripts/IncludeManager.cpp 2012-03-02 13:26:40.000000000 +0100 @@ -1,10 +1,10 @@ -/* +/* This file is part of Rocs. Copyright 2010-2011 Wagner Reck <wagner.reck(a)gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of + published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -43,9 +43,9 @@ QString IncludeManager::include ( const QString& script, const QString& actualPath, const QString &filename) { int pos; bool inComment = false; - if (!actualPath.isEmpty()) { _actualDir = QDir(actualPath); // try the path of saved file + _tempPath << _actualDir; if (!seekFile(filename).isNull()){ _wasIncluded << seekFile(filename); } @@ -96,7 +96,6 @@ } QString str = lines.join("\n"); -// qDebug() << str; return str; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/rocs.desktop new/rocs-4.8.1/src/rocs.desktop --- old/rocs-4.8.0/src/rocs.desktop 2012-01-18 19:49:33.000000000 +0100 +++ new/rocs-4.8.1/src/rocs.desktop 2012-02-29 23:05:13.000000000 +0100 @@ -29,6 +29,7 @@ Name[pt]=Rocs Name[pt_BR]=Rocs Name[ru]=Rocs +Name[sk]=Rocs Name[sv]=Rocs Name[tr]=Rocs Name[ug]=Rocs -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-Werkzeug for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-Werkzeug for openSUSE:Factory checked in at 2012-03-13 09:39:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Werkzeug (Old) and /work/SRC/openSUSE:Factory/.python-Werkzeug.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Werkzeug", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Werkzeug/python-Werkzeug.changes 2011-11-14 13:38:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-Werkzeug.new/python-Werkzeug.changes 2012-03-13 09:39:20.000000000 +0100 @@ -1,0 +2,27 @@ +Mon Mar 12 21:35:29 UTC 2012 - saschpe(a)gmx.de + +- Update to version 0.8.3: + - Fixed another issue with :func:`werkzeug.wsgi.make_line_iter` + where lines longer than the buffer size were not handled + properly. + - Restore stdout after debug console finished executing so + that the debugger can be used on GAE better. + - Fixed a bug with the redis cache for int subclasses + (affects bool caching). + - Fixed an XSS problem with redirect targets coming from + untrusted sources. +- Changes from version 0.8.2: + - Fixed a problem with request handling of the builtin server + not repsonding to socket errors properly. + - The routing request redirect exception's code attribute is now + used properly. + - Fixed a bug with shutdowns on Windows. + - Fixed a few unicode issues with non-ascii characters being + hardcoded in URL rules. + - Fixed two property docstrings being assigned to fdel instead + of ``__doc__``. + - Fixed an issue where CRLF line endings could be split into two + by the line iter function, causing problems with multipart file + uploads. + +------------------------------------------------------------------- Old: ---- Werkzeug-0.8.1.tar.gz New: ---- Werkzeug-0.8.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Werkzeug.spec ++++++ --- /var/tmp/diff_new_pack.xAiv04/_old 2012-03-13 09:39:21.000000000 +0100 +++ /var/tmp/diff_new_pack.xAiv04/_new 2012-03-13 09:39:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-Werkzeug # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,9 +16,8 @@ # - Name: python-Werkzeug -Version: 0.8.1 +Version: 0.8.3 Release: 0 Url: http://werkzeug.pocoo.org/ Summary: The Swiss Army knife of Python web development @@ -26,19 +25,17 @@ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-Sphinx BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-nose -BuildRequires: python-Sphinx -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 -BuildArch: noarch -%endif -%endif Provides: python-werkzeug = %{version} Obsoletes: python-werkzeug < %{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else +BuildArch: noarch +%endif %description Werkzeug started as simple collection of various utilities for WSGI ++++++ Werkzeug-0.8.1.tar.gz -> Werkzeug-0.8.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/AUTHORS new/Werkzeug-0.8.3/AUTHORS --- old/Werkzeug-0.8.1/AUTHORS 2011-07-24 15:42:54.000000000 +0200 +++ new/Werkzeug-0.8.3/AUTHORS 2012-01-21 15:43:50.000000000 +0100 @@ -24,6 +24,7 @@ - Pedro Algarvio - Zahari Petkov - Ludvig Ericson +- Kenneth Reitz Contributors of code for werkzeug/examples are: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/CHANGES new/Werkzeug-0.8.3/CHANGES --- old/Werkzeug-0.8.1/CHANGES 2011-09-30 12:49:51.000000000 +0200 +++ new/Werkzeug-0.8.3/CHANGES 2012-02-05 11:10:04.000000000 +0100 @@ -1,6 +1,39 @@ Werkzeug Changelog ================== +Version 0.8.3 +------------- + +(bugfix release, released on February 5th 2012) + +- Fixed another issue with :func:`werkzeug.wsgi.make_line_iter` + where lines longer than the buffer size were not handled + properly. +- Restore stdout after debug console finished executing so + that the debugger can be used on GAE better. +- Fixed a bug with the redis cache for int subclasses + (affects bool caching). +- Fixed an XSS problem with redirect targets coming from + untrusted sources. + +Version 0.8.2 +------------- + +(bugfix release, released on December 16th 2011) + +- Fixed a problem with request handling of the builtin server + not repsonding to socket errors properly. +- The routing request redirect exception's code attribute is now + used properly. +- Fixed a bug with shutdowns on Windows. +- Fixed a few unicode issues with non-ascii characters being + hardcoded in URL rules. +- Fixed two property docstrings being assigned to fdel instead + of ``__doc__``. +- Fixed an issue where CRLF line endings could be split into two + by the line iter function, causing problems with multipart file + uploads. + Version 0.8.1 ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/PKG-INFO new/Werkzeug-0.8.3/PKG-INFO --- old/Werkzeug-0.8.1/PKG-INFO 2011-09-30 12:50:07.000000000 +0200 +++ new/Werkzeug-0.8.3/PKG-INFO 2012-02-05 11:10:20.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Werkzeug -Version: 0.8.1 +Version: 0.8.3 Summary: The Swiss Army knife of Python web development Home-page: http://werkzeug.pocoo.org/ Author: Armin Ronacher diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/Werkzeug.egg-info/PKG-INFO new/Werkzeug-0.8.3/Werkzeug.egg-info/PKG-INFO --- old/Werkzeug-0.8.1/Werkzeug.egg-info/PKG-INFO 2011-09-30 12:50:07.000000000 +0200 +++ new/Werkzeug-0.8.3/Werkzeug.egg-info/PKG-INFO 2012-02-05 11:10:17.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Werkzeug -Version: 0.8.1 +Version: 0.8.3 Summary: The Swiss Army knife of Python web development Home-page: http://werkzeug.pocoo.org/ Author: Armin Ronacher Files old/Werkzeug-0.8.1/artwork/._.DS_Store and new/Werkzeug-0.8.3/artwork/._.DS_Store differ Files old/Werkzeug-0.8.1/docs/._.DS_Store and new/Werkzeug-0.8.3/docs/._.DS_Store differ Files old/Werkzeug-0.8.1/docs/_static/._.DS_Store and new/Werkzeug-0.8.3/docs/_static/._.DS_Store differ Files old/Werkzeug-0.8.1/docs/_static/._shortly.png and new/Werkzeug-0.8.3/docs/_static/._shortly.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/setup.py new/Werkzeug-0.8.3/setup.py --- old/Werkzeug-0.8.1/setup.py 2011-09-30 12:50:06.000000000 +0200 +++ new/Werkzeug-0.8.3/setup.py 2012-02-05 11:10:15.000000000 +0100 @@ -61,7 +61,7 @@ setup( name='Werkzeug', - version='0.8.1', + version='0.8.3', url='http://werkzeug.pocoo.org/', license='BSD', author='Armin Ronacher', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/__init__.py new/Werkzeug-0.8.3/werkzeug/__init__.py --- old/Werkzeug-0.8.1/werkzeug/__init__.py 2011-09-30 12:50:06.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/__init__.py 2012-02-05 11:10:15.000000000 +0100 @@ -19,7 +19,7 @@ # the version. Usually set automatically by a script. -__version__ = '0.8.1' +__version__ = '0.8.3' # This import magic raises concerns quite often which is why the implementation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/contrib/cache.py new/Werkzeug-0.8.3/werkzeug/contrib/cache.py --- old/Werkzeug-0.8.1/werkzeug/contrib/cache.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/contrib/cache.py 2012-01-25 00:54:51.000000000 +0100 @@ -471,15 +471,15 @@ :param key_prefix: A prefix that should be added to all keys. """ - def __init__(self, host='localhost', port=6379, default_timeout=300, - key_prefix=None): + def __init__(self, host='localhost', port=6379, password=None, + default_timeout=300, key_prefix=None): BaseCache.__init__(self, default_timeout) if isinstance(host, basestring): try: import redis except ImportError: raise RuntimeError('no redis module found') - self._client = redis.Redis(host=host, port=port) + self._client = redis.Redis(host=host, port=port, password=password) else: self._client = host self.key_prefix = key_prefix or '' @@ -488,7 +488,8 @@ """Dumps an object into a string for redis. By default it serializes integers as regular string and pickle dumps everything else. """ - if isinstance(value, (int, long)): + t = type(value) + if t is int or t is long: return str(value) return '!' + pickle.dumps(value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/debug/console.py new/Werkzeug-0.8.3/werkzeug/debug/console.py --- old/Werkzeug-0.8.1/werkzeug/debug/console.py 2011-07-05 01:21:51.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/debug/console.py 2012-01-21 15:42:28.000000000 +0100 @@ -201,4 +201,8 @@ self._ipy = _InteractiveConsole(globals, locals) def eval(self, code): - return self._ipy.runsource(code) + old_sys_stdout = sys.stdout + try: + return self._ipy.runsource(code) + finally: + sys.stdout = old_sys_stdout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/routing.py new/Werkzeug-0.8.3/werkzeug/routing.py --- old/Werkzeug-0.8.1/werkzeug/routing.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/routing.py 2012-02-05 11:08:36.000000000 +0100 @@ -240,7 +240,7 @@ self.new_url = new_url def get_response(self, environ): - return redirect(self.new_url, 301) + return redirect(self.new_url, self.code) class RequestSlash(RoutingException): @@ -715,7 +715,7 @@ return processed.add(data) else: - add(data) + add(url_quote(data, self.map.charset, safe='/:|')) domain_part, url = (u''.join(tmp)).split('|', 1) if append_unknown: @@ -1121,6 +1121,8 @@ subdomain = self.default_subdomain if script_name is None: script_name = '/' + if isinstance(server_name, unicode): + server_name = server_name.encode('idna') return MapAdapter(self, server_name, script_name, subdomain, url_scheme, path_info, default_method, query_args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/serving.py new/Werkzeug-0.8.3/werkzeug/serving.py --- old/Werkzeug-0.8.1/werkzeug/serving.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/serving.py 2012-02-05 11:08:36.000000000 +0100 @@ -177,6 +177,7 @@ def handle(self): """Handles a request ignoring dropped connections.""" + rv = None try: rv = BaseHTTPRequestHandler.handle(self) except (socket.error, socket.timeout), e: @@ -192,9 +193,11 @@ """A horrible, horrible way to kill the server for Python 2.6 and later. It's the best we can do. """ + # Windows does not provide SIGKILL, go with SIGTERM then. + sig = getattr(signal, 'SIGKILL', signal.SIGTERM) # reloader active if os.environ.get('WERKZEUG_RUN_MAIN') == 'true': - os.kill(os.getpid(), signal.SIGKILL) + os.kill(os.getpid(), sig) # python 2.7 self.server._BaseServer__shutdown_request = True # python 2.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/testsuite/contrib/cache.py new/Werkzeug-0.8.3/werkzeug/testsuite/contrib/cache.py --- old/Werkzeug-0.8.1/werkzeug/testsuite/contrib/cache.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/testsuite/contrib/cache.py 2012-01-25 00:54:51.000000000 +0100 @@ -149,6 +149,14 @@ c.delete('foo') + def test_true_false(self): + c = self.make_cache() + c.set('foo', True) + assert c.get('foo') == True + c.set('bar', False) + assert c.get('bar') == False + + def suite(): suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(SimpleCacheTestCase)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/testsuite/exceptions.py new/Werkzeug-0.8.3/werkzeug/testsuite/exceptions.py --- old/Werkzeug-0.8.1/werkzeug/testsuite/exceptions.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/testsuite/exceptions.py 2012-01-21 15:41:00.000000000 +0100 @@ -23,7 +23,6 @@ class ExceptionsTestCase(WerkzeugTestCase): def test_proxy_exception(self): - """Proxy exceptions""" orig_resp = Response('Hello World') try: exceptions.abort(orig_resp) @@ -35,7 +34,6 @@ self.assert_equal(resp.data, 'Hello World') def test_aborter(self): - """Exception aborter""" abort = exceptions.abort self.assert_raises(exceptions.BadRequest, abort, 400) self.assert_raises(exceptions.Unauthorized, abort, 401) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/testsuite/formparser.py new/Werkzeug-0.8.3/werkzeug/testsuite/formparser.py --- old/Werkzeug-0.8.1/werkzeug/testsuite/formparser.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/testsuite/formparser.py 2012-01-21 15:41:00.000000000 +0100 @@ -48,7 +48,6 @@ class FormParserTestCase(WerkzeugTestCase): def test_limiting(self): - """Test the limiting features""" data = 'foo=Hello+World&bar=baz' req = Request.from_values(input_stream=StringIO(data), content_length=len(data), @@ -104,13 +103,12 @@ self.assert_equal(req.form['foo'], 'Hello World') def test_parse_form_data_put_without_content(self): - """A PUT without a Content-Type header returns empty data + # A PUT without a Content-Type header returns empty data - Both rfc1945 and rfc2616 (1.0 and 1.1) say "Any HTTP/[1.0/1.1] message - containing an entity-body SHOULD include a Content-Type header field - defining the media type of that body." In the case where either - headers are omitted, parse_form_data should still work. - """ + # Both rfc1945 and rfc2616 (1.0 and 1.1) say "Any HTTP/[1.0/1.1] message + # containing an entity-body SHOULD include a Content-Type header field + # defining the media type of that body." In the case where either + # headers are omitted, parse_form_data should still work. env = create_environ('/foo', 'http://example.org/', method='PUT') del env['CONTENT_TYPE'] del env['CONTENT_LENGTH'] @@ -121,7 +119,6 @@ self.assert_equal(len(files), 0) def test_parse_form_data_get_without_content(self): - """GET requests without data, content type and length returns no data""" env = create_environ('/foo', 'http://example.org/', method='GET') del env['CONTENT_TYPE'] del env['CONTENT_LENGTH'] @@ -132,7 +129,6 @@ self.assert_equal(len(files), 0) def test_large_file(self): - """Test a largish file.""" data = 'x' * (1024 * 600) req = Request.from_values(data={'foo': (StringIO(data), 'test.txt')}, method='POST') @@ -144,7 +140,6 @@ class MultiPartTestCase(WerkzeugTestCase): def test_basic(self): - """Tests multipart parsing against data collected from webbrowsers""" resources = join(dirname(__file__), 'multipart') client = Client(form_data_consumer, Response) @@ -200,7 +195,6 @@ repr(u'Sellersburg Town Council Meeting 02-22-2010doc.doc')) def test_end_of_file(self): - """Test for multipart files ending unexpectedly""" # This test looks innocent but it was actually timeing out in # the Werkzeug 0.5 release version (#394) data = ( @@ -217,7 +211,6 @@ self.assert_(not data.form) def test_broken(self): - """Broken multipart does not break the applicaiton""" data = ( '--foo\r\n' 'Content-Disposition: form-data; name="test"; filename="test.txt"\r\n' @@ -237,7 +230,6 @@ silent=False) def test_file_no_content_type(self): - """Chrome does not always provide a content type.""" data = ( '--foo\r\n' 'Content-Disposition: form-data; name="test"; filename="test.txt"\r\n\r\n' @@ -251,7 +243,6 @@ self.assert_equal(data.files['test'].read(), 'file contents') def test_extra_newline(self): - """Test for multipart uploads with extra newlines""" # this test looks innocent but it was actually timeing out in # the Werkzeug 0.5 release version (#394) data = ( @@ -268,7 +259,6 @@ self.assert_equal(data.form['foo'], 'a string') def test_headers(self): - """Test access to multipart headers""" data = ('--foo\r\n' 'Content-Disposition: form-data; name="foo"; filename="foo.txt"\r\n' 'X-Custom-Header: blah\r\n' @@ -287,7 +277,6 @@ self.assert_equal(foo.headers['x-custom-header'], 'blah') def test_nonstandard_line_endings(self): - """Test nonstandard line endings of multipart form data""" for nl in '\n', '\r', '\r\n': data = nl.join(( '--foo', @@ -330,7 +319,6 @@ ['foo: bar\r\n', ' x test']) def test_bad_newline_bad_newline_assumption(self): - """Make sure we don't eat up stuff that is not a newline""" class ISORequest(Request): charset = 'latin1' contents = 'U2vlbmUgbORu' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/testsuite/routing.py new/Werkzeug-0.8.3/werkzeug/testsuite/routing.py --- old/Werkzeug-0.8.1/werkzeug/testsuite/routing.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/testsuite/routing.py 2012-02-05 11:08:36.000000000 +0100 @@ -603,6 +603,29 @@ else: assert False, 'Expected not found exception' + def test_redirect_request_exception_code(self): + exc = r.RequestRedirect('http://www.google.com/') + exc.code = 307 + env = create_environ() + self.assert_equal(exc.get_response(env).status_code, exc.code) + + def test_unicode_rules(self): + m = r.Map([ + r.Rule(u'/войти/', endpoint='enter') + ]) + a = m.bind(u'☃.example.com') + try: + a.match(u'/войти') + except r.RequestRedirect, e: + self.assert_equal(e.new_url, 'http://xn--n3h.example.com/' + '%D0%B2%D0%BE%D0%B9%D1%82%D0%B8/') + endpoint, values = a.match(u'/войти/') + self.assert_equal(endpoint, 'enter') + self.assert_equal(values, {}) + + url = a.build('enter', {}, force_external=True) + self.assert_equal(url, 'http://xn--n3h.example.com/%D0%B2%D0%BE%D0%B9%D1%82%D0%B8/') + def suite(): suite = unittest.TestSuite() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/testsuite/utils.py new/Werkzeug-0.8.3/werkzeug/testsuite/utils.py --- old/Werkzeug-0.8.1/werkzeug/testsuite/utils.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/testsuite/utils.py 2012-02-05 11:08:19.000000000 +0100 @@ -40,6 +40,15 @@ assert resp.headers['Location'] == 'http://example.com/' assert resp.status_code == 305 + def test_redirect_xss(self): + location = 'http://example.com/?xss="><script>alert(1)</script>' + resp = utils.redirect(location) + assert '<script>alert(1)</script>' not in resp.data + + location = 'http://example.com/?xss="onmouseover="alert(1)' + resp = utils.redirect(location) + assert 'href="http://example.com/?xss="onmouseover="alert(1)"' not in resp.data + def test_cached_property(self): foo = [] class A(object): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/testsuite/wsgi.py new/Werkzeug-0.8.3/werkzeug/testsuite/wsgi.py --- old/Werkzeug-0.8.1/werkzeug/testsuite/wsgi.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/testsuite/wsgi.py 2012-02-05 11:08:36.000000000 +0100 @@ -210,6 +210,19 @@ lines = list(wsgi.make_line_iter(test_stream, limit=len(data), buffer_size=24)) assert lines == ['abc\r\n', 'This line is broken by the buffer length.\r\n', 'Foo bar baz'] + def test_multi_part_line_breaks_problematic(self): + data = 'abc\rdef\r\nghi' + for x in xrange(1, 10): + test_stream = StringIO(data) + lines = list(wsgi.make_line_iter(test_stream, limit=len(data), buffer_size=4)) + assert lines == ['abc\r', 'def\r\n', 'ghi'] + + def test_lines_longer_buffer_size(self): + data = '1234567890\n1234567890\n' + for bufsize in xrange(1, 15): + lines = list(wsgi.make_line_iter(StringIO(data), limit=len(data), buffer_size=4)) + self.assert_equal(lines, ['1234567890\n', '1234567890\n']) + def suite(): suite = unittest.TestSuite() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/utils.py new/Werkzeug-0.8.3/werkzeug/utils.py --- old/Werkzeug-0.8.1/werkzeug/utils.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/utils.py 2012-02-05 11:08:19.000000000 +0100 @@ -189,10 +189,10 @@ buffer += '>' return buffer buffer += '>' - + children_as_string = ''.join([unicode(x) for x in children if x is not None]) - + if children_as_string: if tag in self._plaintext_elements: children_as_string = escape(children_as_string) @@ -353,7 +353,7 @@ :param code: the redirect status code. defaults to 302. """ from werkzeug.wrappers import BaseResponse - display_location = location + display_location = escape(location) if isinstance(location, unicode): from werkzeug.urls import iri_to_uri location = iri_to_uri(location) @@ -363,7 +363,7 @@ '<h1>Redirecting...</h1>\n' '<p>You should be redirected automatically to target URL: ' '<a href="%s">%s</a>. If not click the link.' % - (location, display_location), code, mimetype='text/html') + (escape(location, True), display_location), code, mimetype='text/html') response.headers['Location'] = location return response @@ -586,7 +586,7 @@ name += (name and '.') + part imported = import_string(name, silent=True) if imported: - tracked.append((name, imported.__file__)) + tracked.append((name, getattr(imported, '__file__', None))) else: track = ['- %r found in %r.' % (n, i) for n, i in tracked] track.append('- %r not found.' % name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/wrappers.py new/Werkzeug-0.8.3/werkzeug/wrappers.py --- old/Werkzeug-0.8.1/werkzeug/wrappers.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/wrappers.py 2012-01-21 15:41:00.000000000 +0100 @@ -737,7 +737,7 @@ except KeyError: self._status = '%d UNKNOWN' % code status_code = property(_get_status_code, _set_status_code, - 'The HTTP Status code as number') + doc='The HTTP Status code as number') del _get_status_code, _set_status_code def _get_status(self): @@ -748,7 +748,7 @@ self._status_code = int(self._status.split(None, 1)[0]) except ValueError: self._status_code = 0 - status = property(_get_status, _set_status, 'The HTTP Status code') + status = property(_get_status, _set_status, doc='The HTTP Status code') del _get_status, _set_status def _get_data(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Werkzeug-0.8.1/werkzeug/wsgi.py new/Werkzeug-0.8.3/werkzeug/wsgi.py --- old/Werkzeug-0.8.1/werkzeug/wsgi.py 2011-09-30 12:49:32.000000000 +0200 +++ new/Werkzeug-0.8.3/werkzeug/wsgi.py 2012-02-05 11:08:36.000000000 +0100 @@ -604,30 +604,52 @@ :param buffer_size: The optional buffer size. """ stream = make_limited_stream(stream, limit) - _read = stream.read - buffer = [] - while 1: - if len(buffer) > 1: - yield buffer.pop() - continue - - # we reverse the chunks because popping from the last - # position of the list is O(1) and the number of chunks - # read will be quite large for binary files. - chunks = _read(buffer_size).splitlines(True) - chunks.reverse() - - first_chunk = buffer and buffer[0] or '' - if chunks: - if first_chunk.endswith('\n') or first_chunk.endswith('\r'): + def _iter_basic_lines(): + _read = stream.read + buffer = [] + while 1: + if len(buffer) > 1: + yield buffer.pop() + continue + + # we reverse the chunks because popping from the last + # position of the list is O(1) and the number of chunks + # read will be quite large for binary files. + chunks = _read(buffer_size).splitlines(True) + chunks.reverse() + + first_chunk = buffer and buffer[0] or '' + if chunks: + if first_chunk and first_chunk[-1] in '\r\n': + yield first_chunk + first_chunk = '' + first_chunk += chunks.pop() + else: + yield first_chunk + break + + buffer = chunks + + # in case the line is longer than the buffer size we + # can't yield yet. This will only happen if the buffer + # is empty. + if not buffer and first_chunk[-1] not in '\r\n': + buffer = [first_chunk] + else: yield first_chunk - first_chunk = '' - first_chunk += chunks.pop() - if not first_chunk: - return - buffer = chunks - yield first_chunk + # This hackery is necessary to merge 'foo\r' and '\n' into one item + # of 'foo\r\n' if we were unlucky and we hit a chunk boundary. + previous = '' + for item in _iter_basic_lines(): + if item == '\n' and previous[-1:] == '\r': + previous += '\n' + item = '' + if previous: + yield previous + previous = item + if previous: + yield previous def make_chunk_iter(stream, separator, limit=None, buffer_size=10 * 1024): -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-tornado for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-tornado for openSUSE:Factory checked in at 2012-03-13 09:39:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tornado (Old) and /work/SRC/openSUSE:Factory/.python-tornado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tornado", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-tornado/python-tornado.changes 2012-02-14 19:06:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-tornado.new/python-tornado.changes 2012-03-13 09:39:15.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 21:38:08 UTC 2012 - saschpe(a)gmx.de + +- Simplified macro usage +- Use upstream tarball + +------------------------------------------------------------------- Old: ---- tornado-2.2.tar.bz2 New: ---- tornado-2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tornado.spec ++++++ --- /var/tmp/diff_new_pack.oJjkPZ/_old 2012-03-13 09:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.oJjkPZ/_new 2012-03-13 09:39:17.000000000 +0100 @@ -15,9 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: python-tornado Version: 2.2 Release: 0 @@ -25,28 +22,31 @@ Summary: Open source version of scalable, non-blocking web server that power FriendFeed License: Apache-2.0 Group: Development/Languages/Python -Source: tornado-%{version}.tar.bz2 +Source: http://github.com/downloads/facebook/tornado/tornado-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel Requires: python-curl Requires: python-simplejson -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif %description -Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed. -The FriendFeed application is written using a web framework that looks a bit like web.py or Google's webapp, -but with additional tools and optimizations to take advantage of the underlying non-blocking infrastructure. +Tornado is an open source version of the scalable, non-blocking web server and +tools that power FriendFeed. The FriendFeed application is written using a web +framework that looks a bit like web.py or Google's webapp, but with additional +tools and optimizations to take advantage of the underlying non-blocking +infrastructure. -The framework is distinct from most mainstream web server frameworks (and certainly most Python frameworks) -because it is non-blocking and reasonably fast. Because it is non-blocking and uses epoll, it can handle -thousands of simultaneous standing connections, which means it is ideal for real-time web services. We built -the web server specifically to handle FriendFeed's real-time features — every active user of FriendFeed -maintains an open connection to the FriendFeed servers. (For more information on scaling servers to support +The framework is distinct from most mainstream web server frameworks (and +certainly most Python frameworks) because it is non-blocking and reasonably +fast. Because it is non-blocking and uses epoll, it can handle thousands of +simultaneous standing connections, which means it is ideal for real-time web +services. We built the web server specifically to handle FriendFeed's real-time +features — every active user of FriendFeed maintains an open connection to the +FriendFeed servers. (For more information on scaling servers to support thousands of clients, see The C10K problem.) %prep -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-simplejson for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-simplejson for openSUSE:Factory checked in at 2012-03-13 09:39:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-simplejson (Old) and /work/SRC/openSUSE:Factory/.python-simplejson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-simplejson", Maintainer is "kkaempf(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-simplejson/python-simplejson.changes 2011-09-26 10:17:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-simplejson.new/python-simplejson.changes 2012-03-13 09:39:11.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Mar 12 21:17:06 UTC 2012 - saschpe(a)gmx.de + +- Update to version 2.4.0: + * New bigint_as_string option for encoder to trade JavaScript number + precision issues for type issues. +- Run testsuite +- Package README.rst, CHANGES.txt and LICENSE.txt + +------------------------------------------------------------------- Old: ---- simplejson-2.2.1.tar.bz2 New: ---- simplejson-2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-simplejson.spec ++++++ --- /var/tmp/diff_new_pack.ecdEbv/_old 2012-03-13 09:39:12.000000000 +0100 +++ /var/tmp/diff_new_pack.ecdEbv/_new 2012-03-13 09:39:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-simplejson # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,22 +16,20 @@ # - Name: python-simplejson -Version: 2.2.1 +Version: 2.4.0 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python License: MIT Group: Development/Languages/Python -Source: simplejson-%{version}.tar.bz2 +Source: http://pypi.python.org/packages/source/s/simplejson/simplejson-%{version}.t… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute -%if 0%{?suse_version} -%py_requires -%endif +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%endif %description simplejson is a simple, fast, complete, correct and extensible @@ -48,8 +46,12 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%check +python setup.py test + %files %defattr(-,root,root) +%doc CHANGES.txt LICENSE.txt README.rst %{python_sitearch}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-Pygments for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-Pygments for openSUSE:Factory checked in at 2012-03-13 09:39:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Pygments (Old) and /work/SRC/openSUSE:Factory/.python-Pygments.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Pygments", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Pygments/python-Pygments.changes 2011-09-26 10:13:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Pygments.new/python-Pygments.changes 2012-03-13 09:39:06.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Mar 12 21:14:22 UTC 2012 - saschpe(a)gmx.de + +- Update to version 1.5: + - Fix Python 3 terminal highlighting with pygmentize + - In the LaTeX formatter, escape special &, < and > chars + - In the LaTeX formatter, fix display problems for styles with token + background colors + - Enhancements to the Squid conf lexer + - Several fixes to the reStructuredText lexer + - Recognize methods in the ObjC lexer + - Fix Lua "class" highlighting: it does not have classes + - Fix degenerate regex in Scala lexer and highlighting bugs + - Fix number pattern order in Ocaml lexer + - Fix generic type highlighting in ActionScript 3 + - Fixes to the Clojure lexer + - Fix degenerate regex in Nemerle lexer + - Fix infinite looping in CoffeeScript lexer + - Fix crashes and analysis with ObjectiveC lexer + - Add some Fortran 2003 keywords. + - Fix Boo string regexes + - Add "rrt" style + - Fix infinite looping in Darcs Patch lexer. + - Lots of misc fixes to character-eating bugs and ordering problems in many + different lexers. + +------------------------------------------------------------------- +Tue Jan 24 13:49:17 UTC 2012 - bwiedemann(a)suse.com + +- fix Obsoletes + +------------------------------------------------------------------- Old: ---- Pygments-1.4.tar.gz New: ---- Pygments-1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Pygments.spec ++++++ --- /var/tmp/diff_new_pack.vdXH6o/_old 2012-03-13 09:39:08.000000000 +0100 +++ /var/tmp/diff_new_pack.vdXH6o/_new 2012-03-13 09:39:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-Pygments # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,9 +16,8 @@ # - Name: python-Pygments -Version: 1.4 +Version: 1.5 Release: 0 Url: http://pygments.org Summary: Pygments is a syntax highlighting package written in Python @@ -28,18 +27,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute -#BuildRequires: python-nose +BuildRequires: python-nose Requires: python-distribute -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +Provides: python-pygments = %{version} +Obsoletes: python-pygments < %{version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -Provides: python-pygments = %{version} -#TODO: Change to '<' after version update: -Obsoletes: python-pygments <= %{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description Pygments is a syntax highlighting package written in Python. @@ -66,8 +62,8 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} install -Dm0644 docs/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize.1 -#%%check -#nosetests +%check +nosetests %files %defattr(-,root,root,-) ++++++ Pygments-1.4.tar.gz -> Pygments-1.5.tar.gz ++++++ ++++ 30329 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-pycrypto for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-pycrypto for openSUSE:Factory checked in at 2012-03-13 09:38:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pycrypto (Old) and /work/SRC/openSUSE:Factory/.python-pycrypto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pycrypto", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pycrypto/python-pycrypto.changes 2011-09-23 12:43:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pycrypto.new/python-pycrypto.changes 2012-03-13 09:39:03.000000000 +0100 @@ -1,0 +2,52 @@ +Mon Mar 12 21:03:54 UTC 2012 - saschpe(a)gmx.de + +- Update to version 2.5: + * Added PKCS#1 encryption schemes (v1.5 and OAEP). We now have + a decent, easy-to-use non-textbook RSA implementation. Yay! + * Added PKCS#1 signature schemes (v1.5 and PSS). v1.5 required some + extensive changes to Hash modules to contain the algorithm specific + ASN.1 OID. To that end, we now always have a (thin) Python module to + hide the one in pure C. + * Added 2 standard Key Derivation Functions (PBKDF1 and PBKDF2). + * Added export/import of RSA keys in OpenSSH and PKCS#8 formats. + * Added password-protected export/import of RSA keys (one old method + for PKCS#8 PEM only). + * Added ability to generate RSA key pairs with configurable public + exponent e. + * Added ability to construct an RSA key pair even if only the private + exponent d is known, and not p and q. + * Added SHA-2 C source code (fully from Lorenz Quack). + * Unit tests for all the above. + * Updates to documentation (both inline and in Doc/pycrypt.rst) + * All of the above changes were put together by Legrandin (Thanks!) + * Minor bug fixes (setup.py and tests). +- Changes from version 2.4.1: + * Fix "error: Setup script exited with error: src/config.h: No such file or + directory" when installing via easy_install. (Sebastian Ramacher) +- Changes from version 2.4: + * Python 3 support! (Thorsten E. Behrens, Anders Sundman) + PyCrypto now supports every version of Python from 2.1 through 3.2. + * Timing-attack countermeasures in _fastmath: When built against + libgmp version 5 or later, we use mpz_powm_sec instead of mpz_powm. + This should prevent the timing attack described by Geremy Condra at + PyCon 2011: + http://blip.tv/pycon-us-videos-2009-2010-2011/pycon-2011-through-the-side-c… + * New hash modules (for Python >= 2.5 only): SHA224, SHA384, and + SHA512 (Frédéric Bertolus) + * Configuration using GNU autoconf. This should help fix a bunch of + build issues. + * Support using MPIR as an alternative to GMP. + * Improve the test command in setup.py, by allowing tests to be + performed on a single sub-package or module only. (Legrandin) + * Fix double-decref of "counter" when Cipher object initialisation + fails (Ryan Kelly) + * Apply patches from Debian's python-crypto 2.3-3 package (Jan + Dittberner, Sebastian Ramacher): + - fix-RSA-generate-exception.patch + - epydoc-exclude-introspect.patch + - no-usr-local.patch + * Fix launchpad bug #702835: "Import key code is not compatible with + GMP library" (Legrandin) + * More tests, better documentation, various bugfixes. + +------------------------------------------------------------------- Old: ---- pycrypto-2.3.tar.gz New: ---- pycrypto-2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pycrypto.spec ++++++ --- /var/tmp/diff_new_pack.H7SBFs/_old 2012-03-13 09:39:04.000000000 +0100 +++ /var/tmp/diff_new_pack.H7SBFs/_new 2012-03-13 09:39:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pycrypto # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,25 +16,22 @@ # - Name: python-pycrypto -Version: 2.3 -Release: 1 +Version: 2.5 +Release: 0 Url: http://www.pycrypto.org/ Summary: Cryptographic modules for Python License: Python-2.0 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/p/pycrypto/pycrypto-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel BuildRequires: gmp-devel -%if 0%{?suse_version} -%py_requires -%endif +BuildRequires: python-devel Provides: python-crypto = %{version} -#TODO: Change to '<' after next version update: -Obsoletes: python-crypto <= %{version} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +Obsoletes: python-crypto < %{version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%endif %description The package contains: @@ -51,7 +48,6 @@ %prep %setup -q -n pycrypto-%{version} -sed -i "1d" lib/Crypto/Util/RFC1751.py # Fix non-executable script %build CFLAGS="%{optflags}" python setup.py build @@ -64,7 +60,7 @@ %files %defattr(-,root,root,-) -%doc ACKS ChangeLog COPYRIGHT README TODO +%doc ACKS ChangeLog COPYRIGHT README %{python_sitearch}/* %changelog ++++++ pycrypto-2.3.tar.gz -> pycrypto-2.5.tar.gz ++++++ ++++ 18321 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-psycopg2 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-psycopg2 for openSUSE:Factory checked in at 2012-03-13 09:38:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-psycopg2 (Old) and /work/SRC/openSUSE:Factory/.python-psycopg2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-psycopg2", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-psycopg2/python-psycopg2.changes 2012-02-16 10:09:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-psycopg2.new/python-psycopg2.changes 2012-03-13 09:38:56.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 21:10:27 UTC 2012 - saschpe(a)gmx.de + +- Simplify macro usage +- Remove outdated SUSE version checks + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-psycopg2.spec ++++++ --- /var/tmp/diff_new_pack.bMHzeR/_old 2012-03-13 09:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.bMHzeR/_new 2012-03-13 09:38:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-psycopg2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -23,17 +23,14 @@ Summary: Python-PostgreSQL Database Adapter License: LGPL-3.0+ or ZPL-2.0 Group: Development/Languages/Python -Source: psycopg2-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/p/psycopg2/psycopg2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: postgresql-devel -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1010 BuildRequires: fdupes +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif -%endif -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description psycopg2 is a PostgreSQL database adapter for the Python programming @@ -64,10 +61,8 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} rm -rf %{buildroot}%{python_sitearch}/psycopg2/tests # Don't package testsuite -%if 0%{?suse_version} > 1010 %fdupes -s %{buildroot}/%_mandir # Create symlinks for man pages %fdupes %{buildroot} # Create hardlinks for the rest -%endif %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-paramiko for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-paramiko for openSUSE:Factory checked in at 2012-03-13 09:38:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-paramiko (Old) and /work/SRC/openSUSE:Factory/.python-paramiko.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-paramiko", Maintainer is "hvogel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-paramiko/python-paramiko.changes 2011-09-23 12:43:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-paramiko.new/python-paramiko.changes 2012-03-13 09:38:52.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 12 21:05:53 UTC 2012 - saschpe(a)gmx.de + +- Simplified macro usage + +------------------------------------------------------------------- @@ -6 +10,0 @@ -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-paramiko.spec ++++++ --- /var/tmp/diff_new_pack.rBcLCG/_old 2012-03-13 09:38:54.000000000 +0100 +++ /var/tmp/diff_new_pack.rBcLCG/_new 2012-03-13 09:38:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-paramiko # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,7 +16,6 @@ # - Name: python-paramiko Version: 1.7.7.1 Release: 0 @@ -29,13 +28,11 @@ BuildRequires: python-devel BuildRequires: unzip Requires: python-pycrypto >= 2.1 -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description This is a library for making SSH2 connections (client or server). -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-mox for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-mox for openSUSE:Factory checked in at 2012-03-13 09:38:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mox (Old) and /work/SRC/openSUSE:Factory/.python-mox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mox", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-mox/python-mox.changes 2012-02-14 13:11:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-mox.new/python-mox.changes 2012-03-13 09:38:48.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 12 21:50:54 UTC 2012 - saschpe(a)gmx.de + +- Use upstream tarball + +------------------------------------------------------------------- Old: ---- mox-0.5.3.tar.bz2 New: ---- mox-0.5.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mox.spec ++++++ --- /var/tmp/diff_new_pack.VU7BAl/_old 2012-03-13 09:38:49.000000000 +0100 +++ /var/tmp/diff_new_pack.VU7BAl/_new 2012-03-13 09:38:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-mox # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -14,8 +14,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Name: python-mox Version: 0.5.3 @@ -24,15 +23,14 @@ Summary: Mock object framework License: Apache-2.0 Group: Development/Languages/Python -Source: mox-%{version}.tar.bz2 +Source: http://pypi.python.org/packages/source/m/mox/mox-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif %description Mox is a mock object framework for Python based on the -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-mechanize for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-mechanize for openSUSE:Factory checked in at 2012-03-13 09:38:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mechanize (Old) and /work/SRC/openSUSE:Factory/.python-mechanize.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mechanize", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-mechanize/python-mechanize.changes 2011-09-26 10:16:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-mechanize.new/python-mechanize.changes 2012-03-13 09:38:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 12 21:51:45 UTC 2012 - saschpe(a)gmx.de + +- Simplified macro usage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mechanize.spec ++++++ --- /var/tmp/diff_new_pack.PLH9r8/_old 2012-03-13 09:38:44.000000000 +0100 +++ /var/tmp/diff_new_pack.PLH9r8/_new 2012-03-13 09:38:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-mechanize # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,7 +16,6 @@ # - Name: python-mechanize Version: 0.2.5 Release: 0 @@ -30,13 +29,11 @@ BuildRequires: python-distribute Requires: python-beautifulsoup Requires: python-clientform -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description Stateful programmatic web browsing, after Andy Lester's Perl module -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-kde4 for openSUSE:Factory checked in at 2012-03-13 09:38:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kde4 (Old) and /work/SRC/openSUSE:Factory/.python-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-kde4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kde4/python-kde4.changes 2012-01-30 12:28:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python-kde4.changes 2012-03-13 09:38:40.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:27:03 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- pykde4-4.8.0.tar.bz2 New: ---- pykde4-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.nz1vH1/_old 2012-03-13 09:38:41.000000000 +0100 +++ /var/tmp/diff_new_pack.nz1vH1/_new 2012-03-13 09:38:41.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-kde4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Python bindings for KDE 4 License: LGPL-2.1+ ++++++ pykde4-4.8.0.tar.bz2 -> pykde4-4.8.1.tar.bz2 ++++++ Files old/pykde4-4.8.0/tools/cmake_project/sample_project/doc/en/index.cache.bz2 and new/pykde4-4.8.1/tools/cmake_project/sample_project/doc/en/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-cssutils for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package python-cssutils for openSUSE:Factory checked in at 2012-03-13 09:38:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cssutils (Old) and /work/SRC/openSUSE:Factory/.python-cssutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cssutils", Maintainer is "pth(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-cssutils/python-cssutils.changes 2011-09-23 12:42:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-cssutils.new/python-cssutils.changes 2012-03-13 09:38:34.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 20:48:16 UTC 2012 - saschpe(a)gmx.de + +- Update to version 9.9.9: + * No changelog provided + +------------------------------------------------------------------- Old: ---- cssutils-0.9.8a3.zip New: ---- cssutils-0.9.9.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cssutils.spec ++++++ --- /var/tmp/diff_new_pack.20QrCH/_old 2012-03-13 09:38:36.000000000 +0100 +++ /var/tmp/diff_new_pack.20QrCH/_new 2012-03-13 09:38:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-cssutils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,10 +16,9 @@ # - Name: python-cssutils -Version: 0.9.8a3 -Release: 1 +Version: 0.9.9 +Release: 0 Url: http://cthedot.de/cssutils/ Summary: A CSS Cascading Style Sheets library for Python License: LGPL-3.0+ @@ -29,15 +28,13 @@ BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: unzip -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 -BuildArch: noarch -%endif -%endif Provides: python-css-utils-doc = %{version} Obsoletes: python-css-utils-doc < %{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else +BuildArch: noarch +%endif %description A Python package to parse and build CSS Cascading Style Sheets. DOM only, not any rendering facilities! -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plasma-addons for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package plasma-addons for openSUSE:Factory checked in at 2012-03-13 09:38:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-addons (Old) and /work/SRC/openSUSE:Factory/.plasma-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma-addons", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-addons/plasma-addons.changes 2012-02-08 15:41:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma-addons.new/plasma-addons.changes 2012-03-13 09:38:30.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:15:34 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdeplasma-addons-4.8.0.tar.bz2 New: ---- kdeplasma-addons-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.6NzeYY/_old 2012-03-13 09:38:32.000000000 +0100 +++ /var/tmp/diff_new_pack.6NzeYY/_new 2012-03-13 09:38:32.000000000 +0100 @@ -16,9 +16,8 @@ # - Name: plasma-addons -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Additional Plasma Widgets License: GPL-2.0+ @@ -32,6 +31,7 @@ BuildRequires: ibus-devel BuildRequires: kdebase4-workspace-devel BuildRequires: kopete-devel +BuildRequires: libdbusmenu-qt-devel BuildRequires: libeigen2-devel BuildRequires: libkexiv2-devel BuildRequires: libqalculate-devel @@ -39,7 +39,6 @@ BuildRequires: libqimageblitz-devel BuildRequires: marble-devel BuildRequires: python-qt4-devel -BuildRequires: libdbusmenu-qt-devel Recommends: plasma-addons-akonadi Recommends: plasma-addons-lancelot Recommends: plasma-addons-marble ++++++ kdeplasma-addons-4.8.0.tar.bz2 -> kdeplasma-addons-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/bball/plasma-applet-bball.desktop new/kdeplasma-addons-4.8.1/applets/bball/plasma-applet-bball.desktop --- old/kdeplasma-addons-4.8.0/applets/bball/plasma-applet-bball.desktop 2012-01-10 15:18:26.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/bball/plasma-applet-bball.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -22,6 +22,7 @@ Name[kk]=Секірмелі доп Name[km]=Bouncy Ball Name[ko]=튀는 공 +Name[lt]=Šokinėjantis kamuolys Name[lv]=Atlecoša bumba Name[nb]=Sprettball Name[nds]=Jumpen Ball @@ -76,6 +77,7 @@ Comment[km]=បាល់លោតសម្រាប់ប្លាស្មា Comment[ko]=바탕 화면에서 튀는 공 Comment[ku]=Topa lotikî ji bo plasma +Comment[lt]=Šokinėjantis kamuolys plazmai Comment[lv]=Atlecoša bumba Comment[nb]=En sprettball for plasma Comment[nds]=En jumpen Ball för Plasma diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/binary-clock/plasma-applet-binaryclock.desktop new/kdeplasma-addons-4.8.1/applets/binary-clock/plasma-applet-binaryclock.desktop --- old/kdeplasma-addons-4.8.0/applets/binary-clock/plasma-applet-binaryclock.desktop 2011-07-27 20:42:28.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/binary-clock/plasma-applet-binaryclock.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -53,7 +53,7 @@ Name[wa]=Ôrlodje binaire Name[x-test]=xxBinary Clockxx Name[zh_CN]=二进制时钟 -Name[zh_TW]=數位時鐘 +Name[zh_TW]=二進制時鐘 Comment=Time displayed in binary format Comment[ar]=الوقت يظهر بالتنسيق الثنائي Comment[ast]=Hora amosada en formatu binariu @@ -82,6 +82,7 @@ Comment[km]=បានបង្ហាញពេលវេលាគិតជាទ្រង់ទ្រាយគោលពីរ Comment[ko]=이진수로 시각 표시 Comment[ku]=Dem di teşeya cot-bûyî de dê bê nîşandan +Comment[lt]=Laikas rodomas skaitmeniniu formatu Comment[lv]=Rāda laiku binārā formātā Comment[nb]=Tiden vist i binærformat Comment[nds]=Tiet in Bineerformaat wiest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/blackboard/plasma-applet-blackboard.desktop new/kdeplasma-addons-4.8.1/applets/blackboard/plasma-applet-blackboard.desktop --- old/kdeplasma-addons-4.8.0/applets/blackboard/plasma-applet-blackboard.desktop 2011-11-04 15:36:24.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/blackboard/plasma-applet-blackboard.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -23,6 +23,7 @@ Name[kk]=Тақта Name[km]=ក្ដារពណ៌ខ្មៅ Name[ko]=칠판 +Name[lt]=Lenta Name[lv]=Tāfele Name[nb]=Tavle Name[nds]=Swatt Brett diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/bookmarks/plasma-applet-bookmarks.desktop new/kdeplasma-addons-4.8.1/applets/bookmarks/plasma-applet-bookmarks.desktop --- old/kdeplasma-addons-4.8.0/applets/bookmarks/plasma-applet-bookmarks.desktop 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/bookmarks/plasma-applet-bookmarks.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -72,6 +72,7 @@ Comment[kk]=Бетбелгілерге тез қатынау Comment[km]=ចូលដំណើរការរហ័សទៅកាន់ចំណាំ Comment[ko]=책갈피에 빨리 접근하기 +Comment[lt]=Greita prieiga prie žymių Comment[lv]=Ātra piekļuve grāmatzīmēm Comment[nb]=Kjapp tilgang til bokmerkene dine Comment[nds]=Fixtogriep op de Leestekens diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/bubblemon/plasma-applet-bubblemon.desktop new/kdeplasma-addons-4.8.1/applets/bubblemon/plasma-applet-bubblemon.desktop --- old/kdeplasma-addons-4.8.0/applets/bubblemon/plasma-applet-bubblemon.desktop 2011-07-27 20:42:28.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/bubblemon/plasma-applet-bubblemon.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -26,6 +26,7 @@ Name[kk]=Көпіршік-монитор Name[km]=Bubblemon Name[ko]=거품 모니터 +Name[lt]=Bubblemon Name[lv]=Bubblemon Name[nb]=Bubblemon Name[nds]=Bubblemon @@ -76,6 +77,7 @@ Comment[kk]=Жүйеңізді бақылайтын ғажайып көпіршік. Comment[km]=ពពុះស្អាតដែលត្រួតពិនិត្យប្រព័ន្ធរបស់អ្នក ។ Comment[ko]=시스템 상태를 보여주는 자그마한 거품. +Comment[lt]=Gražus burbulas, kuris stebi Jūsų sistemą. Comment[lv]=Skaists burbulis, kas novēro jūsu sistēmu. Comment[nb]=En pen boble som overvåker systemet ditt. Comment[nds]=En smuck Blaas, de Dien Systeem bekieken deit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/charselect/plasma-applet-charselect.desktop new/kdeplasma-addons-4.8.1/applets/charselect/plasma-applet-charselect.desktop --- old/kdeplasma-addons-4.8.0/applets/charselect/plasma-applet-charselect.desktop 2011-08-22 15:32:31.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/charselect/plasma-applet-charselect.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -85,6 +85,7 @@ Comment[km]=មើល ជ្រើស និងចម្លងតួអក្សរពីការជ្រើសពុម្ពអក្សរ Comment[ko]=글꼴의 문자를 보고, 선택하고, 복사하기 Comment[ku]=Jê berhevoka cure-nivîsê tîpan bibîne, hilbijêre û ji ber bigire +Comment[lt]=Žiūrėti, pasirinkti ir kopijuoti simbolius iš šriftų kolekcijos Comment[lv]=Apskatiet, izvēlieties un kopējiet rakstzīmes no fontu kolekcijas Comment[nb]=Vis, velg og kopier tegn fra en samling skrifter Comment[nds]=Tekens ut en Schriftoordensammlen ankieken, utsöken un koperen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/community/plasma-applet-opendesktop.desktop new/kdeplasma-addons-4.8.1/applets/community/plasma-applet-opendesktop.desktop --- old/kdeplasma-addons-4.8.0/applets/community/plasma-applet-opendesktop.desktop 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/community/plasma-applet-opendesktop.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -72,6 +72,7 @@ Comment[kk]=Қоғам Үстелі арқылы хабарласу Comment[km]=ទាក់ទងដោយប្រើផ្ទៃតុសង្គម Comment[ko]=사회적 데스크톱을 사용하는 커뮤니케이션 +Comment[lt]=Bendraukite naudodami socialinį darbastalį Comment[lv]=Sazināšanās izmantojot sociālo darbvirsmu Comment[nb]=Kommunikasjon ved bruk av det sosiale skrivebordet Comment[nds]=Klönen över den Meenschap-Schriefdisch @@ -133,6 +134,7 @@ Keywords[kk]=Утилиталар Keywords[km]=ឧបករណ៍ប្រើប្រាស់ Keywords[ko]=유틸리티 +Keywords[lt]=Pagalbininkai Keywords[lv]=Palīgrīki Keywords[nb]=Verktøy Keywords[nds]=Warktüüch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/icontasks/dockconfig.cpp new/kdeplasma-addons-4.8.1/applets/icontasks/dockconfig.cpp --- old/kdeplasma-addons-4.8.0/applets/icontasks/dockconfig.cpp 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/icontasks/dockconfig.cpp 2012-02-29 23:57:26.000000000 +0100 @@ -280,22 +280,22 @@ if (QFile::exists(destDir + "/metadata/" + meta->name()) && !QFile::remove(destDir + "/metadata/" + meta->name())) { KMessageBox::error(this, i18n("<p>Sorry, failed to remove previous plugin metadata file!</p>" - "<p></i>%1</i></p>", destDir + "/metadata/" + meta->name())); + "<p><i>%1</i></p>", destDir + "/metadata/" + meta->name())); abortInstall = true; } if (!abortInstall && QFile::exists(destDir + "/scripts/" + script->name()) && !QFile::remove(destDir + "/scripts/" + script->name())) { KMessageBox::error(this, i18n("<p>Sorry, failed to remove previous plugin metadata file!</p>" - "<p></i>%1</i></p>", destDir + "/scripts/" + script->name())); + "<p><i>%1</i></p>", destDir + "/scripts/" + script->name())); abortInstall = true; } if (!abortInstall && (!(QDir(destDir + "/scripts/").exists() || KStandardDirs::makeDir(destDir + "/scripts/")))) { KMessageBox::error(this, i18n("<p>Sorry, failed to create scripts folder!</p>" - "<p></i>%1</i></p>", destDir + "/scripts/")); + "<p><i>%1</i></p>", destDir + "/scripts/")); abortInstall = true; } if (!abortInstall && (!(QDir(destDir + "/metadata/").exists() || KStandardDirs::makeDir(destDir + "/metadata/")))) { KMessageBox::error(this, i18n("<p>Sorry, failed to create metadata folder!</p>" - "<p></i>%1</i></p>", destDir + "/metadata/")); + "<p><i>%1</i></p>", destDir + "/metadata/")); abortInstall = true; } if (!abortInstall) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/icontasks/plasma-applet-icontasks.desktop new/kdeplasma-addons-4.8.1/applets/icontasks/plasma-applet-icontasks.desktop --- old/kdeplasma-addons-4.8.0/applets/icontasks/plasma-applet-icontasks.desktop 2012-01-18 19:49:55.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/icontasks/plasma-applet-icontasks.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -12,6 +12,8 @@ Name[it]=Gestore attività con sole icone Name[kk]=Тек таңбашалы тапсырмалар менеджері Name[km]=តែរូបតំណាងកម្មវិធីគ្រប់គ្រងភារកិច្ច +Name[ko]=아이콘만 있는 작업 관리자 +Name[lt]=Tik ženkliukų užduočių tvarkytuvė Name[lv]=Tikai ikonu uzdevumu pārvaldnieks Name[nb]=Oppgavebehandler med bare ikoner Name[nds]="Bloots-Lüttbild"-Opgavenpleger @@ -19,6 +21,7 @@ Name[pa]=ਕੇਵਲ ਆਈਕਾਨ ਟਾਸਕ ਮੈਨੇਜਰ Name[pt]=Gestor de Tarefas com Ícones Name[pt_BR]=Gerenciador de tarefas com ícones +Name[sk]=Správca úloh len s ikonami Name[sr]=менаџер задатака само са иконама Name[sr@ijekavian]=менаџер задатака само са иконама Name[sr@ijekavianlatin]=menadžer zadataka samo sa ikonama @@ -42,6 +45,8 @@ Comment[it]=Passa da un'applicazione in esecuzione all'altra Comment[kk]=Жегілген қолданбаларды ақтару Comment[km]=ប្ដូររវាងកម្មវិធីដែលកំពុងរត់ +Comment[ko]=실행 중인 프로그램 전환 +Comment[lt]=Persijungti tarp veikiančių programų Comment[lv]=Pārslēgties starp darbojošām programmām Comment[nb]=Bytt mellom kjørende programmer Comment[nds]=Twischen lopen Programmen wesseln @@ -50,6 +55,7 @@ Comment[pa]=ਚੱਲਦੀਆਂ ਐਪਲੀਕੇਸ਼ਨਾਂ ਬਦਲੋ Comment[pt]=Mudar de aplicações em execução Comment[pt_BR]=Alterna entre os aplicativos em execução +Comment[sk]=Prepínať medzi bežiacimi aplikáciami Comment[sr]=Пребацивање између покренутих програма Comment[sr@ijekavian]=Пребацивање између покренутих програма Comment[sr@ijekavianlatin]=Prebacivanje između pokrenutih programa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/icontasks/tasks.cpp new/kdeplasma-addons-4.8.1/applets/icontasks/tasks.cpp --- old/kdeplasma-addons-4.8.0/applets/icontasks/tasks.cpp 2011-11-17 21:58:05.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/icontasks/tasks.cpp 2012-02-29 23:57:26.000000000 +0100 @@ -289,7 +289,7 @@ if (recentDocuments != RecentDocuments::self()->isEnabled()) { changed = true; } - RecentDocuments::self()->setEnabled(unity); + RecentDocuments::self()->setEnabled(recentDocuments); const SeparatorType showSeparator = TaskManager::GroupManager::ManualSorting == m_groupManager->sortingStrategy() ? static_cast<SeparatorType>(cg.readEntry("showSeparator", static_cast<int>(m_showSeparator))) @@ -667,6 +667,7 @@ cg.writeEntry("showProgress", m_behaviourUi.showProgress->checkState() == Qt::Checked); cg.writeEntry("mediaButtons", m_behaviourUi.mediaButtons->checkState() == Qt::Checked); cg.writeEntry("unity", m_behaviourUi.unity->checkState() == Qt::Checked); + cg.writeEntry("recentDocuments", m_behaviourUi.recentDocuments->checkState() == Qt::Checked); cg.writeEntry("spacing", m_appUi.spacing->value()); cg.writeEntry("previewSize", m_appUi.previewSize->value()); cg.writeEntry("iconScale", m_appUi.iconScale->value()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/kimpanel/backend/ibus/panel.c new/kdeplasma-addons-4.8.1/applets/kimpanel/backend/ibus/panel.c --- old/kdeplasma-addons-4.8.0/applets/kimpanel/backend/ibus/panel.c 2011-11-04 15:36:24.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/kimpanel/backend/ibus/panel.c 2012-02-29 23:57:26.000000000 +0100 @@ -1,6 +1,6 @@ /* * This file is part of KIMToy, an input method frontend for KDE - * Copyright (C) 2011 Ni Hui <shuizhuyuanluo(a)126.com> + * Copyright (C) 2011-2012 Ni Hui <shuizhuyuanluo(a)126.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -28,6 +28,9 @@ #endif #include "panel.h" +#ifndef DBUS_ERROR_FAILED +#define DBUS_ERROR_FAILED "org.freedesktop.DBus.Error.Failed" +#endif /* DBUS_ERROR_FAILED */ #define _UNUSED(x) ((void) x) typedef struct _IBusPanelImpanelClass IBusPanelImpanelClass; @@ -236,6 +239,7 @@ char *propstr) { static const char pre[] = "/IBus/"; + propstr[0] = '\0'; strcat(propstr, pre); strcat(propstr, key); strcat(propstr, prop_sep); @@ -250,11 +254,19 @@ ibus_property_to_propstr (IBusProperty *property, char *propstr) { +#if !IBUS_CHECK_VERSION(1,3,99) ibus_property_args_to_propstr(property->key, property->label->text, property->icon, property->tooltip->text, propstr); +#else + ibus_property_args_to_propstr(ibus_property_get_key (property), + ibus_text_get_text (ibus_property_get_label (property)), + ibus_property_get_icon (property), + ibus_text_get_text (ibus_property_get_tooltip (property)), + propstr); +#endif } static void @@ -266,6 +278,7 @@ char *propstr) { static const char pre[] = "/IBus/Engine/"; + propstr[0] = '\0'; strcat(propstr, pre); strcat(propstr, name); strcat(propstr, prop_sep); @@ -502,48 +515,34 @@ impanel, NULL); // some custom property - impanel->logo_prop = (IBusProperty *)malloc(sizeof(IBusProperty)); - memset(impanel->logo_prop, 0, sizeof(IBusProperty)); - impanel->logo_prop->key = strdup("Logo"); - impanel->logo_prop->icon = strdup("ibus"); - impanel->logo_prop->label = (IBusText *)malloc(sizeof(IBusText)); - memset(impanel->logo_prop->label, 0, sizeof(IBusText)); - impanel->logo_prop->label->text = strdup("IBus"); - impanel->logo_prop->tooltip = (IBusText *)malloc(sizeof(IBusText)); - memset(impanel->logo_prop->tooltip, 0, sizeof(IBusText)); - impanel->logo_prop->tooltip->text = strdup("IBus input method"); - impanel->about_prop = (IBusProperty *)malloc(sizeof(IBusProperty)); - memset(impanel->about_prop, 0, sizeof(IBusProperty)); - impanel->about_prop->key = strdup("About"); - impanel->about_prop->icon = strdup("ibus-help"); - impanel->about_prop->label = (IBusText *)malloc(sizeof(IBusText)); - memset(impanel->about_prop->label, 0, sizeof(IBusText)); - impanel->about_prop->label->text = strdup("IBus intelligent input bus"); - impanel->about_prop->tooltip = (IBusText *)malloc(sizeof(IBusText)); - memset(impanel->about_prop->tooltip, 0, sizeof(IBusText)); - impanel->about_prop->tooltip->text = strdup("IBus is an intelligent input bus for Linux/Unix.\n\n" - "Huang Peng <shawn.p.huang(a)gmail.com>"); + impanel->logo_prop = ibus_property_new ("Logo", + PROP_TYPE_NORMAL, + ibus_text_new_from_string ("IBus"), + "ibus", + ibus_text_new_from_string ("IBus input method"), + FALSE, + FALSE, + PROP_STATE_UNCHECKED, + NULL); + + impanel->about_prop = ibus_property_new ("About", + PROP_TYPE_NORMAL, + ibus_text_new_from_string ("IBus intelligent input bus"), + "ibus-help", + ibus_text_new_from_string ("IBus is an intelligent input bus for Linux/Unix.\n\n" + "Huang Peng <shawn.p.huang(a)gmail.com>"), + FALSE, + FALSE, + PROP_STATE_UNCHECKED, + NULL); } static void ibus_panel_impanel_destroy (IBusPanelImpanel *impanel) { - // free custom property - free(impanel->logo_prop->key); - free(impanel->logo_prop->icon); - free(impanel->logo_prop->label->text); - free(impanel->logo_prop->label); - free(impanel->logo_prop->tooltip->text); - free(impanel->logo_prop->tooltip); - free(impanel->logo_prop); + g_object_unref (impanel->logo_prop); impanel->logo_prop = NULL; - free(impanel->about_prop->key); - free(impanel->about_prop->icon); - free(impanel->about_prop->label->text); - free(impanel->about_prop->label); - free(impanel->about_prop->tooltip->text); - free(impanel->about_prop->tooltip); - free(impanel->about_prop); + g_object_unref (impanel->about_prop); impanel->about_prop = NULL; g_bus_unown_name (owner_id); @@ -584,8 +583,7 @@ // fprintf(stderr, "enable %d %s\n", enable, input_context_path); if (enable == 0) { - free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon); - IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup("ibus"); + ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, "ibus"); } else { IBusEngineDesc *engine_desc = ibus_input_context_get_engine(ic); @@ -600,11 +598,10 @@ #endif } - free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon); #if !IBUS_CHECK_VERSION(1,3,99) - IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(engine_desc->icon); + ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, engine_desc->icon); #else - IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(ibus_engine_desc_get_icon(engine_desc)); + ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, ibus_engine_desc_get_icon (engine_desc)); #endif } @@ -654,41 +651,28 @@ { IBusProperty* property = NULL; guint i = 0; - char *logo_propstr; - char *about_propstr; - char *need_free[32] = {NULL};// WARNING enough large I think --- nihui + char propstr[512]; GVariantBuilder builder; g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); - logo_propstr = (char*)malloc(512 * sizeof(char)); - logo_propstr[0] = '\0'; - ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->logo_prop, logo_propstr); - g_variant_builder_add (&builder, "s", logo_propstr); + ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->logo_prop, propstr); + g_variant_builder_add (&builder, "s", propstr); while ( ( property = ibus_prop_list_get( prop_list, i ) ) != NULL ) { - need_free[i] = (char*)malloc(512 * sizeof(char)); - need_free[i][0] = '\0'; - ibus_property_to_propstr(property, need_free[i]); - g_variant_builder_add (&builder, "s", need_free[i]); + ibus_property_to_propstr(property, propstr); + g_variant_builder_add (&builder, "s", propstr); ++i; } - about_propstr = (char*)malloc(512 * sizeof(char)); - about_propstr[0] = '\0'; - ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->about_prop, about_propstr); - g_variant_builder_add (&builder, "s", about_propstr); + ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->about_prop, propstr); + g_variant_builder_add (&builder, "s", propstr); g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn, NULL, "/kimpanel", "org.kde.kimpanel.inputmethod", "RegisterProperties", g_variant_new ("(as)", &builder), NULL); - free(logo_propstr); - free(about_propstr); - for (i = 0; i < 32; ++i) { - free(need_free[i]); - } #if !IBUS_CHECK_VERSION(1,3,99) _UNUSED(error); return TRUE; @@ -738,7 +722,11 @@ gboolean visible) #endif { - gchar* t = text->text; +#if !IBUS_CHECK_VERSION(1,3,99) + const gchar* t = text->text; +#else + const gchar* t = ibus_text_get_text (text); +#endif const gchar *attr = ""; g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn, @@ -792,7 +780,7 @@ guint i; gchar label[16][4];// WARNING large enough I think --- nihui - gchar *candidate; + const gchar *candidate; GVariantBuilder builder_labels; GVariantBuilder builder_candidates; @@ -808,7 +796,11 @@ // label = ibus_lookup_table_get_label(lookup_table, i)->text; g_variant_builder_add (&builder_labels, "s", label[i-start]); - candidate = ibus_lookup_table_get_candidate(lookup_table, i)->text; +#if !IBUS_CHECK_VERSION(1,3,99) + candidate = ibus_lookup_table_get_candidate (lookup_table, i)->text; +#else + candidate = ibus_text_get_text (ibus_lookup_table_get_candidate (lookup_table, i)); +#endif g_variant_builder_add (&builder_candidates, "s", candidate); g_variant_builder_add (&builder_attrs, "s", attr); @@ -858,7 +850,11 @@ gboolean visible) #endif { - gchar* t = text->text; +#if !IBUS_CHECK_VERSION(1,3,99) + const gchar* t = text->text; +#else + const gchar* t = ibus_text_get_text (text); +#endif const gchar *attr = ""; g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn, @@ -1181,8 +1177,7 @@ gboolean enable = ibus_input_context_is_enabled(IBUS_PANEL_IMPANEL (panel)->input_context); if (enable == 0) { - free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon); - IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup("ibus"); + ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, "ibus"); } else { IBusEngineDesc *engine_desc = ibus_input_context_get_engine(IBUS_PANEL_IMPANEL (panel)->input_context); @@ -1194,11 +1189,10 @@ #endif } - free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon); #if !IBUS_CHECK_VERSION(1,3,99) - IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(engine_desc->icon); + ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, engine_desc->icon); #else - IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(ibus_engine_desc_get_icon(engine_desc)); + ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, ibus_engine_desc_get_icon (engine_desc)); #endif } @@ -1239,9 +1233,7 @@ static void ibus_panel_impanel_exec_menu (IBusPanelService *panel) { - guint i = 0; - char *disable_propstr; - char *need_free[64] = {NULL};// WARNING enough large I think --- nihui + char propstr[512]; GVariantBuilder builder; g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); @@ -1253,32 +1245,23 @@ engine_desc = (IBusEngineDesc *)(node->data); node = g_list_next (node); - need_free[i] = (char*)malloc(512 * sizeof(char)); - need_free[i][0] = '\0'; - ibus_engine_desc_to_propstr(engine_desc, need_free[i]); - g_variant_builder_add (&builder, "s", need_free[i]); - ++i; + ibus_engine_desc_to_propstr(engine_desc, propstr); + g_variant_builder_add (&builder, "s", propstr); } - disable_propstr = (char*)malloc(512 * sizeof(char)); - disable_propstr[0] = '\0'; ibus_engine_desc_args_to_propstr("None", NULL, "Disable", "ibus", "", - disable_propstr); + propstr); - g_variant_builder_add (&builder, "s", disable_propstr); + g_variant_builder_add (&builder, "s", propstr); g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn, NULL, "/kimpanel", "org.kde.kimpanel.inputmethod", "ExecMenu", g_variant_new ("(as)", &builder), NULL); - - for (i = 0; i < 64; ++i) { - free(need_free[i]); - } } IBusPanelImpanel * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/kimpanel/src/plasma-applet-kimpanel.desktop new/kdeplasma-addons-4.8.1/applets/kimpanel/src/plasma-applet-kimpanel.desktop --- old/kdeplasma-addons-4.8.0/applets/kimpanel/src/plasma-applet-kimpanel.desktop 2011-12-02 22:32:14.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/kimpanel/src/plasma-applet-kimpanel.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -19,6 +19,7 @@ Name[kk]=Теру әдістер панелі Name[km]=បន្ទះវិធីសាស្ត្របញ្ចូល Name[ko]=입력기 패널 +Name[lt]=Įvesties metodas skydelis Name[lv]=Ievades metodes panelis Name[nb]=Skrivemetode-rute Name[nds]=Ingaavmetood-Paneel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/knowledgebase/plasma-applet-knowledgebase.desktop new/kdeplasma-addons-4.8.1/applets/knowledgebase/plasma-applet-knowledgebase.desktop --- old/kdeplasma-addons-4.8.0/applets/knowledgebase/plasma-applet-knowledgebase.desktop 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/knowledgebase/plasma-applet-knowledgebase.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -21,6 +21,7 @@ Name[kk]=Білім Қоры Name[km]=KnowledgeBase Name[ko]=지식 센터 +Name[lt]=Žinių bazė Name[lv]=Zināšanu bāze Name[nb]=Kunnskapsbase Name[nds]=KnowledgeBase @@ -67,6 +68,7 @@ Comment[kk]=Opendesktop Білім қоры жүйесі Comment[km]=Opendesktop Knowledgebase Comment[ko]=Opendesktop 지식 센터 +Comment[lt]=Opendesktop žinių bazė Comment[lv]=Opendesktop zināšanu bāze Comment[nb]=Opendesktop kunnskapsbase Comment[nds]=Opendesktop-Wetendatenbank diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/life/plasma-applet-life.desktop new/kdeplasma-addons-4.8.1/applets/life/plasma-applet-life.desktop --- old/kdeplasma-addons-4.8.0/applets/life/plasma-applet-life.desktop 2012-01-02 20:53:08.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/life/plasma-applet-life.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -78,6 +78,7 @@ Comment[nl]=Applet voor Conway's Game of Life Comment[pt]='Applet' do Jogo da Vida da Conway Comment[pt_BR]=Miniaplicativo do Jogo da Vida da Conway +Comment[sk]=Applet Conwayova Hra života Comment[sr]=Аплет Конвејеве игре живота Comment[sr@ijekavian]=Аплет Конвејеве игре живота Comment[sr@ijekavianlatin]=Aplet Konvejeve igre života diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/microblog/plasma-applet-microblog.desktop new/kdeplasma-addons-4.8.1/applets/microblog/plasma-applet-microblog.desktop --- old/kdeplasma-addons-4.8.0/applets/microblog/plasma-applet-microblog.desktop 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/microblog/plasma-applet-microblog.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -116,6 +116,7 @@ Keywords[fr]=identi.ca,twitter Keywords[hu]=identi.ca,twitter Keywords[it]=identi.ca,twitter +Keywords[ja]=identi.ca,twitter Keywords[kk]=identi.ca,twitter Keywords[km]=identi.ca,twitter Keywords[ko]=identi.ca,twitter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/news/plasma-applet-news.desktop new/kdeplasma-addons-4.8.1/applets/news/plasma-applet-news.desktop --- old/kdeplasma-addons-4.8.0/applets/news/plasma-applet-news.desktop 2011-07-27 20:42:28.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/news/plasma-applet-news.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -83,6 +83,7 @@ Comment[km]=បង្ហាញព័ត៌មានពីប្រភពផ្សេងៗ Comment[ko]=다양한 뉴스 보여주기 Comment[ku]=Jê çavkaniyên cur bi cur nûçe yan nîşan bide +Comment[lt]=Rodo naujienas iš įvairių šaltinių Comment[lv]=Rāda ziņas no dažādiem avotiem Comment[nb]=Vis nyheter fra ymse kilder Comment[nds]=Narichten vun verscheden Borns wiesen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/notes/notes.cpp new/kdeplasma-addons-4.8.1/applets/notes/notes.cpp --- old/kdeplasma-addons-4.8.0/applets/notes/notes.cpp 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/notes/notes.cpp 2012-02-29 23:57:26.000000000 +0100 @@ -248,7 +248,8 @@ void Notes::lineChanged() { //Re-set the formatting if previous text was deleted - if (m_noteEditor->document()->characterCount() == 1) { + QTextCursor textCursor = m_noteEditor->textCursor(); + if (textCursor.atStart()) { QTextCharFormat fmt; fmt.setForeground(QBrush(m_textColor)); fmt.setFont(m_font); @@ -259,7 +260,6 @@ return; } - QTextCursor textCursor = m_noteEditor->textCursor(); QTextEdit::ExtraSelection textxtra; textxtra.cursor = m_noteEditor->textCursor(); textxtra.cursor.movePosition(QTextCursor::StartOfLine); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/plasmaboard/plasma_applet_plasmaboard.desktop new/kdeplasma-addons-4.8.1/applets/plasmaboard/plasma_applet_plasmaboard.desktop --- old/kdeplasma-addons-4.8.0/applets/plasmaboard/plasma_applet_plasmaboard.desktop 2011-07-27 20:42:28.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/plasmaboard/plasma_applet_plasmaboard.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -72,6 +72,7 @@ Comment[kk]=Экрандағы виртуалды пернетақта Comment[km]=និម្មិត ក្តារចុចលើអេក្រអ់ Comment[ko]=가상 화면상 키보드 +Comment[lt]=Virtuali, ant ekrano esanti klaviatūra Comment[lv]=Virtuāla ekrāna tastatūra Comment[nb]=Et virtuelt tastatur på skjermen Comment[nds]=En virtuell Tastatuur op den Schirm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/rememberthemilk/plasma-applet-rememberthemilk.desktop new/kdeplasma-addons-4.8.1/applets/rememberthemilk/plasma-applet-rememberthemilk.desktop --- old/kdeplasma-addons-4.8.0/applets/rememberthemilk/plasma-applet-rememberthemilk.desktop 2011-07-27 20:42:28.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/rememberthemilk/plasma-applet-rememberthemilk.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -24,6 +24,7 @@ Name[kk]=Remember The Milk Name[km]=ចងចាំ Milk Name[ko]=Remember The Milk +Name[lt]=Prisiminti pieno Name[lv]=Remember The Milk Name[nb]=Husk melk Name[nds]=Dor-An-Denken @@ -71,6 +72,7 @@ Comment[kk]=Remember The Milk істейтін істер тізімі Comment[km]=ចងចាំអាប់ភ្លេតបញ្ជីការងារត្រូវធ្វើ Milk Comment[ko]=Remember The Milk 할 일 목록 애플릿 +Comment[lt]=„Prisiminti pieno“ užduočių sąrašo programėlė Comment[lv]=Remember The Milk darāmo darbu saraksta sīkrīks Comment[nb]=Husk melk – miniprogram for gjøreliste Comment[nds]=Opgavenlist-Lüttprogramm "Dor An Denken" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/rssnow/plasma-applet-rssnow.desktop new/kdeplasma-addons-4.8.1/applets/rssnow/plasma-applet-rssnow.desktop --- old/kdeplasma-addons-4.8.0/applets/rssnow/plasma-applet-rssnow.desktop 2011-07-27 20:42:28.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/rssnow/plasma-applet-rssnow.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -82,6 +82,7 @@ Comment[km]=បង្ហាញព័ត៌មានពីប្រភពផ្សេងៗ Comment[ko]=다양한 뉴스 보여주기 Comment[ku]=Jê çavkaniyên cur bi cur nûçe yan nîşan bide +Comment[lt]=Rodo naujienas iš įvairių šaltinių Comment[lv]=Rāda ziņas no dažādiem avotiem Comment[nb]=Vis nyheter fra ymse kilder Comment[nds]=Narichten vun verscheden Borns wiesen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/social-news/plasma-applet-opendesktop-activities.desktop new/kdeplasma-addons-4.8.1/applets/social-news/plasma-applet-opendesktop-activities.desktop --- old/kdeplasma-addons-4.8.0/applets/social-news/plasma-applet-opendesktop-activities.desktop 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/social-news/plasma-applet-opendesktop-activities.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -126,6 +126,7 @@ Keywords[kk]=Утилиталар Keywords[km]=ឧបករណ៍ប្រើប្រាស់ Keywords[ko]=유틸리티 +Keywords[lt]=Pagalbininkai Keywords[lv]=Palīgrīki Keywords[nb]=Verktøy Keywords[nds]=Warktüüch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/spellcheck/plasma-applet-spellcheck.desktop new/kdeplasma-addons-4.8.1/applets/spellcheck/plasma-applet-spellcheck.desktop --- old/kdeplasma-addons-4.8.0/applets/spellcheck/plasma-applet-spellcheck.desktop 2011-07-27 20:42:28.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/spellcheck/plasma-applet-spellcheck.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -20,6 +20,7 @@ Name[kk]=Емлені тексеру Name[km]=ពិនិត្យអក្ខរាវិរុទ្ធ Name[ko]=맞춤법 검사 +Name[lt]=Rašybos tikrinimas Name[lv]=Pareizrakstības pārbaude Name[nb]=Stavekontroll Name[nds]=Schriefwiesprööv @@ -68,6 +69,7 @@ Comment[kk]=Жылдам емлені тексеру Comment[km]=ការពិនិត្យអក្ខរាវិរុទ្ឋលឿន Comment[ko]=빠른 맞춤법 검사 +Comment[lt]=Greitas rašybos tikrinimas Comment[lv]=Ātra pareizrakstības pārbaude Comment[nb]=Rask stavekontroll Comment[nds]=Gau Klookschriever diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/systemloadviewer/plasma-applet-systemloadviewer.desktop new/kdeplasma-addons-4.8.1/applets/systemloadviewer/plasma-applet-systemloadviewer.desktop --- old/kdeplasma-addons-4.8.0/applets/systemloadviewer/plasma-applet-systemloadviewer.desktop 2011-11-17 21:58:05.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/systemloadviewer/plasma-applet-systemloadviewer.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -78,6 +78,7 @@ Comment[kk]=Шағын CPU/RAM/Swap мониторы Comment[km]=កម្មវិធីត្រួតពិនិត្យ CPU/RAM/Swap តូច Comment[ko]=작은 CPU/RAM/스왑 모니터 +Comment[lt]=Mažas CPU/RAM/SWAP stebėtojas Comment[lv]=Maziņš CPU/RAM/Swap novērotājs Comment[nb]=Liten overvåker for CPU/RAM/veksleminne Comment[nds]=Lierlütt CPU-, RAM- un Utlagerspieker-Kieker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/weather/plasma-applet-weather.desktop new/kdeplasma-addons-4.8.1/applets/weather/plasma-applet-weather.desktop --- old/kdeplasma-addons-4.8.0/applets/weather/plasma-applet-weather.desktop 2011-11-17 21:58:05.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/applets/weather/plasma-applet-weather.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -80,6 +80,7 @@ Comment[kk]=Ауа райы мәліметін көрсету Comment[km]=បង្ហាញព័ត៌មានអាកាសធាតុ Comment[ko]=날씨 정보 표시 +Comment[lt]=Rodo orų prognozės informaciją Comment[lv]=Rāda laikapstākļu informāciju Comment[nb]=Viser værinformasjon Comment[nds]=Wiest Weder-Informatschonen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/applets/weatherstation/plasma-applet-weatherstation.desktop new/kdeplasma-addons-4.8.1/applets/weatherstation/plasma-applet-weatherstation.desktop --- old/kdeplasma-addons-4.8.0/applets/weatherstation/plasma-applet-weatherstation.desktop 2011-07-27 20:42:28.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/applets/weatherstation/plasma-applet-weatherstation.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -81,6 +81,7 @@ Comment[km]=របាយការណ៍អាកាសធាតុជាមួយនឹងរចនាប័ទ្មបង្ហាញ LCD Comment[ko]=LCD 형태로 날씨를 보여 줍니다 Comment[ku]=Raporên hewayê bi teşeya nîşandana LCD re +Comment[lt]=Orų prognozės LCD ekrano stiliuje Comment[lv]=Rāda laika ziņas LCD stilā Comment[nb]=Værmeldinger med visning i LCD-stil Comment[nds]=Wederberichten mit en LCD-Dorstellstil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/containments/groupingdesktop/panel/groupingpanel.cpp new/kdeplasma-addons-4.8.1/containments/groupingdesktop/panel/groupingpanel.cpp --- old/kdeplasma-addons-4.8.0/containments/groupingdesktop/panel/groupingpanel.cpp 2011-07-27 20:42:29.000000000 +0200 +++ new/kdeplasma-addons-4.8.1/containments/groupingdesktop/panel/groupingpanel.cpp 2012-02-29 23:57:26.000000000 +0100 @@ -31,6 +31,7 @@ #include <Plasma/View> #include <Plasma/PaintUtils> #include <Plasma/Corona> +#include <Plasma/WindowEffects> #include "../lib/abstractgroup.h" @@ -340,7 +341,9 @@ updateBorders(viewGeom); if (containmentOpt && containmentOpt->view && !m_background->mask().isEmpty()) { - containmentOpt->view->setMask(m_background->mask()); + const QRegion mask = m_background->mask(); + containmentOpt->view->setMask(mask); + Plasma::WindowEffects::enableBlurBehind(containmentOpt->view->winId(), true, mask); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/containments/groupingdesktop/panel/plasma-containment-groupingpanel.desktop new/kdeplasma-addons-4.8.1/containments/groupingdesktop/panel/plasma-containment-groupingpanel.desktop --- old/kdeplasma-addons-4.8.0/containments/groupingdesktop/panel/plasma-containment-groupingpanel.desktop 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/containments/groupingdesktop/panel/plasma-containment-groupingpanel.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -5,7 +5,7 @@ Name[ca@valencia]=Plafó agrupat Name[cs]=Seskupovací panel Name[da]=Grupperingspanel -Name[de]=Kontrollleistengruppierung +Name[de]=Gruppen-Kontrollleiste Name[el]=Grouping Panel Name[en_GB]=Grouping Panel Name[es]=Panel de agrupamiento diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/dataengines/kdecommits/plasma-engine-kdecommits.desktop new/kdeplasma-addons-4.8.1/dataengines/kdecommits/plasma-engine-kdecommits.desktop --- old/kdeplasma-addons-4.8.0/dataengines/kdecommits/plasma-engine-kdecommits.desktop 2011-12-20 20:14:34.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/dataengines/kdecommits/plasma-engine-kdecommits.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -24,6 +24,7 @@ Name[pt]=Motor de Envios do KDE Name[pt_BR]=Mecanismo dos commits do KDE Name[ru]=Источник данных об изменениях в репозиториях KDE +Name[sk]=Engine commitov KDE Name[sr]=мотор КДЕ‑ових предаја Name[sr@ijekavian]=мотор КДЕ‑ових предаја Name[sr@ijekavianlatin]=motor KDE‑ovih predaja @@ -59,6 +60,7 @@ Comment[pt]=Um motor de dados para adquirir dados consolidados acerca dos projectos envios do KDE para o SVN Comment[pt_BR]=Um mecanismo de dados para obtenção de dados consolidados sobre os commits do KDE SVN Comment[ru]=Поставщик данных для сбора общих данных об изменениях в репозиториях KDE +Comment[sk]=Dátový nástroj pre získavanie konsolidačných dát o KDE SVN commitoch Comment[sr]=Датомотор за добављање систематизованих података о КДЕ‑овим СВН предајама Comment[sr@ijekavian]=Датомотор за добављање систематизованих података о КДЕ‑овим СВН предајама Comment[sr@ijekavianlatin]=Datomotor za dobavljanje sistematizovanih podataka o KDE‑ovim SVN predajama diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop new/kdeplasma-addons-4.8.1/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop --- old/kdeplasma-addons-4.8.0/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop 2012-01-18 19:49:55.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -14,12 +14,14 @@ Name[it]=Motore dati per Kimpanel Name[kk]=Kimpanel-дің деректер тетігі Name[km]=ម៉ាស៊ីនទិន្នន័យសម្រាប់ Kimpanel +Name[ko]=Kimpanel 데이터 엔진 Name[lv]=Datu dzinējs priekš Kimpanel Name[nb]=Datamotor for Kimpanel Name[nds]=Datenkarn för Kimpaneel Name[nl]=Gegevens-engine voor Kimpanel Name[pt]=Motor de dados do Kimpanel Name[pt_BR]=Mecanismo de dados para o Kimpanel +Name[sk]=Dátový engine pre Kimpanel Name[sr]=Датомотор К‑ИМ‑панела Name[sr@ijekavian]=Датомотор К‑ИМ‑панела Name[sr@ijekavianlatin]=Datomotor KIMPanela @@ -44,12 +46,14 @@ Comment[it]=Motore dati per Kimpanel Comment[kk]=Kimpanel-дің деректер тетігі Comment[km]=ម៉ាស៊ីនទិន្នន័យសម្រាប់ Kimpanel +Comment[ko]=Kimpanel 데이터 엔진 Comment[lv]=Datu dzinējs priekš Kimpanel Comment[nb]=Datamotor for Kimpanel Comment[nds]=Datenkarn för Kimpaneel Comment[nl]=Gegevens-engine voor Kimpanel Comment[pt]=Motor de dados do Kimpanel Comment[pt_BR]=Mecanismo de dados para o Kimpanel +Comment[sk]=Dátový engine pre Kimpanel Comment[sr]=Датомотор К‑ИМ‑панела Comment[sr@ijekavian]=Датомотор К‑ИМ‑панела Comment[sr@ijekavianlatin]=Datomotor KIMPanela diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/dataengines/potd/oseiprovider.desktop new/kdeplasma-addons-4.8.1/dataengines/potd/oseiprovider.desktop --- old/kdeplasma-addons-4.8.0/dataengines/potd/oseiprovider.desktop 2011-11-04 15:36:24.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/dataengines/potd/oseiprovider.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -26,6 +26,7 @@ Name[it]=Operational Significant Event Imagery Picture of the Day Name[kk]=Operational Significant Event Imagery (Osei) "Тәулік суреті" Name[km]=រូបភាពសមើលស្រមៃព្រឹត្តិការណ៍ដ៏មានសារៈសំខាន់នៃប្រតិបត្តិការណ៍នៃថ្ងៃ +Name[ko]=오늘의 중요한 사건 그림 Name[lv]=Operational Significant Event Imagery dienas attēls Name[nb]=Dagens bilde om betydelige miljøhendelser Name[nds]=Operational Significant Event Imagery (OSEI)-Bild för Vundaag @@ -70,6 +71,7 @@ Comment[ja]=Osei のプロバイダ Comment[kk]=Osei таратушысы Comment[km]=ក្រុមហ៊ុនផ្ដល់ Osei +Comment[ko]=OSEI 공급자 Comment[lv]=Osei piegādātājs Comment[nb]=Osei-leverandør Comment[nds]=Osei-Anbeder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop new/kdeplasma-addons-4.8.1/runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop --- old/kdeplasma-addons-4.8.0/runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop 2011-11-04 15:36:24.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -20,6 +20,7 @@ Name[kk]=Аудоплейерді басқару Name[km]=ត្រួតពិនិត្យកម្មវិធីចាក់អូឌីយ៉ូ Name[ko]=오디오 재생기 제어 +Name[lt]=Valdyti audio grotuvą Name[lv]=Kontrolēt audio atskaņotāju Name[nb]=Styr mediaspiller Name[nds]=Klangafspelerkuntrull @@ -62,6 +63,7 @@ Comment[kk]=MPRIS аудиоплейерлерді басқаруға мүмкіндік береді (ол Amarok-тың жиындардық ақтара алады) Comment[km]=អនុញ្ញាតឲ្យត្រួតពិនិត្យកម្មវិធីចាក់អូឌីយ៉ូ MPRIS (វាអាចស្វែងរកតាមរយៈសម្រាំងរបស់ Amarok បានផងដែរ) Comment[ko]=MPRIS 오디오 재생기 제어 (Amarok 모음집 검색 기능 포함) +Comment[lt]=Leidžia valdyti MPRIS audio grotuvus (tai galima ieškoti per Amarok fonetiką taip pat) Comment[lv]=Ļauj kontrolēt MPRIS audio atskaņotājus (spēj arī meklēt Amarok kolekcijā) Comment[nb]=Kan styre MPRIS-lydspillere (det kan også søke gjennom Amaroks samling) Comment[nds]=Stüern för MPRIS-Klangafspelers (kann ok Amarok sien Sammeln dörkieken) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.8.0/runners/audioplayercontrol/plasma-runner-audioplayercontrol_config.desktop new/kdeplasma-addons-4.8.1/runners/audioplayercontrol/plasma-runner-audioplayercontrol_config.desktop --- old/kdeplasma-addons-4.8.0/runners/audioplayercontrol/plasma-runner-audioplayercontrol_config.desktop 2011-11-04 15:36:24.000000000 +0100 +++ new/kdeplasma-addons-4.8.1/runners/audioplayercontrol/plasma-runner-audioplayercontrol_config.desktop 2012-02-29 23:57:26.000000000 +0100 @@ -26,6 +26,7 @@ Name[kk]=Аудоплейерді басқару Name[km]=ត្រួតពិនិត្យកម្មវិធីចាក់អូឌីយ៉ូ Name[ko]=오디오 재생기 제어 +Name[lt]=Valdyti audio grotuvą Name[lv]=Kontrolēt audio atskaņotāju Name[nb]=Styr mediaspiller Name[nds]=Klangafspelerkuntrull -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package perl-qt4 for openSUSE:Factory checked in at 2012-03-13 09:38:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-qt4 (Old) and /work/SRC/openSUSE:Factory/.perl-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-qt4", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-qt4/perl-qt4.changes 2012-01-31 10:21:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-qt4.new/perl-qt4.changes 2012-03-13 09:38:28.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:26:45 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- perlqt-4.8.0-fix_qwt_cmake.patch perlqt-4.8.0.tar.bz2 New: ---- perlqt-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-qt4.spec ++++++ --- /var/tmp/diff_new_pack.yA5jPo/_old 2012-03-13 09:38:29.000000000 +0100 +++ /var/tmp/diff_new_pack.yA5jPo/_new 2012-03-13 09:38:29.000000000 +0100 @@ -15,15 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: perl-qt4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: PerlQt kdebindings library License: GPL-2.0+ Group: Development/Languages/Perl Url: https://projects.kde.org/projects/kde/kdebindings/perl/perlqt Source0: perlqt-%{version}.tar.bz2 -Patch0: perlqt-4.8.0-fix_qwt_cmake.patch BuildRequires: cmake BuildRequires: kde4-filesystem BuildRequires: kdebindings-smokegen @@ -52,7 +52,6 @@ %prep %setup -q -n perlqt-%{version} -%patch0 %build EXTRA_FLAGS="-DCUSTOM_PERL_SITE_ARCH_DIR=`perl -MConfig -e 'print $Config{vendorarch}'`" ++++++ perlqt-4.8.0.tar.bz2 -> perlqt-4.8.1.tar.bz2 ++++++ ++++ 2879 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-namespace-clean for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package perl-namespace-clean for openSUSE:Factory checked in at 2012-03-13 09:38:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-namespace-clean (Old) and /work/SRC/openSUSE:Factory/.perl-namespace-clean.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-namespace-clean", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-namespace-clean/perl-namespace-clean.changes 2012-02-14 11:25:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-namespace-clean.new/perl-namespace-clean.changes 2012-03-13 09:38:18.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 2 01:01:37 CET 2012 - ro(a)suse.de + +- remove perl-namespace-clean-use_lib.patch and use sed statement + instead (less likely to break with every package update) + +------------------------------------------------------------------- +Thu Mar 1 01:27:28 CET 2012 - ro(a)suse.de + +- update perl-namespace-clean-use_lib.patch + +------------------------------------------------------------------- Old: ---- perl-namespace-clean-use_lib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-namespace-clean.spec ++++++ --- /var/tmp/diff_new_pack.CUfwct/_old 2012-03-13 09:38:19.000000000 +0100 +++ /var/tmp/diff_new_pack.CUfwct/_new 2012-03-13 09:38:19.000000000 +0100 @@ -25,8 +25,6 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/namespace-clean/ Source: http://www.cpan.org/authors/id/R/RI/RIBASUSHI/%{cpan_name}-%{version}.tar.gz -# MANUAL -Patch1: perl-namespace-clean-use_lib.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -58,8 +56,12 @@ %prep %setup -q -n %{cpan_name}-%{version} %if 0%{?suse_version} <= 1110 -%patch1 -p1 -sed -i "s|__vendorperl__|%{perl_vendorlib}|g" Makefile.PL t/*.t +for i in `find t -type f` ; do + sed -i -e "s@^\s*use\s\s*Test::More@use lib '%{perl_vendorlib}';\nuse Test::More@" $i +done +# fail due to missing Sub/Name.pm +rm -f t/07-debugger.t +rm -f t/10-pure-perl.t %endif %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Moose for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package perl-Moose for openSUSE:Factory checked in at 2012-03-13 09:38:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Moose (Old) and /work/SRC/openSUSE:Factory/.perl-Moose.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Moose", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Moose/perl-Moose.changes 2011-12-27 18:38:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Moose.new/perl-Moose.changes 2012-03-13 09:38:15.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 2 01:01:06 CET 2012 - ro(a)suse.de + +- remove perl-Moose-old_Test-More.patch and use sed statement + instead (less likely to break with each package update) + +------------------------------------------------------------------- +Thu Mar 1 01:17:21 CET 2012 - ro(a)suse.de + +- update perl-Moose-old_Test-More.patch + +------------------------------------------------------------------- Old: ---- perl-Moose-old_Test-More.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Moose.spec ++++++ --- /var/tmp/diff_new_pack.Ft5HsF/_old 2012-03-13 09:38:16.000000000 +0100 +++ /var/tmp/diff_new_pack.Ft5HsF/_new 2012-03-13 09:38:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Moose # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -25,7 +25,6 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Moose/ Source: http://www.cpan.org/authors/id/D/DO/DOY/%{cpan_name}-%{version}.tar.gz -Patch1: perl-Moose-old_Test-More.patch Patch2: perl-Moose-apply_role.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # MANUAL @@ -61,10 +60,13 @@ BuildRequires: perl(Test::Output) BuildRequires: perl(Test::Requires) >= 0.05 BuildRequires: perl(Try::Tiny) >= 0.02 +Requires: perl(Class::Load) >= 0.09 +Requires: perl(Class::Load::XS) >= 0.01 Requires: perl(Data::OptList) +Requires: perl(Data::OptList) >= 0.107 Requires: perl(Devel::GlobalDestruction) -Requires: perl(Eval::Closure) >= 0.04 Requires: perl(Dist::CheckConflicts) >= 0.02 +Requires: perl(Eval::Closure) >= 0.04 Requires: perl(List::MoreUtils) >= 0.28 Requires: perl(MRO::Compat) >= 0.05 Requires: perl(Package::DeprecationManager) >= 0.11 @@ -76,9 +78,6 @@ Requires: perl(Sub::Name) >= 0.05 Requires: perl(Task::Weaken) Requires: perl(Try::Tiny) >= 0.02 -Requires: perl(Class::Load) >= 0.09 -Requires: perl(Class::Load::XS) >= 0.01 -Requires: perl(Data::OptList) >= 0.107 %{perl_requires} @@ -97,24 +96,13 @@ %prep %setup -q -n %{cpan_name}-%{version} %if 0%{?suse_version} <= 1110 -%patch1 -p0 -rm t/bugs/universal_methods_wrappable.t -rm t/cmop/metaclass_incompatibility.t -rm t/compat/composite_metaroles.t -rm t/compat/extends_nonmoose_that_isa_moose_with_metarole.t -rm t/metaclasses/easy_init_meta.t -rm t/metaclasses/moose_exporter_trait_aliases.t -rm t/moose_util/with_traits.t -rm t/native_traits/collection_with_roles.t -rm t/roles/apply_role.t -rm t/roles/method_modifiers.t -rm t/todo_tests/required_role_accessors.t -rm t/todo_tests/various_role_features.t -# Don't know which tests failed: got 5 ok, expected 0 -rm t/test_moose/test_moose_does_ok.t -rm t/test_moose/test_moose_has_attribute_ok.t -rm t/test_moose/test_moose_meta_ok.t -rm t/test_moose/with_immutable.t +for i in `find t -type f` ; do + sed -i -e "s@^\s*use\s\s*Test::More@use lib '%{perl_vendorlib}';\nuse Test::More@" $i +done +rm -f t/test_moose/test_moose_does_ok.t +rm -f t/test_moose/test_moose_has_attribute_ok.t +rm -f t/test_moose/test_moose_meta_ok.t +rm -f t/test_moose/with_immutable.t %else %patch2 -p0 %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-MailTools for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package perl-MailTools for openSUSE:Factory checked in at 2012-03-13 09:38:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MailTools (Old) and /work/SRC/openSUSE:Factory/.perl-MailTools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MailTools", Maintainer is "DLovasko(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MailTools/perl-MailTools.changes 2011-09-23 12:38:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-MailTools.new/perl-MailTools.changes 2012-03-13 09:38:14.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 01 19:46:02 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 2.09: + * remove dependency to Test::Pod by moving 99pod.t from t/ to xt/ as result + of RT#69918 + +------------------------------------------------------------------- Old: ---- MailTools-2.08.tar.gz New: ---- MailTools-2.09.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MailTools.spec ++++++ --- /var/tmp/diff_new_pack.ngsOzN/_old 2012-03-13 09:38:15.000000000 +0100 +++ /var/tmp/diff_new_pack.ngsOzN/_new 2012-03-13 09:38:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-MailTools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -20,7 +20,7 @@ Name: perl-MailTools Url: http://cpan.org/modules/by-module/Mail/ -Version: 2.08 +Version: 2.09 Release: 1 Provides: p_mtools = %{version} Obsoletes: p_mtools < %{version} ++++++ MailTools-2.08.tar.gz -> MailTools-2.09.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/ChangeLog new/MailTools-2.09/ChangeLog --- old/MailTools-2.08/ChangeLog 2011-06-01 13:55:38.000000000 +0200 +++ new/MailTools-2.09/ChangeLog 2012-02-25 14:47:44.000000000 +0100 @@ -1,6 +1,13 @@ ==== version history for MailTools +version 2.09: Sat Feb 25 14:47:39 CET 2012 + + Improvements: + + - remove dependency to Test::Pod by moving 99pod.t from t/ + to xt/ as result of rt.cpan.org#69918 [Martin Mokrejs] + version 2.08: Wed Jun 1 13:55:34 CEST 2011 Fixes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/MANIFEST new/MailTools-2.09/MANIFEST --- old/MailTools-2.08/MANIFEST 2011-06-01 13:55:40.000000000 +0200 +++ new/MailTools-2.09/MANIFEST 2012-02-25 14:47:47.000000000 +0100 @@ -38,7 +38,6 @@ lib/Mail/Send.pod lib/Mail/Util.pm lib/Mail/Util.pod -t/99pod.t t/extract.t t/header.t t/internet.t @@ -46,4 +45,5 @@ t/mailer.t t/require.t t/send.t +xt/99pod.t META.yml Module meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/META.yml new/MailTools-2.09/META.yml --- old/MailTools-2.08/META.yml 2011-06-01 13:55:40.000000000 +0200 +++ new/MailTools-2.09/META.yml 2012-02-25 14:47:47.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: MailTools -version: 2.08 +version: 2.09 abstract: Various e-mail related modules author: - Mark Overmeer <perl(a)overmeer.net> @@ -17,7 +17,6 @@ Net::Domain: 1.05 Net::SMTP: 1.03 Test::More: 0 - Test::Pod: 1 no_index: directory: - t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/Makefile.PL new/MailTools-2.09/Makefile.PL --- old/MailTools-2.08/Makefile.PL 2011-06-01 13:55:23.000000000 +0200 +++ new/MailTools-2.09/Makefile.PL 2012-02-25 14:47:44.000000000 +0100 @@ -4,7 +4,7 @@ WriteMakefile ( DISTNAME => 'MailTools' - , VERSION => '2.08' + , VERSION => '2.09' , NAME => 'Mail' , AUTHOR => 'Mark Overmeer <perl(a)overmeer.net>' , ABSTRACT => 'Various e-mail related modules' @@ -15,7 +15,6 @@ , Net::Domain => 1.05 , IO::Handle => 0.00 , Test::More => 0.00 - , Test::Pod => 1.00 , Date::Format => 0 , Date::Parse => 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Address.pm new/MailTools-2.09/lib/Mail/Address.pm --- old/MailTools-2.08/lib/Mail/Address.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Address.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,10 +1,10 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. package Mail::Address; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use strict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Address.pod new/MailTools-2.09/lib/Mail/Address.pod --- old/MailTools-2.08/lib/Mail/Address.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Address.pod 2012-02-25 14:47:45.000000000 +0100 @@ -80,11 +80,11 @@ =over 4 -=item $obj-E<gt>B<address> +=item $obj-E<gt>B<address>() Return the address part of the object. -=item $obj-E<gt>B<comment> +=item $obj-E<gt>B<comment>() Return the comment part of the object @@ -95,7 +95,7 @@ the first ADDRESS to be used; other specified ADDRESSes will be appended, separated with commas. -=item $obj-E<gt>B<phrase> +=item $obj-E<gt>B<phrase>() Return the phrase part of the object. @@ -105,16 +105,16 @@ =over 4 -=item $obj-E<gt>B<host> +=item $obj-E<gt>B<host>() Return the address excluding the user id and '@' -=item $obj-E<gt>B<name> +=item $obj-E<gt>B<name>() Using the information contained within the object attempt to identify what the person or groups name is. -=item $obj-E<gt>B<user> +=item $obj-E<gt>B<user>() Return the address excluding the '@' and the mail domain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Cap.pm new/MailTools-2.09/lib/Mail/Cap.pm --- old/MailTools-2.08/lib/Mail/Cap.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Cap.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,10 +1,10 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. package Mail::Cap; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use strict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Field/AddrList.pm new/MailTools-2.09/lib/Mail/Field/AddrList.pm --- old/MailTools-2.08/lib/Mail/Field/AddrList.pm 2011-06-01 13:55:38.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Field/AddrList.pm 2012-02-25 14:47:44.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ package Mail::Field::AddrList; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Mail::Field'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Field/AddrList.pod new/MailTools-2.09/lib/Mail/Field/AddrList.pod --- old/MailTools-2.08/lib/Mail/Field/AddrList.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Field/AddrList.pod 2012-02-25 14:47:45.000000000 +0100 @@ -66,7 +66,7 @@ See L<Mail::Field/""Fake" constructors"> -=item $obj-E<gt>B<parse> +=item $obj-E<gt>B<parse>() See L<Mail::Field/""Fake" constructors"> @@ -80,13 +80,13 @@ See L<Mail::Field/"Accessors"> -=item $obj-E<gt>B<stringify> +=item $obj-E<gt>B<stringify>() See L<Mail::Field/"Accessors"> -=item $obj-E<gt>B<tag> +=item $obj-E<gt>B<tag>() -=item Mail::Field::AddrList-E<gt>B<tag> +=item Mail::Field::AddrList-E<gt>B<tag>() See L<Mail::Field/"Accessors"> @@ -96,15 +96,15 @@ =over 4 -=item $obj-E<gt>B<addr_list> +=item $obj-E<gt>B<addr_list>() Returns the collected L<Mail::Address|Mail::Address> objects. -=item $obj-E<gt>B<addresses> +=item $obj-E<gt>B<addresses>() Returns a list if email addresses, found in the field content. -=item $obj-E<gt>B<names> +=item $obj-E<gt>B<names>() Returns a list of nicely formatted named, for each of the addresses found in the content. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Field/Date.pm new/MailTools-2.09/lib/Mail/Field/Date.pm --- old/MailTools-2.08/lib/Mail/Field/Date.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Field/Date.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ package Mail::Field::Date; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Mail::Field'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Field/Date.pod new/MailTools-2.09/lib/Mail/Field/Date.pod --- old/MailTools-2.08/lib/Mail/Field/Date.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Field/Date.pod 2012-02-25 14:47:45.000000000 +0100 @@ -44,7 +44,7 @@ See L<Mail::Field/""Fake" constructors"> -=item $obj-E<gt>B<parse> +=item $obj-E<gt>B<parse>() See L<Mail::Field/""Fake" constructors"> @@ -70,13 +70,13 @@ =back -=item $obj-E<gt>B<stringify> +=item $obj-E<gt>B<stringify>() See L<Mail::Field/"Accessors"> -=item $obj-E<gt>B<tag> +=item $obj-E<gt>B<tag>() -=item Mail::Field::Date-E<gt>B<tag> +=item Mail::Field::Date-E<gt>B<tag>() See L<Mail::Field/"Accessors"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Field/Generic.pm new/MailTools-2.09/lib/Mail/Field/Generic.pm --- old/MailTools-2.08/lib/Mail/Field/Generic.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Field/Generic.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,10 +1,10 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. package Mail::Field::Generic; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use Carp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Field/Generic.pod new/MailTools-2.09/lib/Mail/Field/Generic.pod --- old/MailTools-2.08/lib/Mail/Field/Generic.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Field/Generic.pod 2012-02-25 14:47:45.000000000 +0100 @@ -69,13 +69,13 @@ See L<Mail::Field/"Accessors"> -=item $obj-E<gt>B<stringify> +=item $obj-E<gt>B<stringify>() See L<Mail::Field/"Accessors"> -=item $obj-E<gt>B<tag> +=item $obj-E<gt>B<tag>() -=item Mail::Field::Generic-E<gt>B<tag> +=item Mail::Field::Generic-E<gt>B<tag>() See L<Mail::Field/"Accessors"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Field.pm new/MailTools-2.09/lib/Mail/Field.pm --- old/MailTools-2.08/lib/Mail/Field.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Field.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,10 +1,10 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. package Mail::Field; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use Carp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Field.pod new/MailTools-2.09/lib/Mail/Field.pod --- old/MailTools-2.08/lib/Mail/Field.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Field.pod 2012-02-25 14:47:45.000000000 +0100 @@ -75,7 +75,7 @@ When called on an existing object, its original content will get replaced. -=item $obj-E<gt>B<parse> +=item $obj-E<gt>B<parse>() Parse a field line. @@ -89,13 +89,13 @@ Change the settings (the content, but then smart) of this field. -=item $obj-E<gt>B<stringify> +=item $obj-E<gt>B<stringify>() Returns the field as a string. -=item $obj-E<gt>B<tag> +=item $obj-E<gt>B<tag>() -=item Mail::Field-E<gt>B<tag> +=item Mail::Field-E<gt>B<tag>() Return the tag (in the correct case) for this item. Well, actually any casing is OK, because the field tags are treated case-insentitive; however diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Filter.pm new/MailTools-2.09/lib/Mail/Filter.pm --- old/MailTools-2.08/lib/Mail/Filter.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Filter.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,11 +1,11 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. use strict; package Mail::Filter; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use Carp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Filter.pod new/MailTools-2.09/lib/Mail/Filter.pod --- old/MailTools-2.08/lib/Mail/Filter.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Filter.pod 2012-02-25 14:47:45.000000000 +0100 @@ -64,13 +64,13 @@ be passed through the filter list. If the first argument is a C<Mail::Folder> object, then each message in turn will be passed through the filter list. -=item $obj-E<gt>B<folder> +=item $obj-E<gt>B<folder>() While the C<filter> method is called with a C<Mail::Folder> object, these filter subroutines can call this method to obtain the folder object that is being processed. -=item $obj-E<gt>B<msgnum> +=item $obj-E<gt>B<msgnum>() If the C<filter> method is called with a C<Mail::Folder> object, then the filter subroutines may call this method to obtain the message number diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Header.pm new/MailTools-2.09/lib/Mail/Header.pm --- old/MailTools-2.08/lib/Mail/Header.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Header.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,10 +1,10 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. package Mail::Header; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use strict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Header.pod new/MailTools-2.09/lib/Mail/Header.pod --- old/MailTools-2.08/lib/Mail/Header.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Header.pod 2012-02-25 14:47:45.000000000 +0100 @@ -33,7 +33,7 @@ =over 4 -=item $obj-E<gt>B<dup> +=item $obj-E<gt>B<dup>() Create a duplicate of the current object. @@ -81,7 +81,7 @@ =over 4 -=item $obj-E<gt>B<empty> +=item $obj-E<gt>B<empty>() Empty an existing C<Mail::Header> object of all lines. @@ -158,11 +158,11 @@ the new line will be inserted into the header at the given point, otherwise the new line will be appended to the end of the header. -=item $obj-E<gt>B<as_string> +=item $obj-E<gt>B<as_string>() Returns the header as a single string. -=item $obj-E<gt>B<cleanup> +=item $obj-E<gt>B<cleanup>() Remove any header line that, other than the tag, only contains whitespace @@ -211,7 +211,7 @@ first instance of the tag is replaced. If the tag does not appear in the header then a new line will be appended to the header. -=item $obj-E<gt>B<tags> +=item $obj-E<gt>B<tags>() Returns an array of all the tags that exist in the header. Each tag will only appear in the list once. The order of the tags is not specified. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Internet.pm new/MailTools-2.09/lib/Mail/Internet.pm --- old/MailTools-2.08/lib/Mail/Internet.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Internet.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,10 +1,10 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. package Mail::Internet; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use strict; # use warnings? probably breaking too much code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Internet.pod new/MailTools-2.09/lib/Mail/Internet.pod --- old/MailTools-2.08/lib/Mail/Internet.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Internet.pod 2012-02-25 14:47:45.000000000 +0100 @@ -25,7 +25,7 @@ =over 4 -=item $obj-E<gt>B<dup> +=item $obj-E<gt>B<dup>() Duplicate the message as a whole. Both header and body will be deep-copied: a new L<Mail::Internet|Mail::Internet> object is returned. @@ -89,7 +89,7 @@ and not copied, so any subsequent changes to the array will change the contents of the body. -=item $obj-E<gt>B<head> +=item $obj-E<gt>B<head>() Returns the C<Mail::Header> object which holds the headers for the current message @@ -106,7 +106,7 @@ given and true, indicates that L<escape_from()|Mail::Internet/"High-level functionality"> has already been called on this object. -=item $obj-E<gt>B<as_string> +=item $obj-E<gt>B<as_string>() Returns the message as a single string. @@ -210,7 +210,7 @@ =back -=item $obj-E<gt>B<tidy_body> +=item $obj-E<gt>B<tidy_body>() Removes all leading and trailing lines from the body that only contain white spaces. @@ -221,7 +221,7 @@ =over 4 -=item $obj-E<gt>B<escape_from> +=item $obj-E<gt>B<escape_from>() It can cause problems with some applications if a message contains a line starting with C<`From '>, in particular when attempting to split a folder. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Mailer/qmail.pm new/MailTools-2.09/lib/Mail/Mailer/qmail.pm --- old/MailTools-2.08/lib/Mail/Mailer/qmail.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Mailer/qmail.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -7,7 +7,7 @@ package Mail::Mailer::qmail; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Mail::Mailer::rfc822'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Mailer/rfc822.pm new/MailTools-2.09/lib/Mail/Mailer/rfc822.pm --- old/MailTools-2.08/lib/Mail/Mailer/rfc822.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Mailer/rfc822.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ package Mail::Mailer::rfc822; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Mail::Mailer'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Mailer/sendmail.pm new/MailTools-2.09/lib/Mail/Mailer/sendmail.pm --- old/MailTools-2.08/lib/Mail/Mailer/sendmail.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Mailer/sendmail.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ package Mail::Mailer::sendmail; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Mail::Mailer::rfc822'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Mailer/smtp.pm new/MailTools-2.09/lib/Mail/Mailer/smtp.pm --- old/MailTools-2.08/lib/Mail/Mailer/smtp.pm 2011-06-01 13:55:38.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Mailer/smtp.pm 2012-02-25 14:47:44.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ package Mail::Mailer::smtp; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Mail::Mailer::rfc822'; @@ -87,7 +87,7 @@ package Mail::Mailer::smtp::pipe; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; sub TIEHANDLE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Mailer/smtps.pm new/MailTools-2.09/lib/Mail/Mailer/smtps.pm --- old/MailTools-2.08/lib/Mail/Mailer/smtps.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Mailer/smtps.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -8,7 +8,7 @@ package Mail::Mailer::smtps; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Mail::Mailer::rfc822'; @@ -90,7 +90,7 @@ package Mail::Mailer::smtps::pipe; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; sub TIEHANDLE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Mailer/testfile.pm new/MailTools-2.09/lib/Mail/Mailer/testfile.pm --- old/MailTools-2.08/lib/Mail/Mailer/testfile.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Mailer/testfile.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ package Mail::Mailer::testfile; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Mail::Mailer::rfc822'; @@ -36,7 +36,7 @@ package Mail::Mailer::testfile::pipe; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; sub TIEHANDLE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Mailer.pm new/MailTools-2.09/lib/Mail/Mailer.pm --- old/MailTools-2.08/lib/Mail/Mailer.pm 2011-06-01 13:55:38.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Mailer.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ package Mail::Mailer; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'IO::Handle'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Send.pm new/MailTools-2.09/lib/Mail/Send.pm --- old/MailTools-2.08/lib/Mail/Send.pm 2011-06-01 13:55:38.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Send.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ use strict; package Mail::Send; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use Carp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Util.pm new/MailTools-2.09/lib/Mail/Util.pm --- old/MailTools-2.08/lib/Mail/Util.pm 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Util.pm 2012-02-25 14:47:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyrights 1995-2011 by Mark Overmeer <perl(a)overmeer.net>. +# Copyrights 1995-2012 by Mark Overmeer <perl(a)overmeer.net>. # For other contributors see ChangeLog. # See the manual pages for details on the licensing terms. # Pod stripped from pm file by OODoc 2.00. @@ -6,7 +6,7 @@ package Mail::Util; use vars '$VERSION'; -$VERSION = '2.08'; +$VERSION = '2.09'; use base 'Exporter'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/lib/Mail/Util.pod new/MailTools-2.09/lib/Mail/Util.pod --- old/MailTools-2.08/lib/Mail/Util.pod 2011-06-01 13:55:39.000000000 +0200 +++ new/MailTools-2.09/lib/Mail/Util.pod 2012-02-25 14:47:46.000000000 +0100 @@ -21,7 +21,7 @@ =over 4 -=item B<mailaddress> +=item B<mailaddress>() Return a guess at the current users mail address. The user can force the return value by setting the MAILADDRESS environment variable. @@ -43,7 +43,7 @@ use Mail::Util 'mailaddress'; print mailaddress; -=item B<maildomain> +=item B<maildomain>() Attempt to determine the current uers mail domain string via the following methods diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/t/99pod.t new/MailTools-2.09/t/99pod.t --- old/MailTools-2.08/t/99pod.t 2011-06-01 13:55:23.000000000 +0200 +++ new/MailTools-2.09/t/99pod.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/usr/bin/perl -use warnings; -use strict; - -use Test::More; - -BEGIN -{ eval "use Test::Pod 1.00"; - plan skip_all => "Test::Pod 1.00 required for testing POD" if $@; - - plan skip_all => "devel home uses OODoc" - if $ENV{MARKOV_DEVEL}; -} - -all_pod_files_ok(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MailTools-2.08/xt/99pod.t new/MailTools-2.09/xt/99pod.t --- old/MailTools-2.08/xt/99pod.t 1970-01-01 01:00:00.000000000 +0100 +++ new/MailTools-2.09/xt/99pod.t 2012-02-25 14:47:44.000000000 +0100 @@ -0,0 +1,7 @@ +#!/usr/bin/perl +use warnings; +use strict; + +use Test::Pod; + +all_pod_files_ok(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package perl-kde4 for openSUSE:Factory checked in at 2012-03-13 09:38:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-kde4 (Old) and /work/SRC/openSUSE:Factory/.perl-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-kde4", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-kde4/perl-kde4.changes 2012-01-27 15:23:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-kde4.new/perl-kde4.changes 2012-03-13 09:38:12.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:26:41 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- perlkde-4.8.0.tar.bz2 New: ---- perlkde-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-kde4.spec ++++++ --- /var/tmp/diff_new_pack.JxpZev/_old 2012-03-13 09:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.JxpZev/_new 2012-03-13 09:38:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-kde4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Kdebindings Perl-KDE library License: LGPL-2.1+ ++++++ perlkde-4.8.0.tar.bz2 -> perlkde-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit parley for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package parley for openSUSE:Factory checked in at 2012-03-13 09:37:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parley (Old) and /work/SRC/openSUSE:Factory/.parley.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parley", Maintainer is "parley" Changes: -------- --- /work/SRC/openSUSE:Factory/parley/parley.changes 2012-01-30 12:27:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.parley.new/parley.changes 2012-03-13 09:38:10.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:25:56 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- parley-4.8.0.tar.bz2 New: ---- parley-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parley.spec ++++++ --- /var/tmp/diff_new_pack.hvsLU1/_old 2012-03-13 09:38:11.000000000 +0100 +++ /var/tmp/diff_new_pack.hvsLU1/_new 2012-03-13 09:38:11.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: parley BuildRequires: avogadro-devel BuildRequires: boost-devel @@ -39,7 +40,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Vocabulary Trainer License: GPL-2.0+ ++++++ parley-4.8.0.tar.bz2 -> parley-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/parley/parley-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.parley.new/parley-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-icon-theme for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package oxygen-icon-theme for openSUSE:Factory checked in at 2012-03-13 09:37:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-icon-theme (Old) and /work/SRC/openSUSE:Factory/.oxygen-icon-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-icon-theme", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-icon-theme/oxygen-icon-theme.changes 2012-01-27 21:27:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-icon-theme.new/oxygen-icon-theme.changes 2012-03-13 09:37:51.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:25:03 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- oxygen-icons-4.8.0.tar.bz2 New: ---- oxygen-icons-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.IuJI2V/_old 2012-03-13 09:38:09.000000000 +0100 +++ /var/tmp/diff_new_pack.IuJI2V/_new 2012-03-13 09:38:09.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: oxygen-icon-theme -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Oxygen Icon Theme License: LGPL-2.1+ ++++++ oxygen-icons-4.8.0.tar.bz2 -> oxygen-icons-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/oxygen-icon-theme/oxygen-icons-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.oxygen-icon-theme.new/oxygen-icons-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package oxygen-gtk3 for openSUSE:Factory checked in at 2012-03-13 09:37:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk3 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk3", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk3/oxygen-gtk3.changes 2012-03-01 17:21:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk3.new/oxygen-gtk3.changes 2012-03-13 09:37:46.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Mar 12 20:35:18 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to 1.0.2: + Fixes include: + * Cleanup of signals and hooks when unloading theme. + * Use of glib's built-in dbus interface. + * Fixed crash in gtk-chtheme (and possibly other theme-switching + applications). + * Fixed margins and spacing for several widgets to make them look more + similar to Qt's version. + +------------------------------------------------------------------- Old: ---- oxygen-gtk3-1.0.1.tar.bz2 New: ---- oxygen-gtk3-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk3.spec ++++++ --- /var/tmp/diff_new_pack.GVyjrE/_old 2012-03-13 09:37:47.000000000 +0100 +++ /var/tmp/diff_new_pack.GVyjrE/_new 2012-03-13 09:37:47.000000000 +0100 @@ -17,7 +17,7 @@ Name: oxygen-gtk3 -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 3.x License: LGPL-2.1+ ++++++ oxygen-gtk3-1.0.1.tar.bz2 -> oxygen-gtk3-1.0.2.tar.bz2 ++++++ ++++ 1742 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-gtk2 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2012-03-13 09:37:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2012-03-01 17:21:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2012-03-13 09:37:40.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Mar 12 20:29:42 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to 1.2.2: + Fixes include: + * Cleanup of signals and hooks when unloading theme. + * Use of glib's built-in dbus interface. + * Fixed crash in gtk-chtheme (and possibly other theme-switching + applications). + * Fixed margins and spacing for several widgets to make them look more + similar to Qt's version. + +------------------------------------------------------------------- Old: ---- oxygen-gtk2-1.2.1.tar.bz2 New: ---- oxygen-gtk2-1.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.QN9Wmn/_old 2012-03-13 09:37:41.000000000 +0100 +++ /var/tmp/diff_new_pack.QN9Wmn/_new 2012-03-13 09:37:41.000000000 +0100 @@ -17,7 +17,7 @@ Name: oxygen-gtk2 -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x License: LGPL-2.1+ ++++++ oxygen-gtk2-1.2.1.tar.bz2 -> oxygen-gtk2-1.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/CMakeLists.txt new/oxygen-gtk2-1.2.2/CMakeLists.txt --- old/oxygen-gtk2-1.2.1/CMakeLists.txt 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/CMakeLists.txt 2012-03-12 09:17:59.000000000 +0100 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "hugo(a)oxygen-icons.org" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "2" ) -set( CPACK_PACKAGE_VERSION_PATCH "1" ) +set( CPACK_PACKAGE_VERSION_PATCH "2" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## @@ -87,7 +87,7 @@ ARGS --variable=prefix gtk+-2.0 OUTPUT_VARIABLE GTK_PREFIX ) - message( "Info: using PKGCONFIG_EXECUTABLE to set the installation prefix" ) + message( "Info: using PKGCONFIG_EXECUTABLE to set the installation prefix" ) set(CMAKE_INSTALL_PREFIX ${GTK_PREFIX} CACHE PATH "GTK install prefix" FORCE ) @@ -106,12 +106,22 @@ pkg_check_modules( CAIRO REQUIRED cairo ) # DBus -set( HAVE_DBUS 0 ) -pkg_check_modules( DBUS dbus-glib-1 ) -if( DBUS_FOUND ) - set( HAVE_DBUS 1 ) +set( HAVE_DBUS_GLIB 0 ) +pkg_check_modules( GLIB_DBUS glib-2.0>=2.26 ) +if( GLIB_DBUS_FOUND ) + set( HAVE_DBUS_GLIB 1 ) endif() +set( HAVE_DBUS 0 ) +if( NOT HAVE_DBUS_GLIB ) + + pkg_check_modules( DBUS dbus-glib-1 ) + if( DBUS_FOUND ) + set( HAVE_DBUS 1 ) + endif( DBUS_FOUND) + +endif( NOT HAVE_DBUS_GLIB ) + ########################## # installation directories ########################## @@ -122,7 +132,7 @@ if( DEFINED LIB_SUFFIX OR NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ) - message( "Info: using LIB_SUFFIX to set the theme engine installation path" ) + message( "Info: using LIB_SUFFIX to set the theme engine installation path" ) set( INSTALL_PATH_GTK_ENGINES "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/gtk-2.0/${GTK_BIN_VERSION}/engines" CACHE PATH "The directory in which to install the theme engine library( eg. /usr/lib/gtk-2.0/2.4.0/engines )" ) else() @@ -132,7 +142,7 @@ ARGS --variable=libdir gtk+-2.0 OUTPUT_VARIABLE GTK_LIBDIR_PREFIX ) - message( "Info: using PKGCONFIG_EXECUTABLE to set the theme engine installation path" ) + message( "Info: using PKGCONFIG_EXECUTABLE to set the theme engine installation path" ) set( INSTALL_PATH_GTK_ENGINES "${GTK_LIBDIR_PREFIX}/gtk-2.0/${GTK_BIN_VERSION}/engines" CACHE PATH "The directory in which to install the theme engine library( eg. /usr/lib/gtk-2.0/2.4.0/engines )" ) endif() @@ -142,9 +152,10 @@ # First emit all warnings in one place # Warn user if dbus-glib not found -if( NOT DBUS_FOUND ) - message( "Warning: dbus-glib-1 <http://dbus.freedesktop.org/releases/dbus-glib/> could not be found on your system.\nD-Bus is a simple inter-process communication system. It is used for GTK applications to be updated on the fly when KDE configuration is changed." ) -endif( NOT DBUS_FOUND ) +if( NOT HAVE_DBUS_GLIB AND NOT HAVE_DBUS ) + message( "Warning: a recent enough version of glib-2.0 <http://www.gtk.org/> could not be found on your system. \n oxygen-gtk will not have D-Bus support.\nD-Bus is a simple inter-process communication system. It is used for GTK applications to be updated on the fly when KDE configuration is changed." ) + message( "Warning: alternatively you can install dbus-glib-1 <http://dbus.freedesktop.org/releases/dbus-glib/>." ) +endif() # Adjust flags based on gtk version and warn user if needed if( ENABLE_INNER_SHADOWS_HACK AND GTK_VERSION VERSION_LESS 2.24.2 ) @@ -158,6 +169,7 @@ message( "Flags: " ) message( " OXYGEN_DEBUG ${OXYGEN_DEBUG}" ) message( " OXYGEN_DEBUG_INNERSHADOWS ${OXYGEN_DEBUG_INNERSHADOWS}" ) +message( " HAVE_DBUS_GLIB ${HAVE_DBUS_GLIB}" ) message( " HAVE_DBUS ${HAVE_DBUS}" ) message( " OXYGEN_ICON_HACK ${OXYGEN_ICON_HACK}" ) message( " OXYGEN_FORCE_KDE_ICONS_AND_FONTS ${OXYGEN_FORCE_KDE_ICONS_AND_FONTS}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/config.h.cmake new/oxygen-gtk2-1.2.2/config.h.cmake --- old/oxygen-gtk2-1.2.1/config.h.cmake 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/config.h.cmake 2012-03-12 09:17:59.000000000 +0100 @@ -11,6 +11,7 @@ #define OXYGEN_ICON_HACK @OXYGEN_ICON_HACK@ #define OXYGEN_FORCE_KDE_ICONS_AND_FONTS @OXYGEN_FORCE_KDE_ICONS_AND_FONTS@ #define HAVE_DBUS @HAVE_DBUS@ +#define HAVE_DBUS_GLIB @HAVE_DBUS_GLIB@ #define ENABLE_COMBOBOX_LIST_RESIZE @ENABLE_COMBOBOX_LIST_RESIZE@ #define ENABLE_INNER_SHADOWS_HACK @ENABLE_INNER_SHADOWS_HACK@ #define ENABLE_GROUPBOX_HACK @ENABLE_GROUPBOX_HACK@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/demo/oxygenbuttondemowidget.cpp new/oxygen-gtk2-1.2.2/demo/oxygenbuttondemowidget.cpp --- old/oxygen-gtk2-1.2.1/demo/oxygenbuttondemowidget.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/demo/oxygenbuttondemowidget.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -121,10 +121,13 @@ GtkIconTheme* theme( gtk_icon_theme_get_default() ); GdkPixbuf* icon = gtk_icon_theme_load_icon( theme, "oxygen", 16, (GtkIconLookupFlags) 0, 0L ); - GtkWidget* image( gtk_image_new_from_pixbuf( icon ) ); - g_object_unref( icon ); + if(icon) + { + GtkWidget* image( gtk_image_new_from_pixbuf( icon ) ); + g_object_unref( icon ); - gtk_button_set_image( GTK_BUTTON( button ), image ); + gtk_button_set_image( GTK_BUTTON( button ), image ); + } gtk_widget_show( button ); gtk_widget_set_tooltip_text( button, "This is a normal, text and icon button" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/metacity.patch new/oxygen-gtk2-1.2.2/metacity.patch --- old/oxygen-gtk2-1.2.1/metacity.patch 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/metacity.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp -index 4ed5401..9422996 100644 ---- a/src/oxygenqtsettings.cpp -+++ b/src/oxygenqtsettings.cpp -@@ -449,8 +449,14 @@ namespace Oxygen - gchar** gtkSearchPath; - int nElements; - gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); -- for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } -- g_free( gtkSearchPath ); -+ for( int i=0; i<nElements; i++ ) -+ { -+ if( gtkSearchPath[i] ) -+ { searchPath.insert( gtkSearchPath[i] ); } -+ } -+ -+ // free -+ g_strfreev( gtkSearchPath ); - - // add kde's path. Loop is reversed because added path must be prepended. - for( PathList::const_reverse_iterator iter = _kdeIconPathList.rbegin(); iter != _kdeIconPathList.rend(); ++iter ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/oxygen-gtk.diff new/oxygen-gtk2-1.2.2/oxygen-gtk.diff --- old/oxygen-gtk2-1.2.1/oxygen-gtk.diff 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/oxygen-gtk.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp -index 4ed5401..35af7c1 100644 ---- a/src/oxygenqtsettings.cpp -+++ b/src/oxygenqtsettings.cpp -@@ -447,9 +447,10 @@ namespace Oxygen - // put existing default path in a set - PathSet searchPath; - gchar** gtkSearchPath; -- int nElements; -+ int nElements(0); - gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); -- for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } -+ for( int i=0; i<nElements; i++ ) -+ { if( gtkSearchPath[i] ) searchPath.insert( gtkSearchPath[i] ); } - g_free( gtkSearchPath ); - - // add kde's path. Loop is reversed because added path must be prepended. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/rc/gtkrc new/oxygen-gtk2-1.2.2/rc/gtkrc --- old/oxygen-gtk2-1.2.1/rc/gtkrc 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/rc/gtkrc 2012-03-12 09:17:59.000000000 +0100 @@ -62,7 +62,8 @@ GtkTreeView::allow-rules = 1 GtkTreeView::row-ending-details = 1 - GtkTreeView::expander-size = 15 + GtkTreeView::expander-size = 10 + GtkTreeView::vertical-separator = 0 # shadow types GtkMenuBar::shadow-type = GTK_SHADOW_NONE @@ -90,7 +91,7 @@ style "oxygen-entry-margins" = "oxygen-default" { xthickness = 5 - ythickness = 2 + ythickness = 1 } class "GtkEntry" style "oxygen-entry-margins" @@ -183,11 +184,11 @@ style "oxygen-combobox-entry-button" = "oxygen-combobox-entry" { - ythickness = 2 + ythickness = 0 xthickness = 2 } -widget_class "*<GtkComboBoxEntry>.<GtkButton>" style "oxygen-combobox-entry-button" +widget_class "*<GtkComboBox>.<GtkButton>" style "oxygen-combobox-entry-button" style "oxygen-combo-button" = "oxygen-combobox-entry" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygenanimations.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenanimations.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -34,6 +34,9 @@ _innerShadowsEnabled( true ), _hooksInitialized( false ) { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::Animations::Animations" << std::endl; + #endif // create engines registerEngine( _backgroundHintEngine = new BackgroundHintEngine( this ) ); @@ -69,14 +72,22 @@ //____________________________________________________________________________________________ Animations::~Animations( void ) { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::Animations::~Animations" << std::endl; + #endif // delete all engines for( BaseEngine::List::iterator iter = _engines.begin(); iter != _engines.end(); ++iter ) { delete *iter; } + // disconnect all signals from map + for( WidgetMap::iterator iter = _allWidgets.begin(); iter != _allWidgets.end(); iter++ ) + { iter->second.disconnect(); } + // clear hooks _sizeAllocationHook.disconnect(); _realizationHook.disconnect(); + _innerShadowHook.disconnect(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenbaseengine.h new/oxygen-gtk2-1.2.2/src/animations/oxygenbaseengine.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenbaseengine.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenbaseengine.h 2012-03-12 09:17:59.000000000 +0100 @@ -41,7 +41,8 @@ _enabled( true ) {} - virtual ~BaseEngine(){} + virtual ~BaseEngine() + {} //! register widget virtual bool registerWidget( GtkWidget* widget ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygencomboboxdata.h new/oxygen-gtk2-1.2.2/src/animations/oxygencomboboxdata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygencomboboxdata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygencomboboxdata.h 2012-03-12 09:17:59.000000000 +0100 @@ -44,7 +44,7 @@ //! destructor virtual ~ComboBoxData( void ) - {} + { disconnect( _target ); } //! setup connections /*! does nothing. Only kept here for consistency with other data */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygencomboboxentrydata.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygencomboboxentrydata.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygencomboboxentrydata.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygencomboboxentrydata.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -119,7 +119,7 @@ { #if OXYGEN_DEBUG - std::cerr << "Oxygen::ComboBoxEntryData::Data::disconnect - " << _widget << " (" << G_OBJECT_TYPE_NAME( _widget ) << ")" << std::endl; + std::cerr << "Oxygen::ComboBoxEntryData::Data::disconnect - " << _widget << " (" << (_widget ? G_OBJECT_TYPE_NAME( _widget ):"null") << ")" << std::endl; #endif if( !_widget ) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygencomboboxentrydata.h new/oxygen-gtk2-1.2.2/src/animations/oxygencomboboxentrydata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygencomboboxentrydata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygencomboboxentrydata.h 2012-03-12 09:17:59.000000000 +0100 @@ -41,7 +41,7 @@ //! destructor virtual ~ComboBoxEntryData( void ) - {} + { disconnect( _list ); } //! disconnect virtual void disconnect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenhook.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygenhook.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygenhook.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenhook.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -28,6 +28,10 @@ namespace Oxygen { + #if OXYGEN_DEBUG + static int counter( 0 ); + #endif + //__________________________________________________________________ bool Hook::connect( const std::string& signal, GType typeId, GSignalEmissionHook hookFunction, gpointer data ) { @@ -66,6 +70,11 @@ hookFunction, data, 0L); + #if OXYGEN_DEBUG + ++counter; + std::cerr << "Oxygen::Hook::connect - hook: " << _hookId << " counter: " << counter << std::endl; + #endif + return true; } @@ -75,7 +84,18 @@ { // disconnect signal - if( _signalId > 0 && _hookId > 0 ) g_signal_remove_emission_hook( _signalId, _hookId ); + if( _signalId > 0 && _hookId > 0 ) + { + + #if OXYGEN_DEBUG + --counter; + std::cerr << "Oxygen::Hook::disconnect - hook: " << _hookId << " counter: " << counter << std::endl; + #endif + + g_signal_remove_emission_hook( _signalId, _hookId ); + + } + _signalId = 0; _hookId = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenhoverdata.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygenhoverdata.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygenhoverdata.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenhoverdata.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -35,7 +35,7 @@ { #if OXYGEN_DEBUG - std::cerr << "Oxygen::HoverData::connect - " << widget << " (" << G_OBJECT_TYPE_NAME( widget ) << ")" << std::endl; + std::cerr << "Oxygen::HoverData::connect - " << widget << " (" << (widget ? G_OBJECT_TYPE_NAME( widget ):"null") << ")" << std::endl; #endif const bool enabled( gtk_widget_get_state( widget ) != GTK_STATE_INSENSITIVE ); @@ -66,7 +66,7 @@ void HoverData::disconnect( GtkWidget* widget ) { #if OXYGEN_DEBUG - std::cerr << "Oxygen::HoverData::disconnect - " << widget << " (" << G_OBJECT_TYPE_NAME( widget ) << ")" << std::endl; + std::cerr << "Oxygen::HoverData::disconnect - " << widget << " (" << (widget ? G_OBJECT_TYPE_NAME( widget ):"null") << ")" << std::endl; #endif _enterId.disconnect(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenhoverdata.h new/oxygen-gtk2-1.2.2/src/animations/oxygenhoverdata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenhoverdata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenhoverdata.h 2012-03-12 09:17:59.000000000 +0100 @@ -40,7 +40,7 @@ //! destructor virtual ~HoverData( void ) - {} + { disconnect( 0L ); } //! setup connections virtual void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygeninnershadowdata.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygeninnershadowdata.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygeninnershadowdata.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygeninnershadowdata.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -68,7 +68,7 @@ } //_____________________________________________ - void InnerShadowData::disconnect( GtkWidget* widget ) + void InnerShadowData::disconnect( GtkWidget* ) { _target = 0; for( ChildDataMap::iterator iter = _childrenData.begin(); iter != _childrenData.end(); ++iter ) @@ -117,7 +117,7 @@ // make sure widget is scrollable GTK_WIDGET_GET_CLASS( widget )->set_scroll_adjustments_signal ) { - data.initiallyComposited=gdk_window_get_composited(window); + data._initiallyComposited = gdk_window_get_composited(window); gdk_window_set_composited(window,TRUE); } @@ -164,8 +164,8 @@ // remove compositing flag GdkWindow* window( gtk_widget_get_window( widget ) ); - if( GTK_IS_WINDOW( window ) && G_OBJECT_TYPE_NAME( widget ) != std::string("GtkPizza") ) - { gdk_window_set_composited(window,initiallyComposited); } + if( GDK_IS_WINDOW( window ) && G_OBJECT_TYPE_NAME( widget ) != std::string("GtkPizza") ) + { gdk_window_set_composited( window, _initiallyComposited ); } } //____________________________________________________________________________________________ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygeninnershadowdata.h new/oxygen-gtk2-1.2.2/src/animations/oxygeninnershadowdata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygeninnershadowdata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygeninnershadowdata.h 2012-03-12 09:17:59.000000000 +0100 @@ -43,7 +43,7 @@ //! destructor virtual ~InnerShadowData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); @@ -89,8 +89,11 @@ //! disconnect all signals void disconnect( GtkWidget* ); + //! signal Signal _unrealizeId; - bool initiallyComposited; + + //! keep track of composited state + bool _initiallyComposited; }; //! map registered children and corresponding data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenmainwindowdata.h new/oxygen-gtk2-1.2.2/src/animations/oxygenmainwindowdata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenmainwindowdata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenmainwindowdata.h 2012-03-12 09:17:59.000000000 +0100 @@ -44,7 +44,7 @@ //! destructor virtual ~MainWindowData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenmenubarstatedata.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygenmenubarstatedata.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygenmenubarstatedata.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenmenubarstatedata.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -57,7 +57,7 @@ } //________________________________________________________________________________ - void MenuBarStateData::disconnect( GtkWidget* widget ) + void MenuBarStateData::disconnect( GtkWidget* ) { _target = 0L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenmenubarstatedata.h new/oxygen-gtk2-1.2.2/src/animations/oxygenmenubarstatedata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenmenubarstatedata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenmenubarstatedata.h 2012-03-12 09:17:59.000000000 +0100 @@ -52,7 +52,7 @@ //! destructor virtual ~MenuBarStateData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenmenubarstateengine.h new/oxygen-gtk2-1.2.2/src/animations/oxygenmenubarstateengine.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenmenubarstateengine.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenmenubarstateengine.h 2012-03-12 09:17:59.000000000 +0100 @@ -60,10 +60,11 @@ const bool registered( GenericEngine<MenuBarStateData>::registerWidget( widget ) ); if( registered ) { - data().value( widget ).setDuration( duration() ); - data().value( widget ).setAnimationsEnabled( _animationsEnabled ); - data().value( widget ).setFollowMouse( _followMouse ); - data().value( widget ).setFollowMouseAnimationsDuration( _followMouseAnimationsDuration ); + MenuBarStateData& data( this->data().value( widget ) ); + data.setDuration( duration() ); + data.setAnimationsEnabled( _animationsEnabled ); + data.setFollowMouse( _followMouse ); + data.setFollowMouseAnimationsDuration( _followMouseAnimationsDuration ); } return registered; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenmenustatedata.h new/oxygen-gtk2-1.2.2/src/animations/oxygenmenustatedata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenmenustatedata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenmenustatedata.h 2012-03-12 09:17:59.000000000 +0100 @@ -48,7 +48,7 @@ //! destructor virtual ~MenuStateData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenmenustateengine.h new/oxygen-gtk2-1.2.2/src/animations/oxygenmenustateengine.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenmenustateengine.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenmenustateengine.h 2012-03-12 09:17:59.000000000 +0100 @@ -59,10 +59,11 @@ const bool registered( GenericEngine<MenuStateData>::registerWidget( widget ) ); if( registered ) { - data().value( widget ).setDuration( duration() ); - data().value( widget ).setEnabled( enabled() ); - data().value( widget ).setFollowMouse( _followMouse ); - data().value( widget ).setFollowMouseAnimationsDuration( _followMouseAnimationsDuration ); + MenuStateData& data( this->data().value( widget ) ); + data.setDuration( duration() ); + data.setEnabled( enabled() ); + data.setFollowMouse( _followMouse ); + data.setFollowMouseAnimationsDuration( _followMouseAnimationsDuration ); } return registered; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenpaneddata.h new/oxygen-gtk2-1.2.2/src/animations/oxygenpaneddata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenpaneddata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenpaneddata.h 2012-03-12 09:17:59.000000000 +0100 @@ -39,7 +39,10 @@ //! destructor virtual ~PanedData( void ) - { if( _cursor ) gdk_cursor_unref( _cursor ); } + { + disconnect( 0L ); + if( _cursor ) gdk_cursor_unref( _cursor ); + } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenscrollbardata.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygenscrollbardata.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygenscrollbardata.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenscrollbardata.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -35,7 +35,7 @@ } //________________________________________________________________________________ - void ScrollBarData::disconnect( GtkWidget* widget ) + void ScrollBarData::disconnect( GtkWidget* ) { _target = 0L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenscrollbardata.h new/oxygen-gtk2-1.2.2/src/animations/oxygenscrollbardata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenscrollbardata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenscrollbardata.h 2012-03-12 09:17:59.000000000 +0100 @@ -43,7 +43,7 @@ //! destructor virtual ~ScrollBarData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenscrolledwindowdata.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygenscrolledwindowdata.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygenscrolledwindowdata.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenscrolledwindowdata.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -84,7 +84,7 @@ } //_____________________________________________ - void ScrolledWindowData::disconnect( GtkWidget* widget ) + void ScrolledWindowData::disconnect( GtkWidget* ) { _target = 0; for( ChildDataMap::iterator iter = _childrenData.begin(); iter != _childrenData.end(); ++iter ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygenscrolledwindowdata.h new/oxygen-gtk2-1.2.2/src/animations/oxygenscrolledwindowdata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygenscrolledwindowdata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygenscrolledwindowdata.h 2012-03-12 09:17:59.000000000 +0100 @@ -43,7 +43,7 @@ //! destructor virtual ~ScrolledWindowData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygensignal.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygensignal.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygensignal.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygensignal.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -27,6 +27,10 @@ namespace Oxygen { + #if OXYGEN_DEBUG + static int counter( 0 ); + #endif + //____________________________________________________________________ bool Signal::connect( GObject* object, const std::string& signal, GCallback callback, gpointer data, bool after ) { @@ -53,6 +57,11 @@ if(after) _id = g_signal_connect_after( object, signal.c_str(), callback, data ); else _id = g_signal_connect( object, signal.c_str(), callback, data ); + #if OXYGEN_DEBUG + ++counter; + std::cerr << "Oxygen::Signal::connect - _id: " << _id << " counter: " << counter << std::endl; + #endif + return true; } @@ -62,7 +71,17 @@ { // disconnect signal - if( _object && _id > 0 ) g_signal_handler_disconnect( _object, _id ); + if( _object && _id > 0 ) + { + + #if OXYGEN_DEBUG + --counter; + std::cerr << "Oxygen::Signal::disconnect - _id: " << _id << " counter: " << counter << std::endl; + #endif + + g_signal_handler_disconnect( _object, _id ); + + } // reset members _object = 0L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.h new/oxygen-gtk2-1.2.2/src/animations/oxygentabwidgetdata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygentabwidgetdata.h 2012-03-12 09:17:59.000000000 +0100 @@ -45,7 +45,7 @@ //! destructor virtual ~TabWidgetData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygentimelineserver.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygentimelineserver.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygentimelineserver.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygentimelineserver.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -20,6 +20,9 @@ #include "oxygentimelineserver.h" #include "oxygentimeline.h" +#include "../config.h" + +#include <iostream> namespace Oxygen { @@ -31,6 +34,7 @@ TimeLineServer* TimeLineServer::_instance = 0L; TimeLineServer& TimeLineServer::instance( void ) { + if( !_instance ) { _instance = new TimeLineServer(); } @@ -40,12 +44,20 @@ //____________________________________________________________________ TimeLineServer::TimeLineServer( void ): _timerId( 0 ) - {} + { + #if OXYGEN_DEBUG + std::cerr << "TimeLineServer::TimeLineServer." << std::endl; + #endif + } //____________________________________________________________________ TimeLineServer::~TimeLineServer( void ) { + #if OXYGEN_DEBUG + std::cerr << "TimeLineServer::~TimeLineServer." << std::endl; + #endif + // clear timer Id and singleton if( _timerId ) g_source_remove( _timerId ); _instance = 0L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.h new/oxygen-gtk2-1.2.2/src/animations/oxygentoolbarstatedata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygentoolbarstatedata.h 2012-03-12 09:17:59.000000000 +0100 @@ -47,7 +47,7 @@ //! destructor virtual ~ToolBarStateData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstateengine.h new/oxygen-gtk2-1.2.2/src/animations/oxygentoolbarstateengine.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstateengine.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygentoolbarstateengine.h 2012-03-12 09:17:59.000000000 +0100 @@ -59,10 +59,11 @@ const bool registered( GenericEngine<ToolBarStateData>::registerWidget( widget ) ); if( registered ) { - data().value( widget ).setDuration( duration() ); - data().value( widget ).setEnabled( enabled() ); - data().value( widget ).setFollowMouse( _followMouse ); - data().value( widget ).setFollowMouseAnimationsDuration( _followMouseAnimationsDuration ); + ToolBarStateData& data( this->data().value( widget ) ); + data.setDuration( duration() ); + data.setEnabled( enabled() ); + data.setFollowMouse( _followMouse ); + data.setFollowMouseAnimationsDuration( _followMouseAnimationsDuration ); } return registered; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygentreeviewdata.cpp new/oxygen-gtk2-1.2.2/src/animations/oxygentreeviewdata.cpp --- old/oxygen-gtk2-1.2.1/src/animations/oxygentreeviewdata.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygentreeviewdata.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -77,7 +77,7 @@ { #if OXYGEN_DEBUG - std::cerr << "Oxygen::TreeViewData::disconnect - " << widget << " (" << G_OBJECT_TYPE_NAME( widget ) << ")" << std::endl; + std::cerr << "Oxygen::TreeViewData::disconnect - " << widget << " (" << (widget ? G_OBJECT_TYPE_NAME( widget ):"null") << ")" << std::endl; #endif // reset target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/animations/oxygentreeviewdata.h new/oxygen-gtk2-1.2.2/src/animations/oxygentreeviewdata.h --- old/oxygen-gtk2-1.2.1/src/animations/oxygentreeviewdata.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/animations/oxygentreeviewdata.h 2012-03-12 09:17:59.000000000 +0100 @@ -47,7 +47,7 @@ //! destructor virtual ~TreeViewData( void ) - {} + { disconnect( _target ); } //! setup connections void connect( GtkWidget* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/log new/oxygen-gtk2-1.2.2/src/log --- old/oxygen-gtk2-1.2.1/src/log 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/log 1970-01-01 01:00:00.000000000 +0100 @@ -1,141 +0,0 @@ - - -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,32,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar/GtkImageMenuItem -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8918778 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8918778 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8918778 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8918778 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8918778 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8918778 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8918778 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8918778 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8917000 rect: ( -4,-6,172,177) path: /GtkWindow/GtkMenu -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,172,177) path: /GtkWindow/GtkMenu -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x891fc10 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x891fc10 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8920360 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920360 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920360 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920360 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920360 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920360 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920360 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920360 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8920a10 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8920a10 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,32,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar/GtkImageMenuItem -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,28,31) path: /GtkWindow/GtkVBox/GtkHBox/GtkHBox/GtkButton -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8925420 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8925420 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8925420 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8925420 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8925420 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8925420 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8925420 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8925420 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow -Oxygen::render_background - context: 0x8924748 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8924748 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8924748 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8924748 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8924748 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8924748 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton -Oxygen::render_background - context: 0x8924748 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8924748 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView -Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygenargbhelper.cpp new/oxygen-gtk2-1.2.2/src/oxygenargbhelper.cpp --- old/oxygen-gtk2-1.2.1/src/oxygenargbhelper.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygenargbhelper.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -36,13 +36,21 @@ //__________________________________________________________________ ArgbHelper::ArgbHelper( void ): _hooksInitialized( false ) - {} + { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::ArgbHelper::ArgbHelper" << std::endl; + #endif + } //_____________________________________________________ ArgbHelper::~ArgbHelper( void ) { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::ArgbHelper::~ArgbHelper" << std::endl; + #endif + // disconnect hooks _colormapHook.disconnect(); _styleHook.disconnect(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygendbus.cpp new/oxygen-gtk2-1.2.2/src/oxygendbus.cpp --- old/oxygen-gtk2-1.2.1/src/oxygendbus.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygendbus.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -34,60 +34,149 @@ DBus* DBus::_instance = 0; DBus& DBus::instance( void ) { - if( !_instance ) + if( !_instance ) _instance = new DBus(); + return *_instance; + } + + //_________________________________________________________ + DBus::DBus( void ): + #if HAVE_DBUS_GLIB + _connection( 0L ), + #elif HAVE_DBUS + _connection( 0L ), + #endif + _oxygenId( 0 ), + _globalSettingsId( 0 ) + { } + + //_________________________________________________________ + DBus::~DBus( void ) + { _instance = 0L; } + + //_________________________________________________________ + void DBus::connect( void ) + { + + #if HAVE_DBUS_GLIB + + // check connection + if( isConnected() ) return; + + // get dbus connection + _connection = g_bus_get_sync(G_BUS_TYPE_SESSION, 0L, 0L ); + if( !_connection ) return; + + // setup subscriptions + if( _oxygenId <= 0 ) { - _instance = new DBus(); - _instance->setupConnection(); + _oxygenId = g_dbus_connection_signal_subscribe( + _connection, + 0L, "org.kde.Oxygen.Style", 0L, "/OxygenStyle", 0L, + G_DBUS_SIGNAL_FLAGS_NONE, + filter, 0L, 0L ); } - return *_instance; + if( _globalSettingsId <= 0 ) + { + _globalSettingsId = g_dbus_connection_signal_subscribe( + _connection, + 0L, "org.kde.KGlobalSettings", 0L, "/KGlobalSettings", 0L, + G_DBUS_SIGNAL_FLAGS_NONE, + filter, 0L, 0L ); + } + + #elif HAVE_DBUS + + // check connection + if( isConnected() ) return; + + // connect to session bus and check + _connection = dbus_g_bus_get( DBUS_BUS_SESSION, 0L ); + if( !_connection ) return; + + // install signal filter + dbus_bus_add_match( dbus_g_connection_get_connection( _connection ), "type='signal',interface='org.kde.Oxygen.Style',path='/OxygenStyle'", 0L ); + dbus_bus_add_match( dbus_g_connection_get_connection( _connection ), "type='signal',interface='org.kde.KGlobalSettings',path='/KGlobalSettings'", 0L ); + dbus_connection_add_filter( dbus_g_connection_get_connection( _connection ), signalFilter, 0L, 0L ); + + #endif } + //_________________________________________________________ - void DBus::setupConnection( void ) + void DBus::disconnect( void ) { + #if HAVE_DBUS_GLIB - // make sure the method is called only once - static bool first( true ); - if( !first ) return; - first = false; + // check connection + if( !isConnected() ) return; + + // release subscriptions + if( _oxygenId > 0 ) + { + g_dbus_connection_signal_unsubscribe( _connection, _oxygenId ); + _oxygenId = 0; + } + + if( _globalSettingsId > 0 ) + { + g_dbus_connection_signal_unsubscribe( _connection, _globalSettingsId ); + _globalSettingsId = 0; + } + + // unref connection + g_object_unref( _connection ); + _connection = 0L; + + #elif HAVE_DBUS + + // check connection + if( !isConnected() ) return; + + dbus_connection_remove_filter( dbus_g_connection_get_connection( _connection ), signalFilter, 0L ); + dbus_g_connection_unref( _connection ); + _connection = 0L; - #if OXYGEN_DEBUG - std::cerr << "Oxygen::DBus::setupConnection" << std::endl; #endif + } - #if HAVE_DBUS - // dbus error - DBusError error; - dbus_error_init( &error ); + #if HAVE_DBUS_GLIB - // connect to session bus and check - DBusConnection *bus( dbus_bus_get( DBUS_BUS_SESSION, &error ) ); - if( !bus ) + //_________________________________________________________ + void DBus::filter( GDBusConnection*, const gchar* sender, const gchar* path, const gchar* interface, const gchar* signal, GVariant*, gpointer ) + { + + #if OXYGEN_DEBUG + std::cerr + << "Oxygen::DBus::signalFilter - received signal" + << " sender: " << ( sender ? sender:"0x0" ) + << " path: " << (path ? path:"0x0") + << " interface: " << (interface ? interface:"0x0") + << " signal: " << (signal ? signal:"0x0") + << std::endl; + #endif + + if( !signal ) return; + const std::string signalString( signal ); + if( signalString == "reparseConfiguration" ) { - #if OXYGEN_DEBUG - std::cerr - << "Oxygen::DBus::setupConnection -" - << " connection failed." - << " Error: " << error.message - << std::endl; - #endif + Style::instance().initialize( QtSettings::Oxygen|QtSettings::Forced ); - dbus_error_free( &error ); - return; - } - dbus_connection_setup_with_g_main( bus, 0L ); + } else if( signalString == "notifyChange" ) { + + Style::instance().initialize( QtSettings::All|QtSettings::Forced ); + + } else return; + + // reset RC styles + gtk_rc_reset_styles( gtk_settings_get_default() ); - // install signal filter - dbus_bus_add_match( bus, "type='signal',interface='org.kde.Oxygen.Style',path='/OxygenStyle'", &error ); - dbus_bus_add_match( bus, "type='signal',interface='org.kde.KGlobalSettings',path='/KGlobalSettings'", &error ); - dbus_connection_add_filter( bus, signalFilter, 0L, 0L ); - #endif } + #elif HAVE_DBUS + //_________________________________________________________ - #if HAVE_DBUS DBusHandlerResult DBus::signalFilter( DBusConnection*, DBusMessage* message, gpointer data ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygendbus.h new/oxygen-gtk2-1.2.2/src/oxygendbus.h --- old/oxygen-gtk2-1.2.1/src/oxygendbus.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygendbus.h 2012-03-12 09:17:59.000000000 +0100 @@ -25,7 +25,9 @@ */ #include "config.h" -#if HAVE_DBUS +#if HAVE_DBUS_GLIB +#include <gio/gio.h> +#elif HAVE_DBUS #include <dbus/dbus-glib-lowlevel.h> #endif @@ -42,42 +44,54 @@ static DBus& instance( void ); //! destructor - virtual ~DBus( void ) - { _instance = 0L; } + virtual ~DBus( void ); + + //! connect + void connect( void ); + + //! diconnect + void disconnect( void ); protected: - //! setup connections - void setupConnection( void ); + #if HAVE_DBUS_GLIB - /*! - copied from kdelibs/kdeui/kernel/kglobalsettings - used to only update relevant parts on kglobalconfig changes - */ - enum ChangeType - { - PaletteChanged = 0, - FontChanged, - StyleChanged, - SettingsChanged, - IconChanged, - CursorChanged, - ToolbarStyleChanged, - ClipboardConfigChanged, - BlockShortcuts, - NaturalSortingChanged - }; + //! dbus messages filter (callback) + static void filter( GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant*, gpointer ); + + #elif HAVE_DBUS - #if HAVE_DBUS //! dbus messages filter (callback) static DBusHandlerResult signalFilter( DBusConnection*, DBusMessage*, gpointer ); + #endif + // true if connected + bool isConnected( void ) const + { + #if HAVE_DBUS_GLIB + return _connection; + #elif HAVE_DBUS + return _connection; + #else + return false; + #endif + } + private: //! constructor - DBus( void ) - {} + DBus( void ); + + #if HAVE_DBUS_GLIB + GDBusConnection* _connection; + #elif HAVE_DBUS + DBusGConnection* _connection; + #endif + + //! ids + int _oxygenId; + int _globalSettingsId; //! singleton static DBus* _instance; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygenshadowhelper.cpp new/oxygen-gtk2-1.2.2/src/oxygenshadowhelper.cpp --- old/oxygen-gtk2-1.2.1/src/oxygenshadowhelper.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygenshadowhelper.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -56,6 +56,8 @@ #endif reset(); + _realizeHook.disconnect(); + } //______________________________________________ @@ -69,10 +71,6 @@ GdkScreen* screen = gdk_screen_get_default(); if( !screen ) return; - #if OXYGEN_DEBUG - std::cerr << "Oxygen::ShadowHelper::~ShadowHelper - reset" << std::endl; - #endif - Display* display( GDK_DISPLAY_XDISPLAY( gdk_screen_get_display( screen ) ) ); // round pixmaps diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygenstylehelper.cpp new/oxygen-gtk2-1.2.2/src/oxygenstylehelper.cpp --- old/oxygen-gtk2-1.2.1/src/oxygenstylehelper.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygenstylehelper.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -38,7 +38,19 @@ //__________________________________________________________________ StyleHelper::StyleHelper( void ) - {} + { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::StyleHelper::StyleHelper" << std::endl; + #endif + } + + //__________________________________________________________________ + StyleHelper::~StyleHelper( void ) + { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::StyleHelper::~StyleHelper" << std::endl; + #endif + } //__________________________________________________________________ void StyleHelper::initializeRefSurface( void ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygenstylehelper.h new/oxygen-gtk2-1.2.2/src/oxygenstylehelper.h --- old/oxygen-gtk2-1.2.1/src/oxygenstylehelper.h 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygenstylehelper.h 2012-03-12 09:17:59.000000000 +0100 @@ -46,8 +46,7 @@ StyleHelper( void ); //! destructor - virtual ~StyleHelper( void ) - {} + virtual ~StyleHelper( void ); //! initialize ref surface void initializeRefSurface( void ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.cpp new/oxygen-gtk2-1.2.2/src/oxygenstylewrapper.cpp --- old/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygenstylewrapper.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -523,12 +523,14 @@ // hide left part and increase width tiles &= ~TileSet::Left; + Style::instance().renderHoleBackground( window, widget, clipRect, x-sideMargin-2, y, w+2*sideMargin+2, h, TileSet::Full, sideMargin ); Style::instance().renderHole( window, clipRect, x-9, y, w+9, h, options, data, tiles ); } else { // hide right part and increase width tiles &= ~TileSet::Right; + Style::instance().renderHoleBackground( window, widget, clipRect, x-sideMargin, y, w+2*sideMargin+2, h, TileSet::Full, sideMargin ); Style::instance().renderHole( window, clipRect, x, y, w+9, h, options, data, tiles ); } @@ -572,12 +574,14 @@ // hide right part and adjust width tiles &= ~TileSet::Left; + Style::instance().renderHoleBackground( window, widget, clipRect, x-2-sideMargin, y, w+2*sideMargin+2, h, tiles, sideMargin ); Style::instance().renderHole( window, clipRect, x-7, y, w+7, h, options, data, tiles ); } else { // hide right part and adjust width tiles &= ~TileSet::Right; + Style::instance().renderHoleBackground( window, widget, clipRect, x-sideMargin, y, w+2*sideMargin, h, tiles, sideMargin ); Style::instance().renderHole( window, clipRect, x, y, w+7, h, options, data, tiles ); } @@ -628,6 +632,7 @@ } // render hole + Style::instance().renderHoleBackground( window, widget, clipRect, x-sideMargin, y, w+2*sideMargin, h, TileSet::Full, sideMargin ); const AnimationData data( Style::instance().animations().widgetStateEngine().get( widget, options, AnimationHover|AnimationFocus, AnimationFocus ) ); Style::instance().renderHole( window, clipRect, x, y, w, h, options, data, tiles ); @@ -1523,7 +1528,7 @@ } else if( d.isEntryProgress() ) { StyleOptions options( widget, state, shadow ); - Style::instance().renderProgressBarHandle( window, clipRect, x-2, y-2, w+4, h+4, options ); + Style::instance().renderProgressBarHandle( window, clipRect, x-2, y-1, w+4, h+2, options ); } else if( d.isTroughFillLevel () ) { @@ -2502,7 +2507,7 @@ y+= 1; - } else if( arrow == GTK_ARROW_DOWN ) y -= 1; + } // disable contrast options &= ~Contrast; @@ -3563,7 +3568,7 @@ { Style::instance().windowManager().initializeHooks(); } // dbus - Oxygen::DBus::instance(); + Oxygen::DBus::instance().connect(); // argb hooks if( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygentheme.cpp new/oxygen-gtk2-1.2.2/src/oxygentheme.cpp --- old/oxygen-gtk2-1.2.1/src/oxygentheme.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygentheme.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -25,11 +25,13 @@ #include "oxygentheme.h" #include "config.h" +#include "oxygendbus.h" #include "oxygenrcstyle.h" #include "oxygenstyle.h" #include "oxygenstylewrapper.h" #include "oxygenwindecooptions.h" #include "oxygenwindowshadow.h" +#include "oxygentimelineserver.h" #include <gmodule.h> #include <gtk/gtk.h> @@ -69,6 +71,11 @@ // delete style instance delete &Oxygen::Style::instance(); + delete &Oxygen::TimeLineServer::instance(); + + // disconnect + // Oxygen::DBus::instance().disconnect(); + delete &Oxygen::DBus::instance(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.1/src/oxygenwindowmanager.cpp new/oxygen-gtk2-1.2.2/src/oxygenwindowmanager.cpp --- old/oxygen-gtk2-1.2.1/src/oxygenwindowmanager.cpp 2012-02-15 10:22:29.000000000 +0100 +++ new/oxygen-gtk2-1.2.2/src/oxygenwindowmanager.cpp 2012-03-12 09:17:59.000000000 +0100 @@ -47,6 +47,9 @@ _x(-1), _y(-1) { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::WindowManager::WindowManager" << std::endl; + #endif // black list initializeBlackList(); @@ -56,6 +59,11 @@ //_________________________________________________ WindowManager::~WindowManager( void ) { + + #if OXYGEN_DEBUG + std::cerr << "Oxygen::WindowManager::~WindowManager" << std::endl; + #endif + _styleSetHook.disconnect(); _buttonReleaseHook.disconnect(); _map.disconnectAll(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osc for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2012-03-13 09:37:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2011-12-21 10:01:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2012-03-13 09:37:24.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Mar 5 09:49:51 UTC 2012 - adrian(a)suse.de + +- update to 0.134.0 + * Enables new maintenance submissions for new OBS 2.3 maintenance model + * Fixes srcmd5 revisions in submit request, when link target != submission target +- From NEWS file: + - patchinfo call can work without checked out copy now + - use qemu as fallback for building not directly supported architectures + - "results --watch" option to watch build results until they finished building + - fixes injection of terminal control chars (bnc#749335)(CVE-2012-1095) + # + # Features which requires OBS 2.3 + # + - support dryrun of branching to preview the expected result. "osc sm" is doing this now by default. + - maintenance requests accept package lists as source and target incidents to be merged in + - add "setincident" command to "request" to re-direct a maintenance request + - ask user to create "maintenance incident" request when submit request is failing at release project + - "osc my patchinfos" is showing patchinfos where any open bug is assigned to user + - "osc my" or "osc my work" is including assigned patchinfos + - "osc branch --maintenance" is creating setups for maintenance + +------------------------------------------------------------------- Old: ---- osc-0.133.1.tar.gz New: ---- osc-0.134.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.xzqxZA/_old 2012-03-13 09:37:25.000000000 +0100 +++ /var/tmp/diff_new_pack.xzqxZA/_new 2012-03-13 09:37:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -17,7 +17,7 @@ Name: osc -Version: 0.133.1 +Version: 0.134.0 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.xzqxZA/_old 2012-03-13 09:37:25.000000000 +0100 +++ /var/tmp/diff_new_pack.xzqxZA/_new 2012-03-13 09:37:25.000000000 +0100 @@ -1,3 +1,8 @@ +osc (0.134.0-1) unstable; urgency=low + - Update to 0.134.0 + + -- Adrian Schroeter <adrian(a)suse.de> Wed, 29 Feb 2012 10:00:00 +0200 + osc (0.132.6-1) unstable; urgency=low - Update to 0.132.6 ++++++ debian.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/control new/debian/control --- old/debian/control 2010-01-28 16:35:13.000000000 +0100 +++ new/debian/control 2011-12-12 12:48:39.000000000 +0100 @@ -7,7 +7,7 @@ Package: osc Section: devel -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>=2.5) | python-celementtree, python-urlgrabber, python-m2crypto Description: openSUSE (buildsystem) commander svn-like cmdline tool (and python library) to maintain source files in the ++++++ osc-0.133.1.tar.gz -> osc-0.134.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/NEWS new/osc-0.134.0/NEWS --- old/osc-0.133.1/NEWS 2011-12-20 22:56:23.000000000 +0100 +++ new/osc-0.134.0/NEWS 2012-03-12 14:36:38.000000000 +0100 @@ -1,3 +1,20 @@ +0.134 + - patchinfo call can work without checked out copy now + - use qemu as fallback for building not directly supported architectures + - "results --watch" option to watch build results until they finished building + - setlinkrev and linkpac ---current is setting vrev. this requires OBS 2.1.17 or 2.3 + - security fix for buildlog function, terminal control characters are limited now. +# +# Features which requires OBS 2.3 +# + - support dryrun of branching to preview the expected result. "osc sm" is doing this now by default. + - maintenance requests accept package lists as source and target incidents to be merged in + - add "setincident" command to "request" to re-direct a maintenance request + - ask user to create "maintenance incident" request when submit request is failing at release project + - "osc my patchinfos" is showing patchinfos where any open bug is assigned to user + - "osc my" or "osc my work" is including assigned patchinfos + - "osc branch --maintenance" is creating setups for maintenance + 0.133 - add --meta option also to "list", "cat" and "less" commands - project checkout is skipping packages linking to project local packages by default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/osc/build.py new/osc-0.134.0/osc/build.py --- old/osc-0.133.1/osc/build.py 2011-12-20 22:55:35.000000000 +0100 +++ new/osc-0.134.0/osc/build.py 2012-02-29 10:41:49.000000000 +0100 @@ -35,6 +35,15 @@ 'sparcv8': 'linux32', } +# FIXME: qemu_can_build should not be needed anymore since OBS 2.3 +qemu_can_build = [ 'armv4l', 'armv5el', 'armv5l', 'armv6l', 'armv7l', 'armv6el', 'armv7el', 'armv7hl', 'armv8el', + 'sh4', 'mips', 'mipsel', + 'ppc', 'ppc64', + 's390', 's390x', + 'sparc64v', 'sparcv9v', 'sparcv9', 'sparcv8', 'sparc', + 'hppa' + ] + can_also_build = { 'armv4l': [ 'armv4l' ], 'armv6l' :[ 'armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el' ], @@ -49,13 +58,12 @@ 's390x': ['s390' ], 'ppc64': [ 'ppc', 'ppc64' ], 'sh4': [ 'sh4' ], - 'i386': [ 'i586', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv5l', 'armv6l', 'armv7l', 'armv6el', 'armv7el', 'armv7hl', 'armv8el', 'sh4', 'mips', 'mipsel' ], - 'i586': [ 'i386', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv5l', 'armv6l', 'armv7l', 'armv6el', 'armv7el', 'armv7hl', 'armv8el', 'sh4', 'mips', 'mipsel' ], - 'i686': [ 'i586', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv5l', 'armv6l', 'armv7l', 'armv6el', 'armv7el', 'armv7hl', 'armv8el', 'sh4', 'mips', 'mipsel' ], - 'x86_64': ['i686', 'i586', 'i386', 'ppc', 'ppc64', 'armv4l', 'armv5el', 'armv5l', 'armv6l', 'armv7l', 'armv6el', 'armv7el', 'armv7hl', 'armv8el', 'sh4', 'mips', 'mipsel' ], + 'i586': [ 'i386' ], + 'i686': [ 'i586', 'i386' ], + 'x86_64': ['i686', 'i586', 'i386' ], 'sparc64': ['sparc64v', 'sparcv9v', 'sparcv9', 'sparcv8', 'sparc'], 'parisc': ['hppa'], - } + } # real arch of this machine hostarch = os.uname()[4] @@ -99,6 +107,10 @@ self.pacsuffix = 'deb' self.buildarch = root.find('arch').text + if root.find('hostarch') != None: + self.hostarch = root.find('hostarch').text + else: + self.hostarch = None if root.find('release') != None: self.release = root.find('release').text else: @@ -152,7 +164,7 @@ def __init__(self, node, buildarch, pacsuffix, apiurl, localpkgs = []): self.mp = {} - for i in ['name', 'package', + for i in ['binary', 'package', 'version', 'release', 'project', 'repository', 'preinstall', 'vminstall', 'noinstall', 'runscripts', @@ -164,6 +176,7 @@ self.mp['pacsuffix'] = pacsuffix self.mp['arch'] = node.get('arch') or self.mp['buildarch'] + self.mp['name'] = node.get('name') or self.mp['binary'] # this is not the ideal place to check if the package is a localdep or not localdep = self.mp['name'] in localpkgs and not self.mp['noinstall'] @@ -185,14 +198,15 @@ self.mp['apiurl'] = apiurl if pacsuffix == 'deb': - self.filename = debquery.DebQuery.filename(self.mp['name'], self.mp['version'], self.mp['release'], self.mp['arch']) + filename = debquery.DebQuery.filename(self.mp['name'], self.mp['version'], self.mp['release'], self.mp['arch']) else: - self.filename = rpmquery.RpmQuery.filename(self.mp['name'], self.mp['version'], self.mp['release'], self.mp['arch']) + filename = rpmquery.RpmQuery.filename(self.mp['name'], self.mp['version'], self.mp['release'], self.mp['arch']) - self.mp['filename'] = self.filename + self.mp['filename'] = node.get('binary') or filename if self.mp['repopackage'] == '_repository': self.mp['repofilename'] = self.mp['name'] else: + # OBS 2.3 puts binary into product bdeps (noinstall ones) self.mp['repofilename'] = self.mp['filename'] # make the content of the dictionary accessible as class attributes @@ -617,10 +631,17 @@ # real arch of this machine # vs. # arch we are supposed to build for - if hostarch != bi.buildarch: - if not bi.buildarch in can_also_build.get(hostarch, []): - print >>sys.stderr, 'Error: hostarch \'%s\' cannot build \'%s\'.' % (hostarch, bi.buildarch) + if bi.hostarch != None: + if hostarch != bi.hostarch and not hostarch in can_also_build.get(hostarch, []): + print >>sys.stderr, 'Error: hostarch \'%s\' is required.' % (bi.hostarch) return 1 + elif hostarch != bi.buildarch: + if not bi.buildarch in can_also_build.get(hostarch, []): + # OBSOLETE: qemu_can_build should not be needed anymore since OBS 2.3 + if not bi.buildarch in qemu_can_build: + print >>sys.stderr, 'Error: hostarch \'%s\' cannot build \'%s\'.' % (hostarch, bi.buildarch) + return 1 + print >>sys.stderr, 'WARNING: It is guessed to build on hostarch \'%s\' for \'%s\' via QEMU.' % (hostarch, bi.buildarch) rpmlist_prefers = [] if prefer_pkgs: @@ -833,6 +854,9 @@ vm_options += [ '--vmdisk-rootsize=' + config['build-vmdisk-rootsize'] ] if config['build-vmdisk-swapsize']: vm_options += [ '--vmdisk-swapsize=' + config['build-vmdisk-swapsize'] ] + if config['build-vmdisk-filesystem']: + vm_options += [ '--vmdisk-filesystem=' + config['build-vmdisk-filesystem'] ] + if opts.preload: print "Preload done for selected repo/arch." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/osc/checker.py new/osc-0.134.0/osc/checker.py --- old/osc-0.133.1/osc/checker.py 2011-12-06 09:54:35.000000000 +0100 +++ new/osc-0.134.0/osc/checker.py 2012-02-29 10:41:49.000000000 +0100 @@ -87,6 +87,8 @@ self.imported[file] = 1 def check(self, pkg): + # avoid errors on non rpm + if pkg[-4:] != '.rpm': return fd = os.open(pkg, os.O_RDONLY) hdr = self.ts.hdrFromFdno(fd) os.close(fd) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/osc/commandline.py new/osc-0.134.0/osc/commandline.py --- old/osc-0.133.1/osc/commandline.py 2011-12-20 22:56:33.000000000 +0100 +++ new/osc-0.134.0/osc/commandline.py 2012-03-12 14:36:09.000000000 +0100 @@ -437,46 +437,51 @@ Examples: osc patchinfo - osc patchinfo PATCH_NAME + osc patchinfo [PROJECT [PATCH_NAME]] ${cmd_option_list} """ + apiurl = self.get_api_url() project_dir = localdir = os.getcwd() - patchinfo = None - if is_project_dir(localdir): - project = store_read_project(localdir) - apiurl = self.get_api_url() - for p in meta_get_packagelist(apiurl, project): - if p.startswith("_patchinfo") or p.startswith("patchinfo"): - patchinfo = p + patchinfo = 'patchinfo' + if len(args) == 0: + if is_project_dir(localdir): + project = store_read_project(localdir) + apiurl = self.get_api_url() + for p in meta_get_packagelist(apiurl, project): + if p.startswith("_patchinfo") or p.startswith("patchinfo"): + patchinfo = p + else: + if is_package_dir(localdir): + project = store_read_project(localdir) + patchinfo = store_read_package(localdir) + apiurl = self.get_api_url() + else: + sys.exit('This command must be called in a checked out project or patchinfo package.') else: - if is_package_dir(localdir): - project = store_read_project(localdir) - patchinfo = store_read_package(localdir) - apiurl = self.get_api_url() - else: - sys.exit('This command must be called in a checked out project or patchinfo package.') + project = args[0] + if len(args) > 1: + patchinfo = args[1] filelist = None if patchinfo: - filelist = meta_get_filelist(apiurl, project, patchinfo) + try: + filelist = meta_get_filelist(apiurl, project, patchinfo) + except urllib2.HTTPError: + pass - if opts.force or not patchinfo or not '_patchinfo' in filelist: - print "Creating initial patchinfo..." - query='cmd=createpatchinfo' + if opts.force or not filelist or not '_patchinfo' in filelist: + print "Creating new patchinfo..." + query='cmd=createpatchinfo&name=' + patchinfo if opts.force: query += "&force=1" - if args and args[0]: - query += "&name=" + args[0] - elif patchinfo: - query += "&name=" + patchinfo url = makeurl(apiurl, ['source', project], query=query) f = http_POST(url) for p in meta_get_packagelist(apiurl, project): if p.startswith("_patchinfo") or p.startswith("patchinfo"): patchinfo = p else: - print "Update _patchinfo file..." + print "Update existing _patchinfo file..." query='cmd=updatepatchinfo' url = makeurl(apiurl, ['source', project, patchinfo], query=query) f = http_POST(url) @@ -730,6 +735,8 @@ for i in opts.set.split(','): values += '<value>%s</value>' % i aname = opts.attribute.split(":") + if len(aname) != 2: + raise oscerr.WrongOptions('Given attribute is not in "NAMESPACE:NAME" style') d = '<attributes><attribute namespace=\'%s\' name=\'%s\' >%s</attribute></attributes>' % (aname[0], aname[1], values) url = makeurl(apiurl, attributepath) for data in streamfile(url, http_POST, data=d): @@ -1003,7 +1010,10 @@ if len(args) == 2: dst_package = args[1] else: - dst_package = src_package + if p.islink(): + dst_package = p.linkinfo.package + else: + dst_package = src_package else: sys.exit('Package \'%s\' is not a source link, so I cannot guess the submit target.\n' 'Please provide it the target via commandline arguments.' % p.name) @@ -1062,18 +1072,17 @@ rev=opts.revision if not rev: # get _link info from server, that knows about the local state ... - u = makeurl(apiurl, ['source', src_project, src_package]) + u = makeurl(apiurl, ['source', src_project, src_package], query="expand=1") f = http_GET(u) root = ET.parse(f).getroot() linkinfo = root.find('linkinfo') - if linkinfo != None: - if linkinfo.get('error'): - print "Package source is a broken source link." - sys.exit("Please fix this first") + if linkinfo == None: + rev=root.get('rev') + else: if linkinfo.get('project') != dst_project or linkinfo.get('package') != dst_package: # the submit target is not link target. use merged md5sum references to avoid not mergable # sources when multiple request from same source get created. - rev=linkinfo.get('xsrcmd5') + rev=root.get('srcmd5') rdiff = None if opts.diff or not opts.message: @@ -1090,9 +1099,9 @@ return # Are there already requests to this package ? - reqs = get_request_list(apiurl, dst_project, dst_package, req_type='submit', req_state=['new','review', 'declined']) + reqs = get_exact_request_list(apiurl, src_project, dst_project, src_package, dst_package, req_type='submit', req_state=['new','review', 'declined']) + myreqs = [ i for i in reqs ] user = conf.get_apiurl_usr(apiurl) - myreqs = [ i for i in reqs if i.state.who == user ] repl = '' if len(myreqs) > 0 and not opts.supersede: @@ -1788,6 +1797,8 @@ "reopen" will set the request back to new or review. + "setincident" will direct "maintenance" requests into specific incidents + "supersede" will supersede one request with another existing one. "revoke" will set the request state to "revoked" @@ -1819,12 +1830,14 @@ osc request decline [-m TEXT] ID osc request revoke [-m TEXT] ID osc request reopen [-m TEXT] ID + osc request setincident [-m TEXT] ID INCIDENT osc request supersede [-m TEXT] ID SUPERSEDING_ID osc request approvenew [-m TEXT] PROJECT osc request checkout/co ID osc request clone [-m TEXT] ID + osc review show [-d] [-b] ID osc review list [-U USER] [-G GROUP] [-P PROJECT [-p PACKAGE]] [-s state] osc review add [-m TEXT] [-U USER] [-G GROUP] [-P PROJECT [-p PACKAGE]] ID osc review accept [-m TEXT] [-U USER] [-G GROUP] [-P PROJECT [-p PACKAGE]] ID @@ -1859,11 +1872,11 @@ if args[0] == 'help': return self.do_help(['help', 'request']) - cmds = [ 'list', 'log', 'show', 'decline', 'reopen', 'clone', 'accept', 'approvenew', 'wipe', 'supersede', 'revoke', 'checkout', 'co' ] + cmds = ['list', 'log', 'show', 'decline', 'reopen', 'clone', 'accept', 'approvenew', 'wipe', 'setincident', 'supersede', 'revoke', 'checkout', 'co'] if subcmd != 'review' and args[0] not in cmds: raise oscerr.WrongArgs('Unknown request action %s. Choose one of %s.' \ % (args[0],', '.join(cmds))) - cmds = [ 'list', 'add', 'decline', 'accept', 'reopen', 'supersede' ] + cmds = ['show', 'list', 'add', 'decline', 'accept', 'reopen', 'supersede'] if subcmd == 'review' and args[0] not in cmds: raise oscerr.WrongArgs('Unknown review action %s. Choose one of %s.' \ % (args[0],', '.join(cmds))) @@ -1875,7 +1888,7 @@ if cmd in ['list']: min_args, max_args = 0, 2 - elif cmd in ['supersede']: + elif cmd in ['supersede', 'setincident']: min_args, max_args = 2, 2 else: min_args, max_args = 1, 1 @@ -1909,6 +1922,9 @@ elif cmd == 'supersede': reqid = args[0] supersedid = args[1] + elif cmd == 'setincident': + reqid = args[0] + incident = args[1] elif cmd in ['log', 'add', 'show', 'decline', 'reopen', 'clone', 'accept', 'wipe', 'revoke', 'checkout', 'co']: reqid = args[0] @@ -1917,6 +1933,13 @@ # should we force a message? print 'Cloned packages are available in project: %s' % clone_request(apiurl, reqid, opts.message) + # change incidents + elif cmd == 'setincident': + query = { 'cmd': 'setincident', 'incident': incident } + url = makeurl(apiurl, ['request', reqid], query) + r = http_POST(url, data=opts.message) + print ET.parse(r).getroot().get('code') + # add new reviewer to existing request elif cmd in ['add'] and subcmd == 'review': query = { 'cmd': 'addreview' } @@ -2154,8 +2177,6 @@ help='use the specified revision.') @cmdln.option('-R', '--use-plain-revision', action='store_true', help='Don\'t expand revsion based on baserev, the revision which was used when commit happened.') - @cmdln.option('-b', '--use-baserev', action='store_true', - help='Use the revisions which exists when the original commit happend and don\'t try to merge later commits.') @cmdln.option('-u', '--unset', action='store_true', help='remove revision in link, it will point always to latest revision') def do_setlinkrev(self, subcmd, opts, *args): @@ -2174,11 +2195,10 @@ apiurl = self.get_api_url() package = None expand = True - baserev = False + baserev = True if opts.use_plain_revision: expand = False - if opts.use_baserev: - baserev = True + baserev = False rev = parseRevisionOption(opts.revision)[0] or '' if opts.unset: @@ -2332,6 +2352,7 @@ + self.get_cmd_help('linkpac')) rev, dummy = parseRevisionOption(opts.revision) + vrev = None src_project = args[0] src_package = args[1] @@ -2350,13 +2371,16 @@ opts.cicount = "copy" if opts.current and not opts.new_package: - rev = show_upstream_rev(apiurl, src_project, src_package) + rev, vrev = show_upstream_rev_vrev(apiurl, src_project, src_package, expand=1) + if rev == None or len(rev) < 32: + # vrev is only needed for srcmd5 and OBS instances < 2.1.17 do not support it + vrev = None if rev and not checkRevision(src_project, src_package, rev): print >>sys.stderr, 'Revision \'%s\' does not exist' % rev sys.exit(1) - link_pac(src_project, src_package, dst_project, dst_package, opts.force, rev, opts.cicount, opts.disable_publish, opts.new_package) + link_pac(src_project, src_package, dst_project, dst_package, opts.force, rev, opts.cicount, opts.disable_publish, opts.new_package, vrev) @cmdln.option('--nosources', action='store_true', help='ignore source packages when copying build results to destination project') @@ -2612,6 +2636,11 @@ help='specify message TEXT') @cmdln.option('--no-cleanup', action='store_true', help='do not remove source project on accept') + @cmdln.option('--incident', metavar='INCIDENT', + help='specify incident number to merge in') + @cmdln.option('--incident-project', metavar='INCIDENT_PROJECT', + help='specify incident project to merge in') + @cmdln.alias("mr") def do_maintenancerequest(self, subcmd, opts, *args): """${cmd_name}: Create a request for starting a maintenance incident. @@ -2623,7 +2652,7 @@ the "patchinfo" command how add the required maintenance update information. usage: - osc maintenancerequest [ SOURCEPROJECT [ TARGETPROJECT ] ] + osc maintenancerequest [ SOURCEPROJECT [ SOURCEPACKAGES RELEASEPROJECT ] ] ${cmd_option_list} """ @@ -2633,12 +2662,7 @@ if opts.attribute: maintenance_attribute = opts.attribute - source_project = target_project = opt_sourceupdate = None - if not opts.no_cleanup: - opt_sourceupdate = 'cleanup' - - if len(args) > 2: - raise oscerr.WrongArgs('Too many arguments.') + source_project = source_packages = target_project = release_project = opt_sourceupdate = None if len(args) == 0 and is_project_dir(os.curdir): source_project = store_read_project(os.curdir) @@ -2646,9 +2670,19 @@ raise oscerr.WrongArgs('Too few arguments.') if len(args) > 0: source_project = args[0] - if len(args) > 1: - target_project = args[1] + if len(args) == 2: + sys.exit('Source package defined, but no release project.') + source_packages = args[1:] + release_project = args[-1] + source_packages.remove(release_project) + if not opts.no_cleanup: + default_branch = 'home:%s:branches:' % (conf.get_apiurl_usr(apiurl)) + if source_project.startswith(default_branch) and not opts.no_cleanup: + opt_sourceupdate = 'cleanup' + + if opts.incident_project: + target_project = opts.incident_project else: xpath = 'attribute/@name = \'%s\'' % maintenance_attribute res = search(apiurl, project_id=xpath) @@ -2657,12 +2691,14 @@ if project is None: sys.exit('Unable to find defined OBS:MaintenanceProject project on server.') target_project = project.get('name') + if opts.incident: + target_project += ":" + opts.incident print 'Using target project \'%s\'' % target_project if not opts.message: opts.message = edit_message() - r = create_maintenance_request(apiurl, source_project, target_project, opt_sourceupdate, opts.message) + r = create_maintenance_request(apiurl, source_project, source_packages, target_project, release_project, opt_sourceupdate, opts.message) print r.reqid @@ -2671,24 +2707,34 @@ '(\'osc bco\' is a shorthand for this option)' ) @cmdln.option('-a', '--attribute', metavar='ATTRIBUTE', help='Use this attribute to find affected packages (default is OBS:Maintained)') - @cmdln.option('--noaccess', action='store_true', - help='Create a hidden project') @cmdln.option('-u', '--update-project-attribute', metavar='UPDATE_ATTRIBUTE', help='Use this attribute to find update projects (default is OBS:UpdateProject) ') + @cmdln.option('--dryrun', action='store_true', + help='Just simulate the action and report back the result.') + @cmdln.option('--noaccess', action='store_true', + help='Create a hidden project') + @cmdln.option('--nodevelproject', action='store_true', + help='do not follow a defined devel project ' \ + '(primary project where a package is developed)') + @cmdln.alias('sm') + @cmdln.alias('maintained') def do_mbranch(self, subcmd, opts, *args): - """${cmd_name}: Multiple branch of a package + """${cmd_name}: Search or banch multiple instances of a package + + This command is used for searching all relevant instances of packages + and creating links of them in one project. + This is esp. used for maintenance updates. It can also be used to branch + all packages marked before with a given attribute. [See http://en.opensuse.org/openSUSE:Build_Service_Concept_Maintenance for information on this topic.] - This command is used for creating multiple links of defined version of a package - in one project. This is esp. used for maintenance updates. - The branched package will live in home:USERNAME:branches:ATTRIBUTE:PACKAGE if nothing else specified. usage: + osc sm [SOURCEPACKAGE] [-a ATTRIBUTE] osc mbranch [ SOURCEPACKAGE [ TARGETPROJECT ] ] ${cmd_option_list} """ @@ -2697,7 +2743,11 @@ tproject = None maintained_attribute = conf.config['maintained_attribute'] + if opts.attribute: + maintained_attribute = opts.attribute maintained_update_project_attribute = conf.config['maintained_update_project_attribute'] + if opts.update_project_attribute: + maintained_update_project_attribute = opts.update_project_attribute if not len(args) or len(args) > 2: raise oscerr.WrongArgs('Wrong number of arguments.') @@ -2706,23 +2756,31 @@ if len(args) >= 2: tproject = args[1] - r = attribute_branch_pkg(apiurl, maintained_attribute, maintained_update_project_attribute, \ - package, tproject, noaccess = opts.noaccess) + if subcmd == 'sm' or subcmd == 'maintained': + opts.dryrun = 1 + + result = attribute_branch_pkg(apiurl, maintained_attribute, maintained_update_project_attribute, \ + package, tproject, noaccess = opts.noaccess, nodevelproject=opts.nodevelproject, dryrun=opts.dryrun) - if r is None: + if result is None: print >>sys.stderr, 'ERROR: Attribute branch call came not back with a project.' sys.exit(1) - print "Project " + r + " created." + if opts.dryrun: + for r in result.findall('package'): + print "%s/%s"%(r.get('project'), r.get('package')) + return + + print "Project " + result + " created." if opts.checkout: - Project.init_project(apiurl, r, r, conf.config['do_package_tracking']) - print statfrmt('A', r) + Project.init_project(apiurl, result, result, conf.config['do_package_tracking']) + print statfrmt('A', result) # all packages - for package in meta_get_packagelist(apiurl, r): + for package in meta_get_packagelist(apiurl, result): try: - checkout_package(apiurl, r, package, expand_link = True, prj_dir = r) + checkout_package(apiurl, result, package, expand_link = True, prj_dir = result) except: print >>sys.stderr, 'Error while checkout package:\n', package @@ -2749,6 +2807,8 @@ help='Create a hidden project') @cmdln.option('-m', '--message', metavar='TEXT', help='specify message TEXT') + @cmdln.option('-M', '--maintenance', default=False, action="store_true", + help='Create project and package in maintenance mode') @cmdln.option('-N', '--new-package', action='store_true', help='create a branch pointing to a not yet existing package') @cmdln.option('-r', '--revision', metavar='rev', @@ -2812,7 +2872,9 @@ return_existing=opts.checkout, msg=opts.message or '', force=opts.force, noaccess=opts.noaccess, add_repositories=opts.add_repositories, - extend_package_names=opts.extend_package_names, missingok=opts.new_package) + extend_package_names=opts.extend_package_names, + missingok=opts.new_package, + maintenance=opts.maintenance) if exists: print >>sys.stderr, 'Using existing branch project: %s' % targetprj @@ -2835,7 +2897,7 @@ ' A direct branch of the specified package can be forced\n' \ ' with the --nodevelproject option.\n' % devloc - package = tpackage or args[1] + package = targetpkg or args[1] if opts.checkout: checkout_package(apiurl, targetprj, package, server_service_files=True, expand_link=True, prj_dir=targetprj) @@ -3060,10 +3122,10 @@ baserev = linkinfo.get('baserev') opts.revision = baserev if pacs: - print "diff working copy against linked revision %s\n" % baserev + print "diff working copy against last commited version\n" else: print "diff commited package against linked revision %s\n" % baserev - run_pager(server_diff(self.get_api_url(), args[0], args[1], baserev, + run_pager(server_diff(self.get_api_url(), linkinfo.get('project'), linkinfo.get('package'), baserev, args[0], args[1], linkinfo.get('lsrcmd5'), not opts.plain, opts.missingok)) return @@ -3740,7 +3802,7 @@ help='deprecated, don\'t use it') @cmdln.option('-v', '--verbose', default=False, action="store_true", help='Run the source services with verbose information') - @cmdln.option('--skip-local-service-run', default=False, action="store_true", + @cmdln.option('--skip-local-service-run', '--noservice', default=False, action="store_true", help='Skip service run of configured source services for local run') def do_commit(self, subcmd, opts, *args): """${cmd_name}: Upload content to the repository server @@ -4146,6 +4208,8 @@ help='Show results only for specified architecture(s)') @cmdln.option('-v', '--verbose', action='store_true', default=False, help='more verbose output') + @cmdln.option('-w', '--watch', action='store_true', default=False, + help='watch the results until all finished building') @cmdln.option('', '--xml', action='store_true', default=False, help='generate output in XML (former results_meta)') @cmdln.option('', '--csv', action='store_true', default=False, @@ -4168,7 +4232,6 @@ if len(args) < 2: wd = os.curdir if is_project_dir(wd): - opts.csv = None if opts.arch == []: opts.arch = None if opts.repo == []: @@ -4197,10 +4260,14 @@ if opts.xml: print ''.join(show_results_meta(*args)), elif opts.csv: - print '\n'.join(format_results(get_package_results(*args), opts.format)) + # ignore _oldstate key + results = [r for r in get_package_results(*args) if not '_oldstate' in r] + print '\n'.join(format_results(results, opts.format)) else: args.append(opts.verbose) - print '\n'.join(get_results(*args)) + args.append(opts.watch) + args.append("\n") + get_results(*args) # WARNING: this function is also called by do_results. You need to set a default there # as well when adding a new option! @@ -4761,6 +4828,7 @@ arg_descr = arg else: if (arg in osc.build.can_also_build.get(osc.build.hostarch, []) + or arg in osc.build.qemu_can_build or arg in osc.build.hostarch) and arg_arch is None: arg_arch = arg elif not arg_repository: @@ -4853,7 +4921,7 @@ @cmdln.option('-o', '--offline', action='store_true', help='Start with cached prjconf and packages without contacting the api server') @cmdln.option('-l', '--preload', action='store_true', - help='Preload all files into the chache for offline operation') + help='Preload all files into the cache for offline operation') @cmdln.option('--no-changelog', action='store_true', help='don\'t update the package changelog from a changes file') @cmdln.option('--rsync-src', metavar='RSYNCSRCPATH', dest='rsyncsrc', @@ -4984,7 +5052,7 @@ # check for source services r = None try: - if not opts.offline: + if not opts.offline and not opts.noservice: p = Package('.') r = p.run_source_services(verbose=True) except: @@ -5619,10 +5687,12 @@ help='verbose listing') @cmdln.option('--maintained', action='store_true', help='limit search results to packages with maintained attribute set.') - def do_my(self, subcmd, opts, type): - """${cmd_name}: show packages, projects or requests involving yourself + def do_my(self, subcmd, opts, *args): + """${cmd_name}: show waiting work, packages, projects or requests involving yourself Examples: + # list all tasks where it is expected to work on + osc ${cmd_name} [work] # list packages where I am bugowner osc ${cmd_name} pkg -b # list projects where I am maintainer @@ -5647,10 +5717,11 @@ # The usage above indicates, that sr would be a subset of rq, which is no the case with my tests. # jw. - args_rq = ('requests', 'request', 'req', 'rq') + args_rq = ('requests', 'request', 'req', 'rq', 'work') args_sr = ('submitrequests', 'submitrequest', 'submitreq', 'submit', 'sr') args_prj = ('projects', 'project', 'projs', 'proj', 'prj') args_pkg = ('packages', 'package', 'pack', 'pkgs', 'pkg') + args_patchinfos = ('patchinfos', 'work') if opts.bugowner and opts.maintainer: raise oscerr.WrongOptions('Sorry, \'--bugowner\' and \'maintainer\' are mutually exclusive') @@ -5671,8 +5742,14 @@ else: user = opts.user - list_requests = False what = {'project': '', 'package': ''} + type="work" + if len(args) > 0: + type=args[0] + + list_patchinfos = list_requests = False + if type in args_patchinfos: + list_patchinfos = True if type in args_rq: list_requests = True elif type in args_prj: @@ -5695,6 +5772,35 @@ if opts.all: role_filter = '' + if list_patchinfos: + u = makeurl(apiurl, ['/search/package'], { + 'match' : "([kind='patchinfo' and issue/[@state='OPEN' and owner/@login='%s']])" % user + }) + f = http_GET(u) + root = ET.parse(f).getroot() + if root.findall('package'): + print "Patchinfos with open bugs assigned to you:\n" + for node in root.findall('package'): + project = node.get('project') + package = node.get('name') + print project, "/", package, '\n' + p = makeurl(apiurl, ['source', project, package], { 'view': 'issues' }) + fp = http_GET(p) + issues = ET.parse(fp).findall('issue') + for issue in issues: + if issue.find('state') == None or issue.find('state').text != "OPEN": + continue + if issue.find('owner') == None or issue.find('owner').find('login').text != user: + continue + print " #", issue.find('label').text, ': ', + desc = issue.find('summary') + if desc != None: + print desc.text + else: + print "\n" + print "" + + if list_requests: # try api side search as supported since OBS 2.2 try: @@ -5832,7 +5938,8 @@ help='search binary packages') @cmdln.option('-B', '--baseproject', metavar='PROJECT', help='search packages built for PROJECT (implies --binary)') - @cmdln.alias('sm') + @cmdln.option('--binaryversion', metavar='VERSION', + help='search for binary with specified version (implies --binary)') @cmdln.alias('se') @cmdln.alias('bse') def do_search(self, subcmd, opts, *args): @@ -5844,7 +5951,6 @@ usage: osc search \'search term\' <options> - osc sm \'source package name\' ('osc search --maintained') osc bse ... ('osc search --binary') osc se 'perl(Foo::Bar)' ('osc --package perl-Foo-Bar') ${cmd_option_list} @@ -5882,11 +5988,9 @@ if opts.substring and opts.exact: raise oscerr.WrongOptions('Sorry, the options \'--substring\' and \'--exact\' are mutually exclusive') - if subcmd == 'sm' or opts.maintained: - opts.package = True if not opts.substring: opts.exact = True - if subcmd == 'bse' or opts.baseproject: + if subcmd == 'bse' or opts.baseproject or opts.binaryversion: opts.binary = True if opts.binary and (opts.title or opts.description or opts.involved or opts.bugowner or opts.maintainer @@ -5920,16 +6024,22 @@ xpath = xpath_join(xpath, 'attribute/@name=\'%s\'' % opts.limit_to_attribute, op='and') if opts.baseproject: xpath = xpath_join(xpath, 'path/@project=\'%s\'' % opts.baseproject, op='and') + if opts.binaryversion: + m = re.match(r'(.+)-(.*?)$', opts.binaryversion) + if m: + if m.group(2) != '': + xpath = xpath_join(xpath, '@versrel=\'%s\'' % opts.binaryversion, op='and') + else: + xpath = xpath_join(xpath, '@version=\'%s\'' % m.group(1), op='and') + else: + xpath = xpath_join(xpath, '@version=\'%s\'' % opts.binaryversion, op='and') if not xpath: xpath = xpath_join(xpath, build_xpath('@name', search_term, opts.substring), inner=True) xpath = xpath_join(xpath, build_xpath('title', search_term, opts.substring), inner=True) xpath = xpath_join(xpath, build_xpath('description', search_term, opts.substring), inner=True) what = {'project': xpath, 'package': xpath} - if subcmd == 'sm' or opts.maintained: - xpath = xpath_join(xpath, '(project/attribute/@name=\'%(attr)s\' or attribute/@name=\'%(attr)s\')' % {'attr': conf.config['maintained_attribute']}, op='and') - what = {'package': xpath} - elif opts.project and not opts.package: + if opts.project and not opts.package: what = {'project': xpath} elif not opts.project and opts.package: what = {'package': xpath} @@ -6367,22 +6477,21 @@ @cmdln.alias('who') @cmdln.alias('user') - def do_whois(self, subcmd, opts, *args): + def do_whois(self, subcmd, opts, *usernames): """${cmd_name}: Show fullname and email of a buildservice user ${cmd_usage} ${cmd_option_list} """ apiurl = self.get_api_url() - if len(args) > 1: - raise oscerr.WrongArgs('Wrong number of arguments.') - if len(args) < 1: + if len(usernames) < 1: if not conf.config['api_host_options'][apiurl].has_key('user'): raise oscerr.WrongArgs('your .oscrc does not have your user name.') - args = (conf.config['api_host_options'][apiurl]['user'],) - user = get_user_data(apiurl, args[0], 'login', 'realname', 'email') - if len(user) > 0: user[1] = '"'+user[1]+'"' - print " ".join(user), "\n" + usernames = (conf.config['api_host_options'][apiurl]['user'],) + for name in usernames: + user = get_user_data(apiurl, name, 'login', 'realname', 'email') + if len(user) == 3: + print "%s: \"%s\" <%s>"%(user[0], user[1], user[2]) @cmdln.option('-r', '--revision', metavar='rev', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/osc/conf.py new/osc-0.134.0/osc/conf.py --- old/osc-0.133.1/osc/conf.py 2011-12-20 22:55:35.000000000 +0100 +++ new/osc-0.134.0/osc/conf.py 2012-03-12 14:36:09.000000000 +0100 @@ -97,6 +97,7 @@ 'build-swap': '', # optional for VM builds 'build-vmdisk-rootsize': '', # optional for VM builds 'build-vmdisk-swapsize': '', # optional for VM builds + 'build-vmdisk-filesystem': '', # optional for VM builds 'build-jobs': _get_processors(), 'builtin_signature_check': '1', # by default use builtin check for verify pkgs @@ -217,6 +218,10 @@ # values in MB - e.g. 1024 #build-vmdisk-swapsize = 1024 +# build-vmdisk-filesystem is the file system type of the disk-image used in a VM build +# values are ext3(default) ext4 xfs reiserfs btrfs +#build-vmdisk-filesystem = ext4 + # Numeric uid:gid to assign to the "abuild" user in the build-root # or "caller" to use the current users uid:gid # This is convenient when sharing the buildroot with ordinary userids @@ -878,7 +883,7 @@ apiurl = aliases.get(config['apiurl'], config['apiurl']) config['apiurl'] = urljoin(*parse_apisrv_url(None, apiurl)) # backward compatibility - if key in config: + if 'apisrv' in config: apisrv = config['apisrv'].lstrip('http://') apisrv = apisrv.lstrip('https://') scheme = config.get('scheme', 'https') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/osc/core.py new/osc-0.134.0/osc/core.py --- old/osc-0.133.1/osc/core.py 2011-12-20 22:56:23.000000000 +0100 +++ new/osc-0.134.0/osc/core.py 2012-03-12 14:49:45.000000000 +0100 @@ -3,7 +3,7 @@ # and distributed under the terms of the GNU General Public Licence, # either version 2, or version 3 (at your option). -__version__ = '0.133' +__version__ = '0.134.0' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -59,7 +59,7 @@      </patches> </link> -""" % (project, src_package, missingok, rev, cicount) +""" % (project, src_package, missingok, rev, vrev, cicount) u = makeurl(apiurl, ['source', dst_project, dst_package, '_link']) http_PUT(u, data=link_template) @@ -4293,7 +4369,7 @@ print 'Done.' -def attribute_branch_pkg(apiurl, attribute, maintained_update_project_attribute, package, targetproject, return_existing=False, force=False, noaccess=False, add_repositories=False): +def attribute_branch_pkg(apiurl, attribute, maintained_update_project_attribute, package, targetproject, return_existing=False, force=False, noaccess=False, add_repositories=False, dryrun=False, nodevelproject=False, maintenance=False): """ Branch packages defined via attributes (via API call) """ @@ -4301,12 +4377,18 @@ query['attribute'] = attribute if targetproject: query['target_project'] = targetproject + if dryrun: + query['dryrun'] = "1" if force: query['force'] = "1" if noaccess: query['noaccess'] = "1" + if nodevelproject: + query['ignoredevel'] = '1' if add_repositories: query['add_repositories'] = "1" + if maintenance: + query['maintenance'] = "1" if package: query['package'] = package if maintained_update_project_attribute: @@ -4322,13 +4404,23 @@ msg = msg.split('</summary>')[0] raise oscerr.APIError(msg) - r = f.read() - r = r.split('targetproject">')[1] - r = r.split('</data>')[0] + r = None + + root = ET.fromstring(f.read()) + if dryrun: + return root + # TODO: change api here and return parsed XML as class + if conf.config['http_debug']: + print >> sys.stderr, ET.tostring(root) + for node in root.findall('data'): + r = node.get('name') + if r and r == 'targetproject': + return node.text + return r -def branch_pkg(apiurl, src_project, src_package, nodevelproject=False, rev=None, target_project=None, target_package=None, return_existing=False, msg='', force=False, noaccess=False, add_repositories=False, extend_package_names=False, missingok=False): +def branch_pkg(apiurl, src_project, src_package, nodevelproject=False, rev=None, target_project=None, target_package=None, return_existing=False, msg='', force=False, noaccess=False, add_repositories=False, extend_package_names=False, missingok=False, maintenance=False): """ Branch a package (via API call) """ @@ -4341,6 +4433,8 @@ query['noaccess'] = '1' if add_repositories: query['add_repositories'] = "1" + if maintenance: + query['maintenance'] = "1" if missingok: query['missingok'] = "1" if extend_package_names: @@ -4369,6 +4463,8 @@ raise return (True, m.group(1), m.group(2), None, None) + if conf.config['http_debug']: + print >> sys.stderr, ET.tostring(root) data = {} for i in ET.fromstring(f.read()).findall('data'): data[i.get('name')] = i.text @@ -4384,6 +4480,7 @@ expand = False, revision = None, comment = None, + force_meta_update = None, keep_link = None): """ Create a copy of a package. @@ -4400,9 +4497,16 @@ src_meta = replace_pkg_meta(src_meta, dst_package, dst_project, keep_maintainers, dst_userid, keep_develproject) - print 'Sending meta data...' - u = makeurl(dst_apiurl, ['source', dst_project, dst_package, '_meta']) - http_PUT(u, data=src_meta) + url = make_meta_url('pkg', (quote_plus(dst_project),) + (quote_plus(dst_package),), dst_apiurl) + found = None + try: + found = http_GET(url).readlines() + except urllib2.HTTPError, e: + pass + if force_meta_update or not found: + print 'Sending meta data...' + u = makeurl(dst_apiurl, ['source', dst_project, dst_package, '_meta']) + http_PUT(u, data=src_meta) print 'Copying files...' if not client_side_copy: @@ -4468,6 +4572,8 @@ query = {} if force: query['force'] = "1" + if msg: + query['comment'] = msg u = makeurl(apiurl, ['source', prj, pac], query) http_DELETE(u) @@ -4596,10 +4702,12 @@ return r -def show_results_meta(apiurl, prj, package=None, lastbuild=None, repository=[], arch=[]): +def show_results_meta(apiurl, prj, package=None, lastbuild=None, repository=[], arch=[], oldstate=None): query = {} if package: query['package'] = package + if oldstate: + query['oldstate'] = oldstate if lastbuild: query['lastbuild'] = 1 u = makeurl(apiurl, ['build', prj, '_result'], query=query) @@ -4617,13 +4725,15 @@ return f.readlines() -def get_package_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[]): +def get_package_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], oldstate=None): """ return a package results as a list of dicts """ r = [] - f = show_results_meta(apiurl, prj, package, lastbuild, repository, arch) + f = show_results_meta(apiurl, prj, package, lastbuild, repository, arch, oldstate) root = ET.fromstring(''.join(f)) + r.append( {'_oldstate': root.get('state')} ) + for node in root.findall('result'): rmap = {} rmap['project'] = rmap['prj'] = prj @@ -4654,26 +4764,51 @@ """apply selected format on each dict in results and return it as a list of strings""" return [format % r for r in results] -def get_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], verbose=False): +def get_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], verbose=False, wait=False, printJoin=None): r = [] result_line_templ = '%(rep)-20s %(arch)-10s %(status)s' + oldstate = None - for res in get_package_results(apiurl, prj, package, lastbuild, repository, arch): - res['status'] = res['code'] - if verbose and res['details'] != '': - if res['status'] in ('unresolvable', 'expansion error'): - lines = res['details'].split(',') - res['status'] += ': ' + '\n '.join(lines) + while True: + waiting = False + results = r = [] + try: + results = get_package_results(apiurl, prj, package, lastbuild, repository, arch, oldstate) + except urllib2.HTTPError, e: + # check for simple timeout error and fetch again + if e.code != 502: + raise + # re-try result request + continue + + for res in results: + if res.has_key('_oldstate'): + oldstate = res['_oldstate'] + continue + res['status'] = res['code'] + if verbose and res['details'] != '': + if res['status'] in ('unresolvable', 'expansion error'): + lines = res['details'].split(',') + res['status'] += ': ' + '\n '.join(lines) + + else: + res['status'] += ': %s' % (res['details'], ) + if res['dirty']: + waiting=True + if verbose: + res['status'] = 'outdated (was: %s)' % res['status'] + else: + res['status'] += '*' + if res['status'] in ('blocked', 'scheduled', 'dispatching', 'building', 'signing', 'finished'): + waiting=True - else: - res['status'] += ': %s' % (res['details'], ) - if res['dirty']: - if verbose: - res['status'] = 'outdated (was: %s)' % res['status'] - else: - res['status'] += '*' + r.append(result_line_templ % res) + + if printJoin: + print printJoin.join(r) - r.append(result_line_templ % res) + if wait==False or waiting==False: + break return r @@ -4879,6 +5014,10 @@ cl = f.info().get('Content-Length') if cl is not None: + # sometimes the proxy adds the same header again + # which yields in value like '3495, 3495' + # use the first of these values (should be all the same) + cl = cl.split(',')[0] cl = int(cl) if progress_obj: @@ -4903,6 +5042,12 @@ def print_buildlog(apiurl, prj, package, repository, arch, offset = 0): """prints out the buildlog on stdout""" + + # to protect us against control characters + import string + all_bytes = string.maketrans('', '') + remove_bytes = all_bytes[:10] + all_bytes[11:32] # accept newlines + query = {'nostream' : '1', 'start' : '%s' % offset} while True: query['start'] = offset @@ -4910,7 +5055,7 @@ u = makeurl(apiurl, ['build', prj, repository, arch, package, '_log'], query=query) for data in streamfile(u): offset += len(data) - sys.stdout.write(data) + sys.stdout.write(data.translate(all_bytes, remove_bytes)) if start_offset == offset: break @@ -5475,6 +5620,7 @@ src_project = root.get('project', project) src_package = root.get('package', package) linkrev=None + vrev = None if baserev: linkrev = 'base' expand = True @@ -5482,10 +5628,13 @@ if 'rev' in root.keys(): del root.attrib['rev'] elif revision == '' or expand: - revision = show_upstream_rev(apiurl, src_project, src_package, revision=revision, linkrev=linkrev, expand=expand) + revision, vrev = show_upstream_rev_vrev(apiurl, src_project, src_package, revision=revision, linkrev=linkrev, expand=expand) if revision: root.set('rev', revision) + # add vrev when revision is a srcmd5 + if vrev and revision and len(revision) >= 32: + root.set('vrev', vrev) l = ET.tostring(root) http_PUT(url, data=l) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/osc/fetch.py new/osc-0.134.0/osc/fetch.py --- old/osc-0.133.1/osc/fetch.py 2011-12-20 22:55:35.000000000 +0100 +++ new/osc-0.134.0/osc/fetch.py 2012-02-29 10:41:49.000000000 +0100 @@ -165,7 +165,14 @@ def move_package(self, tmpfile, destdir, pac_obj = None): import shutil pkgq = packagequery.PackageQuery.query(tmpfile, extra_rpmtags=(1044, 1051, 1052)) - canonname = pkgq.canonname() + if pkgq: + canonname = pkgq.canonname() + else: + if pac_obj is None: + print >>sys.stderr, 'Unsupported file type: ', tmpfile + sys.exit(1) + canonname = pac_obj.binary + fullfilename = os.path.join(destdir, canonname) if pac_obj is not None: pac_obj.filename = canonname diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/osc/oscssl.py new/osc-0.134.0/osc/oscssl.py --- old/osc-0.133.1/osc/oscssl.py 2011-12-20 22:55:35.000000000 +0100 +++ new/osc-0.134.0/osc/oscssl.py 2012-02-29 10:41:49.000000000 +0100 @@ -154,8 +154,8 @@ def __init__(self): SSL.Context.__init__(self, 'sslv23') - self.set_options(m2.SSL_OP_ALL | m2.SSL_OP_NO_SSLv2 | m2.SSL_OP_NO_SSLv3) - self.set_cipher_list("HIGH:!eNULL:!aNULL:!EXPORT:!LOW:!MEDIUM:!FZA:!kRSA:!MD5:!RC4:!SSLv2:@STRENGTH") + self.set_options(m2.SSL_OP_NO_SSLv2 | m2.SSL_OP_NO_SSLv3) + self.set_cipher_list("ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!MD5:@STRENGTH") self.set_session_cache_mode(m2.SSL_SESS_CACHE_CLIENT) self.verrs = None #self.set_info_callback() # debug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/osc/util/packagequery.py new/osc-0.134.0/osc/util/packagequery.py --- old/osc-0.133.1/osc/util/packagequery.py 2011-06-15 14:19:07.000000000 +0200 +++ new/osc-0.134.0/osc/util/packagequery.py 2012-02-29 10:41:49.000000000 +0100 @@ -98,8 +98,11 @@ import debquery pkgquery = debquery.DebQuery(f) extra_tags = extra_debtags + elif magic[:5] == '<?xml': + f.close() + return None else: - raise PackageError('unsupported package type. magic: \'%s\' (%s)' % (magic, filename)) + raise PackageError(filename, 'unsupported package type. magic: \'%s\'' % magic) pkgquery.read(all_tags, *extra_tags) f.close() return pkgquery diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.133.1/tests/test_setlinkrev.py new/osc-0.134.0/tests/test_setlinkrev.py --- old/osc-0.133.1/tests/test_setlinkrev.py 2011-06-15 14:19:07.000000000 +0200 +++ new/osc-0.134.0/tests/test_setlinkrev.py 2012-03-05 10:48:10.000000000 +0100 @@ -33,7 +33,7 @@ @GET('http://localhost/source/osctest/simple/_link', file='noproject_link') @GET('http://localhost/source/osctest/srcpkg?rev=latest&expand=1', file='expandedsrc_filesremote') @PUT('http://localhost/source/osctest/simple/_link', - exp='<link package="srcpkg" rev="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" />', text='dummytext') + exp='<link package="srcpkg" rev="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1" />', text='dummytext') def test_expandedsrc(self): """expand src package""" osc.core.set_link_rev('http://localhost', 'osctest', 'simple', expand=True) @@ -41,7 +41,7 @@ @GET('http://localhost/source/osctest/simple/_link', file='simple_link') @GET('http://localhost/source/srcprj/srcpkg?linkrev=base&rev=latest&expand=1', file='baserev_filesremote') @PUT('http://localhost/source/osctest/simple/_link', - exp='<link package="srcpkg" project="srcprj" rev="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" />', text='dummytext') + exp='<link package="srcpkg" project="srcprj" rev="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1" />', text='dummytext') def test_baserev(self): """expanded baserev revision""" osc.core.set_link_rev('http://localhost', 'osctest', 'simple', baserev=True) ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.xzqxZA/_old 2012-03-13 09:37:26.000000000 +0100 +++ /var/tmp/diff_new_pack.xzqxZA/_new 2012-03-13 09:37:26.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.133.1 +Version: 0.134.0 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit okular for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2012-03-13 09:37:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "okular", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2012-02-08 17:19:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2012-03-13 09:37:13.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:54 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- okular-4.8.0.tar.bz2 New: ---- okular-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.yyR2Nn/_old 2012-03-13 09:37:15.000000000 +0100 +++ /var/tmp/diff_new_pack.yyR2Nn/_new 2012-03-13 09:37:15.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: okular -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Document Viewer License: GPL-2.0+ @@ -57,8 +58,8 @@ %package devel Summary: Document Viewer - Development Files Group: Development/Libraries/KDE -Requires: libkde4-devel Requires: %{name} = %{version} +Requires: libkde4-devel Provides: kde4-%{name}-devel = 4.3.0 Obsoletes: kde4-%{name}-devel < 4.3.0 %kde4_runtime_requires ++++++ okular-4.8.0.tar.bz2 -> okular-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/VERSION new/okular-4.8.1/VERSION --- old/okular-4.8.0/VERSION 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/VERSION 2012-02-29 23:57:33.000000000 +0100 @@ -1 +1 @@ -okular v0.14.0 +okular v0.14.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/core/textpage.cpp new/okular-4.8.1/core/textpage.cpp --- old/okular-4.8.0/core/textpage.cpp 2011-12-20 20:14:45.000000000 +0100 +++ new/okular-4.8.1/core/textpage.cpp 2012-02-29 23:57:31.000000000 +0100 @@ -1098,10 +1098,10 @@ */ static void removeSpace(TextList *words) { - TextList::Iterator it = words->begin(), itEnd = words->end(); + TextList::Iterator it = words->begin(); const QString str(' '); - while ( it != itEnd ) + while ( it != words->end() ) { if((*it)->text() == str) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/core/version.h new/okular-4.8.1/core/version.h --- old/okular-4.8.0/core/version.h 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/core/version.h 2012-02-29 23:57:33.000000000 +0100 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.14.0" +#define OKULAR_VERSION_STRING "0.14.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 14 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ Files old/okular-4.8.0/doc/index.cache.bz2 and new/okular-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/chm/okularApplication_chm.desktop new/okular-4.8.1/generators/chm/okularApplication_chm.desktop --- old/okular-4.8.0/generators/chm/okularApplication_chm.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/chm/okularApplication_chm.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=chm +X-KDE-Keywords[ar]=chm X-KDE-Keywords[ca]=chm X-KDE-Keywords[ca@valencia]=chm X-KDE-Keywords[cs]=chm @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=chm X-KDE-Keywords[it]=chm X-KDE-Keywords[kk]=chm +X-KDE-Keywords[ko]=chm X-KDE-Keywords[nb]=chm X-KDE-Keywords[nds]=CHM X-KDE-Keywords[nl]=chm @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=chm X-KDE-Keywords[pt]=chm X-KDE-Keywords[pt_BR]=chm +X-KDE-Keywords[ru]=chm X-KDE-Keywords[sk]=chm X-KDE-Keywords[sr]=chm,ЦХМ X-KDE-Keywords[sr@ijekavian]=chm,ЦХМ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/comicbook/okularApplication_comicbook.desktop new/okular-4.8.1/generators/comicbook/okularApplication_comicbook.desktop --- old/okular-4.8.0/generators/comicbook/okularApplication_comicbook.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/comicbook/okularApplication_comicbook.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ar]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[kk]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책 X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie X-KDE-Keywords[nds]=cbr, cbz, cbt, Comicbook X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ru]=cbr, cbz, cbt, Comic Book, комикс X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/djvu/okularApplication_djvu.desktop new/okular-4.8.1/generators/djvu/okularApplication_djvu.desktop --- old/okular-4.8.0/generators/djvu/okularApplication_djvu.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/djvu/okularApplication_djvu.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=djvu +X-KDE-Keywords[ar]=djvu X-KDE-Keywords[ca]=djvu X-KDE-Keywords[ca@valencia]=djvu X-KDE-Keywords[cs]=djvu @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=djvu X-KDE-Keywords[it]=djvu X-KDE-Keywords[kk]=djvu +X-KDE-Keywords[ko]=djvu X-KDE-Keywords[nb]=djvu X-KDE-Keywords[nds]=DjVu X-KDE-Keywords[nl]=djvu @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=djvu X-KDE-Keywords[pt]=djvu X-KDE-Keywords[pt_BR]=djvu +X-KDE-Keywords[ru]=djvu X-KDE-Keywords[sk]=djvu X-KDE-Keywords[sr]=djvu,ДјВу X-KDE-Keywords[sr@ijekavian]=djvu,ДјВу diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/dvi/okularApplication_dvi.desktop new/okular-4.8.1/generators/dvi/okularApplication_dvi.desktop --- old/okular-4.8.0/generators/dvi/okularApplication_dvi.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/dvi/okularApplication_dvi.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=dvi +X-KDE-Keywords[ar]=dvi X-KDE-Keywords[ca]=dvi X-KDE-Keywords[ca@valencia]=dvi X-KDE-Keywords[cs]=dvi @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=dvi X-KDE-Keywords[it]=dvi X-KDE-Keywords[kk]=dvi +X-KDE-Keywords[ko]=dvi X-KDE-Keywords[nb]=dvi X-KDE-Keywords[nds]=DVI X-KDE-Keywords[nl]=dvi @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=dvi X-KDE-Keywords[pt]=dvi X-KDE-Keywords[pt_BR]=dvi +X-KDE-Keywords[ru]=dvi X-KDE-Keywords[sk]=dvi X-KDE-Keywords[sr]=dvi,ДВИ X-KDE-Keywords[sr@ijekavian]=dvi,ДВИ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/epub/okularApplication_epub.desktop new/okular-4.8.1/generators/epub/okularApplication_epub.desktop --- old/okular-4.8.0/generators/epub/okularApplication_epub.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/epub/okularApplication_epub.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=epub, e-book +X-KDE-Keywords[ar]=epub, e-book X-KDE-Keywords[ca]=epub, e-book X-KDE-Keywords[ca@valencia]=epub, e-book X-KDE-Keywords[cs]=epub, e-book @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=epub, e-book X-KDE-Keywords[it]=epub, e-book X-KDE-Keywords[kk]=epub, e-book +X-KDE-Keywords[ko]=epub, e-book,전자책,이북 X-KDE-Keywords[nb]=epub, e-bok X-KDE-Keywords[nds]=epub, e-book X-KDE-Keywords[nl]=epub, e-book @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=epub, e-book X-KDE-Keywords[pt]=epub, e-book X-KDE-Keywords[pt_BR]=epub, e-book +X-KDE-Keywords[ru]=epub, e-book, электронная книга X-KDE-Keywords[sk]=epub, e-book X-KDE-Keywords[sr]=epub, e-book,ЕПУБ,е‑књига X-KDE-Keywords[sr@ijekavian]=epub, e-book,ЕПУБ,е‑књига diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/fictionbook/okularApplication_fb.desktop new/okular-4.8.1/generators/fictionbook/okularApplication_fb.desktop --- old/okular-4.8.0/generators/fictionbook/okularApplication_fb.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/fictionbook/okularApplication_fb.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=FictionBook, e-book, fb2 +X-KDE-Keywords[ar]=FictionBook, e-book, fb2 X-KDE-Keywords[ca]=FictionBook, e-book, fb2 X-KDE-Keywords[ca@valencia]=FictionBook, e-book, fb2 X-KDE-Keywords[da]=FictionBook,e-book,fb2 @@ -140,6 +141,7 @@ X-KDE-Keywords[hu]=FictionBook, e-book, fb2 X-KDE-Keywords[it]=FictionBook, e-book, fb2 X-KDE-Keywords[kk]=FictionBook, e-book, fb2 +X-KDE-Keywords[ko]=FictionBook, e-book, fb2 X-KDE-Keywords[nb]=FictionBook, e-bok, fb2 X-KDE-Keywords[nds]=FictionBook, e-book, fb2 X-KDE-Keywords[nl]=Fictieboek, e-book, fb2 @@ -147,6 +149,7 @@ X-KDE-Keywords[pl]=FictionBook, e-book, fb2 X-KDE-Keywords[pt]=FictionBook, e-book, fb2 X-KDE-Keywords[pt_BR]=FictionBook, e-book, fb2 +X-KDE-Keywords[ru]=FictionBook, e-book, fb2, электронная книга X-KDE-Keywords[sk]=FictionBook, e-book, fb2 X-KDE-Keywords[sr]=FictionBook, e-book, fb2,фикшнбук,е‑књига X-KDE-Keywords[sr@ijekavian]=FictionBook, e-book, fb2,фикшнбук,е‑књига diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/plucker/okularApplication_plucker.desktop new/okular-4.8.1/generators/plucker/okularApplication_plucker.desktop --- old/okular-4.8.0/generators/plucker/okularApplication_plucker.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/plucker/okularApplication_plucker.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=plucker +X-KDE-Keywords[ar]=plucker X-KDE-Keywords[ca]=plucker X-KDE-Keywords[ca@valencia]=plucker X-KDE-Keywords[da]=plucker @@ -140,6 +141,7 @@ X-KDE-Keywords[hu]=plucker X-KDE-Keywords[it]=plucker X-KDE-Keywords[kk]=plucker +X-KDE-Keywords[ko]=plucker X-KDE-Keywords[nb]=plucker X-KDE-Keywords[nds]=Plucker X-KDE-Keywords[nl]=plucker @@ -147,6 +149,7 @@ X-KDE-Keywords[pl]=plucker X-KDE-Keywords[pt]=plucker X-KDE-Keywords[pt_BR]=plucker +X-KDE-Keywords[ru]=plucker X-KDE-Keywords[sk]=plucker X-KDE-Keywords[sr]=plucker,Плакер X-KDE-Keywords[sr@ijekavian]=plucker,Плакер diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/poppler/okularApplication_pdf.desktop new/okular-4.8.1/generators/poppler/okularApplication_pdf.desktop --- old/okular-4.8.0/generators/poppler/okularApplication_pdf.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/poppler/okularApplication_pdf.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -126,6 +126,7 @@ InitialPreference=8 Categories=Qt;KDE;Graphics;Viewer; X-KDE-Keywords=PDF, Portable Document Format +X-KDE-Keywords[ar]=PDF, Portable Document Format X-KDE-Keywords[ca]=PDF, Portable Document Format, Format de document portable X-KDE-Keywords[ca@valencia]=PDF, Portable Document Format, Format de document portable X-KDE-Keywords[cs]=PDF, Portable Document Format @@ -140,6 +141,7 @@ X-KDE-Keywords[hu]=PDF, Portable Document Format X-KDE-Keywords[it]=PDF, Portable Document Format, formato per documenti portabile X-KDE-Keywords[kk]=PDF, Portable Document Format +X-KDE-Keywords[ko]=PDF, Portable Document Format X-KDE-Keywords[nb]=PDF, Portabelt Dokument Format X-KDE-Keywords[nds]=PDF, Porteerbor Dokmentformaat X-KDE-Keywords[nl]=PDF, Portable Document Format @@ -147,6 +149,7 @@ X-KDE-Keywords[pl]=PDF, Przenośny Format Dokumentu X-KDE-Keywords[pt]=PDF, Formato de Documento Portável X-KDE-Keywords[pt_BR]=PDF, Formato de documento portável +X-KDE-Keywords[ru]=PDF, Portable Document Format X-KDE-Keywords[sk]=PDF, Portable Document Format X-KDE-Keywords[sr]=PDF, Portable Document Format,ПДФ X-KDE-Keywords[sr@ijekavian]=PDF, Portable Document Format,ПДФ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/xps/okularApplication_xps.desktop new/okular-4.8.1/generators/xps/okularApplication_xps.desktop --- old/okular-4.8.0/generators/xps/okularApplication_xps.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/xps/okularApplication_xps.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -126,6 +126,7 @@ InitialPreference=7 Categories=Qt;KDE;Graphics;Viewer; X-KDE-Keywords=XPS +X-KDE-Keywords[ar]=XPS X-KDE-Keywords[ca]=XPS X-KDE-Keywords[ca@valencia]=XPS X-KDE-Keywords[cs]=XPS @@ -140,6 +141,7 @@ X-KDE-Keywords[hu]=XPS X-KDE-Keywords[it]=XPS X-KDE-Keywords[kk]=XPS +X-KDE-Keywords[ko]=XPS X-KDE-Keywords[nb]=XPS X-KDE-Keywords[nds]=XPS X-KDE-Keywords[nl]=XPS @@ -147,6 +149,7 @@ X-KDE-Keywords[pl]=XPS X-KDE-Keywords[pt]=XPS X-KDE-Keywords[pt_BR]=XPS +X-KDE-Keywords[ru]=XPS X-KDE-Keywords[sk]=XPS X-KDE-Keywords[sr]=XPS,ИксПС X-KDE-Keywords[sr@ijekavian]=XPS,ИксПС diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/ui/findbar.cpp new/okular-4.8.1/ui/findbar.cpp --- old/okular-4.8.0/ui/findbar.cpp 2011-08-07 17:42:18.000000000 +0200 +++ new/okular-4.8.1/ui/findbar.cpp 2012-02-29 23:57:31.000000000 +0100 @@ -49,7 +49,7 @@ m_search->lineEdit()->setSearchMoveViewport( true ); m_search->lineEdit()->setToolTip( i18n( "Text to search for" ) ); m_search->installEventFilter( this ); - label->setBuddy( m_search ); + label->setBuddy( m_search->lineEdit() ); lay->addWidget( m_search ); QPushButton * findNextBtn = new QPushButton( KIcon( "go-down-search" ), i18nc( "Find and go to the next search match", "Next" ), this ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/ui/presentationwidget.cpp new/okular-4.8.1/ui/presentationwidget.cpp --- old/okular-4.8.0/ui/presentationwidget.cpp 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/ui/presentationwidget.cpp 2012-02-29 23:57:31.000000000 +0100 @@ -129,7 +129,7 @@ PresentationWidget::PresentationWidget( QWidget * parent, Okular::Document * doc, KActionCollection * collection ) : QWidget( 0 /* must be null, to have an independent widget */, Qt::FramelessWindowHint ), - m_pressedLink( 0 ), m_handCursor( false ), m_drawingEngine( 0 ), m_screenSaverCookie( -1 ), + m_pressedLink( 0 ), m_handCursor( false ), m_drawingEngine( 0 ), m_parentWidget( parent ), m_document( doc ), m_frameIndex( -1 ), m_topBar( 0 ), m_pagesEdit( 0 ), m_searchBar( 0 ), m_screenSelect( 0 ), m_isSetup( false ), m_blockNotifications( false ), m_inBlackScreenMode( false ) @@ -232,8 +232,8 @@ setupActions( collection ); - // inhibit the screen saver - inhibitScreenSaver(); + // inhibit power management + inhibitPowerManagement(); show(); @@ -245,8 +245,8 @@ PresentationWidget::~PresentationWidget() { - // allow the screen saver again - allowScreenSaver(); + // allow power management saver again + allowPowerManagement(); // stop the audio playbacks Okular::AudioPlayer::instance()->stopPlaybacks(); @@ -1391,33 +1391,18 @@ generatePage( true /* no transitions */ ); } -void PresentationWidget::inhibitScreenSaver() +void PresentationWidget::inhibitPowerManagement() { QString reason = i18nc( "Reason for inhibiting the screensaver activation, when the presentation mode is active", "Giving a presentation" ); - QDBusMessage message = QDBusMessage::createMethodCall( "org.freedesktop.ScreenSaver", "/ScreenSaver", - "org.freedesktop.ScreenSaver", "Inhibit" ); - message << QString( "Okular" ); - message << reason; - - QDBusReply<uint> reply = QDBusConnection::sessionBus().call( message ); - if ( reply.isValid() ) - m_screenSaverCookie = reply.value(); // Inhibit screen and sleep + // Note: beginSuppressingScreenPowerManagement inhibits DPMS, automatic brightness change and screensaver m_screenInhibitCookie = Solid::PowerManagement::beginSuppressingScreenPowerManagement(reason); m_sleepInhibitCookie = Solid::PowerManagement::beginSuppressingSleep(reason); } -void PresentationWidget::allowScreenSaver() +void PresentationWidget::allowPowerManagement() { - if ( m_screenSaverCookie != -1 ) - { - QDBusMessage message = QDBusMessage::createMethodCall( "org.freedesktop.ScreenSaver", "/ScreenSaver", - "org.freedesktop.ScreenSaver", "UnInhibit" ); - message << (uint)m_screenSaverCookie; - QDBusConnection::sessionBus().send( message ); - } - // Remove cookies Solid::PowerManagement::stopSuppressingScreenPowerManagement(m_screenInhibitCookie); Solid::PowerManagement::stopSuppressingSleep(m_sleepInhibitCookie); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/ui/presentationwidget.h new/okular-4.8.1/ui/presentationwidget.h --- old/okular-4.8.0/ui/presentationwidget.h 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/ui/presentationwidget.h 2012-02-29 23:57:31.000000000 +0100 @@ -86,8 +86,8 @@ void requestPixmaps(); void setScreen( int ); void applyNewScreenSize( const QSize & oldSize ); - void inhibitScreenSaver(); - void allowScreenSaver(); + void inhibitPowerManagement(); + void allowPowerManagement(); void showTopBar( bool ); // create actions that interact with this widget void setupActions( KActionCollection * collection ); @@ -104,7 +104,6 @@ AnnotatorEngine * m_drawingEngine; QRect m_drawingRect; int m_screen; - int m_screenSaverCookie; int m_screenInhibitCookie; int m_sleepInhibitCookie; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mono-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package mono-qt4 for openSUSE:Factory checked in at 2012-03-13 09:36:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mono-qt4 (Old) and /work/SRC/openSUSE:Factory/.mono-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mono-qt4", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mono-qt4/mono-qt4.changes 2012-01-27 15:22:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mono-qt4.new/mono-qt4.changes 2012-03-13 09:36:51.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:27:19 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- qyoto-4.8.0.tar.bz2 New: ---- qyoto-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-qt4.spec ++++++ --- /var/tmp/diff_new_pack.jPk3nv/_old 2012-03-13 09:36:52.000000000 +0100 +++ /var/tmp/diff_new_pack.jPk3nv/_new 2012-03-13 09:36:52.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mono-qt4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Mono Qt4 kdebindings library License: GPL-2.0+ ++++++ qyoto-4.8.0.tar.bz2 -> qyoto-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mobipocket for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package mobipocket for openSUSE:Factory checked in at 2012-03-13 09:36:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mobipocket (Old) and /work/SRC/openSUSE:Factory/.mobipocket.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mobipocket", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mobipocket/mobipocket.changes 2012-01-27 15:22:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mobipocket.new/mobipocket.changes 2012-03-13 09:36:46.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:14:08 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdegraphics-mobipocket-4.8.0.tar.bz2 New: ---- kdegraphics-mobipocket-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mobipocket.spec ++++++ --- /var/tmp/diff_new_pack.M4P89S/_old 2012-03-13 09:36:47.000000000 +0100 +++ /var/tmp/diff_new_pack.M4P89S/_new 2012-03-13 09:36:47.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mobipocket -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: E-book plugin for Okular License: GPL-2.0+ ++++++ kdegraphics-mobipocket-4.8.0.tar.bz2 -> kdegraphics-mobipocket-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.8.0/okular/okularApplication_mobi.desktop new/kdegraphics-mobipocket-4.8.1/okular/okularApplication_mobi.desktop --- old/kdegraphics-mobipocket-4.8.0/okular/okularApplication_mobi.desktop 2012-01-18 19:49:53.000000000 +0100 +++ new/kdegraphics-mobipocket-4.8.1/okular/okularApplication_mobi.desktop 2012-02-29 23:57:22.000000000 +0100 @@ -128,6 +128,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=mobipocket +X-KDE-Keywords[ar]=mobipocket X-KDE-Keywords[ca]=mobipocket X-KDE-Keywords[ca@valencia]=mobipocket X-KDE-Keywords[cs]=mobipocket @@ -141,12 +142,14 @@ X-KDE-Keywords[hu]=mobipocket X-KDE-Keywords[it]=mobipocket X-KDE-Keywords[kk]=mobipocket +X-KDE-Keywords[ko]=mobipocket X-KDE-Keywords[nb]=mobipocket X-KDE-Keywords[nds]=Mobipocket X-KDE-Keywords[nl]=mobipocket X-KDE-Keywords[pl]=mobipocket X-KDE-Keywords[pt]=Mobipocket X-KDE-Keywords[pt_BR]=mobipocket +X-KDE-Keywords[ru]=mobipocket,электронная книга X-KDE-Keywords[sk]=mobipocket X-KDE-Keywords[sr]=mobipocket,Мобипокет X-KDE-Keywords[sr@ijekavian]=mobipocket,Мобипокет diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-4.8.0/thumbnailers/mobithumbnail.desktop new/kdegraphics-mobipocket-4.8.1/thumbnailers/mobithumbnail.desktop --- old/kdegraphics-mobipocket-4.8.0/thumbnailers/mobithumbnail.desktop 2012-01-10 15:18:18.000000000 +0100 +++ new/kdegraphics-mobipocket-4.8.1/thumbnailers/mobithumbnail.desktop 2012-02-29 23:57:22.000000000 +0100 @@ -1,6 +1,7 @@ [Desktop Entry] Type=Service Name=Mobipocket Files +Name[ar]=ملفات Mobipocket Name[bg]=Файлове за Mobipocket Name[bs]=Mobipoketove datoteke Name[ca]=Fitxers Mobipocket -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit marble for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2012-03-13 09:36:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "marble", Maintainer is "marble" Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2012-02-14 11:25:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2012-03-13 09:36:43.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:45 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- 79c39f45.patch b89ff577.patch marble-4.8.0.tar.bz2 New: ---- marble-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.uojC6P/_old 2012-03-13 09:36:45.000000000 +0100 +++ /var/tmp/diff_new_pack.uojC6P/_new 2012-03-13 09:36:45.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: marble -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ @@ -24,8 +25,6 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.bz2 Patch1: marble-designer-plugin.diff -Patch2: 79c39f45.patch -Patch3: b89ff577.patch BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel BuildRequires: libkdeedu4-devel @@ -46,8 +45,6 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %ifarch ppc ppc64 @@ -143,9 +140,9 @@ %{_kde4_modulesdir}/libmarble_part.so %{_kde4_modulesdir}/plasma_applet_worldclock.so %{_kde4_modulesdir}/plasma_runner_marble.so -# fixme: we need to figure out a better way to handle common QML directories like this -%dir %{_kde4_modulesdir}/imports/org/kde/edu/ -%{_kde4_modulesdir}/imports/org/kde/edu/marble/ +%dir %{_libdir}/qt4/plugins/imports/org/kde/ +%dir %{_libdir}/qt4/plugins/imports/org/kde/edu/ +%{_libdir}/qt4/plugins/imports/org/kde/edu/marble/ %{_kde4_modulesdir}/plugins/designer/* %{_kde4_modulesdir}/plugins/marble/ %{_kde4_servicesdir}/*.desktop ++++++ marble-4.8.0.tar.bz2 -> marble-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/marble/marble-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.marble.new/marble-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libquicktime for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package libquicktime for openSUSE:Factory checked in at 2012-03-13 09:36:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libquicktime (Old) and /work/SRC/openSUSE:Factory/.libquicktime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libquicktime", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libquicktime/libquicktime.changes 2012-03-01 07:21:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libquicktime.new/libquicktime.changes 2012-03-13 09:36:35.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 2 15:07:56 UTC 2012 - reddwarf(a)opensuse.org + +- Compile against newest ffmpeg + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libquicktime.spec ++++++ --- /var/tmp/diff_new_pack.UNznLn/_old 2012-03-13 09:36:37.000000000 +0100 +++ /var/tmp/diff_new_pack.UNznLn/_new 2012-03-13 09:36:37.000000000 +0100 @@ -43,7 +43,7 @@ %if 0%{?BUILD_ORIG} BuildRequires: libfaac-devel BuildRequires: libfaad2-devel -BuildRequires: libffmpeg_oldabi-devel +BuildRequires: libffmpeg-devel BuildRequires: libmp3lame-devel BuildRequires: libx264-devel %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libksane for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2012-03-13 09:36:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libksane", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2012-01-27 15:21:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2012-03-13 09:36:30.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:37 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- libksane-4.8.0.tar.bz2 New: ---- libksane-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.s4KVQ5/_old 2012-03-13 09:36:31.000000000 +0100 +++ /var/tmp/diff_new_pack.s4KVQ5/_new 2012-03-13 09:36:31.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libksane BuildRequires: chmlib-devel BuildRequires: fribidi-devel @@ -39,7 +40,7 @@ License: GPL-2.0+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: %{name}-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -86,8 +87,8 @@ %package devel Summary: KDE scan library - Development Files Group: Development/Libraries/KDE -Requires: libksane0 = %version Requires: libkde4-devel +Requires: libksane0 = %version %if 0%{?suse_version} > 1130 Requires: sane-backends-devel %else ++++++ libksane-4.8.0.tar.bz2 -> libksane-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkipi for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package libkipi for openSUSE:Factory checked in at 2012-03-13 09:36:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkipi (Old) and /work/SRC/openSUSE:Factory/.libkipi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkipi", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libkipi/libkipi.changes 2012-01-27 15:21:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkipi.new/libkipi.changes 2012-03-13 09:36:26.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:33 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- libkipi-4.8.0.tar.bz2 New: ---- libkipi-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkipi.spec ++++++ --- /var/tmp/diff_new_pack.j5TmzF/_old 2012-03-13 09:36:28.000000000 +0100 +++ /var/tmp/diff_new_pack.j5TmzF/_new 2012-03-13 09:36:28.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libkipi BuildRequires: OpenEXR-devel BuildRequires: chmlib-devel @@ -39,7 +40,7 @@ License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: %{name}-%version.tar.bz2 Patch0: 4_6_BRANCH.diff @@ -93,8 +94,8 @@ Group: Development/Libraries/KDE Provides: libkipi6-devel = %version Obsoletes: libkipi6-devel <= 4.1.87 -Requires: libkipi8 = %version Requires: libkde4-devel +Requires: libkipi8 = %version %description devel This package provides a generic KDE Image Plug-in Interface used by ++++++ libkipi-4.8.0.tar.bz2 -> libkipi-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkexiv2 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package libkexiv2 for openSUSE:Factory checked in at 2012-03-13 09:36:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkexiv2 (Old) and /work/SRC/openSUSE:Factory/.libkexiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkexiv2", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libkexiv2/libkexiv2.changes 2012-01-27 15:21:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkexiv2.new/libkexiv2.changes 2012-03-13 09:36:19.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:28 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- libkexiv2-4.8.0.tar.bz2 New: ---- libkexiv2-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkexiv2.spec ++++++ --- /var/tmp/diff_new_pack.wUb4uR/_old 2012-03-13 09:36:20.000000000 +0100 +++ /var/tmp/diff_new_pack.wUb4uR/_new 2012-03-13 09:36:20.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libkexiv2 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Library to manipulate picture meta data License: GPL-2.0+ ++++++ libkexiv2-4.8.0.tar.bz2 -> libkexiv2-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkdeedu4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package libkdeedu4 for openSUSE:Factory checked in at 2012-03-13 09:36:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdeedu4 (Old) and /work/SRC/openSUSE:Factory/.libkdeedu4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkdeedu4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdeedu4/libkdeedu4.changes 2012-01-31 10:21:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdeedu4.new/libkdeedu4.changes 2012-03-13 09:36:12.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:15 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- libkdeedu-4.8.0.tar.bz2 New: ---- libkdeedu-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.lK9rm9/_old 2012-03-13 09:36:13.000000000 +0100 +++ /var/tmp/diff_new_pack.lK9rm9/_new 2012-03-13 09:36:13.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libkdeedu4 BuildRequires: boost-devel BuildRequires: fdupes @@ -40,7 +41,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Library for KDE Education Applications License: GPL-2.0+ ++++++ libkdeedu-4.8.0.tar.bz2 -> libkdeedu-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkdcraw for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package libkdcraw for openSUSE:Factory checked in at 2012-03-13 09:36:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdcraw (Old) and /work/SRC/openSUSE:Factory/.libkdcraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkdcraw", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdcraw/libkdcraw.changes 2012-01-27 15:21:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdcraw.new/libkdcraw.changes 2012-03-13 09:36:06.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:11 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- libkdcraw-4.8.0.tar.bz2 New: ---- libkdcraw-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdcraw.spec ++++++ --- /var/tmp/diff_new_pack.cPYq3U/_old 2012-03-13 09:36:07.000000000 +0100 +++ /var/tmp/diff_new_pack.cPYq3U/_new 2012-03-13 09:36:07.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libkdcraw -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Shared library interface around dcraw License: LGPL-2.1+ ++++++ libkdcraw-4.8.0.tar.bz2 -> libkdcraw-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kwordquiz for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kwordquiz for openSUSE:Factory checked in at 2012-03-13 09:36:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwordquiz (Old) and /work/SRC/openSUSE:Factory/.kwordquiz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwordquiz", Maintainer is "kwordquiz" Changes: -------- --- /work/SRC/openSUSE:Factory/kwordquiz/kwordquiz.changes 2012-01-30 12:26:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwordquiz.new/kwordquiz.changes 2012-03-13 09:36:02.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:07 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kwordquiz-4.8.0.tar.bz2 New: ---- kwordquiz-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwordquiz.spec ++++++ --- /var/tmp/diff_new_pack.7qaBfu/_old 2012-03-13 09:36:04.000000000 +0100 +++ /var/tmp/diff_new_pack.7qaBfu/_new 2012-03-13 09:36:04.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kwordquiz BuildRequires: boost-devel BuildRequires: freeglut-devel @@ -45,7 +46,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Vocabulary Trainer License: GPL-2.0+ ++++++ kwordquiz-4.8.0.tar.bz2 -> kwordquiz-4.8.1.tar.bz2 ++++++ Files old/kwordquiz-4.8.0/doc/index.cache.bz2 and new/kwordquiz-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwordquiz-4.8.0/src/kwordquiz.desktop new/kwordquiz-4.8.1/src/kwordquiz.desktop --- old/kwordquiz-4.8.0/src/kwordquiz.desktop 2012-01-10 15:15:20.000000000 +0100 +++ new/kwordquiz-4.8.1/src/kwordquiz.desktop 2012-02-29 23:56:55.000000000 +0100 @@ -174,6 +174,7 @@ GenericName[pt]=Treinador de Cartões GenericName[pt_BR]=Treinador de cartões GenericName[ru]=Тренировка словарного запаса +GenericName[sk]=Precvičovanie slovnej zásoby s kartičkami GenericName[sl]=Učenje s spominskimi kartami GenericName[sv]=Snabbkortsträning GenericName[tr]=Fiş Çalıştırıcı -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kwalletmanager for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kwalletmanager for openSUSE:Factory checked in at 2012-03-13 09:35:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwalletmanager (Old) and /work/SRC/openSUSE:Factory/.kwalletmanager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwalletmanager", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kwalletmanager/kwalletmanager.changes 2012-02-03 10:23:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwalletmanager.new/kwalletmanager.changes 2012-03-13 09:35:55.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:02 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kwallet-4.8.0.tar.bz2 New: ---- kwallet-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwalletmanager.spec ++++++ --- /var/tmp/diff_new_pack.WCgaoF/_old 2012-03-13 09:35:57.000000000 +0100 +++ /var/tmp/diff_new_pack.WCgaoF/_new 2012-03-13 09:35:57.000000000 +0100 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kwalletmanager -Version: 4.8.0 +Version: 4.8.1 Release: 0 -License: GPL-2.0+ Summary: Wallet Management Tool -Url: http://www.kde.org +License: GPL-2.0+ Group: System/GUI/KDE +Url: http://www.kde.org Source0: kwallet-%{version}.tar.bz2 Patch0: 4_7_BRANCH.diff Patch1: desktop-files.diff ++++++ kwallet-4.8.0.tar.bz2 -> kwallet-4.8.1.tar.bz2 ++++++ Files old/kwallet-4.8.0/doc/index.cache.bz2 and new/kwallet-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.8.0/konfigurator/kwalletconfig.desktop new/kwallet-4.8.1/konfigurator/kwalletconfig.desktop --- old/kwallet-4.8.0/konfigurator/kwalletconfig.desktop 2012-01-18 19:50:09.000000000 +0100 +++ new/kwallet-4.8.1/konfigurator/kwalletconfig.desktop 2012-02-29 23:57:48.000000000 +0100 @@ -160,11 +160,13 @@ X-KDE-Keywords[ia]=Portafolio, Reimplemento de Formulario,Contrasignos,Datos de formulario X-KDE-Keywords[it]=Portafogli,compilazione moduli,password,dati moduli X-KDE-Keywords[kk]=Wallet,Form Fill,Passwords,Form Data +X-KDE-Keywords[ko]=Wallet,Form Fill,Passwords,Form Data,지갑,암호,비밀번호,양식,폼 X-KDE-Keywords[nb]=Lommebok,Skjema,Passord,Skjemadata X-KDE-Keywords[nds]=Knipp,Passwöör,Kiekwarkdaten,Formulordaten X-KDE-Keywords[nl]=Portefeuille,Formulier invullen,wachtwoorden,formuliergegevens X-KDE-Keywords[pt]=Carteira,Preenchimento de Formulários,Senhas,Dados de Formulários X-KDE-Keywords[pt_BR]=carteira,preencher formulário,senha,dados de formulário +X-KDE-Keywords[sk]=Peňaženka,Vypĺňanie formulárov,Heslá,Dáta formulára X-KDE-Keywords[sr]=Wallet,Form Fill,Passwords,Form Data,новчаник,попуњавање формулара,лозинка X-KDE-Keywords[sr@ijekavian]=Wallet,Form Fill,Passwords,Form Data,новчаник,попуњавање формулара,лозинка X-KDE-Keywords[sr@ijekavianlatin]=Wallet,Form Fill,Passwords,Form Data,novčanik,popunjavanje formulara,lozinka -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kturtle for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kturtle for openSUSE:Factory checked in at 2012-03-13 09:35:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kturtle (Old) and /work/SRC/openSUSE:Factory/.kturtle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kturtle", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kturtle/kturtle.changes 2012-01-30 12:26:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kturtle.new/kturtle.changes 2012-03-13 09:35:50.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:58 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kturtle-4.8.0.tar.bz2 New: ---- kturtle-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kturtle.spec ++++++ --- /var/tmp/diff_new_pack.crIL3O/_old 2012-03-13 09:35:51.000000000 +0100 +++ /var/tmp/diff_new_pack.crIL3O/_new 2012-03-13 09:35:51.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kturtle BuildRequires: boost-devel BuildRequires: freeglut-devel @@ -50,7 +51,7 @@ License: GPL-2.0+ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: %{name}-%version.tar.bz2 Patch0: 4_6_BRANCH.diff ++++++ kturtle-4.8.0.tar.bz2 -> kturtle-4.8.1.tar.bz2 ++++++ Files old/kturtle-4.8.0/doc/index.cache.bz2 and new/kturtle-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-4.8.0/src/kturtle.desktop new/kturtle-4.8.1/src/kturtle.desktop --- old/kturtle-4.8.0/src/kturtle.desktop 2012-01-10 15:15:18.000000000 +0100 +++ new/kturtle-4.8.1/src/kturtle.desktop 2012-02-29 23:56:54.000000000 +0100 @@ -111,6 +111,7 @@ GenericName[pt_BR]=Ambiente de programação educacional GenericName[ro]=Mediu de programare educațional GenericName[ru]=Среда обучения программированию +GenericName[sk]=Výukové programovacie prostredie GenericName[sl]=Okolje za učenje programiranja GenericName[sv]=Programmeringsmiljö för utbildning GenericName[tr]=Eğitimsel Programlama Ortamı -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ktouch for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package ktouch for openSUSE:Factory checked in at 2012-03-13 09:35:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktouch (Old) and /work/SRC/openSUSE:Factory/.ktouch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktouch", Maintainer is "ktouch" Changes: -------- --- /work/SRC/openSUSE:Factory/ktouch/ktouch.changes 2012-01-30 12:26:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktouch.new/ktouch.changes 2012-03-13 09:35:46.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:52 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- ktouch-4.8.0.tar.bz2 New: ---- ktouch-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktouch.spec ++++++ --- /var/tmp/diff_new_pack.sWvi2M/_old 2012-03-13 09:35:47.000000000 +0100 +++ /var/tmp/diff_new_pack.sWvi2M/_new 2012-03-13 09:35:47.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ktouch BuildRequires: boost-devel BuildRequires: freeglut-devel @@ -45,7 +46,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Touch Typing Tutor License: GPL-2.0+ ++++++ ktouch-4.8.0.tar.bz2 -> ktouch-4.8.1.tar.bz2 ++++++ Files old/ktouch-4.8.0/doc/index.cache.bz2 and new/ktouch-4.8.1/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ktimer for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package ktimer for openSUSE:Factory checked in at 2012-03-13 09:35:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktimer (Old) and /work/SRC/openSUSE:Factory/.ktimer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktimer", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/ktimer/ktimer.changes 2012-02-03 10:23:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktimer.new/ktimer.changes 2012-03-13 09:35:38.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:47 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- ktimer-4.8.0.tar.bz2 New: ---- ktimer-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktimer.spec ++++++ --- /var/tmp/diff_new_pack.PnkOup/_old 2012-03-13 09:35:40.000000000 +0100 +++ /var/tmp/diff_new_pack.PnkOup/_new 2012-03-13 09:35:40.000000000 +0100 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ktimer -Version: 4.8.0 +Version: 4.8.1 Release: 0 -License: GPL-2.0+ Summary: Countdown Launcher -Url: http://www.kde.org +License: GPL-2.0+ Group: Productivity/Other +Url: http://www.kde.org Source0: ktimer-%{version}.tar.bz2 Patch0: 4_7_BRANCH.diff BuildRequires: kdebase4-workspace-devel ++++++ ktimer-4.8.0.tar.bz2 -> ktimer-4.8.1.tar.bz2 ++++++ Files old/ktimer-4.8.0/doc/index.cache.bz2 and new/ktimer-4.8.1/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kstars for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kstars for openSUSE:Factory checked in at 2012-03-13 09:35:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kstars (Old) and /work/SRC/openSUSE:Factory/.kstars.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kstars", Maintainer is "kstars" Changes: -------- --- /work/SRC/openSUSE:Factory/kstars/kstars.changes 2012-01-27 15:21:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kstars.new/kstars.changes 2012-03-13 09:35:30.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:41 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kstars-4.8.0.tar.bz2 New: ---- kstars-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kstars.spec ++++++ --- /var/tmp/diff_new_pack.VNm0Vr/_old 2012-03-13 09:35:32.000000000 +0100 +++ /var/tmp/diff_new_pack.VNm0Vr/_new 2012-03-13 09:35:32.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kstars -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Desktop Planetarium License: GPL-2.0+ ++++++ kstars-4.8.0.tar.bz2 -> kstars-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kstars/kstars-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kstars.new/kstars-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ksnapshot for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package ksnapshot for openSUSE:Factory checked in at 2012-03-13 09:35:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksnapshot (Old) and /work/SRC/openSUSE:Factory/.ksnapshot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksnapshot", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/ksnapshot/ksnapshot.changes 2012-01-27 15:21:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksnapshot.new/ksnapshot.changes 2012-03-13 09:35:15.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:36 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- ksnapshot-4.8.0.tar.bz2 New: ---- ksnapshot-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksnapshot.spec ++++++ --- /var/tmp/diff_new_pack.qPvcuN/_old 2012-03-13 09:35:16.000000000 +0100 +++ /var/tmp/diff_new_pack.qPvcuN/_new 2012-03-13 09:35:16.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ksnapshot BuildRequires: libexiv2-devel BuildRequires: libkdcraw-devel @@ -27,7 +28,7 @@ %else BuildRequires: sane-backends %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Screen Capture Program License: GPL-2.0+ ++++++ ksnapshot-4.8.0.tar.bz2 -> ksnapshot-4.8.1.tar.bz2 ++++++ Files old/ksnapshot-4.8.0/doc/index.cache.bz2 and new/ksnapshot-4.8.1/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ksaneplugin for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package ksaneplugin for openSUSE:Factory checked in at 2012-03-13 09:35:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksaneplugin (Old) and /work/SRC/openSUSE:Factory/.ksaneplugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksaneplugin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ksaneplugin/ksaneplugin.changes 2012-01-27 15:21:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksaneplugin.new/ksaneplugin.changes 2012-03-13 09:35:09.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:31 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- ksaneplugin-4.8.0.tar.bz2 New: ---- ksaneplugin-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksaneplugin.spec ++++++ --- /var/tmp/diff_new_pack.wZsP9L/_old 2012-03-13 09:35:11.000000000 +0100 +++ /var/tmp/diff_new_pack.wZsP9L/_new 2012-03-13 09:35:11.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ksaneplugin BuildRequires: libkde4-devel BuildRequires: libksane-devel @@ -28,7 +29,7 @@ License: LGPL-2.1+ Group: Productivity/Graphics/Other Url: http://www.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: %{name}-%version.tar.bz2 Patch0: 4_6_BRANCH.diff ++++++ ksaneplugin-4.8.0.tar.bz2 -> ksaneplugin-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kruler for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kruler for openSUSE:Factory checked in at 2012-03-13 09:34:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kruler (Old) and /work/SRC/openSUSE:Factory/.kruler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kruler", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kruler/kruler.changes 2012-01-27 15:21:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kruler.new/kruler.changes 2012-03-13 09:35:00.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:26 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kruler-4.8.0.tar.bz2 New: ---- kruler-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kruler.spec ++++++ --- /var/tmp/diff_new_pack.OIgofO/_old 2012-03-13 09:35:01.000000000 +0100 +++ /var/tmp/diff_new_pack.OIgofO/_new 2012-03-13 09:35:01.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kruler BuildRequires: libkde4-devel BuildRequires: oxygen-icon-theme-large @@ -24,7 +25,7 @@ Provides: kde4-kruler = 4.3.0 Obsoletes: kde4-kruler < 4.3.0 Url: http://www.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: %{name}-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kruler-4.8.0.tar.bz2 -> kruler-4.8.1.tar.bz2 ++++++ Files old/kruler-4.8.0/doc/index.cache.bz2 and new/kruler-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kruler-4.8.0/kruler.desktop new/kruler-4.8.1/kruler.desktop --- old/kruler-4.8.0/kruler.desktop 2011-08-22 15:32:21.000000000 +0200 +++ new/kruler-4.8.1/kruler.desktop 2012-02-27 19:18:02.000000000 +0100 @@ -72,7 +72,7 @@ GenericName[zh_TW]=螢幕尺規 Name=KRuler Name[af]=K-lineaal -Name[ar]=كيرولِر +Name[ar]=مسطرة ك Name[ast]=KRuler Name[bg]=KRuler Name[br]=KRuler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kruler-4.8.0/kruler.notifyrc new/kruler-4.8.1/kruler.notifyrc --- old/kruler-4.8.0/kruler.notifyrc 2011-09-26 11:46:08.000000000 +0200 +++ new/kruler-4.8.1/kruler.notifyrc 2012-02-27 19:18:02.000000000 +0100 @@ -1,6 +1,7 @@ [Global] IconName=kruler Comment=On-Screen Ruler +Comment[ar]=مسطرة الشاشة Comment[bg]=Линийка за екрана Comment[bs]=Ekranski lenjir Comment[ca]=Regle de pantalla -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kremotecontrol for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kremotecontrol for openSUSE:Factory checked in at 2012-03-13 09:34:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kremotecontrol (Old) and /work/SRC/openSUSE:Factory/.kremotecontrol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kremotecontrol", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kremotecontrol/kremotecontrol.changes 2012-02-03 10:23:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kremotecontrol.new/kremotecontrol.changes 2012-03-13 09:34:52.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:18 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kremotecontrol-4.8.0.tar.bz2 New: ---- kremotecontrol-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kremotecontrol.spec ++++++ --- /var/tmp/diff_new_pack.81rtSY/_old 2012-03-13 09:34:53.000000000 +0100 +++ /var/tmp/diff_new_pack.81rtSY/_new 2012-03-13 09:34:53.000000000 +0100 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kremotecontrol -Version: 4.8.0 +Version: 4.8.1 Release: 0 -License: GPL-2.0+ Summary: KDE Frontend for the Linux Infrared Remote Control system -Url: http://www.kde.org +License: GPL-2.0+ Group: Productivity/Other +Url: http://www.kde.org Source0: kremotecontrol-%{version}.tar.bz2 Patch0: 4_7_BRANCH.diff BuildRequires: kdebase4-workspace-devel @@ -34,15 +35,15 @@ Kremotecontrol is a KDE frontend for the Linux Infrared Remote Control system. %package -n liblibkremotecontrol1 -Group: System/Libraries Summary: KDE Frontend for the Linux Infrared Remote Control system +Group: System/Libraries %description -n liblibkremotecontrol1 Kremotecontrol is a KDE frontend for the Linux Infrared Remote Control system. %package devel -Group: Development/Libraries/C and C++ Summary: KDE Frontend for the Linux Infrared Remote Control system +Group: Development/Libraries/C and C++ Requires: liblibkremotecontrol1 = %{version} %description devel @@ -95,5 +96,4 @@ %doc TODO %_kde4_libdir/liblibkremotecontrol.so - %changelog ++++++ kremotecontrol-4.8.0.tar.bz2 -> kremotecontrol-4.8.1.tar.bz2 ++++++ Files old/kremotecontrol-4.8.0/doc/index.cache.bz2 and new/kremotecontrol-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kremotecontrol-4.8.0/kcmremotecontrol/kcm_remotecontrol.desktop new/kremotecontrol-4.8.1/kcmremotecontrol/kcm_remotecontrol.desktop --- old/kremotecontrol-4.8.0/kcmremotecontrol/kcm_remotecontrol.desktop 2012-01-18 19:50:06.000000000 +0100 +++ new/kremotecontrol-4.8.1/kcmremotecontrol/kcm_remotecontrol.desktop 2012-02-29 23:57:45.000000000 +0100 @@ -24,11 +24,13 @@ X-KDE-Keywords[ia]=KCMRemoteControl,controlo remote X-KDE-Keywords[it]=KCMRemoteControl,telecomando X-KDE-Keywords[kk]=KCMRemoteControl,remote control +X-KDE-Keywords[ko]=KCMRemoteControl,remote control,리모콘,원격 조정 X-KDE-Keywords[nb]=KRemoteControl,fjernstyring X-KDE-Keywords[nds]=KCM-Feernbedenen,Feernbedenen X-KDE-Keywords[nl]=KCMRemoteControl,besturing op afstand X-KDE-Keywords[pt]=KCMRemoteControl,comando à distância X-KDE-Keywords[pt_BR]=KCMRemoteControl,controle remoto +X-KDE-Keywords[sk]=KCMRemoteControl,diaľkové ovládanie X-KDE-Keywords[sr]=KCMRemoteControl,remote control,даљински управљач X-KDE-Keywords[sr@ijekavian]=KCMRemoteControl,remote control,даљински управљач X-KDE-Keywords[sr@ijekavianlatin]=KCMRemoteControl,remote control,daljinski upravljač diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kremotecontrol-4.8.0/kded/kremotecontroldaemon.desktop new/kremotecontrol-4.8.1/kded/kremotecontroldaemon.desktop --- old/kremotecontrol-4.8.0/kded/kremotecontroldaemon.desktop 2012-01-10 15:18:59.000000000 +0100 +++ new/kremotecontrol-4.8.1/kded/kremotecontroldaemon.desktop 2012-02-29 23:57:45.000000000 +0100 @@ -44,7 +44,7 @@ Name[sv]=Demon för Kremotecontrol Name[th]=ดีมอนตัวควบคุมระยะไกล-K Name[tr]=KRemote Denetim Hizmeti -Name[ug]=K يىراقتىن تىزگىنلەش Daemon ى +Name[ug]=K يىراقتىن تىزگىنلەش Daemon ئى Name[uk]=Фонова служба дистанційного керування Name[x-test]=xxK Remote Control Daemonxx Name[zh_CN]=K 远程控制守护程序 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kremotecontrol-4.8.0/krcdnotifieritem/krcdnotifieritem.desktop new/kremotecontrol-4.8.1/krcdnotifieritem/krcdnotifieritem.desktop --- old/kremotecontrol-4.8.0/krcdnotifieritem/krcdnotifieritem.desktop 2012-01-10 15:18:59.000000000 +0100 +++ new/kremotecontrol-4.8.1/krcdnotifieritem/krcdnotifieritem.desktop 2012-02-29 23:57:45.000000000 +0100 @@ -42,6 +42,7 @@ Name[sv]=Underrättelseobjekt för Kremotecontrol Name[th]=รายการตัวแจ้งให้ทราบของตัวควบคุมระยะไกล-K Name[tr]=KRemoteControl Bildirim Ögesi +Name[ug]=KRemoteControl بىلدۈرگۈ تۇرى Name[uk]=Пункт сповіщення KRemoteControl Name[x-test]=xxKRemoteControl Notifier Itemxx Name[zh_CN]=KRemoteControl 通知项 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kremotecontrol-4.8.0/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop new/kremotecontrol-4.8.1/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop --- old/kremotecontrol-4.8.0/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop 2012-01-10 15:18:59.000000000 +0100 +++ new/kremotecontrol-4.8.1/libkremotecontrol/backends/lirc/kremotecontrol_lirc.desktop 2012-02-29 23:57:45.000000000 +0100 @@ -33,6 +33,7 @@ Name[pt_BR]=Lirc Name[ro]=Lirc Name[ru]=Lirc +Name[sk]=Lirc Name[sr]=ЛИРЦ Name[sr@ijekavian]=ЛИРЦ Name[sr@ijekavianlatin]=LIRC @@ -72,6 +73,7 @@ Comment[pt]=Comando à Distância por Infravermelhos para Linux Comment[pt_BR]=Controle remoto infravermelho no Linux Comment[ru]=Инфракрасное дистанционное управление для Linux +Comment[sk]=Linuxové infračervené diaľkové ovládanie Comment[sr]=Инфрацрвени даљински управљачи под Линуксом Comment[sr@ijekavian]=Инфрацрвени даљински управљачи под Линуксом Comment[sr@ijekavianlatin]=Infracrveni daljinski upravljači pod Linuxom diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kremotecontrol-4.8.0/libkremotecontrol/kremotecontrolmanager.desktop new/kremotecontrol-4.8.1/libkremotecontrol/kremotecontrolmanager.desktop --- old/kremotecontrol-4.8.0/libkremotecontrol/kremotecontrolmanager.desktop 2012-01-10 15:18:59.000000000 +0100 +++ new/kremotecontrol-4.8.1/libkremotecontrol/kremotecontrolmanager.desktop 2012-02-29 23:57:45.000000000 +0100 @@ -28,6 +28,7 @@ Comment[pa]=ਰਿਮੋਟ ਕੰਟਰੋਲ ਪਰਬੰਧ ਬੈਕਐਂਡ Comment[pt]=Infra-Estrutura de Gestão de Comandos à Distância Comment[pt_BR]=Infraestrutura de gerenciamento do controle remoto +Comment[sk]=Podporná vsrtva pre správu diaľkových ovládačov Comment[sr]=Позадина за управљање даљинским управљачима Comment[sr@ijekavian]=Позадина за управљање даљинским управљачима Comment[sr@ijekavianlatin]=Pozadina za upravljanje daljinskim upravljačima -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit konsole for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2012-03-13 09:34:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "konsole", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2012-01-27 15:21:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2012-03-13 09:34:47.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:23:07 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- konsole-4.8.0.tar.bz2 New: ---- konsole-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.T7HmUF/_old 2012-03-13 09:34:48.000000000 +0100 +++ /var/tmp/diff_new_pack.T7HmUF/_new 2012-03-13 09:34:48.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: konsole -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: KDE Terminal License: GPL-2.0+ ++++++ konsole-4.8.0.tar.bz2 -> konsole-4.8.1.tar.bz2 ++++++ Files old/konsole-4.8.0/doc/manual/index.cache.bz2 and new/konsole-4.8.1/doc/manual/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.8.0/doc/manual/index.docbook new/konsole-4.8.1/doc/manual/index.docbook --- old/konsole-4.8.0/doc/manual/index.docbook 2011-11-17 21:57:16.000000000 +0100 +++ new/konsole-4.8.1/doc/manual/index.docbook 2012-02-29 23:56:57.000000000 +0100 @@ -73,7 +73,9 @@ emulator, often referred to as a terminal or a shell. It emulates a command line interface in a text only window. </para> -<para>Explaining the use of the &UNIX; <acronym>CLI</acronym> is beyond the scope of this document. A search of the web for these terms will produce more information. +<para>&konsole; typically runs a command shell, an application that executes commands that you type. +The shell the &konsole; runs depends on your account settings. +Consult your operating system documentation to know what the shell is, how to configure it and how to use it. </para> </sect1> @@ -809,7 +811,7 @@ <variablelist> <varlistentry> <term><option>--help</option></term> -<listitem><para><action>List the various options</action>.</para></listitem> +<listitem><para><action>List various options</action>.</para></listitem> </varlistentry> <varlistentry> @@ -820,13 +822,19 @@ <varlistentry> <term><option>--list-profiles</option></term> -<listitem><para><action>List</action> all of the available profiles. +<listitem><para><action>List</action> all available profiles. +</para></listitem> +</varlistentry> + +<varlistentry> +<term><option>--list-profile-properties</option></term> +<listitem><para><action>List</action> all possible properties with name and type. See option <option>-p</option> . </para></listitem> </varlistentry> <varlistentry> <term><option>--background-mode</option></term> -<listitem><para><action>Start &konsole;</action> in the background and bring to the front when the F12 key is pressed. +<listitem><para><action>Start &konsole;</action> in the background and bring to the front when <keycombo action="simul">&Ctrl;&Shift;<keycap>F12</keycap></keycombo> (by default) is pressed. </para></listitem> </varlistentry> @@ -880,14 +888,13 @@ <term><option>-e</option> <parameter>command</parameter></term> <listitem><para><action>Execute</action> <parameter>command</parameter> instead of the normal shell.</para> -<note><para>Any arguments after <parameter>command</parameter> will be passed to -<parameter>command</parameter>, not &konsole;.</para></note> +<note><para>This option will catch all following arguments passed to &konsole;, and execute it as <parameter>command</parameter>. So this option should always be used as the last option.</para></note> </listitem> </varlistentry> <varlistentry> <term><option>--nofork</option></term> -<listitem><para><action>Do not run in the background</action>. This is often needed to mimic other terminals. +<listitem><para><action>Do not run in the background</action>. This is often needed to mimic other terminal emulators. </para></listitem> </varlistentry> @@ -1122,6 +1129,14 @@ </para> </listitem> +<listitem><para> +The <option>--new-tab</option> option sometimes behaves strangely. It may create new window, or it may create new tab in another existing &konsole; window instead of the current &konsole; window. +</para> +<para> +Those behaviors feel strange, but they are not necessarily bugs. The <option>--new-tab</option> option tries to reuse existing &konsole; windows, but not all &konsole; windows are reusable. All &konsole; windows opened through &krunner; are reusable, while most &konsole; windows opened from command line are not. +</para> +</listitem> + </itemizedlist> </sect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.8.0/src/MainWindow.cpp new/konsole-4.8.1/src/MainWindow.cpp --- old/konsole-4.8.0/src/MainWindow.cpp 2011-11-17 21:57:16.000000000 +0100 +++ new/konsole-4.8.1/src/MainWindow.cpp 2012-02-29 23:56:57.000000000 +0100 @@ -397,12 +397,14 @@ void MainWindow::newTab() { - emit newSessionRequest( _defaultProfile , activeSessionDir() , _viewManager); + Profile::Ptr defaultProfile = SessionManager::instance()->defaultProfile(); + emit newSessionRequest(defaultProfile , activeSessionDir() , _viewManager); } void MainWindow::newWindow() { - emit newWindowRequest( _defaultProfile , activeSessionDir() ); + Profile::Ptr defaultProfile = SessionManager::instance()->defaultProfile(); + emit newWindowRequest(defaultProfile , activeSessionDir()); } bool MainWindow::queryClose() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.8.0/src/Pty.cpp new/konsole-4.8.1/src/Pty.cpp --- old/konsole-4.8.0/src/Pty.cpp 2011-11-17 21:57:16.000000000 +0100 +++ new/konsole-4.8.1/src/Pty.cpp 2012-02-29 23:56:57.000000000 +0100 @@ -133,15 +133,25 @@ void Pty::setInitialWorkingDirectory(const QString& dir) { - setWorkingDirectory(dir); + QString pwd = dir; + + // remove trailing slash in the path when appropriate + // example: /usr/share/icons/ ==> /usr/share/icons + if ( pwd.length() > 1 && pwd.endsWith(QLatin1String("/")) ) { + pwd.chop(1); + } + + setWorkingDirectory(pwd); // setting PWD to "." will cause problem for bash & zsh - if ( dir != "." ) - setEnv("PWD", dir); + if (pwd != ".") + setEnv("PWD", pwd); } void Pty::addEnvironmentVariables(const QStringList& environment) { + bool isTermEnvAdded = false; + QListIterator<QString> iter(environment); while (iter.hasNext()) { @@ -156,8 +166,17 @@ QString value = pair.mid(pos+1); setEnv(variable,value); + + if ( variable == "TERM" ) { + isTermEnvAdded = true; + } } } + + // extra safeguard to make sure $TERM is always set + if ( !isTermEnvAdded ) { + setEnv("TERM", "xterm"); + } } int Pty::start(const QString& program, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.8.0/src/Vt102Emulation.cpp new/konsole-4.8.1/src/Vt102Emulation.cpp --- old/konsole-4.8.0/src/Vt102Emulation.cpp 2011-11-17 21:57:16.000000000 +0100 +++ new/konsole-4.8.1/src/Vt102Emulation.cpp 2012-02-29 23:56:57.000000000 +0100 @@ -938,12 +938,16 @@ states |= KeyboardTranslator::ApplicationKeypadState; // check flow control state - if (modifiers & Qt::ControlModifier) - { - if (event->key() == Qt::Key_S) + if (modifiers & Qt::ControlModifier) { + switch (event->key()) { + case Qt::Key_S: emit flowControlKeyPressed(true); - else if (event->key() == Qt::Key_Q) + break; + case Qt::Key_Q: + case Qt::Key_C: // cancel flow control emit flowControlKeyPressed(false); + break; + } } // lookup key binding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.8.0/src/main.cpp new/konsole-4.8.1/src/main.cpp --- old/konsole-4.8.0/src/main.cpp 2011-11-17 21:57:16.000000000 +0100 +++ new/konsole-4.8.1/src/main.cpp 2012-02-29 23:56:57.000000000 +0100 @@ -30,7 +30,7 @@ #include <KLocale> #include <KDebug> -#define KONSOLE_VERSION "2.8" +#define KONSOLE_VERSION "2.8.1" // standard input file descriptor static const int STDIN = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kolourpaint for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kolourpaint for openSUSE:Factory checked in at 2012-03-13 09:34:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kolourpaint (Old) and /work/SRC/openSUSE:Factory/.kolourpaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kolourpaint", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kolourpaint/kolourpaint.changes 2012-01-27 15:21:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kolourpaint.new/kolourpaint.changes 2012-03-13 09:34:43.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:22:41 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kolourpaint-4.8.0.tar.bz2 New: ---- kolourpaint-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kolourpaint.spec ++++++ --- /var/tmp/diff_new_pack.DIfdCh/_old 2012-03-13 09:34:44.000000000 +0100 +++ /var/tmp/diff_new_pack.DIfdCh/_new 2012-03-13 09:34:44.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kolourpaint -Version: 4.8.0 +Version: 4.8.1 Release: 0 # See bnc#717722 for license details Summary: Paint Program ++++++ kolourpaint-4.8.0.tar.bz2 -> kolourpaint-4.8.1.tar.bz2 ++++++ Files old/kolourpaint-4.8.0/doc/index.cache.bz2 and new/kolourpaint-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kolourpaint-4.8.0/imagelib/kpFloodFill.cpp new/kolourpaint-4.8.1/imagelib/kpFloodFill.cpp --- old/kolourpaint-4.8.0/imagelib/kpFloodFill.cpp 2011-09-26 11:46:04.000000000 +0200 +++ new/kolourpaint-4.8.1/imagelib/kpFloodFill.cpp 2012-02-29 23:57:17.000000000 +0100 @@ -384,11 +384,11 @@ //--------------------------------------------------------------------- // public -void kpFloodFill::fill () +void kpFloodFill::fill() { prepare(); - QApplication::setOverrideCursor (Qt::WaitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); QPainter painter(d->imagePtr); @@ -401,13 +401,13 @@ foreach (const kpFillLine &l, d->fillLines) { - const QPoint p1 (l.m_x1, l.m_y); - const QPoint p2 (l.m_x2, l.m_y); - - painter.drawLine (p1, p2); + if ( l.m_x1 == l.m_x2 ) + painter.drawPoint(l.m_x1, l.m_y); + else + painter.drawLine(l.m_x1, l.m_y, l.m_x2, l.m_y); } - QApplication::restoreOverrideCursor (); + QApplication::restoreOverrideCursor(); } //--------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kolourpaint-4.8.0/tools/selection/kpAbstractSelectionTool_Create.cpp new/kolourpaint-4.8.1/tools/selection/kpAbstractSelectionTool_Create.cpp --- old/kolourpaint-4.8.0/tools/selection/kpAbstractSelectionTool_Create.cpp 2011-07-27 20:42:13.000000000 +0200 +++ new/kolourpaint-4.8.1/tools/selection/kpAbstractSelectionTool_Create.cpp 2012-02-29 23:57:17.000000000 +0100 @@ -92,11 +92,36 @@ } //--------------------------------------------------------------------- +// use a crosshair cursor which is really always exactly 1 pixel wide +// to the contrary of the "themed" crosshair cursors which might look nice +// but does not allow to exactly position the hot-spot. +/* XPM */ +static const char *crosshair[]={ +"17 17 2 1", +". c None", +"# c #000000", +"........#........", +"........#........", +"........#........", +"........#........", +"........#........", +"........#........", +"........#........", +"........#........", +"########.########", +"........#........", +"........#........", +"........#........", +"........#........", +"........#........", +"........#........", +"........#........", +"........#........"}; // private void kpAbstractSelectionTool::setCursorCreate () { - viewManager ()->setCursor (Qt::ArrowCursor); + viewManager()->setCursor(QCursor(QPixmap(crosshair), 8, 8)); } //--------------------------------------------------------------------- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmplot for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kmplot for openSUSE:Factory checked in at 2012-03-13 09:34:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmplot (Old) and /work/SRC/openSUSE:Factory/.kmplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmplot", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kmplot/kmplot.changes 2012-01-30 12:26:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmplot.new/kmplot.changes 2012-03-13 09:34:35.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:22:34 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kmplot-4.8.0.tar.bz2 New: ---- kmplot-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmplot.spec ++++++ --- /var/tmp/diff_new_pack.UiSynC/_old 2012-03-13 09:34:36.000000000 +0100 +++ /var/tmp/diff_new_pack.UiSynC/_new 2012-03-13 09:34:36.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kmplot BuildRequires: boost-devel BuildRequires: freeglut-devel @@ -45,7 +46,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Mathematical Function Plotter License: GPL-2.0+ ++++++ kmplot-4.8.0.tar.bz2 -> kmplot-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.8.0/doc/commands.docbook new/kmplot-4.8.1/doc/commands.docbook --- old/kmplot-4.8.0/doc/commands.docbook 2011-07-27 20:40:47.000000000 +0200 +++ new/kmplot-4.8.1/doc/commands.docbook 2012-02-29 23:56:48.000000000 +0100 @@ -196,7 +196,12 @@ <guimenuitem>Show Sliders</guimenuitem> </menuchoice></term> <listitem> - <para><action>Toggles</action> the visibility of the slider dialog.</para> + <para><action>Toggles</action> the visibility of the slider dialog. + In the dialog move a slider to change the parameter of the function plot connected to it.</para> + <para>Enable this on the Function tab and select one of the sliders to change the parameter value dynamically. The values vary from 0 (left) to 10 (right) by default, but can be changed in the slider dialog.</para> + <para>For a small tutorial see <ulink url="http://userbase.kde.org/KmPlot/">Using Sliders</ulink>.</para> +  </listitem> </varlistentry> Files old/kmplot-4.8.0/doc/index.cache.bz2 and new/kmplot-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.8.0/kmplot/kmplotio.cpp new/kmplot-4.8.1/kmplot/kmplotio.cpp --- old/kmplot-4.8.0/kmplot/kmplotio.cpp 2011-07-27 20:40:47.000000000 +0200 +++ new/kmplot-4.8.1/kmplot/kmplotio.cpp 2012-03-02 23:02:37.000000000 +0100 @@ -572,7 +572,7 @@ void KmPlotIO::parseParameters( const QDomElement &n, Function * function ) { QChar separator = (version < 1) ? ',' : ';'; - QString tagName = (version < 5) ? "parameterlist" : "parameter-list"; + QString tagName = (version < 4) ? "parameterlist" : "parameter-list"; const QStringList str_parameters = n.namedItem( tagName ).toElement().text().split( separator, QString::SkipEmptyParts ); for( QStringList::const_iterator it = str_parameters.constBegin(); it != str_parameters.constEnd(); ++it ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmouth for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kmouth for openSUSE:Factory checked in at 2012-03-13 09:34:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmouth (Old) and /work/SRC/openSUSE:Factory/.kmouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmouth", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kmouth/kmouth.changes 2012-01-30 12:25:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmouth.new/kmouth.changes 2012-03-13 09:34:28.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:22:17 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kmouth-4.8.0.tar.bz2 New: ---- kmouth-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmouth.spec ++++++ --- /var/tmp/diff_new_pack.DnsUvV/_old 2012-03-13 09:34:29.000000000 +0100 +++ /var/tmp/diff_new_pack.DnsUvV/_new 2012-03-13 09:34:29.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: %{name}-%version.tar.bz2 Patch: 4_7_BRANCH.diff ++++++ kmouth-4.8.0.tar.bz2 -> kmouth-4.8.1.tar.bz2 ++++++ Files old/kmouth-4.8.0/doc/index.cache.bz2 and new/kmouth-4.8.1/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmousetool for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kmousetool for openSUSE:Factory checked in at 2012-03-13 09:34:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmousetool (Old) and /work/SRC/openSUSE:Factory/.kmousetool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmousetool", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kmousetool/kmousetool.changes 2012-01-30 12:25:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmousetool.new/kmousetool.changes 2012-03-13 09:34:20.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:21:45 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kmousetool-4.8.0.tar.bz2 New: ---- kmousetool-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmousetool.spec ++++++ --- /var/tmp/diff_new_pack.NokkLE/_old 2012-03-13 09:34:21.000000000 +0100 +++ /var/tmp/diff_new_pack.NokkLE/_new 2012-03-13 09:34:21.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: %{name}-%version.tar.bz2 Patch: 4_7_BRANCH.diff ++++++ kmousetool-4.8.0.tar.bz2 -> kmousetool-4.8.1.tar.bz2 ++++++ Files old/kmousetool-4.8.0/doc/index.cache.bz2 and new/kmousetool-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmousetool-4.8.0/kmousetool/kmousetool.desktop new/kmousetool-4.8.1/kmousetool/kmousetool.desktop --- old/kmousetool-4.8.0/kmousetool/kmousetool.desktop 2011-08-22 15:34:15.000000000 +0200 +++ new/kmousetool-4.8.1/kmousetool/kmousetool.desktop 2012-02-29 23:57:55.000000000 +0100 @@ -23,7 +23,7 @@ Comment[eu]=Sagua zure ordez klikatzen du, RSI-aren efektuak gutxitzeko Comment[fa]=موشی را برایتان فشار می‌دهد، اثرات RSI را کاهش می‌دهد Comment[fi]=Napsauttaa hiirtä puolestasi rannevammojen ehkäisemiseksi -Comment[fr]=Clique sur la souris à votre place, limitant les douleurs liées aux TMS +Comment[fr]=Clique sur la souris à votre place, limitant les douleurs liées aux TMS (Troubles Musculo-Squelettiques) Comment[ga]=Cliceálann seo an luch duit, chun tionchar gortú athstraidhneála a laghdú Comment[gl]=Preme o rato por vostede, reducindo os efectos do RSI Comment[he]=לוחץ על העכבר עבורך, ובכך מקל על פרק היד -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmod for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2012-03-13 09:34:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmod", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2012-03-07 20:09:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-03-13 09:34:19.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 10 17:44:05 UTC 2012 - rschweikert(a)suse.com + +- place binary in /usr tree (UsrMerge project) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.TWx0df/_old 2012-03-13 09:34:20.000000000 +0100 +++ /var/tmp/diff_new_pack.TWx0df/_new 2012-03-13 09:34:20.000000000 +0100 @@ -14,6 +14,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: kmod %define lname libkmod2 Summary: Utilities to load modules into the kernel @@ -91,20 +93,30 @@ # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. %configure --with-xz --with-zlib --includedir=%_includedir/%name-%version \ - --with-rootlibdir=/%_lib --bindir=/bin + --with-rootlibdir=%{_libdir} --bindir=%{_bindir} make %{?_smp_mflags} %install -b="%buildroot"; %make_install -rm -f "$b/bin"/kmod-*; -rm -f "$b/%_libdir"/*.la; +rm -f %buildroot/%_libdir/*.la # kmod-compat -mkdir -p "$b/bin" "$b/sbin"; -ln -s kmod "$b/bin/lsmod"; +#UsrMerge +mkdir -p %buildroot/bin +mkdir -p %buildroot/sbin +mkdir -p %buildroot/%_lib +ln -s %{_bindir}/kmod %buildroot/bin +ln -s %{_bindir}/kmod %buildroot/bin/lsmod +for i in depmod insmod lsmod modinfo modprobe rmmod; do + ln -s %{_bindir}/kmod %buildroot/sbin/$i +done; +ln -s %_libdir/libkmod.so.2 %buildroot/%_lib +ln -s %_libdir/libkmod.so.2.1.0 %buildroot/%_lib +#EndUsrMerge +mkdir -p %buildroot/%{_sbindir} +ln -s %{_bindir}/kmod %buildroot/%{_bindir}/lsmod for i in depmod insmod lsmod modinfo modprobe rmmod; do - ln -s "/bin/kmod" "$b/sbin/$i"; + ln -s %{_bindir}/kmod %buildroot/%{_sbindir}/$i done; %check @@ -116,12 +128,18 @@ %files %defattr(-,root,root) +%{_bindir}/kmod +#UsrMerge /bin/kmod +#EndUsrMerge %_mandir/man5/modules.dep.bin.5* %files -n %lname %defattr(-,root,root) +%_libdir/libkmod.so.2* +#UsrMerge /%_lib/libkmod.so.2* +#EndUsrMerge %files -n libkmod-devel %defattr(-,root,root) @@ -131,6 +149,7 @@ %files compat %defattr(-,root,root) +#UsrMerge /bin/lsmod /sbin/depmod /sbin/insmod @@ -138,6 +157,14 @@ /sbin/modinfo /sbin/modprobe /sbin/rmmod +#EndUsrMerge +%_bindir/lsmod +%_sbindir/depmod +%_sbindir/insmod +%_sbindir/lsmod +%_sbindir/modinfo +%_sbindir/modprobe +%_sbindir/rmmod %_mandir/man5/depmod.d.5* %_mandir/man5/modprobe.d.5* %_mandir/man5/modules.dep.5* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit klettres for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package klettres for openSUSE:Factory checked in at 2012-03-13 09:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klettres (Old) and /work/SRC/openSUSE:Factory/.klettres.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "klettres", Maintainer is "klettres" Changes: -------- --- /work/SRC/openSUSE:Factory/klettres/klettres.changes 2012-01-30 12:25:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.klettres.new/klettres.changes 2012-03-13 09:34:10.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:18:38 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- klettres-4.8.0.tar.bz2 New: ---- klettres-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klettres.spec ++++++ --- /var/tmp/diff_new_pack.UtL6PS/_old 2012-03-13 09:34:11.000000000 +0100 +++ /var/tmp/diff_new_pack.UtL6PS/_new 2012-03-13 09:34:11.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: klettres BuildRequires: boost-devel BuildRequires: freeglut-devel @@ -45,7 +46,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Alphabet Learning Game License: GPL-2.0+ ++++++ klettres-4.8.0.tar.bz2 -> klettres-4.8.1.tar.bz2 ++++++ Files old/klettres-4.8.0/doc/index.cache.bz2 and new/klettres-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klettres-4.8.0/src/klettres.desktop new/klettres-4.8.1/src/klettres.desktop --- old/klettres-4.8.0/src/klettres.desktop 2012-01-10 15:15:13.000000000 +0100 +++ new/klettres-4.8.1/src/klettres.desktop 2012-02-29 23:56:47.000000000 +0100 @@ -51,6 +51,7 @@ Comment[pt_BR]=Um programa do KDE para aprender o alfabeto Comment[ro]=un program KDE pentru însușirea alfabetului Comment[ru]=Программа для изучения алфавита +Comment[sk]=KDE program pre výuku abecedy Comment[sl]=Program za učenje abecede za KDE Comment[sv]=Ett KDE program för att lära sig alfabetet Comment[tr]=Alfabeyi öğrenmeye yardımcı bir KDE uygulaması @@ -174,6 +175,7 @@ GenericName[pt_BR]=Aprenda o alfabeto GenericName[ro]=Învață alfabetul GenericName[ru]=Изучение алфавита +GenericName[sk]=Výuka abecedy GenericName[sl]=Naučite se abecedo GenericName[sv]=Inlärning av alfabetet GenericName[tr]=Alfabeyi Öğren -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiten for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kiten for openSUSE:Factory checked in at 2012-03-13 09:34:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiten (Old) and /work/SRC/openSUSE:Factory/.kiten.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiten", Maintainer is "mfabian(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiten/kiten.changes 2012-01-30 12:25:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiten.new/kiten.changes 2012-03-13 09:34:05.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:18:17 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kiten-4.8.0.tar.bz2 New: ---- kiten-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiten.spec ++++++ --- /var/tmp/diff_new_pack.EeTzM3/_old 2012-03-13 09:34:07.000000000 +0100 +++ /var/tmp/diff_new_pack.EeTzM3/_new 2012-03-13 09:34:07.000000000 +0100 @@ -46,7 +46,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Japanese Reference/Study Tool License: GPL-2.0+ ++++++ kiten-4.8.0.tar.bz2 -> kiten-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiten/kiten-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kiten.new/kiten-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kig for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kig for openSUSE:Factory checked in at 2012-03-13 09:33:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kig (Old) and /work/SRC/openSUSE:Factory/.kig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kig", Maintainer is "kig" Changes: -------- --- /work/SRC/openSUSE:Factory/kig/kig.changes 2012-01-30 12:25:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kig.new/kig.changes 2012-03-13 09:34:03.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:18:04 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kig-4.8.0.tar.bz2 New: ---- kig-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kig.spec ++++++ --- /var/tmp/diff_new_pack.igzPNb/_old 2012-03-13 09:34:04.000000000 +0100 +++ /var/tmp/diff_new_pack.igzPNb/_new 2012-03-13 09:34:04.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kig BuildRequires: boost-devel BuildRequires: freeglut-devel @@ -45,7 +46,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Interactive Geometry License: GPL-2.0+ ++++++ kig-4.8.0.tar.bz2 -> kig-4.8.1.tar.bz2 ++++++ Files old/kig-4.8.0/doc/index.cache.bz2 and new/kig-4.8.1/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit khangman for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package khangman for openSUSE:Factory checked in at 2012-03-13 09:33:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khangman (Old) and /work/SRC/openSUSE:Factory/.khangman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "khangman", Maintainer is "khangman" Changes: -------- --- /work/SRC/openSUSE:Factory/khangman/khangman.changes 2012-01-30 12:25:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.khangman.new/khangman.changes 2012-03-13 09:34:00.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:18:00 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- khangman-4.8.0.tar.bz2 New: ---- khangman-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khangman.spec ++++++ --- /var/tmp/diff_new_pack.ZodOvK/_old 2012-03-13 09:34:02.000000000 +0100 +++ /var/tmp/diff_new_pack.ZodOvK/_new 2012-03-13 09:34:02.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: khangman BuildRequires: avogadro-devel BuildRequires: boost-devel @@ -37,7 +38,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Hangman Game License: GPL-2.0+ ++++++ khangman-4.8.0.tar.bz2 -> khangman-4.8.1.tar.bz2 ++++++ Files old/khangman-4.8.0/doc/index.cache.bz2 and new/khangman-4.8.1/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kgpg for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2012-03-13 09:33:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgpg (Old) and /work/SRC/openSUSE:Factory/.kgpg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgpg", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kgpg/kgpg.changes 2012-02-03 10:23:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2012-03-13 09:33:57.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:17:55 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kgpg-4.8.0.tar.bz2 New: ---- kgpg-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.7Nl9I3/_old 2012-03-13 09:33:59.000000000 +0100 +++ /var/tmp/diff_new_pack.7Nl9I3/_new 2012-03-13 09:33:59.000000000 +0100 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kgpg -Version: 4.8.0 +Version: 4.8.1 Release: 0 -License: GPL-2.0+ Summary: Encryption Tool -Url: http://www.kde.org +License: GPL-2.0+ Group: Productivity/Security +Url: http://www.kde.org Source0: kgpg-%{version}.tar.bz2 Patch0: 4_7_BRANCH.diff Patch1: kgpg-autostart.diff ++++++ kgpg-4.8.0.tar.bz2 -> kgpg-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/core/KGpgRootNode.cpp new/kgpg-4.8.1/core/KGpgRootNode.cpp --- old/kgpg-4.8.0/core/KGpgRootNode.cpp 2011-08-22 15:26:11.000000000 +0200 +++ new/kgpg-4.8.1/core/KGpgRootNode.cpp 2012-02-29 23:57:42.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright 2008,2009 Rolf Eike Beer <kde(a)opensource.sf-tec.de> +/* Copyright 2008,2009,2010,2012 Rolf Eike Beer <kde(a)opensource.sf-tec.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -29,7 +29,6 @@ m_deleting(false) { m_model = model; - addGroups(); } KGpgRootNode::~KGpgRootNode() @@ -49,12 +48,10 @@ } void -KGpgRootNode::addGroups() +KGpgRootNode::addGroups(const QStringList &groups) { - const QStringList groups = KgpgInterface::getGpgGroupNames(KGpgSettings::gpgConfigPath()); - - for (QStringList::const_iterator it = groups.begin(); it != groups.end(); ++it) - new KGpgGroupNode(this, QString(*it)); + foreach (const QString &groupName, groups) + new KGpgGroupNode(this, groupName); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/core/KGpgRootNode.h new/kgpg-4.8.1/core/KGpgRootNode.h --- old/kgpg-4.8.0/core/KGpgRootNode.h 2011-08-22 15:26:11.000000000 +0200 +++ new/kgpg-4.8.1/core/KGpgRootNode.h 2012-02-29 23:57:42.000000000 +0100 @@ -55,9 +55,10 @@ virtual KgpgCore::KgpgItemType getType() const; /** - * Read the group definitions from GnuPG config file + * Create new group nodes + * @param groups list of group names to create */ - void addGroups(); + void addGroups(const QStringList &groups); void addKeys(const QStringList &ids = QStringList()); void refreshKeys(KGpgKeyNode::List nodes); /** Files old/kgpg-4.8.0/doc/index.cache.bz2 and new/kgpg-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/groupedit.cpp new/kgpg-4.8.1/groupedit.cpp --- old/kgpg-4.8.0/groupedit.cpp 2011-08-22 15:26:11.000000000 +0200 +++ new/kgpg-4.8.1/groupedit.cpp 2012-02-29 23:57:42.000000000 +0100 @@ -90,7 +90,7 @@ for (int i = 0; i < sel.count(); i++) { if (sel.at(i).column() != 0) continue; - KGpgNode *nd = m_out->nodeForIndex(sel.at(i)); + KGpgNode *nd = m_out->nodeForIndex(m_outFilter->mapToSource(sel.at(i))); members->append(nd); } m_in->invalidate(); @@ -119,7 +119,7 @@ void groupEdit::groupAdd(const QModelIndex &index) { - KGpgNode *nd = m_out->nodeForIndex(index); + KGpgNode *nd = m_out->nodeForIndex(m_outFilter->mapToSource(index)); members->append(nd); m_in->invalidate(); m_out->invalidate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/keyservers.cpp new/kgpg-4.8.1/keyservers.cpp --- old/kgpg-4.8.0/keyservers.cpp 2011-08-22 15:26:11.000000000 +0200 +++ new/kgpg-4.8.1/keyservers.cpp 2012-02-29 23:57:42.000000000 +0100 @@ -1,10 +1,7 @@ -/*************************************************************************** - keyservers.cpp - description - ------------------- - begin : Tue Nov 26 2002 - copyright : (C) 2002 by Jean-Baptiste Mardelle - email : bj(a)altern.org - ***************************************************************************/ +/* + * Copyright (C) 2002 Jean-Baptiste Mardelle <bj(a)altern.org> + * Copyright (C) 2006,2007,2008,2009,2010,2012 Rolf Eike Beer <kde(a)opensource.sf-tec.de> + */ /*************************************************************************** * * @@ -39,8 +36,6 @@ #include "kgpgsendkeys.h" #include "kgpgimport.h" -using namespace KgpgCore; - KeyServer::KeyServer(QWidget *parent, KGpgItemModel *model, const bool autoclose) : KDialog(parent), m_searchproc(NULL), @@ -326,9 +321,9 @@ KMessageBox::sorry(this, i18n("You must choose a key.")); return; } - page->kLEimportid->setText(m_listpop->kLEID->text()); + const QStringList keys = m_listpop->kLEID->text().simplified().split(QLatin1Char(' ')); m_dialogserver->close(); - slotImport(); + startImport(keys, page->kCBimportks->currentText(), page->kLEproxyI->text()); } void KeyServer::slotPreExport() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/kgpg.desktop new/kgpg-4.8.1/kgpg.desktop --- old/kgpg-4.8.0/kgpg.desktop 2012-01-10 15:18:52.000000000 +0100 +++ new/kgpg-4.8.1/kgpg.desktop 2012-02-29 23:57:42.000000000 +0100 @@ -131,6 +131,7 @@ Comment[tg]=Пешохири GnuPG Comment[th]=ฟร้อนเอนด์ของ GnuPG Comment[tr]=Bir GnuPG arayüzü +Comment[ug]=GnuPG ئالدى ئۇچ پروگراممىسى Comment[uk]=Інтерфейс до GnuPG Comment[uz]=GnuPG uchun grafik interfeys Comment[uz@cyrillic]=GnuPG учун график интерфейс diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/kgpgfirstassistant.cpp new/kgpg-4.8.1/kgpgfirstassistant.cpp --- old/kgpg-4.8.0/kgpgfirstassistant.cpp 2011-08-22 15:26:11.000000000 +0200 +++ new/kgpg-4.8.1/kgpgfirstassistant.cpp 2012-02-29 23:57:42.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright 2008 Rolf Eike Beer <kde(a)opensource.sf-tec.de> +/* Copyright 2008,2010,2012 Rolf Eike Beer <kde(a)opensource.sf-tec.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -169,7 +169,7 @@ gridLayout->setMargin(11); gridLayout->setContentsMargins(0, 0, 0, 0); - QHBoxLayout *hboxLayout = new QHBoxLayout(page); + QHBoxLayout *hboxLayout = new QHBoxLayout(); hboxLayout->setSpacing(6); label = new QLabel(page); label->setText(i18n("Your default key:")); @@ -193,7 +193,7 @@ page_defaultkey = addPage(page, i18n("Default Key")); - page = new QWidget(); + page = new QWidget(this); gridLayout = new QGridLayout(page); gridLayout->setSpacing(6); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/kgpginterface.cpp new/kgpg-4.8.1/kgpginterface.cpp --- old/kgpg-4.8.0/kgpginterface.cpp 2011-11-04 15:36:50.000000000 +0100 +++ new/kgpg-4.8.1/kgpginterface.cpp 2012-02-29 23:57:42.000000000 +0100 @@ -1,6 +1,7 @@ /* * Copyright (C) 2002 Jean-Baptiste Mardelle <bj(a)altern.org> - * Copyright (C) 2007,2008,2009,2010 Rolf Eike Beer <kde(a)opensource.sf-tec.de> + * Copyright (C) 2007,2008,2009,2010,2011,2012 + * Rolf Eike Beer <kde(a)opensource.sf-tec.de> */ /*************************************************************************** * * @@ -164,7 +165,7 @@ QStringList groups; QFile qfile(configfile); - if (qfile.open(QIODevice::ReadOnly) && (qfile.exists())) { + if (qfile.exists() && qfile.open(QIODevice::ReadOnly)) { QTextStream t(&qfile); while (!t.atEnd()) { QString result(t.readLine().simplified()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/main.cpp new/kgpg-4.8.1/main.cpp --- old/kgpg-4.8.0/main.cpp 2012-01-18 19:50:04.000000000 +0100 +++ new/kgpg-4.8.1/main.cpp 2012-02-29 23:57:42.000000000 +0100 @@ -1,10 +1,8 @@ -/*************************************************************************** - main.cpp - description - ------------------- - begin : Mon Jul 8 2002 - copyright : (C) 2002 by Jean-Baptiste Mardelle - email : bj(a)altern.org - ***************************************************************************/ +/* + * Copyright (C) 2002 Jean-Baptiste Mardelle <bj(a)altern.org> + * Copyright (C) 2007,2008,2009,2010,2011,2012 + * Rolf Eike Beer <kde(a)opensource.sf-tec.de> + */ /*************************************************************************** * * @@ -27,7 +25,7 @@ static const char description[] = I18N_NOOP("KGpg - simple gui for gpg\n\nKGpg was designed to make gpg very easy to use.\nI tried to make it as secure as possible.\nHope you enjoy it."); -static const char version[] = "2.7.0"; +static const char version[] = "2.7.1"; int main(int argc, char *argv[]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/model/kgpgitemmodel.cpp new/kgpg-4.8.1/model/kgpgitemmodel.cpp --- old/kgpg-4.8.0/model/kgpgitemmodel.cpp 2011-12-20 20:15:15.000000000 +0100 +++ new/kgpg-4.8.1/model/kgpgitemmodel.cpp 2012-02-29 23:57:42.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright 2008 Rolf Eike Beer <kde(a)opensource.sf-tec.de> +/* Copyright 2008,2009,2010,2011,2012 Rolf Eike Beer <kde(a)opensource.sf-tec.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -22,12 +22,14 @@ #include "convert.h" #include <KGlobal> #include <KLocale> +#include <QMetaObject> KGpgItemModel::KGpgItemModel(QObject *parent) : QAbstractItemModel(parent), m_root(new KGpgRootNode(this)), m_default(KGpgSettings::defaultKey()) { + QMetaObject::invokeMethod(this, "refreshGroups", Qt::QueuedConnection); } KGpgItemModel::~KGpgItemModel() @@ -221,11 +223,13 @@ KGpgItemModel::addGroup(const QString &name, const KGpgKeyNode::List &keys) { KGpgGroupNode *nd; + const int cIndex = m_root->getChildCount(); // row of the new node - emit layoutAboutToBeChanged(); + beginInsertRows(QModelIndex(), cIndex, cIndex); nd = new KGpgGroupNode(m_root, name, keys); - fixPersistentIndexes(); - emit layoutChanged(); + endInsertRows(); + + Q_ASSERT(m_root->getChildIndex(nd) == cIndex); return nd; } @@ -233,16 +237,15 @@ void KGpgItemModel::delNode(KGpgNode *node) { - emit layoutAboutToBeChanged(); + beginResetModel(); delete node; - fixPersistentIndexes(); - emit layoutChanged(); + endResetModel(); } void KGpgItemModel::changeGroup(KGpgGroupNode *node, const QList<KGpgNode *> &keys) { - emit layoutAboutToBeChanged(); + const QModelIndex gIndex = nodeIndex(node); for (int i = node->getChildCount() - 1; i >= 0; i--) { bool found = false; @@ -253,22 +256,29 @@ } if (found) continue; + + beginRemoveRows(gIndex, i, i); delete node->getChild(i); + endRemoveRows(); } + int cnt = node->getChildCount(); + for (int i = 0; i < keys.count(); i++) { bool found = false; - for (int j = 0; j < node->getChildCount(); j++) { + for (int j = 0; j < cnt; j++) { found = (node->getChild(j)->getId() == keys.at(i)->getId()); if (found) break; } if (found) continue; + + beginInsertRows(gIndex, cnt, cnt); new KGpgGroupMemberNode(node, keys.at(i)->toKeyNode()); + endInsertRows(); + cnt++; } - fixPersistentIndexes(); - emit layoutChanged(); } void @@ -276,10 +286,12 @@ { Q_ASSERT(group == member->getParentKeyNode()); - emit layoutAboutToBeChanged(); + const int childRow = group->getChildIndex(member); + const QModelIndex pIndex = nodeIndex(group); + + beginRemoveRows(pIndex, childRow, childRow); delete member; - fixPersistentIndexes(); - emit layoutChanged(); + endRemoveRows(); } QVariant @@ -365,7 +377,7 @@ void KGpgItemModel::refreshKeyIds(const QStringList &ids) { - emit layoutAboutToBeChanged(); + beginResetModel(); if (ids.isEmpty()) { for (int i = m_root->getChildCount() - 1; i >= 0; i--) { KGpgNode *nd = m_root->getChild(i); @@ -384,8 +396,7 @@ } m_root->addKeys(ids); - fixPersistentIndexes(); - emit layoutChanged(); + endResetModel(); } void @@ -393,25 +404,33 @@ { QStringList ids; - emit layoutAboutToBeChanged(); + beginResetModel(); m_root->refreshKeys(nodes); - fixPersistentIndexes(); - emit layoutChanged(); + endResetModel(); } void KGpgItemModel::refreshGroups() { - emit layoutAboutToBeChanged(); for (int i = m_root->getChildCount() - 1; i >= 0; i--) { KGpgNode *nd = m_root->getChild(i); - if (nd->getType() == ITYPE_GROUP) - delete nd; + if (nd->getType() != ITYPE_GROUP) + continue; + + beginRemoveRows(QModelIndex(), i, i); + delete nd; + endRemoveRows(); } - m_root->addGroups(); - fixPersistentIndexes(); - emit layoutChanged(); + const QStringList groups = KgpgInterface::getGpgGroupNames(KGpgSettings::gpgConfigPath()); + + if (groups.isEmpty()) + return; + + const int oldCount = m_root->getChildCount(); + beginInsertRows(QModelIndex(), oldCount, oldCount + groups.count()); + m_root->addGroups(groups); + endInsertRows(); } bool @@ -421,25 +440,6 @@ } void -KGpgItemModel::fixPersistentIndexes() -{ - foreach (const QModelIndex &idx, persistentIndexList()) { - if (!idx.isValid()) - continue; - - KGpgNode *nd = nodeForIndex(idx); - int j = rowForNode(nd); - if (j == idx.row()) - continue; - - if (j >= 0) - changePersistentIndex(idx, createIndex(j, idx.column(), nd)); - else - changePersistentIndex(idx, QModelIndex()); - } -} - -void KGpgItemModel::invalidateIndexes(KGpgNode *nd) { foreach (const QModelIndex &idx, persistentIndexList()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-4.8.0/model/kgpgitemmodel.h new/kgpg-4.8.1/model/kgpgitemmodel.h --- old/kgpg-4.8.0/model/kgpgitemmodel.h 2011-08-22 15:26:11.000000000 +0200 +++ new/kgpg-4.8.1/model/kgpgitemmodel.h 2012-02-29 23:57:42.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright 2008 Rolf Eike Beer <kde(a)opensource.sf-tec.de> +/* Copyright 2008,2009,2010,2011,2012 Rolf Eike Beer <kde(a)opensource.sf-tec.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -93,7 +93,6 @@ void refreshKeyIds(const QStringList &id); void refreshKeyIds(KGpgKeyNode::List &nodes); bool isDefaultKey(const KGpgNode *node) const; - void fixPersistentIndexes(); void updateNodeTrustColor(KGpgExpandableNode *node, const KgpgCore::KgpgKeyTrust trust, const QColor &color); }; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kgeography for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kgeography for openSUSE:Factory checked in at 2012-03-13 09:33:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgeography (Old) and /work/SRC/openSUSE:Factory/.kgeography.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgeography", Maintainer is "kgeography" Changes: -------- --- /work/SRC/openSUSE:Factory/kgeography/kgeography.changes 2012-01-30 12:25:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgeography.new/kgeography.changes 2012-03-13 09:33:55.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:17:11 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kgeography-4.8.0.tar.bz2 New: ---- kgeography-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgeography.spec ++++++ --- /var/tmp/diff_new_pack.1kuEfO/_old 2012-03-13 09:33:56.000000000 +0100 +++ /var/tmp/diff_new_pack.1kuEfO/_new 2012-03-13 09:33:56.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kgeography BuildRequires: boost-devel BuildRequires: freeglut-devel @@ -45,7 +46,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Geography Trainer License: GPL-2.0+ ++++++ kgeography-4.8.0.tar.bz2 -> kgeography-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kgeography/kgeography-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kgeography.new/kgeography-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kgamma for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kgamma for openSUSE:Factory checked in at 2012-03-13 09:33:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgamma (Old) and /work/SRC/openSUSE:Factory/.kgamma.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgamma", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kgamma/kgamma.changes 2012-01-27 15:21:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgamma.new/kgamma.changes 2012-03-13 09:33:53.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:17:05 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kgamma-4.8.0.tar.bz2 New: ---- kgamma-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgamma.spec ++++++ --- /var/tmp/diff_new_pack.OybUxU/_old 2012-03-13 09:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.OybUxU/_new 2012-03-13 09:33:55.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kgamma -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Display gamma configuration License: GPL-2.0+ ++++++ kgamma-4.8.0.tar.bz2 -> kgamma-4.8.1.tar.bz2 ++++++ Files old/kgamma-4.8.0/doc/index.cache.bz2 and new/kgamma-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma-4.8.0/kcmkgamma/kgamma.desktop new/kgamma-4.8.1/kcmkgamma/kgamma.desktop --- old/kgamma-4.8.0/kcmkgamma/kgamma.desktop 2012-01-18 19:49:47.000000000 +0100 +++ new/kgamma-4.8.1/kcmkgamma/kgamma.desktop 2012-02-29 23:57:13.000000000 +0100 @@ -144,6 +144,7 @@ Exec=kcmshell4 kgamma Icon=preferences-desktop-display-color.png X-KDE-Keywords=KGamma, kgamma, Gamma, gamma +X-KDE-Keywords[ar]=جاما,KGamma, kgamma, Gamma, gamma X-KDE-Keywords[ca]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[ca@valencia]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[da]=KGamma,kgamma,Gamma,gamma @@ -156,12 +157,14 @@ X-KDE-Keywords[hu]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[it]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[kk]=KGamma, kgamma, Gamma, gamma, гамма, Гамма +X-KDE-Keywords[ko]=KGamma, kgamma, Gamma, gamma,감마 X-KDE-Keywords[nb]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[nds]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[nl]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[pl]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[pt]=KGamma, kgamma, Gamma, gamma, Gama, gama X-KDE-Keywords[pt_BR]=KGamma, kgamma, Gamma, gama +X-KDE-Keywords[ru]=KGamma,kgamma,Gamma,gamma,гамма,монитор X-KDE-Keywords[sk]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[sr]=KGamma, kgamma, Gamma, gamma,К‑гама,гама X-KDE-Keywords[sr@ijekavian]=KGamma, kgamma, Gamma, gamma,К‑гама,гама -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kfloppy for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kfloppy for openSUSE:Factory checked in at 2012-03-13 09:33:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfloppy (Old) and /work/SRC/openSUSE:Factory/.kfloppy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfloppy", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kfloppy/kfloppy.changes 2012-02-03 10:23:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kfloppy.new/kfloppy.changes 2012-03-13 09:33:49.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:17:01 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kfloppy-4.8.0.tar.bz2 New: ---- kfloppy-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfloppy.spec ++++++ --- /var/tmp/diff_new_pack.6YolSy/_old 2012-03-13 09:33:53.000000000 +0100 +++ /var/tmp/diff_new_pack.6YolSy/_new 2012-03-13 09:33:53.000000000 +0100 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kfloppy -Version: 4.8.0 +Version: 4.8.1 Release: 0 -License: GPL-2.0+ Summary: Floppy Formatter -Url: http://www.kde.org +License: GPL-2.0+ Group: System/GUI/KDE +Url: http://www.kde.org Source0: kfloppy-%{version}.tar.bz2 Patch0: 4_7_BRANCH.diff BuildRequires: kdebase4-workspace-devel ++++++ kfloppy-4.8.0.tar.bz2 -> kfloppy-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfloppy-4.8.0/KFloppy.desktop new/kfloppy-4.8.1/KFloppy.desktop --- old/kfloppy-4.8.0/KFloppy.desktop 2012-01-10 15:18:48.000000000 +0100 +++ new/kfloppy-4.8.1/KFloppy.desktop 2012-02-29 23:57:41.000000000 +0100 @@ -63,6 +63,7 @@ GenericName[tg]=Шаклбанднамоии Диски Нарм GenericName[th]=เครื่องมือฟอร์แมตแผ่นฟลอปปี้้ GenericName[tr]=Disket Biçimlendirici +GenericName[ug]=يۇمشاق دىسكا پىچقۇچ GenericName[uk]=Відформатувати дискету GenericName[uz]=Disketni formatlagich GenericName[uz@cyrillic]=Дискетни форматлагич Files old/kfloppy-4.8.0/doc/index.cache.bz2 and new/kfloppy-4.8.1/doc/index.cache.bz2 differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdf for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdf for openSUSE:Factory checked in at 2012-03-13 09:33:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdf (Old) and /work/SRC/openSUSE:Factory/.kdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdf", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kdf/kdf.changes 2012-02-03 10:23:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdf.new/kdf.changes 2012-03-13 09:33:47.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:16:53 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdf-4.8.0.tar.bz2 New: ---- kdf-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdf.spec ++++++ --- /var/tmp/diff_new_pack.biSRAN/_old 2012-03-13 09:33:49.000000000 +0100 +++ /var/tmp/diff_new_pack.biSRAN/_new 2012-03-13 09:33:49.000000000 +0100 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdf -Version: 4.8.0 +Version: 4.8.1 Release: 0 -License: GPL-2.0+ Summary: Disk Usage Viewer -Url: http://www.kde.org +License: GPL-2.0+ Group: System/Monitoring +Url: http://www.kde.org Source0: kdf-%{version}.tar.bz2 Patch0: 4_7_BRANCH.diff Patch1: desktop-files.diff ++++++ kdf-4.8.0.tar.bz2 -> kdf-4.8.1.tar.bz2 ++++++ Files old/kdf-4.8.0/doc/app/index.cache.bz2 and new/kdf-4.8.1/doc/app/index.cache.bz2 differ Files old/kdf-4.8.0/doc/kcontrol/index.cache.bz2 and new/kdf-4.8.1/doc/kcontrol/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-4.8.0/kdf.desktop new/kdf-4.8.1/kdf.desktop --- old/kdf-4.8.0/kdf.desktop 2012-01-10 15:18:45.000000000 +0100 +++ new/kdf-4.8.1/kdf.desktop 2012-02-29 23:57:40.000000000 +0100 @@ -133,6 +133,7 @@ GenericName[tg]=Назари Истифодабарии Диск GenericName[th]=แสดงการใช้พื้นที่ดิสก์ GenericName[tr]=Disk Kullanımını Görüntüle +GenericName[ug]=دىسكىنىڭ ئىشلىتىلىش ئۇچۇرلىرىنى كۆرۈش GenericName[uk]=Перегляд використання диска GenericName[vi]=Xem đĩa trống GenericName[wa]=Vey l' eployaedje del deure plake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-4.8.0/kwikdisk.desktop new/kdf-4.8.1/kwikdisk.desktop --- old/kdf-4.8.0/kwikdisk.desktop 2012-01-10 15:18:45.000000000 +0100 +++ new/kdf-4.8.1/kwikdisk.desktop 2012-02-29 23:57:40.000000000 +0100 @@ -136,6 +136,7 @@ GenericName[tg]=Барномаи Пуштибон барои Расонаҳои Ҷойивазшаванда GenericName[th]=เครื่องมือจัดการสื่อที่ถอดได้ GenericName[tr]=Çıkartılabilir Aygıt +GenericName[ug]=يۆتكىلىشچان ۋاسىتە قورالى GenericName[uk]=Утиліта змінних носіїв GenericName[wa]=Usteye po les bodjåves sopoirts GenericName[xh]=Umdlali wezoSasazo -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdewebdev4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdewebdev4 for openSUSE:Factory checked in at 2012-03-13 09:33:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdewebdev4 (Old) and /work/SRC/openSUSE:Factory/.kdewebdev4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdewebdev4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdewebdev4/kdewebdev4.changes 2012-01-27 15:20:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdewebdev4.new/kdewebdev4.changes 2012-03-13 09:33:45.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:16:24 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdewebdev-4.8.0.tar.bz2 New: ---- kdewebdev-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebdev4.spec ++++++ --- /var/tmp/diff_new_pack.JeDrXp/_old 2012-03-13 09:33:47.000000000 +0100 +++ /var/tmp/diff_new_pack.JeDrXp/_new 2012-03-13 09:33:47.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdewebdev4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Base package for kdewebdev License: GPL-2.0+ ++++++ kdewebdev-4.8.0.tar.bz2 -> kdewebdev-4.8.1.tar.bz2 ++++++ Files old/kdewebdev-4.8.0/doc/kfilereplace/index.cache.bz2 and new/kdewebdev-4.8.1/doc/kfilereplace/index.cache.bz2 differ Files old/kdewebdev-4.8.0/doc/kimagemapeditor/index.cache.bz2 and new/kdewebdev-4.8.1/doc/kimagemapeditor/index.cache.bz2 differ Files old/kdewebdev-4.8.0/doc/klinkstatus/index.cache.bz2 and new/kdewebdev-4.8.1/doc/klinkstatus/index.cache.bz2 differ Files old/kdewebdev-4.8.0/doc/kommander/index.cache.bz2 and new/kdewebdev-4.8.1/doc/kommander/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.8.0/kfilereplace/kfilereplace.desktop new/kdewebdev-4.8.1/kfilereplace/kfilereplace.desktop --- old/kdewebdev-4.8.0/kfilereplace/kfilereplace.desktop 2011-08-22 15:33:05.000000000 +0200 +++ new/kdewebdev-4.8.1/kfilereplace/kfilereplace.desktop 2012-03-01 00:05:00.000000000 +0100 @@ -105,6 +105,7 @@ GenericName[sv]=Sök- och ersättningsverktyg GenericName[th]=เครื่องมือค้นหาและแทนที่ GenericName[tr]=Arama Ve Değiştirme Aracı +GenericName[ug]=ئىزدەش ۋە ئالماشتۇرۇش قورالى GenericName[uk]=Засіб пошуку та заміни GenericName[x-test]=xxSearch & Replace Toolxx GenericName[zh_CN]=搜索替换工具 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.8.0/kimagemapeditor/kimagemapeditor.desktop new/kdewebdev-4.8.1/kimagemapeditor/kimagemapeditor.desktop --- old/kdewebdev-4.8.0/kimagemapeditor/kimagemapeditor.desktop 2012-01-03 20:47:55.000000000 +0100 +++ new/kdewebdev-4.8.1/kimagemapeditor/kimagemapeditor.desktop 2012-03-01 00:05:00.000000000 +0100 @@ -103,6 +103,7 @@ GenericName[tg]=Муҳаррири тасвири ҳаритаи HTML GenericName[th]=โปรแกรมแก้ไข Image Map GenericName[tr]=HTML Resim Haritası Düzenleyicisi +GenericName[ug]=HTML رەسىم خەرىتىسى تەھرىرلىگۈچ GenericName[uk]=Редактор карт зображень HTML GenericName[x-test]=xxHTML Image Map Editorxx GenericName[zh_CN]=HTML 图像映射编辑器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.8.0/klinkstatus/src/plugins/automation/klinkstatus_automation.desktop new/kdewebdev-4.8.1/klinkstatus/src/plugins/automation/klinkstatus_automation.desktop --- old/kdewebdev-4.8.0/klinkstatus/src/plugins/automation/klinkstatus_automation.desktop 2011-10-11 16:52:40.000000000 +0200 +++ new/kdewebdev-4.8.1/klinkstatus/src/plugins/automation/klinkstatus_automation.desktop 2012-03-01 00:05:00.000000000 +0100 @@ -33,6 +33,7 @@ Name[pt_BR]=Plug-in de automação Name[ro]=Modul automat Name[ru]=Расширение автоматизации +Name[sk]=Modul pre automatizáciu Name[sv]=Insticksprogram för automatisering Name[th]=ปลั๊กอินอัตโนมัติ Name[tr]=Otomasyon eklentisi @@ -73,6 +74,7 @@ Comment[pt_BR]=Permite a configuração de tarefas automatizadas Comment[ro]=Permite configurarea sarcinilor automatizate Comment[ru]=Позволяет настраивать автоматизированные задачи +Comment[sk]=Povoliť konfiguráciu automatizovaných úloh Comment[sv]=Tillåt inställning av automatiserade uppgifter Comment[th]=ใช้เพื่อตั้งค่างานแบบอัตโนมัติ Comment[tr]=Otomatik görevlerin yapılandırılmasına izin ver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.8.0/klinkstatus/src/plugins/scripting/krossmoduleklinkstatus.desktop new/kdewebdev-4.8.1/klinkstatus/src/plugins/scripting/krossmoduleklinkstatus.desktop --- old/kdewebdev-4.8.0/klinkstatus/src/plugins/scripting/krossmoduleklinkstatus.desktop 2011-10-11 16:52:40.000000000 +0200 +++ new/kdewebdev-4.8.1/klinkstatus/src/plugins/scripting/krossmoduleklinkstatus.desktop 2012-03-01 00:05:00.000000000 +0100 @@ -33,6 +33,7 @@ Name[pt]='Plugin' de programação Name[pt_BR]=Plug-in de scripting Name[ru]=Расширение сценариев +Name[sk]=Modul pre skripty Name[sv]=Skript-insticksprogram Name[th]=ปลั๊กอินสคริปต์ Name[tr]=Betik desteği eklentisi @@ -76,6 +77,7 @@ Comment[pt_BR]=Permite a execução de scripts Comment[ro]=Permite executarea scripturilor Comment[ru]=Позволяет выполнять сценарии +Comment[sk]=Povoliť vykonávanie skriptov Comment[sv]=Möjliggör körning av skript Comment[th]=ใช้เพื่อประมวลผลสคริปต์ Comment[tr]=Betik çalıştırmaya izin ver -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdetoys4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdetoys4 for openSUSE:Factory checked in at 2012-03-13 09:33:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdetoys4 (Old) and /work/SRC/openSUSE:Factory/.kdetoys4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdetoys4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdetoys4/kdetoys4.changes 2012-01-30 12:25:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdetoys4.new/kdetoys4.changes 2012-03-13 09:33:44.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:15:54 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdetoys-4.8.0.tar.bz2 New: ---- kdetoys-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdetoys4.spec ++++++ --- /var/tmp/diff_new_pack.gaZEU8/_old 2012-03-13 09:33:45.000000000 +0100 +++ /var/tmp/diff_new_pack.gaZEU8/_new 2012-03-13 09:33:45.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdetoys4 BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel @@ -23,7 +24,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: kdetoys-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,8 +63,8 @@ Group: Amusements/Toys/Other %kde4_runtime_requires Provides: kde4-amor = 4.3.0 -Obsoletes: kde4-amor < 4.3.0 Obsoletes: %{name} < 4.7.1 +Obsoletes: kde4-amor < 4.3.0 Provides: %{name} = 4.7.1 %description -n amor ++++++ kdetoys-4.8.0.tar.bz2 -> kdetoys-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/amor/data/blobrc new/kdetoys-4.8.1/amor/data/blobrc --- old/kdetoys-4.8.0/amor/data/blobrc 2012-01-03 20:47:53.000000000 +0100 +++ new/kdetoys-4.8.1/amor/data/blobrc 2012-03-01 00:04:58.000000000 +0100 @@ -3,6 +3,7 @@ PixmapPath=pics/animated/blob Description=Multi-Talented Spot Description[af]=Multi-Talented Spot +Description[ar]=البقعة متعددة المواهب Description[be]=Таленавіты калабок Description[bg]=Всезнайко Description[bn]=বহুমুখী প্রতিভাসম্পন্ন বিন্দু diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/amor/data/bonhommerc new/kdetoys-4.8.1/amor/data/bonhommerc --- old/kdetoys-4.8.0/amor/data/bonhommerc 2012-01-03 20:47:53.000000000 +0100 +++ new/kdetoys-4.8.1/amor/data/bonhommerc 2012-03-01 00:04:58.000000000 +0100 @@ -73,6 +73,7 @@ Description[zh_TW]=Bonhomme About=By Jean-Claude Dumas About[af]=Deur Jean-Claude Dumas +About[ar]=By Jean-Claude Dumas About[be]=Аўтар Jean-Claude Dumas About[bg]=Автор Жан Клод Дюма About[bn]=তৈরি করেছেন জাঁ-ক্ল ডুমাস diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/amor/data/bsdrc new/kdetoys-4.8.1/amor/data/bsdrc --- old/kdetoys-4.8.0/amor/data/bsdrc 2012-01-03 20:47:53.000000000 +0100 +++ new/kdetoys-4.8.1/amor/data/bsdrc 2012-03-01 00:04:58.000000000 +0100 @@ -4,6 +4,7 @@ Static=true Description=FreeBSD Mascot Description[af]=Freebsd Gelukbringer +Description[ar]=FreeBSD Mascot Description[be]=Сімвал FreeBSD Description[bg]=Талисман на FreeBSD Description[bn]=FreeBSD মাস্কট diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/amor/data/eyesrc new/kdetoys-4.8.1/amor/data/eyesrc --- old/kdetoys-4.8.0/amor/data/eyesrc 2012-01-03 20:47:53.000000000 +0100 +++ new/kdetoys-4.8.1/amor/data/eyesrc 2012-03-01 00:04:58.000000000 +0100 @@ -5,6 +5,7 @@ PixmapPath=pics/animated/eyes Description=Crazy Eyes Description[af]=Mal Oë +Description[ar]=العيون المجنونة Description[be]=Вочы Description[bg]=Луди очички Description[bn]=পাগলা চোখ @@ -72,6 +73,7 @@ Description[zh_TW]=瘋狂的眼睛 About=By Jean-Claude Dumas About[af]=Deur Jean-Claude Dumas +About[ar]=By Jean-Claude Dumas About[be]=Аўтар Jean-Claude Dumas About[bg]=Автор Жан Клод Дюма About[bn]=তৈরি করেছেন জাঁ-ক্ল ডুমাস diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/amor/data/ghostrc new/kdetoys-4.8.1/amor/data/ghostrc --- old/kdetoys-4.8.0/amor/data/ghostrc 2012-01-03 20:47:53.000000000 +0100 +++ new/kdetoys-4.8.1/amor/data/ghostrc 2012-03-01 00:04:58.000000000 +0100 @@ -3,6 +3,7 @@ PixmapPath=pics/animated/ghost Description=Spooky Ghost Description[af]=Onheilspellende Spook +Description[ar]=الشبح المخيف Description[be]=Страшны прывід Description[bg]=Призрачен дух Description[bn]=ভূতুড়ে ভূত diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/amor/data/nekokurorc new/kdetoys-4.8.1/amor/data/nekokurorc --- old/kdetoys-4.8.0/amor/data/nekokurorc 2012-01-10 15:27:06.000000000 +0100 +++ new/kdetoys-4.8.1/amor/data/nekokurorc 2012-03-01 00:04:58.000000000 +0100 @@ -7,6 +7,7 @@ [Config] PixmapPath=pics/animated/neko-kuro Description=Neko Kuro +Description[ar]=Neko Kuro Description[bg]=Neko Kuro Description[bs]=Neko Kuro Description[ca]=Neko Kuro diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/amor/data/wormrc new/kdetoys-4.8.1/amor/data/wormrc --- old/kdetoys-4.8.0/amor/data/wormrc 2012-01-03 20:47:53.000000000 +0100 +++ new/kdetoys-4.8.1/amor/data/wormrc 2012-03-01 00:04:58.000000000 +0100 @@ -3,6 +3,7 @@ PixmapPath=pics/animated/worm Description=Little Worm Description[af]=Klein Wurm +Description[ar]=الدودة الصغيرة Description[be]=Маленькі чарвячок Description[bg]=Малкото червейче Description[bn]=ছোট্ট কেঁচো diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/amor/src/amor.desktop new/kdetoys-4.8.1/amor/src/amor.desktop --- old/kdetoys-4.8.0/amor/src/amor.desktop 2012-01-03 20:47:52.000000000 +0100 +++ new/kdetoys-4.8.1/amor/src/amor.desktop 2012-03-01 00:04:58.000000000 +0100 @@ -73,6 +73,7 @@ Type=Application X-DocPath=amor/index.html GenericName=On-Screen Creature +GenericName[ar]=مخلوق على الشاشة GenericName[be]=Экранная жывёла GenericName[bg]=Усмивка за работното място GenericName[bn]=পর্দায় বসবাসকারী জন্তু Files old/kdetoys-4.8.0/doc/amor/index.cache.bz2 and new/kdetoys-4.8.1/doc/amor/index.cache.bz2 differ Files old/kdetoys-4.8.0/doc/kteatime/index.cache.bz2 and new/kdetoys-4.8.1/doc/kteatime/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/kteatime/src/kteatime.desktop new/kdetoys-4.8.1/kteatime/src/kteatime.desktop --- old/kdetoys-4.8.0/kteatime/src/kteatime.desktop 2011-07-27 20:26:16.000000000 +0200 +++ new/kdetoys-4.8.1/kteatime/src/kteatime.desktop 2012-03-01 00:04:58.000000000 +0100 @@ -1,5 +1,6 @@ [Desktop Entry] Name=KTeaTime +Name[ar]=برنامج وقت الشاي KTeaTime Name[be]=KTeaTime Name[bg]=KTeaTime Name[bn]=কে-টী-টাইম @@ -64,6 +65,7 @@ Name[zh_CN]=KTeaTime Name[zh_TW]=KTeaTime GenericName=Tea Cooker +GenericName[ar]=طنجرة الشاي GenericName[be]=Прыгатаўленне гарбаты GenericName[bg]=Приготвяне на чай GenericName[bn]=চায়ের কেটলি diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/kteatime/src/kteatime.notifyrc new/kdetoys-4.8.1/kteatime/src/kteatime.notifyrc --- old/kdetoys-4.8.0/kteatime/src/kteatime.notifyrc 2012-01-10 15:27:06.000000000 +0100 +++ new/kdetoys-4.8.1/kteatime/src/kteatime.notifyrc 2012-03-01 00:04:58.000000000 +0100 @@ -1,6 +1,7 @@ [Global] IconName=kteatime Comment=Tea Cooker +Comment[ar]=طنجرة الشاي Comment[bg]=Приготвяне на чай Comment[bs]=Kuhač čaja Comment[ca]=El cuiner de te @@ -50,6 +51,7 @@ [Event/ready] Name=Tea is ready +Name[ar]=الشاي جاهز Name[be]=Гарбата гатова Name[bg]=Чаят е готов Name[bn]=চা প্রস্তুত @@ -115,6 +117,7 @@ Name[zh_CN]=茶沏好了 Name[zh_TW]=茶煮好了 Comment=Tea is ready +Comment[ar]=الشاي جاهز Comment[be]=Гарбата гатова Comment[bg]=Чаят е готов Comment[bn]=অই চা গরমমম!!! @@ -185,6 +188,7 @@ [Event/reminder] Name=Tea is getting lonely +Name[ar]=الشاي يشعر بالوحدة Name[bg]=Чаят изстива Name[bs]=Čaj postaje usamljen Name[ca]=El te està quedant abandonat @@ -239,6 +243,7 @@ Name[zh_CN]=茶都凉了 Name[zh_TW]=茶煮好了，怎麼沒人喝 Comment=Tea is getting lonely. +Comment[ar]=الشاي يشعر بالوحدة. Comment[bg]=Чаят изстива... Comment[bs]=Čaj postaje usamljen. Comment[ca]=El te està quedant abandonat. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.8.0/ktux/src/ktux.desktop new/kdetoys-4.8.1/ktux/src/ktux.desktop --- old/kdetoys-4.8.0/ktux/src/ktux.desktop 2012-01-03 20:47:52.000000000 +0100 +++ new/kdetoys-4.8.1/ktux/src/ktux.desktop 2012-03-01 00:04:58.000000000 +0100 @@ -1,6 +1,7 @@ [Desktop Entry] Name=KTux Name[af]=Ktux +Name[ar]=KTux Name[be]=KTux Name[bg]=KTux Name[bn]=কে-টাক্স @@ -79,6 +80,7 @@ Exec=ktux -setup Name=Setup... Name[af]=Opstelling... +Name[ar]=Setup... Name[be]=Настаўленні... Name[bg]=Настройки... Name[bn]=প্রস্তুতি... @@ -152,6 +154,7 @@ [Desktop Action InWindow] Exec=ktux -window-id %w Name=Display in Specified Window +Name[ar]=اعرض في نافذة محددة Name[be]=Паказваць у зададзеным вакне Name[bg]=Зареждане в избран прозорец Name[bn]=উল্লেখকৃত উইন্ডোতে দেখাও @@ -221,6 +224,7 @@ [Desktop Action Root] Exec=ktux -root Name=Display in Root Window +Name[ar]=اعرض في النافذة الأمّ Name[be]=Паказваць у фанавым вакне Name[bg]=Зареждане в главния прозорец Name[bn]=রুট উইন্ডোতে দেখাও -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesdk4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdesdk4 for openSUSE:Factory checked in at 2012-03-13 09:33:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk4 (Old) and /work/SRC/openSUSE:Factory/.kdesdk4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesdk4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk4/kdesdk4.changes 2012-02-08 15:38:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk4.new/kdesdk4.changes 2012-03-13 09:33:41.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:15:47 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdesdk-4.8.0.tar.bz2 lokalize-catalogmodel.patch New: ---- kdesdk-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4.spec ++++++ --- /var/tmp/diff_new_pack.b8SHAb/_old 2012-03-13 09:33:42.000000000 +0100 +++ /var/tmp/diff_new_pack.b8SHAb/_new 2012-03-13 09:33:42.000000000 +0100 @@ -16,8 +16,9 @@ # + Name: kdesdk4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: KDE SDK Package License: GPL-2.0+ @@ -26,7 +27,6 @@ Source0: kdesdk-%{version}.tar.bz2 Source100: kdesdk4-rpmlintrc Patch0: desktop-files.diff -Patch1: lokalize-catalogmodel.patch BuildRequires: antlr BuildRequires: antlr-devel # for libiberty (used by kmtrace for cp_demangle) @@ -40,10 +40,10 @@ BuildRequires: libkdepimlibs4-devel BuildRequires: libkonq-devel BuildRequires: libqca2-devel +BuildRequires: libtool BuildRequires: oxygen-icon-theme BuildRequires: strigi BuildRequires: subversion-devel -BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires(post): shared-mime-info @@ -55,7 +55,6 @@ %prep %setup -q -n kdesdk-%{version} %patch0 -%patch1 -p4 %build %ifarch ppc64 ++++++ kdesdk-4.8.0.tar.bz2 -> kdesdk-4.8.1.tar.bz2 ++++++ ++++ 27738 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2012-03-13 09:33:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepimlibs4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2012-02-10 17:15:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2012-03-13 09:33:37.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:15:25 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.8.0.tar.bz2 New: ---- kdepimlibs-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.CXq116/_old 2012-03-13 09:33:39.000000000 +0100 +++ /var/tmp/diff_new_pack.CXq116/_new 2012-03-13 09:33:39.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdepimlibs4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ ++++++ kdepimlibs-4.8.0.tar.bz2 -> kdepimlibs-4.8.1.tar.bz2 ++++++ ++++ 4255 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2012-03-13 09:33:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4-runtime", Maintainer is "WStephenson(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2012-02-22 15:53:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2012-03-13 09:33:34.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:15:29 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdepim-runtime-4.8.0.tar.bz2 kdepim-runtime-nepomuk-feeder-fix.diff New: ---- kdepim-runtime-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.j8piTS/_old 2012-03-13 09:33:36.000000000 +0100 +++ /var/tmp/diff_new_pack.j8piTS/_new 2012-03-13 09:33:36.000000000 +0100 @@ -16,9 +16,8 @@ # - Name: kdepim4-runtime -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Base package of kdepim License: LGPL-2.1+ @@ -28,7 +27,6 @@ Source1: akonadi.png Patch0: 4_8_BRANCH.diff Patch1: disable-knut.diff -Patch2: kdepim-runtime-nepomuk-feeder-fix.diff BuildRequires: fdupes BuildRequires: libkdepimlibs4-devel Suggests: kontact @@ -48,7 +46,6 @@ %setup -q -n kdepim-runtime-%{version} %patch0 -p1 %patch1 -%patch2 -p1 %build %ifarch ppc64 ++++++ kdepim-runtime-4.8.0.tar.bz2 -> kdepim-runtime-4.8.1.tar.bz2 ++++++ ++++ 2610 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at 2012-03-13 09:32:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old) and /work/SRC/openSUSE:Factory/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes 2012-01-27 15:20:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes 2012-03-13 09:33:31.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:14:39 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdepim-4.8.0.tar.bz2 New: ---- kdepim-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.JGXrQw/_old 2012-03-13 09:33:34.000000000 +0100 +++ /var/tmp/diff_new_pack.JGXrQw/_new 2012-03-13 09:33:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdepim4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Base package of kdepim License: GPL-2.0+ ; LGPL-2.1+ @@ -196,8 +196,8 @@ Requires: kdepim4-runtime = %{version} Requires: soprano Provides: kde4-akonadi = 4.3.0 -Obsoletes: kde4-akonadi < 4.3.0 Obsoletes: akonadi-devel < 4.4.60 +Obsoletes: kde4-akonadi < 4.3.0 Provides: akonadi-devel = 4.4.60 %kde4_runtime_requires %kde4_pimlibs_requires @@ -514,6 +514,8 @@ %doc %lang(en) %{_kde4_htmldir}/en/kwatchgnupg %doc %lang(en) %{_kde4_htmldir}/en/kleopatra %{_datadir}/dbus-1/interfaces/* +%{_datadir}/ontology/kde/messagetag.ontology +%{_datadir}/ontology/kde/messagetag.trig %{_kde4_applicationsdir}/* %{_kde4_appsdir} %{_kde4_bindir}/* ++++++ kdepim-4.8.0.tar.bz2 -> kdepim-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kdepim4/kdepim-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdenetwork4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdenetwork4 for openSUSE:Factory checked in at 2012-03-13 09:32:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenetwork4 (Old) and /work/SRC/openSUSE:Factory/.kdenetwork4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdenetwork4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdenetwork4/kdenetwork4.changes 2012-01-30 12:24:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdenetwork4.new/kdenetwork4.changes 2012-03-13 09:33:28.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:14:33 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdenetwork-4.8.0.tar.bz2 New: ---- kdenetwork-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.WuETay/_old 2012-03-13 09:33:30.000000000 +0100 +++ /var/tmp/diff_new_pack.WuETay/_new 2012-03-13 09:33:30.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdenetwork4 -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: KDE Network Base Package License: GPL-2.0+ ++++++ kdenetwork-4.8.0.tar.bz2 -> kdenetwork-4.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kdenetwork4/kdenetwork-4.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.kdenetwork4.new/kdenetwork-4.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdemultimedia4 for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at 2012-03-13 09:32:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdemultimedia4 (Old) and /work/SRC/openSUSE:Factory/.kdemultimedia4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdemultimedia4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdemultimedia4/kdemultimedia4.changes 2012-01-27 15:20:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdemultimedia4.new/kdemultimedia4.changes 2012-03-13 09:33:25.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:14:28 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdemultimedia-4.8.0.tar.bz2 New: ---- kdemultimedia-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.qqQccG/_old 2012-03-13 09:33:26.000000000 +0100 +++ /var/tmp/diff_new_pack.qqQccG/_new 2012-03-13 09:33:26.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_with ffmpeg Name: kdemultimedia4 @@ -39,7 +40,7 @@ BuildRequires: taglib-devel BuildRequires: xine-devel BuildRequires: xine-lib -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Base package for KDE multimedia applications License: GPL-2.0+ ++++++ kdemultimedia-4.8.0.tar.bz2 -> kdemultimedia-4.8.1.tar.bz2 ++++++ Files old/kdemultimedia-4.8.0/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/dragonplayer/index.cache.bz2 differ Files old/kdemultimedia-4.8.0/doc/juk/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-4.8.0/doc/kcontrol/cddbretrieval/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/kcontrol/cddbretrieval/index.cache.bz2 differ Files old/kdemultimedia-4.8.0/doc/kioslave/audiocd/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/kioslave/audiocd/index.cache.bz2 differ Files old/kdemultimedia-4.8.0/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/kmix/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/juk/cache.cpp new/kdemultimedia-4.8.1/juk/cache.cpp --- old/kdemultimedia-4.8.0/juk/cache.cpp 2011-07-27 20:25:35.000000000 +0200 +++ new/kdemultimedia-4.8.1/juk/cache.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -200,6 +200,14 @@ Playlist *p = new Playlist(collection, true); createdPlaylists.append(p); s >> *p; + + // We may have already read this playlist from the folder + // scanner, if an .m3u playlist + if(collection->containsPlaylistFile(p->fileName())) { + delete p; + p = 0; + } + playlist = p; break; } // switch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/juk/main.cpp new/kdemultimedia-4.8.1/juk/main.cpp --- old/kdemultimedia-4.8.0/juk/main.cpp 2011-07-27 20:25:35.000000000 +0200 +++ new/kdemultimedia-4.8.1/juk/main.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.7", ki18n(description), KAboutData::License_GPL, + "3.7.1", ki18n(description), KAboutData::License_GPL, ki18n("© 2002 - 2011, Scott Wheeler"), KLocalizedString(), "http://developer.kde.org/~wheeler/juk.html"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/juk/playlist.cpp new/kdemultimedia-4.8.1/juk/playlist.cpp --- old/kdemultimedia-4.8.0/juk/playlist.cpp 2011-08-22 15:32:22.000000000 +0200 +++ new/kdemultimedia-4.8.1/juk/playlist.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -381,7 +381,7 @@ m_widthsDirty(true), m_searchEnabled(true), m_lastSelected(0), - m_fileName(playlistFile.absoluteFilePath()), + m_fileName(playlistFile.canonicalFilePath()), m_rmbMenu(0), m_toolTip(0), m_blockDataChanged(false) @@ -1880,7 +1880,7 @@ } if(importPlaylists && MediaFiles::isPlaylistFile(file) && - !m_collection->containsPlaylistFile(fileInfo.absoluteFilePath())) + !m_collection->containsPlaylistFile(fileInfo.canonicalFilePath())) { new Playlist(m_collection, fileInfo); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/juk/playlistcollection.h new/kdemultimedia-4.8.1/juk/playlistcollection.h --- old/kdemultimedia-4.8.0/juk/playlistcollection.h 2011-07-27 20:25:35.000000000 +0200 +++ new/kdemultimedia-4.8.1/juk/playlistcollection.h 2012-03-01 00:04:51.000000000 +0100 @@ -152,6 +152,15 @@ virtual void raise(Playlist *playlist); /** + * @return true, if a playlist with the file name given in @p file is + * already loaded into this collection, or false otherwise. + * + * @note @p file should be the "canonical" full path to the file to avoid + * problems with duplicates and symlinks. + */ + bool containsPlaylistFile(const QString &file) const; + + /** * This is used to put up a temporary widget over the top of the playlist * stack. This is part of a trick to significantly speed up painting by * hiding the playlist to which items are being added. @@ -167,7 +176,6 @@ virtual void removePlaylist(Playlist *playlist) = 0; bool importPlaylists() const; - bool containsPlaylistFile(const QString &file) const; QString playlistNameDialog(const QString &caption = i18n("Create New Playlist"), const QString &suggest = QString(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/apps/kmix.h new/kdemultimedia-4.8.1/kmix/apps/kmix.h --- old/kdemultimedia-4.8.0/kmix/apps/kmix.h 2011-12-20 22:00:16.000000000 +0100 +++ new/kdemultimedia-4.8.1/kmix/apps/kmix.h 2012-03-01 00:04:51.000000000 +0100 @@ -60,6 +60,7 @@ ~KMixWindow(); bool updateDocking(); + Qt::Orientation toplevelOrientation() { return m_toplevelOrientation; } private: void saveBaseConfig(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/backends/mixer_sun.cpp new/kdemultimedia-4.8.1/kmix/backends/mixer_sun.cpp --- old/kdemultimedia-4.8.0/kmix/backends/mixer_sun.cpp 2011-08-22 15:32:25.000000000 +0200 +++ new/kdemultimedia-4.8.1/kmix/backends/mixer_sun.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -189,7 +189,7 @@ Volume::ChannelMask chnmask = Volume::MLEFT; if ( stereodevs & ( 1 << idx ) ) chnmask = (Volume::ChannelMask)(chnmask|Volume::MRIGHT); - Volume playbackVol( chnmask, 100, 1, true, false ); + Volume playbackVol( 100, 1, true, false ); QString id; id.setNum(idx); MixDevice* md = new MixDevice( _mixer, id, @@ -199,7 +199,7 @@ if ( recmask & ( 1 << idx ) ) { // can be captured => add capture volume, with no capture volume chnmask = Volume::MNONE; - Volume captureVol( chnmask, 100, 1, true, true ); + Volume captureVol( 100, 1, true, true ); md->addCaptureVolume(captureVol); } m_mixDevices.append( md ); @@ -424,26 +424,26 @@ void Mixer_SUN::VolumeToGainBalance( Volume& volume, uint_t& gain, uchar_t& balance ) { if ( ( volume.count() == 1 ) || - ( volume[Volume::LEFT] == volume[Volume::RIGHT] ) ) + ( volume.getVolume(Volume::LEFT) == volume.getVolume(Volume::RIGHT) ) ) { - gain = volume[Volume::LEFT]; + gain = volume.getVolume(Volume::LEFT); balance = AUDIO_MID_BALANCE; } else { - if ( volume[Volume::LEFT] > volume[Volume::RIGHT] ) + if ( volume.getVolume(Volume::LEFT) > volume.getVolume(Volume::RIGHT) ) { - gain = volume[Volume::LEFT]; + gain = volume.getVolume(Volume::LEFT); balance = AUDIO_LEFT_BALANCE + ( AUDIO_MID_BALANCE - AUDIO_LEFT_BALANCE ) * - volume[Volume::RIGHT] / volume[Volume::LEFT]; + volume.getVolume(Volume::RIGHT) / volume.getVolume(Volume::LEFT); } else { - gain = volume[Volume::RIGHT]; + gain = volume.getVolume(Volume::RIGHT); balance = AUDIO_RIGHT_BALANCE - ( AUDIO_RIGHT_BALANCE - AUDIO_MID_BALANCE ) * - volume[Volume::LEFT] / volume[Volume::RIGHT]; + volume.getVolume(Volume::LEFT) / volume.getVolume(Volume::RIGHT); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/gui/kmixdockwidget.cpp new/kdemultimedia-4.8.1/kmix/gui/kmixdockwidget.cpp --- old/kdemultimedia-4.8.0/kmix/gui/kmixdockwidget.cpp 2011-12-20 22:00:16.000000000 +0100 +++ new/kdemultimedia-4.8.1/kmix/gui/kmixdockwidget.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -101,6 +101,7 @@ _volWA->setDefaultWidget(_referenceWidget2); _referenceWidget->addAction(_volWA); + connect( m_mixer, SIGNAL(controlChanged()), _referenceWidget2, SLOT(refreshVolumeLevels()) ); //setAssociatedWidget(_referenceWidget); //setAssociatedWidget(_referenceWidget); // If you use the popup, associate that instead of the MainWindow @@ -273,6 +274,9 @@ vol = md->captureVolume(); } int percentage = vol.getAvgVolumePercent(Volume::MALL); + + // kDebug() << "TrayVol id=" << md->id() << " vol=" << vol.getAvgVolumePercent(Volume::MALL); + if ( percentage <= 0 ) newPixmapType = '0'; // Hint: also negative-values else if ( percentage < 25 ) newPixmapType = '1'; else if ( percentage < 75 ) newPixmapType = '2'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/gui/viewdockareapopup.cpp new/kdemultimedia-4.8.1/kmix/gui/viewdockareapopup.cpp --- old/kdemultimedia-4.8.0/kmix/gui/viewdockareapopup.cpp 2011-12-20 22:00:16.000000000 +0100 +++ new/kdemultimedia-4.8.1/kmix/gui/viewdockareapopup.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -134,7 +134,7 @@ true, // Show Mute LED false, // Show Record LED false, // Small - Qt::Horizontal, // Direction: only 1 device, so doesn't matter + _dock->toplevelOrientation(), // Direction: only 1 device, so doesn't matter this, // parent 0 // Is "NULL", so that there is no RMB-popup , pctl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/plasma/engine/plasma-engine-mixer.desktop new/kdemultimedia-4.8.1/kmix/plasma/engine/plasma-engine-mixer.desktop --- old/kdemultimedia-4.8.0/kmix/plasma/engine/plasma-engine-mixer.desktop 2012-01-18 19:50:30.000000000 +0100 +++ new/kdemultimedia-4.8.1/kmix/plasma/engine/plasma-engine-mixer.desktop 2012-03-01 00:04:51.000000000 +0100 @@ -32,6 +32,7 @@ Name[pt_BR]=Mecanismo de dados do mixer Name[ro]=MotorDate mixer Name[ru]=Источник данных Plasma для работы с микшером +Name[sk]=Dátový stroj zmiešavača Name[sr]=Датомотор миксете Name[sr@ijekavian]=Датомотор миксете Name[sr@ijekavianlatin]=Datomotor miksete -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics-thumbnailers for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdegraphics-thumbnailers for openSUSE:Factory checked in at 2012-03-13 09:32:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegraphics-thumbnailers (Old) and /work/SRC/openSUSE:Factory/.kdegraphics-thumbnailers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdegraphics-thumbnailers", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegraphics-thumbnailers/kdegraphics-thumbnailers.changes 2012-01-27 15:20:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdegraphics-thumbnailers.new/kdegraphics-thumbnailers.changes 2012-03-13 09:33:23.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:14:16 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdegraphics-thumbnailers-4.8.0.tar.bz2 New: ---- kdegraphics-thumbnailers-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics-thumbnailers.spec ++++++ --- /var/tmp/diff_new_pack.BZ5kK3/_old 2012-03-13 09:33:24.000000000 +0100 +++ /var/tmp/diff_new_pack.BZ5kK3/_new 2012-03-13 09:33:24.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdegraphics-thumbnailers -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Graphics file thumbnail generators License: LGPL-2.1+ ++++++ kdegraphics-thumbnailers-4.8.0.tar.bz2 -> kdegraphics-thumbnailers-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-thumbnailers-4.8.0/raw/rawthumbnail.desktop new/kdegraphics-thumbnailers-4.8.1/raw/rawthumbnail.desktop --- old/kdegraphics-thumbnailers-4.8.0/raw/rawthumbnail.desktop 2012-01-18 19:49:45.000000000 +0100 +++ new/kdegraphics-thumbnailers-4.8.1/raw/rawthumbnail.desktop 2012-02-29 23:57:11.000000000 +0100 @@ -1,6 +1,7 @@ [Desktop Entry] Type=Service Name=RAW Photo Camera Files +Name[ar]=ملفات الخامة RAW لآلة التصوير Name[bg]=Снимки RAW от фотоапарат Name[bs]=Sirove datoteke s kamere Name[ca]=Fitxers RAW de càmera de fotos -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics-strigi-analyzer for openSUSE:Factory
by root＠hilbert.suse.de 13 Mar '12

13 Mar '12

Hello community, here is the log from the commit of package kdegraphics-strigi-analyzer for openSUSE:Factory checked in at 2012-03-13 09:32:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegraphics-strigi-analyzer (Old) and /work/SRC/openSUSE:Factory/.kdegraphics-strigi-analyzer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdegraphics-strigi-analyzer", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer.changes 2012-01-27 15:20:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdegraphics-strigi-analyzer.new/kdegraphics-strigi-analyzer.changes 2012-03-13 09:33:21.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 6 01:26:45 UTC 2012 - stefan.bruens(a)rwth-aachen.de + +- fix tiff analyzer (missing types, wrong datetime format) + +------------------------------------------------------------------- +Fri Mar 2 23:14:12 CET 2012 - dmueller(a)suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- 4_6_BRANCH.diff kdegraphics-strigi-analyzer-4.8.0.tar.bz2 New: ---- fix_tiff.diff kdegraphics-strigi-analyzer-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics-strigi-analyzer.spec ++++++ --- /var/tmp/diff_new_pack.KIfaRL/_old 2012-03-13 09:33:23.000000000 +0100 +++ /var/tmp/diff_new_pack.KIfaRL/_new 2012-03-13 09:33:23.000000000 +0100 @@ -15,21 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdegraphics-strigi-analyzer BuildRequires: libkde4-devel -BuildRequires: libsoprano-devel BuildRequires: libtiff-devel -BuildRequires: oxygen-icon-theme-large -BuildRequires: soprano-backend-redland BuildRequires: strigi-devel Summary: Base package for kdegraphics apps License: LGPL-2.1+ Group: Productivity/Graphics/Other Url: http://www.kde.org -Version: 4.8.0 +Version: 4.8.1 Release: 0 Source0: %{name}-%version.tar.bz2 -Patch0: 4_6_BRANCH.diff +Patch0: fix_tiff.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -39,7 +37,7 @@ %prep %setup -q -n %{name}-%version -%patch0 +%patch0 -p1 %build %cmake_kde4 -d build ++++++ fix_tiff.diff ++++++ diff --git a/tiff/tiffendanalyzer.cpp b/tiff/tiffendanalyzer.cpp index 77128d8..f995394 100644 --- a/tiff/tiffendanalyzer.cpp +++ b/tiff/tiffendanalyzer.cpp @@ -26,6 +26,7 @@ #include <tiffio.h> #include <cstring> +#include <time.h> using namespace Strigi; @@ -105,6 +106,17 @@ readTiffTagUint16(TIFF* tiff, ttag_t tag, AnalysisResult& ar, const RegisteredFi ar.addValue(field, value); } +void +readTiffTagDateTime(TIFF* tiff, ttag_t tag, AnalysisResult& ar, const RegisteredField* field) { + struct tm dt; + char* buffer = 0; + TIFFGetField(tiff, tag, &buffer); + // the tiff datetime string format is as follows: "2005:06:03 17:13:33" + if (buffer && (6 == sscanf(buffer, "%d:%d:%d %d:%d:%d", + &dt.tm_year, &dt.tm_mon, &dt.tm_mday, &dt.tm_hour, &dt.tm_min, &dt.tm_sec)) ) + ar.addValue(field, uint32_t(mktime(&dt))); +} + } class TiffEndAnalyzerFactory; @@ -146,37 +158,41 @@ private: const RegisteredField* bitsPerSampleField; const RegisteredField* xResolutionField; const RegisteredField* yResolutionField; + const RegisteredField* typeField; }; #define NS_NFO "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#" #define NS_NIE "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#" -#define NS_NEXIF "http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#" +#define NS_NCO "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#" +// #define NS_NEXIF "http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#" void TiffEndAnalyzerFactory::registerFields(FieldRegister& r) { widthField = r.registerField(NS_NFO "width"); heightField = r.registerField(NS_NFO "height"); copyrightField = r.registerField(NS_NIE "copyright"); - descriptionField = r.registerField(NS_NEXIF "imageDescription"); - samplesPerPixelField = r.registerField(NS_NEXIF "samplesPerPixel"); - softwareField = r.registerField(NS_NEXIF "software"); - artistField = r.registerField(NS_NEXIF "artist"); - dateTimeField = r.registerField(NS_NEXIF "dateTime"); - bitsPerSampleField = r.registerField(NS_NEXIF "bitsPerSample"); - xResolutionField = r.registerField(NS_NEXIF "xResolution"); - yResolutionField = r.registerField(NS_NEXIF "yResolution"); + descriptionField = r.registerField(NS_NIE "description"); + // there is no appropriate field in NS_NFO/NS_NIE ontologies + // samplesPerPixelField = r.registerField(NS_NEXIF "samplesPerPixel"); + softwareField = r.registerField(NS_NIE "generator"); + artistField = r.registerField(NS_NCO "creator"); + dateTimeField = r.registerField(NS_NIE "contentCreated"); + bitsPerSampleField = r.registerField(NS_NFO "colorDepth"); + xResolutionField = r.registerField(NS_NFO "horizontalResolution"); + yResolutionField = r.registerField(NS_NFO "verticalResolution"); + typeField = r.typeField; addField(widthField); addField(heightField); addField(copyrightField); addField(descriptionField); - addField(samplesPerPixelField); addField(softwareField); addField(artistField); addField(dateTimeField); addField(bitsPerSampleField); addField(xResolutionField); addField(yResolutionField); + addField(typeField); } #undef NS_NFO @@ -203,15 +219,17 @@ TiffEndAnalyzer::analyze(AnalysisResult& ar, InputStream* in) { return -1; } + ar.addValue(factory->typeField, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#RasterImage"); + // simple fields readTiffTagUint32(tiff, TIFFTAG_IMAGEWIDTH, ar, factory->widthField); readTiffTagUint32(tiff, TIFFTAG_IMAGELENGTH, ar, factory->heightField); readTiffTagString(tiff, TIFFTAG_COPYRIGHT, ar, factory->copyrightField); readTiffTagString(tiff, TIFFTAG_IMAGEDESCRIPTION, ar, factory->descriptionField); - readTiffTagUint16(tiff, TIFFTAG_SAMPLESPERPIXEL, ar, factory->samplesPerPixelField); + // readTiffTagUint16(tiff, TIFFTAG_SAMPLESPERPIXEL, ar, factory->samplesPerPixelField); readTiffTagString(tiff, TIFFTAG_SOFTWARE, ar, factory->softwareField); readTiffTagString(tiff, TIFFTAG_ARTIST, ar, factory->artistField); - readTiffTagString(tiff, TIFFTAG_DATETIME, ar, factory->dateTimeField); + readTiffTagDateTime(tiff, TIFFTAG_DATETIME, ar, factory->dateTimeField); readTiffTagUint16(tiff, TIFFTAG_BITSPERSAMPLE, ar, factory->bitsPerSampleField); // X and Y resolutions ++++++ kdegraphics-strigi-analyzer-4.8.0.tar.bz2 -> kdegraphics-strigi-analyzer-4.8.1.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0