March 2012 - openSUSE Commits - openSUSE Mailing Lists

commit polkit-default-privs for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package polkit-default-privs for openSUSE:Factory checked in at 2012-03-01 17:25:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polkit-default-privs (Old) and /work/SRC/openSUSE:Factory/.polkit-default-privs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "polkit-default-privs", Maintainer is "lnussel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/polkit-default-privs/polkit-default-privs.changes 2012-01-25 15:02:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.polkit-default-privs.new/polkit-default-privs.changes 2012-03-01 17:25:58.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 29 13:54:02 UTC 2012 - lnussel(a)suse.de + +- add smb4k (bnc#749065) + +------------------------------------------------------------------- +Wed Feb 29 13:48:31 UTC 2012 - lnussel(a)suse.de + +- add udisks2 (bnc#742751) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit-default-privs-12.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-12.2/polkit-default-privs.restrictive new/polkit-default-privs-12.2/polkit-default-privs.restrictive --- old/polkit-default-privs-12.2/polkit-default-privs.restrictive 2012-01-18 10:14:11.000000000 +0100 +++ new/polkit-default-privs-12.2/polkit-default-privs.restrictive 2012-02-29 14:53:45.000000000 +0100 @@ -136,7 +136,7 @@ org.freedesktop.policykit.example.pkexec.run-frobnicate auth_admin # -# device-kit. Should be consitent with consolekit +# udisks # org.freedesktop.udisks.filesystem-mount auth_admin org.freedesktop.udisks.filesystem-mount-system-internal auth_admin @@ -160,6 +160,34 @@ org.freedesktop.udisks.drive-set-spindown auth_admin org.freedesktop.udisks.linux-lvm2 auth_admin # +# udisks2 (bnc#742751) +# +org.freedesktop.udisks2.filesystem-mount-system auth_admin +org.freedesktop.udisks2.filesystem-fstab auth_admin +org.freedesktop.udisks2.filesystem-unmount-others auth_admin +org.freedesktop.udisks2.encrypted-unlock-system auth_admin +org.freedesktop.udisks2.encrypted-unlock-crypttab auth_admin +org.freedesktop.udisks2.encrypted-lock-others auth_admin +org.freedesktop.udisks2.encrypted-change-passphrase-system auth_admin +org.freedesktop.udisks2.loop-delete-others auth_admin +org.freedesktop.udisks2.manage-swapspace auth_admin +org.freedesktop.udisks2.modify-device-system auth_admin +org.freedesktop.udisks2.open-device auth_admin +org.freedesktop.udisks2.open-device-system auth_admin +org.freedesktop.udisks2.modify-system-configuration auth_admin +org.freedesktop.udisks2.read-system-configuration-secrets auth_admin +org.freedesktop.udisks2.ata-smart-selftest auth_admin +# +org.freedesktop.udisks2.filesystem-mount auth_admin +org.freedesktop.udisks2.encrypted-unlock auth_admin +org.freedesktop.udisks2.encrypted-change-passphrase auth_admin +org.freedesktop.udisks2.loop-setup auth_admin +org.freedesktop.udisks2.modify-device auth_admin +org.freedesktop.udisks2.ata-smart-update auth_admin + +# +# upower +# org.freedesktop.upower.suspend auth_admin org.freedesktop.upower.hibernate auth_admin org.freedesktop.upower.qos.request-latency auth_admin @@ -312,4 +340,10 @@ org.freedesktop.accounts.set-login-option auth_admin org.freedesktop.accounts.change-own-user-data auth_admin +# +# smb4k (bnc#749065) +# +de.berlios.smb4k.mounthelper.mount auth_admin_keep +de.berlios.smb4k.mounthelper.unmount auth_admin_keep + ### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-12.2/polkit-default-privs.standard new/polkit-default-privs-12.2/polkit-default-privs.standard --- old/polkit-default-privs-12.2/polkit-default-privs.standard 2012-01-18 10:14:11.000000000 +0100 +++ new/polkit-default-privs-12.2/polkit-default-privs.standard 2012-02-29 14:53:45.000000000 +0100 @@ -137,7 +137,7 @@ org.freedesktop.policykit.example.pkexec.run-frobnicate auth_admin:auth_admin:auth_admin # -# device-kit. Should be consitent with consolekit +# udisks. # org.freedesktop.udisks.filesystem-mount auth_admin:auth_admin:yes org.freedesktop.udisks.filesystem-mount-system-internal auth_admin:auth_admin:auth_admin_keep @@ -161,6 +161,34 @@ org.freedesktop.udisks.drive-set-spindown auth_admin:auth_admin:yes org.freedesktop.udisks.linux-lvm2 auth_admin_keep # +# udisks2 (bnc#742751) +# +org.freedesktop.udisks2.filesystem-mount-system auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.filesystem-fstab auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.filesystem-unmount-others auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.encrypted-unlock-system auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.encrypted-unlock-crypttab auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.encrypted-lock-others auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.encrypted-change-passphrase-system auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.loop-delete-others auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.manage-swapspace auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.modify-device-system auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.open-device auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.open-device-system auth_admin:auth_admin:auth_admin_keep +org.freedesktop.udisks2.modify-system-configuration auth_admin +org.freedesktop.udisks2.read-system-configuration-secrets auth_admin +org.freedesktop.udisks2.ata-smart-selftest auth_admin:auth_admin:auth_admin_keep +# +org.freedesktop.udisks2.filesystem-mount auth_admin:auth_admin:yes +org.freedesktop.udisks2.encrypted-unlock auth_admin:auth_admin:yes +org.freedesktop.udisks2.encrypted-change-passphrase auth_admin:auth_admin:yes +org.freedesktop.udisks2.loop-setup auth_admin:auth_admin:yes +org.freedesktop.udisks2.modify-device auth_admin:auth_admin:yes +org.freedesktop.udisks2.ata-smart-update auth_admin:auth_admin:yes + +# +# upower +# org.freedesktop.upower.suspend auth_admin:auth_admin:yes org.freedesktop.upower.hibernate auth_admin:auth_admin:yes org.freedesktop.upower.qos.request-latency auth_admin:auth_admin:yes @@ -313,4 +341,10 @@ org.freedesktop.accounts.set-login-option auth_admin org.freedesktop.accounts.change-own-user-data yes +# +# smb4k (bnc#749065) +# +de.berlios.smb4k.mounthelper.mount auth_admin_keep +de.berlios.smb4k.mounthelper.unmount auth_admin_keep + ### -- 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_Url for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Url for openSUSE:Factory checked in at 2012-03-01 17:25:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Url (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Url.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Url", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Url/php5-pear-Horde_Url.changes 2011-09-23 12:40:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Url.new/php5-pear-Horde_Url.changes 2012-03-01 17:25:52.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 14 20:11:51 UTC 2011 - coolo(a)suse.com + +- latest LGPL is v3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Url.spec ++++++ --- /var/tmp/diff_new_pack.B9SdzG/_old 2012-03-01 17:25:53.000000000 +0100 +++ /var/tmp/diff_new_pack.B9SdzG/_new 2012-03-01 17:25:53.000000000 +0100 @@ -20,12 +20,12 @@ %define xmldir /var/lib/pear Summary: PEAR: Horde Url class +License: LGPL-3.0 +Group: Development/Libraries/PHP Name: php5-pear-Horde_Url Version: 1.0.0 -Release: 1 -License: LGPL -Group: Development/Libraries/PHP +Release: 0 Source0: http://pear.horde.org/get/Horde_Url-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Url -- 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_Editor for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Editor for openSUSE:Factory checked in at 2012-03-01 17:25:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Editor (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Editor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Editor", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Editor/php5-pear-Horde_Editor.changes 2011-09-23 12:40:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Editor.new/php5-pear-Horde_Editor.changes 2012-03-01 17:25:46.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Feb 28 13:41:36 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-2.1 and (MPL-1.1 or GPL-2.0+ or LGPL-2.1+) + Package uses CKEditor which is mozilla triple licensed + +------------------------------------------------------------------- +Sun Aug 14 20:52:45 UTC 2011 - lang(a)b1-systems.de + +- removed conflict with 2.0 packages as it's implied by requiring < 2.0 + +------------------------------------------------------------------- @@ -10 +21 @@ -- * Upgrade ckeditor to v3.5.4. +- Upgrade ckeditor to v3.5.4. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Editor.spec ++++++ --- /var/tmp/diff_new_pack.FEQkei/_old 2012-03-01 17:25:48.000000000 +0100 +++ /var/tmp/diff_new_pack.FEQkei/_new 2012-03-01 17:25:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Horde_Editor # -# 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,19 +21,20 @@ %define hordedir /usr/share/php5/PEAR/www/horde Summary: PEAR: Horde Editor API +License: LGPL-2.1 and (MPL-1.1 or GPL-2.0+ or LGPL-2.1+) +Group: Development/Libraries/PHP Name: php5-pear-Horde_Editor Version: 1.0.1 -Release: 1 -License: LGPL -Group: Development/Libraries/PHP +Release: 0 Source0: http://pear.horde.org/get/Horde_Editor-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Editor BuildRequires: php5-pear >= 1.4.7 Requires: php5-pear-Horde_Browser < 2.0.0, php5-pear-Horde_Core < 2.0.0, php5-pear-Horde_Exception < 2.0.0, php5-pear-Horde_Serialize < 2.0.0, php5-pear >= 1.7.0 -Conflicts: php5-pear-Horde_Browser = 2.0.0, php5-pear-Horde_Core = 2.0.0, php5-pear-Horde_Exception = 2.0.0, php5-pear-Horde_Serialize = 2.0.0 -BuildRequires: php-macros php5-pear-Horde_Role php5-pear-channel-horde +BuildRequires: php-macros +BuildRequires: php5-pear-Horde_Role +BuildRequires: php5-pear-channel-horde Requires: php5-pear-channel-horde, php5-pear-Horde_Role BuildArch: noarch %define pear_name Horde_Editor -- 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-cache_lite for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package php5-pear-cache_lite for openSUSE:Factory checked in at 2012-03-01 17:25:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-cache_lite (Old) and /work/SRC/openSUSE:Factory/.php5-pear-cache_lite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-cache_lite", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-cache_lite/php5-pear-cache_lite.changes 2011-09-23 12:40:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-cache_lite.new/php5-pear-cache_lite.changes 2012-03-01 17:25:38.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 14 19:59:00 UTC 2011 - coolo(a)suse.com + +- LICENSE says LGPL-2.1+ + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-cache_lite.spec ++++++ --- /var/tmp/diff_new_pack.07k7WU/_old 2012-03-01 17:25:39.000000000 +0100 +++ /var/tmp/diff_new_pack.07k7WU/_new 2012-03-01 17:25:39.000000000 +0100 @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define peardir %(pear config-get php_dir 2> /dev/null) %define xmldir /var/lib/pear Summary: Fast and Safe little cache system +License: LGPL-2.1+ +Group: Development/Libraries/Other Name: php5-pear-cache_lite Version: 1.7.2 -Release: 1 -License: LGPL -Group: Development/Libraries/Other +Release: 0 Source0: http://pear.php.net/get/Cache_Lite-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.php.net/package/Cache_Lite @@ -95,4 +94,5 @@ %doc docs/Cache_Lite/* %{peardir}/* %{xmldir}/Cache_Lite.xml + %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 perl-WWW-RobotRules for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-WWW-RobotRules for openSUSE:Factory checked in at 2012-03-01 17:25:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-WWW-RobotRules (Old) and /work/SRC/openSUSE:Factory/.perl-WWW-RobotRules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-WWW-RobotRules", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-WWW-RobotRules/perl-WWW-RobotRules.changes 2011-09-23 12:39:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-WWW-RobotRules.new/perl-WWW-RobotRules.changes 2012-03-01 17:25:34.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 20 10:48:55 UTC 2012 - coolo(a)suse.com + +- updated to 6.02 + * Restore perl-5.8.1 compatiblity. + +------------------------------------------------------------------- Old: ---- WWW-RobotRules-6.01.tar.gz New: ---- WWW-RobotRules-6.02.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-WWW-RobotRules.spec ++++++ --- /var/tmp/diff_new_pack.JbuBZ9/_old 2012-03-01 17:25:38.000000000 +0100 +++ /var/tmp/diff_new_pack.JbuBZ9/_new 2012-03-01 17:25:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-WWW-RobotRules # -# 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,23 @@ # - Name: perl-WWW-RobotRules -Version: 6.01 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 6.02 +Release: 0 %define cpan_name WWW-RobotRules Summary: database of robots.txt-derived permissions -Url: http://search.cpan.org/dist/WWW-RobotRules/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/G/GA/GAAS/WWW-RobotRules-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz -BuildRequires: perl(Fcntl) -BuildRequires: perl(URI) >= 1.10 +Url: http://search.cpan.org/dist/WWW-RobotRules/ +Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -Requires: perl(Fcntl) +BuildRequires: perl(URI) >= 1.10 +#BuildRequires: perl(WWW::RobotRules) +#BuildRequires: perl(WWW::RobotRules::AnyDBM_File) Requires: perl(URI) >= 1.10 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} %description @@ -43,9 +41,35 @@ can use the _/robots.txt_ file to forbid conforming robots from accessing parts of their web site. +The parsed files are kept in a WWW::RobotRules object, and this object +provides methods to check if access to a given URL is prohibited. The same +WWW::RobotRules object can be used for one or more parsed _/robots.txt_ +files on any number of hosts. + +The following methods are provided: + +* $rules = WWW::RobotRules->new($robot_name) + + This is the constructor for WWW::RobotRules objects. The first argument + given to new() is the name of the robot. + +* $rules->parse($robot_txt_url, $content, $fresh_until) + + The parse() method takes as arguments the URL that was used to retrieve + the _/robots.txt_ file, and the contents of the file. + +* $rules->allowed($uri) + + Returns TRUE if this robot is allowed to retrieve this URL. + +* $rules->agent([$name]) + + Get/set the agent name. NOTE: Changing the agent name will clear the + robots.txt rules and expire times out of the cache. %prep %setup -q -n %{cpan_name}-%{version} +find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -59,11 +83,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++ WWW-RobotRules-6.01.tar.gz -> WWW-RobotRules-6.02.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-RobotRules-6.01/Changes new/WWW-RobotRules-6.02/Changes --- old/WWW-RobotRules-6.01/Changes 2011-03-13 16:08:40.000000000 +0100 +++ new/WWW-RobotRules-6.02/Changes 2012-02-18 14:07:15.000000000 +0100 @@ -1,4 +1,11 @@ _______________________________________________________________________________ +2012-02-18 WWW-RobotRules 6.02 + +Restore perl-5.8.1 compatiblity. + + + +_______________________________________________________________________________ 2011-03-13 WWW-RobotRules 6.01 Added legal notice and updated the meta repository link diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-RobotRules-6.01/META.yml new/WWW-RobotRules-6.02/META.yml --- old/WWW-RobotRules-6.01/META.yml 2011-03-13 16:08:54.000000000 +0100 +++ new/WWW-RobotRules-6.02/META.yml 2012-02-18 14:07:29.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: WWW-RobotRules -version: 6.01 +version: 6.02 abstract: database of robots.txt-derived permissions author: - Gisle Aas <gisle(a)activestate.com> @@ -13,16 +13,16 @@ requires: AnyDBM_File: 0 Fcntl: 0 - perl: 5.008008 + perl: 5.008001 URI: 1.10 resources: MailingList: mailto:libwww@perl.org - repository: http://github.com/gisle/libwww-perl/tree/WWW-RobotRules/master + repository: http://github.com/gisle/www-robotrules no_index: directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.56 +generated_by: ExtUtils::MakeMaker version 6.57_05 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-RobotRules-6.01/Makefile.PL new/WWW-RobotRules-6.02/Makefile.PL --- old/WWW-RobotRules-6.01/Makefile.PL 2011-03-13 16:08:36.000000000 +0100 +++ new/WWW-RobotRules-6.02/Makefile.PL 2012-02-18 13:57:41.000000000 +0100 @@ -1,6 +1,6 @@ #!perl -w -require 5.008008; +require 5.008001; use strict; use ExtUtils::MakeMaker; @@ -10,7 +10,7 @@ ABSTRACT_FROM => 'lib/WWW/RobotRules.pm', AUTHOR => 'Gisle Aas <gisle(a)activestate.com>', LICENSE => "perl", - MIN_PERL_VERSION => 5.008008, + MIN_PERL_VERSION => 5.008001, PREREQ_PM => { 'AnyDBM_File' => 0, 'Fcntl' => 0, @@ -18,7 +18,7 @@ }, META_MERGE => { resources => { - repository => 'http://github.com/gisle/libwww-perl/tree/WWW-RobotRules/master', + repository => 'http://github.com/gisle/www-robotrules', MailingList => 'mailto:libwww@perl.org', } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-RobotRules-6.01/lib/WWW/RobotRules.pm new/WWW-RobotRules-6.02/lib/WWW/RobotRules.pm --- old/WWW-RobotRules-6.01/lib/WWW/RobotRules.pm 2011-03-13 16:08:40.000000000 +0100 +++ new/WWW-RobotRules-6.02/lib/WWW/RobotRules.pm 2012-02-18 14:05:13.000000000 +0100 @@ -1,6 +1,6 @@ package WWW::RobotRules; -$VERSION = "6.01"; +$VERSION = "6.02"; sub Version { $VERSION; } use strict; -- 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-Variable-Magic for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-Variable-Magic for openSUSE:Factory checked in at 2012-03-01 17:25:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Variable-Magic (Old) and /work/SRC/openSUSE:Factory/.perl-Variable-Magic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Variable-Magic", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Variable-Magic/perl-Variable-Magic.changes 2011-12-21 10:02:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Variable-Magic.new/perl-Variable-Magic.changes 2012-03-01 17:25:27.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Feb 25 06:32:19 UTC 2012 - coolo(a)suse.com + +- updated to 0.48 + + Add : You can now pass a reference to undef as the magic callback in + order to install a no-op callback. + Thanks Florian Ragwitz for the suggestion. + +------------------------------------------------------------------- Old: ---- Variable-Magic-0.47.tar.gz New: ---- Variable-Magic-0.48.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Variable-Magic.spec ++++++ --- /var/tmp/diff_new_pack.GUVjI3/_old 2012-03-01 17:25:28.000000000 +0100 +++ /var/tmp/diff_new_pack.GUVjI3/_new 2012-03-01 17:25:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Variable-Magic # -# 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,28 +16,26 @@ # -%bcond_with test - Name: perl-Variable-Magic +Version: 0.48 +Release: 0 %define cpan_name Variable-Magic Summary: Associate user-defined magic to variables from Perl -License: GPL-1.0+ or Artistic-1.0 +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -Version: 0.47 -Release: 0 Url: http://search.cpan.org/dist/Variable-Magic/ -Source: http://search.cpan.org/CPAN/authors/id/V/VP/VPIT/%{cpan_name}-%{version}.ta… +Source: http://www.cpan.org/authors/id/V/VP/VPIT/%{cpan_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl-macros -# for testsuite -%if %{with test} -BuildRequires: perl(Test::Pod) >= 1.14 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 -#BuildRequires: perl(Test::Portability::Files) +#BuildRequires: perl(ActivePerl) +#BuildRequires: perl(Hash::Util::FieldHash) #BuildRequires: perl(Test::Kwalitee) -%endif +#BuildRequires: perl(Variable::Magic) +#BuildRequires: perl(Variable::Magic::TestThreads) +#BuildRequires: perl(Variable::Magic::TestValue) +#BuildRequires: perl(Variable::Magic::TestWatcher) +%{perl_requires} %description Magic is Perl's way of enhancing variables. This mechanism lets the user @@ -46,16 +44,18 @@ module, you can add your own magic to any variable without having to write a single line of XS. - -Authors: --------- - Vincent Pit <perl(a)profvince.com> +You'll realize that these magic variables look a lot like tied variables. +It's not surprising, as tied variables are implemented as a special kind of +magic, just like any 'irregular' Perl variable : scalars like '$!', '$(' or +'$^W', the '%ENV' and '%SIG' hashes, the '@ISA' array, 'vec()' and +'substr()' lvalues, the threads::shared manpage variables... They all share +the same underlying C API, and this module gives you direct access to it. %prep %setup -q -n %{cpan_name}-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS -Wall" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" %{__make} %{?_smp_mflags} %check @@ -66,11 +66,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++ Variable-Magic-0.47.tar.gz -> Variable-Magic-0.48.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/Changes new/Variable-Magic-0.48/Changes --- old/Variable-Magic-0.47/Changes 2011-10-27 18:38:36.000000000 +0200 +++ new/Variable-Magic-0.48/Changes 2012-02-18 00:30:16.000000000 +0100 @@ -1,5 +1,10 @@ Revision history for Variable-Magic +0.48 2012-02-17 23:40 UTC + + Add : You can now pass a reference to undef as the magic callback in + order to install a no-op callback. + Thanks Florian Ragwitz for the suggestion. + 0.47 2011-10-27 16:55 UTC + Add : The new constant VMG_COMPAT_HASH_DELETE_NOUVAR_VOID evaluates to true when "delete $hash{key}" does not call 'delete' uvar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/META.json new/Variable-Magic-0.48/META.json --- old/Variable-Magic-0.47/META.json 2011-10-27 18:39:32.000000000 +0200 +++ new/Variable-Magic-0.48/META.json 2012-02-18 00:31:41.000000000 +0100 @@ -4,7 +4,7 @@ "Vincent Pit <perl(a)profvince.com>" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112621", + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120351", "license" : [ "perl_5" ], @@ -22,27 +22,27 @@ "prereqs" : { "build" : { "requires" : { - "Carp" : 0, - "Config" : 0, - "Exporter" : 0, - "ExtUtils::MakeMaker" : 0, - "Test::More" : 0, - "XSLoader" : 0, - "base" : 0 + "Carp" : "0", + "Config" : "0", + "Exporter" : "0", + "ExtUtils::MakeMaker" : "0", + "Test::More" : "0", + "XSLoader" : "0", + "base" : "0" } }, "configure" : { "requires" : { - "Config" : 0, - "ExtUtils::MakeMaker" : 0 + "Config" : "0", + "ExtUtils::MakeMaker" : "0" } }, "runtime" : { "requires" : { - "Carp" : 0, - "Exporter" : 0, - "XSLoader" : 0, - "base" : 0, + "Carp" : "0", + "Exporter" : "0", + "XSLoader" : "0", + "base" : "0", "perl" : "5.008" } } @@ -60,5 +60,5 @@ "url" : "http://git.profvince.com/?p=perl%2Fmodules%2FVariable-Magic.git" } }, - "version" : "0.47" + "version" : "0.48" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/META.yml new/Variable-Magic-0.48/META.yml --- old/Variable-Magic-0.47/META.yml 2011-10-27 18:39:32.000000000 +0200 +++ new/Variable-Magic-0.48/META.yml 2012-02-18 00:31:40.000000000 +0100 @@ -14,7 +14,7 @@ Config: 0 ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112621' +generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120351' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -35,4 +35,4 @@ homepage: http://search.cpan.org/dist/Variable-Magic/ license: http://dev.perl.org/licenses/ repository: http://git.profvince.com/?p=perl%2Fmodules%2FVariable-Magic.git -version: 0.47 +version: 0.48 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/Magic.xs new/Variable-Magic-0.48/Magic.xs --- old/Variable-Magic-0.47/Magic.xs 2011-10-26 23:56:46.000000000 +0200 +++ new/Variable-Magic-0.48/Magic.xs 2012-02-17 19:46:19.000000000 +0100 @@ -435,9 +435,7 @@ #define vmg_vtable_vtbl(T) (T)->vtbl -#if VMG_THREADSAFE STATIC perl_mutex vmg_vtable_refcount_mutex; -#endif STATIC vmg_vtable *vmg_vtable_dup(pTHX_ vmg_vtable *t) { #define vmg_vtable_dup(T) vmg_vtable_dup(aTHX_ (T)) @@ -1016,7 +1014,7 @@ return &PL_sv_undef; } -/* ... svt callbacks ....................................................... */ +/* --- svt callbacks ------------------------------------------------------- */ #define VMG_CB_CALL_ARGS_MASK 15 #define VMG_CB_CALL_ARGS_SHIFT 4 @@ -1074,18 +1072,44 @@ #define vmg_cb_call3(I, OI, S, A1, A2, A3) \ vmg_cb_call(aTHX_ (I), VMG_CB_FLAGS((OI), 3), (S), (A1), (A2), (A3)) +STATIC int vmg_svt_default_noop(pTHX_ SV *sv, MAGIC *mg) { + return 0; +} + +/* ... get magic ........................................................... */ + STATIC int vmg_svt_get(pTHX_ SV *sv, MAGIC *mg) { const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); return vmg_cb_call1(w->cb_get, w->opinfo, sv, mg->mg_obj); } +#define vmg_svt_get_noop vmg_svt_default_noop + +/* ... set magic ........................................................... */ + STATIC int vmg_svt_set(pTHX_ SV *sv, MAGIC *mg) { const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); return vmg_cb_call1(w->cb_set, w->opinfo, sv, mg->mg_obj); } +#define vmg_svt_set_noop vmg_svt_default_noop + +/* ... len magic ........................................................... */ + +STATIC U32 vmg_sv_len(pTHX_ SV *sv) { +#define vmg_sv_len(S) vmg_sv_len(aTHX_ (S)) + STRLEN len; +#if VMG_HAS_PERL(5, 9, 3) + const U8 *s = VOID2(const U8 *, VOID2(const void *, SvPV_const(sv, len))); +#else + U8 *s = SvPV(sv, len); +#endif + + return DO_UTF8(sv) ? utf8_length(s, s + len) : len; +} + STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) { const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); unsigned int opinfo = w->opinfo; @@ -1103,16 +1127,7 @@ PUSHs(sv_2mortal(newRV_inc(sv))); PUSHs(mg->mg_obj ? mg->mg_obj : &PL_sv_undef); if (t < SVt_PVAV) { - STRLEN l; -#if VMG_HAS_PERL(5, 9, 3) - const U8 *s = VOID2(const U8 *, VOID2(const void *, SvPV_const(sv, l))); -#else - U8 *s = SvPV(sv, l); -#endif - if (DO_UTF8(sv)) - len = utf8_length(s, s + l); - else - len = l; + len = vmg_sv_len(sv); mPUSHu(len); } else if (t == SVt_PVAV) { len = av_len((AV *) sv) + 1; @@ -1140,12 +1155,31 @@ return ret; } +STATIC U32 vmg_svt_len_noop(pTHX_ SV *sv, MAGIC *mg) { + U32 len = 0; + svtype t = SvTYPE(sv); + + if (t < SVt_PVAV) { + len = vmg_sv_len(sv); + } else if (t == SVt_PVAV) { + len = (U32) av_len((AV *) sv); + } + + return len; +} + +/* ... clear magic ......................................................... */ + STATIC int vmg_svt_clear(pTHX_ SV *sv, MAGIC *mg) { const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); return vmg_cb_call1(w->cb_clear, w->opinfo, sv, mg->mg_obj); } +#define vmg_svt_clear_noop vmg_svt_default_noop + +/* ... free magic .......................................................... */ + STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) { const vmg_wizard *w; int ret = 0; @@ -1201,12 +1235,16 @@ return ret; } +#define vmg_svt_free_noop vmg_svt_default_noop + #if VMG_HAS_PERL_MAINT(5, 11, 0, 33256) || VMG_HAS_PERL(5, 12, 0) # define VMG_SVT_COPY_KEYLEN_TYPE I32 #else # define VMG_SVT_COPY_KEYLEN_TYPE int #endif +/* ... copy magic .......................................................... */ + STATIC int vmg_svt_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key, VMG_SVT_COPY_KEYLEN_TYPE keylen) { const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); SV *keysv; @@ -1227,20 +1265,35 @@ return ret; } +STATIC int vmg_svt_copy_noop(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key, VMG_SVT_COPY_KEYLEN_TYPE keylen) { + return 0; +} + +/* ... dup magic ........................................................... */ + #if 0 STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) { return 0; } +#define vmg_svt_dup_noop vmg_svt_dup #endif +/* ... local magic ......................................................... */ + #if MGf_LOCAL + STATIC int vmg_svt_local(pTHX_ SV *nsv, MAGIC *mg) { const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg); return vmg_cb_call1(w->cb_local, w->opinfo, nsv, mg->mg_obj); } + +#define vmg_svt_local_noop vmg_svt_default_noop + #endif /* MGf_LOCAL */ +/* ... uvar magic .......................................................... */ + #if VMG_UVAR STATIC OP *vmg_pp_resetuvar(pTHX) { SvRMAGICAL_on(cSVOP_sv); @@ -1336,19 +1389,46 @@ /* --- Macros for the XS section ------------------------------------------- */ -#define VMG_SET_CB(S, N) \ - cb = (S); \ - w->cb_ ## N = (SvOK(cb) && SvROK(cb)) ? SvREFCNT_inc(SvRV(cb)) : NULL; - -#define VMG_SET_SVT_CB(S, N) \ - cb = (S); \ - if (SvOK(cb) && SvROK(cb)) { \ - t->svt_ ## N = vmg_svt_ ## N; \ - w->cb_ ## N = SvREFCNT_inc(SvRV(cb)); \ - } else { \ - t->svt_ ## N = NULL; \ - w->cb_ ## N = NULL; \ - } +#ifdef CvISXSUB +# define VMG_CVOK(C) \ + ((CvISXSUB(C) ? (void *) CvXSUB(C) : (void *) CvROOT(C)) ? 1 : 0) +#else +# define VMG_CVOK(C) (CvROOT(C) || CvXSUB(C)) +#endif + +#define VMG_CBOK(S) ((SvTYPE(S) == SVt_PVCV) ? VMG_CVOK(S) : SvOK(S)) + +#define VMG_SET_CB(S, N) { \ + SV *cb = (S); \ + if (SvOK(cb) && SvROK(cb)) { \ + cb = SvRV(cb); \ + if (VMG_CBOK(cb)) \ + SvREFCNT_inc_simple_void(cb); \ + else \ + cb = NULL; \ + } else { \ + cb = NULL; \ + } \ + w->cb_ ## N = cb; \ +} + +#define VMG_SET_SVT_CB(S, N) { \ + SV *cb = (S); \ + if (SvOK(cb) && SvROK(cb)) { \ + cb = SvRV(cb); \ + if (VMG_CBOK(cb)) { \ + t->svt_ ## N = vmg_svt_ ## N; \ + SvREFCNT_inc_simple_void(cb); \ + } else { \ + t->svt_ ## N = vmg_svt_ ## N ## _noop; \ + cb = NULL; \ + } \ + } else { \ + t->svt_ ## N = NULL; \ + cb = NULL; \ + } \ + w->cb_ ## N = cb; \ +} /* --- XS ------------------------------------------------------------------ */ @@ -1424,7 +1504,7 @@ PREINIT: vmg_wizard *w; MGVTBL *t; - SV *cb, *op_info, *copy_key; + SV *op_info, *copy_key; I32 i = 0; CODE: if (items != 9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/README new/Variable-Magic-0.48/README --- old/Variable-Magic-0.47/README 2011-10-27 18:39:32.000000000 +0200 +++ new/Variable-Magic-0.48/README 2012-02-18 00:31:41.000000000 +0100 @@ -2,7 +2,7 @@ Variable::Magic - Associate user-defined magic to variables from Perl. VERSION - Version 0.47 + Version 0.48 SYNOPSIS use Variable::Magic qw<wizard cast VMG_OP_INFO_NAME>; @@ -234,8 +234,19 @@ straight to the perl magic API. However, only the return value of the "len" callback currently holds a meaning. - Each callback can be specified as a code or a string reference, in which - case the function denoted by the string will be used as the callback. + Each callback can be specified as : + + * a code reference, which will be called as a subroutine. + + * a string reference, where the string denotes which subroutine is to + be called when magic is triggered. If the subroutine name is not + fully qualified, then the current package at the time the magic is + invoked will be used instead. + + * a reference to "undef", in which case a no-op magic callback is + installed instead of the default one. This may especially be helpful + for 'local' magic, where an empty callback prevents magic from being + copied during localization. Note that "free" callbacks are *never* called during global destruction, as there's no way to ensure that the wizard and the "free" callback @@ -550,7 +561,8 @@ <http://www.profvince.com/perl/cover/Variable-Magic>. COPYRIGHT & LICENSE - Copyright 2007,2008,2009,2010,2011 Vincent Pit, all rights reserved. + Copyright 2007,2008,2009,2010,2011,2012 Vincent Pit, all rights + reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/lib/Variable/Magic.pm new/Variable-Magic-0.48/lib/Variable/Magic.pm --- old/Variable-Magic-0.47/lib/Variable/Magic.pm 2011-10-27 18:38:40.000000000 +0200 +++ new/Variable-Magic-0.48/lib/Variable/Magic.pm 2012-02-18 00:30:23.000000000 +0100 @@ -11,13 +11,13 @@ =head1 VERSION -Version 0.47 +Version 0.48 =cut our $VERSION; BEGIN { - $VERSION = '0.47'; + $VERSION = '0.48'; } =head1 SYNOPSIS @@ -285,7 +285,25 @@ =back -Each callback can be specified as a code or a string reference, in which case the function denoted by the string will be used as the callback. +Each callback can be specified as : + +=over 4 + +=item * + +a code reference, which will be called as a subroutine. + +=item * + +a string reference, where the string denotes which subroutine is to be called when magic is triggered. +If the subroutine name is not fully qualified, then the current package at the time the magic is invoked will be used instead. + +=item * + +a reference to C<undef>, in which case a no-op magic callback is installed instead of the default one. +This may especially be helpful for 'local' magic, where an empty callback prevents magic from being copied during localization. + +=back Note that C<free> callbacks are I<never> called during global destruction, as there's no way to ensure that the wizard and the C<free> callback weren't destroyed before the variable. @@ -657,7 +675,7 @@ =head1 COPYRIGHT & LICENSE -Copyright 2007,2008,2009,2010,2011 Vincent Pit, all rights reserved. +Copyright 2007,2008,2009,2010,2011,2012 Vincent Pit, all rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/t/14-callbacks.t new/Variable-Magic-0.48/t/14-callbacks.t --- old/Variable-Magic-0.47/t/14-callbacks.t 2011-09-04 17:19:53.000000000 +0200 +++ new/Variable-Magic-0.48/t/14-callbacks.t 2012-02-16 23:01:30.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use warnings; -use Test::More tests => 17; +use Test::More tests => 26; use Variable::Magic qw<wizard cast>; @@ -31,18 +31,53 @@ my $c = 0; sub X::wat { ++$c } my $wiz = eval { wizard get => \'X::wat' }; - is($@, '', 'wizard with a string callback doesn\'t croak'); + is($@, '', 'wizard with a qualified string callback doesn\'t croak'); my $b = $n; my $res = eval { cast $b, $wiz }; - is($@, '', 'cast a wizard with a string callback doesn\'t croak'); + is($@, '', 'cast a wizard with a qualified string callback doesn\'t croak'); my $x; eval { local $SIG{__WARN__} = sub { die }; $x = $b; }; - is($@, '', 'string callback doesn\'t warn/croak'); - is($c, 1, 'string callback is called'); - is($x, $n, 'string callback returns the right thing'); + is($@, '', 'qualified string callback doesn\'t warn/croak'); + is($c, 1, 'qualified string callback is called'); + is($x, $n, 'qualified string callback returns the right thing'); +} + +{ + my $c = 0; + sub wut { fail 'main::wut was called' } + sub Y::wut { ++$c } + my $wiz = eval { wizard get => \'wut' }; + is($@, '', 'wizard with a short string callback doesn\'t croak'); + my $b = $n; + my $res = eval { cast $b, $wiz }; + is($@, '', 'cast a wizard with a short string callback doesn\'t croak'); + my $x; + eval { + local $SIG{__WARN__} = sub { die }; + package Y; + $x = $b; + }; + is($@, '', 'short string callback doesn\'t warn/croak'); + is($c, 1, 'short string callback is called'); + is($x, $n, 'short string callback returns the right thing'); +} + +{ + my $wiz = eval { wizard get => \undef }; + is($@, '', 'wizard with a ref-to-undef callback doesn\'t croak'); + my $b = $n; + my $res = eval { cast $b, $wiz }; + is($@, '', 'cast a wizard with a ref-to-undef callback doesn\'t croak'); + my $x; + eval { + local $SIG{__WARN__} = sub { die }; + $x = $b; + }; + is($@, '', 'ref-to-undef callback doesn\'t warn/croak'); + is($x, $n, 'ref-to-undef callback returns the right thing'); } my @callers; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/t/22-len.t new/Variable-Magic-0.48/t/22-len.t --- old/Variable-Magic-0.47/t/22-len.t 2011-09-04 17:19:53.000000000 +0200 +++ new/Variable-Magic-0.48/t/22-len.t 2012-02-17 19:09:07.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use warnings; -use Test::More tests => 39 + (2 * 2 + 1); +use Test::More tests => 39 + (2 * 2 + 1) + (5 + 2 * 3); use Variable::Magic qw<wizard cast dispell VMG_COMPAT_SCALAR_LENGTH_NOLEN>; @@ -70,8 +70,8 @@ $c = 0; $n = 1 + int rand 1000; # length magic on scalars needs also get magic to be triggered. - $wiz = wizard get => sub { return 'anything' }, - len => sub { $d = $_[2]; ++$c; return $n }; + my $wiz = wizard get => sub { return 'anything' }, + len => sub { $d = $_[2]; ++$c; return $n }; my $x = 6789; @@ -167,3 +167,35 @@ dispell @val, $wv; is_deeply \@val, [ 4, 5, 8 ], 'len: after value'; } + +{ + local $@; + + my $wua = eval { wizard len => \undef }; + is $@, '', 'len: noop wizard (for arrays) creation does not croak'; + + my @a = ('a' .. 'z'); + eval { cast @a, $wua }; + is $@, '', 'len: noop wizard (for arrays) cast does not croak'; + + my $l; + eval { $l = $#a }; + is $@, '', 'len: noop wizard (for arrays) invocation does not croak'; + is $l, 25, 'len: noop magic on an array returns the previous length'; + + my $wus = eval { wizard get => \undef, len => \undef }; + is $@, '', 'len: noop wizard (for strings) creation does not croak'; + + for ([ 'euro', 'string' ], [ "\x{20AC}uro", 'unicode string' ]) { + my ($euro, $desc) = @$_; + + eval { cast $euro, $wus }; + is $@, '', 'len: noop wizard (for strings) cast does not croak'; + + eval { pos($euro) = 2 }; + is $@, '', 'len: noop wizard (for strings) invocation does not croak'; + + my ($rest) = ($euro =~ /(.*)/g); + is $rest, 'ro', "len: noop magic on a $desc returns the previous length"; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/t/27-local.t new/Variable-Magic-0.48/t/27-local.t --- old/Variable-Magic-0.47/t/27-local.t 2011-09-04 17:19:53.000000000 +0200 +++ new/Variable-Magic-0.48/t/27-local.t 2012-02-17 18:01:52.000000000 +0100 @@ -5,10 +5,10 @@ use Test::More; -use Variable::Magic qw<cast MGf_LOCAL>; +use Variable::Magic qw<wizard cast getdata MGf_LOCAL>; if (MGf_LOCAL) { - plan tests => 2 * 3 + 1 + 1; + plan tests => 2 * 3 + 1 + (2 + 2 * 7) + 1; } else { plan skip_all => 'No local magic for this perl'; } @@ -24,3 +24,50 @@ ok $res, 'local: cast succeeded'; watch { local $a } { local => 1 }, 'localized'; + +{ + local $@; + + my $w1 = eval { wizard local => \undef, data => sub { 'w1' } }; + is $@, '', 'local: noop wizard creation does not croak'; + my $w2 = eval { wizard data => sub { 'w2' } }; + is $@, '', 'local: dummy wizard creation does not croak'; + + { + our $u; + eval { cast $u, $w1 }; + is $@, '', 'local: noop magic (first) cast does not croak'; + is getdata($u, $w1), 'w1', 'local: noop magic (first) cast succeeded'; + eval { cast $u, $w2 }; + is $@, '', 'local: dummy magic (second) cast does not croak'; + is getdata($u, $w2), 'w2', 'local: dummy magic (second) cast succeeded'; + my ($z1, $z2); + eval { + local $u = ''; + $z1 = getdata $u, $w1; + $z2 = getdata $u, $w2; + }; + is $@, '', 'local: noop/dummy magic invocation does not croak'; + is $z1, undef, 'local: noop magic (first) prevented magic copy'; + is $z2, 'w2', 'local: dummy magic (second) was copied'; + } + + { + our $v; + eval { cast $v, $w2 }; + is $@, '', 'local: dummy magic (first) cast does not croak'; + is getdata($v, $w2), 'w2', 'local: dummy magic (first) cast succeeded'; + eval { cast $v, $w1 }; + is $@, '', 'local: noop magic (second) cast does not croak'; + is getdata($v, $w1), 'w1', 'local: noop magic (second) cast succeeded'; + my ($z1, $z2); + eval { + local $v = ''; + $z1 = getdata $v, $w1; + $z2 = getdata $v, $w2; + }; + is $@, '', 'local: dummy/noop magic invocation does not croak'; + is $z2, 'w2', 'local: dummy magic (first) was copied'; + is $z1, undef, 'local: noop magic (second) prevented magic copy'; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Variable-Magic-0.47/t/lib/Variable/Magic/TestWatcher.pm new/Variable-Magic-0.48/t/lib/Variable/Magic/TestWatcher.pm --- old/Variable-Magic-0.47/t/lib/Variable/Magic/TestWatcher.pm 2011-10-26 19:58:10.000000000 +0200 +++ new/Variable-Magic-0.48/t/lib/Variable/Magic/TestWatcher.pm 2012-02-16 23:08:12.000000000 +0100 @@ -28,6 +28,7 @@ croak 'can\'t initialize twice' if defined $wiz; my $types = _types shift; $prefix = (defined) ? "$_: " : '' for shift; + local $@; %mg = (); $wiz = eval 'wizard ' . join(', ', map { "$_ => sub { \$mg{$_}++;" . ($_ eq 'len' ? '$_[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 perl-Path-Class for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-Path-Class for openSUSE:Factory checked in at 2012-03-01 17:25:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Path-Class (Old) and /work/SRC/openSUSE:Factory/.perl-Path-Class.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Path-Class", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Path-Class/perl-Path-Class.changes 2011-09-23 12:38:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Path-Class.new/perl-Path-Class.changes 2012-03-01 17:25:17.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 27 09:04:53 UTC 2012 - coolo(a)suse.com + +- updated to 0.25 + - resolve() now croak()s instead of die()s on non-existent file. [Danijel Tašov] + - Added a traverse() method for directories, based on the fmap_cont() + method of Forest::Tree::Pure. It's an alternative to ->recurse, + which allows for more control over how the recursion + happens. [Jesse Luehrs] + - Fixed a grammar error in the docs. [Shlomi Fish] + +------------------------------------------------------------------- Old: ---- Path-Class-0.24.tar.gz New: ---- Path-Class-0.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Path-Class.spec ++++++ --- /var/tmp/diff_new_pack.LgDla4/_old 2012-03-01 17:25:20.000000000 +0100 +++ /var/tmp/diff_new_pack.LgDla4/_new 2012-03-01 17:25:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Path-Class # -# 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,21 +16,24 @@ # - Name: perl-Path-Class -Version: 0.24 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 0.25 +Release: 0 %define cpan_name Path-Class Summary: Cross-platform path specification manipulation -Url: http://search.cpan.org/dist/Path-Class/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/Path-Class/ Source: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Module::Build) >= 0.3601 +#BuildRequires: perl(Path::Class) +#BuildRequires: perl(Path::Class::Dir) +#BuildRequires: perl(Path::Class::Entity) +#BuildRequires: perl(Path::Class::File) %{perl_requires} %description @@ -95,9 +98,6 @@ ./Build install destdir=%{buildroot} create_packlist=0 %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) %doc Changes LICENSE README ++++++ Path-Class-0.24.tar.gz -> Path-Class-0.25.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/Build.PL new/Path-Class-0.25/Build.PL --- old/Path-Class-0.24/Build.PL 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/Build.PL 2012-02-16 03:56:28.000000000 +0100 @@ -6,38 +6,41 @@ my %module_build_args = ( - 'build_requires' => { - 'Module::Build' => '0.3601', - 'Test' => '0', - 'Test::More' => '0' + "build_requires" => { + "Module::Build" => "0.3601", + "Test" => 0, + "Test::More" => 0, + "warnings" => 0 }, - 'configure_requires' => { - 'ExtUtils::MakeMaker' => '6.30', - 'Module::Build' => '0.3601' + "configure_requires" => { + "ExtUtils::MakeMaker" => "6.30", + "Module::Build" => "0.3601" }, - 'dist_abstract' => 'Cross-platform path specification manipulation', - 'dist_author' => [ - 'Ken Williams <kwilliams(a)cpan.org>' + "dist_abstract" => "Cross-platform path specification manipulation", + "dist_author" => [ + "Ken Williams <kwilliams\(a)cpan.org>" ], - 'dist_name' => 'Path-Class', - 'dist_version' => '0.24', - 'license' => 'perl', - 'module_name' => 'Path::Class', - 'recommends' => {}, - 'recursive_test_files' => 1, - 'requires' => { - 'Carp' => '0', - 'Cwd' => '0', - 'Exporter' => '0', - 'File::Path' => '0', - 'File::Spec' => '0.87', - 'File::Temp' => '0', - 'File::stat' => '0', - 'IO::Dir' => '0', - 'IO::File' => '0', - 'overload' => '0' + "dist_name" => "Path-Class", + "dist_version" => "0.25", + "license" => "perl", + "module_name" => "Path::Class", + "recommends" => {}, + "recursive_test_files" => 1, + "requires" => { + "Carp" => 0, + "Cwd" => 0, + "Exporter" => 0, + "File::Path" => 0, + "File::Spec" => "0.87", + "File::Temp" => 0, + "File::stat" => 0, + "IO::Dir" => 0, + "IO::File" => 0, + "base" => 0, + "overload" => 0, + "strict" => 0 }, - 'script_files' => [] + "script_files" => [] ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/Changes new/Path-Class-0.25/Changes --- old/Path-Class-0.24/Changes 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/Changes 2012-02-16 03:56:28.000000000 +0100 @@ -1,5 +1,16 @@ Revision history for Perl extension Path::Class. +0.25 Wed Feb 15 20:55:30 CST 2012 + + - resolve() now croak()s instead of die()s on non-existent file. [Danijel Tašov] + + - Added a traverse() method for directories, based on the fmap_cont() + method of Forest::Tree::Pure. It's an alternative to ->recurse, + which allows for more control over how the recursion + happens. [Jesse Luehrs] + + - Fixed a grammar error in the docs. [Shlomi Fish] + 0.24 Sat May 28 20:52:39 CDT 2011 - Added a tempfile() method for Dir objects, which provides an @@ -224,7 +235,7 @@ properly. [Michael Schwern] - Fixed a test failure on Win32 (from line 71 of t/01-basic.t). - [reported by Murat �nalan] + [reported by Murat Ünalan] - Rewrote general description of Path::Class in the documentation [suggested by Joshua Keroes] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/INSTALL new/Path-Class-0.25/INSTALL --- old/Path-Class-0.24/INSTALL 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/INSTALL 2012-02-16 03:56:28.000000000 +0100 @@ -1,14 +1,44 @@ - Installation instructions for Path::Class -To install this module, follow the standard steps for installing most -Perl modules: +This is the Perl distribution Path-Class. - perl Makefile.PL - make - make test - make install +Installing Path-Class is straightforward. -Or you may use the CPAN.pm module, which will automatically execute -these steps for you. +## Installation with cpanm - -Ken +If you have cpanm, you only need one line: + + % cpanm Path::Class + +If you are installing into a system-wide directory, you may need to pass the +"-S" flag to cpanm, which uses sudo to install the module: + + % cpanm -S Path::Class + +## Installing with the CPAN shell + +Alternatively, if your CPAN shell is set up, you should just be able to do: + + % cpan Path::Class + +## Manual installation + +As a last resort, you can manually install it. Download the tarball, untar it, +then build it: + + % perl Makefile.PL + % make && make test + +Then install it: + + % make install + +If you are installing into a system-wide directory, you may need to run: + + % sudo make install + +## Documentation + +Path-Class documentation is available as POD. +You can run perldoc from a shell to read the documentation: + + % perldoc Path::Class diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/LICENSE new/Path-Class-0.25/LICENSE --- old/Path-Class-0.24/LICENSE 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/LICENSE 2012-02-16 03:56:28.000000000 +0100 @@ -1,4 +1,4 @@ -This software is copyright (c) 2011 by Ken Williams. +This software is copyright (c) 2012 by Ken Williams. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,21 +12,22 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2011 by Ken Williams. +This software is Copyright (c) 2012 by Ken Williams. This is free software, licensed under: The GNU General Public License, Version 1, February 1989 - GNU GENERAL PUBLIC LICENSE - Version 1, February 1989 + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + 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. - Preamble + Preamble The license agreements of most software companies try to keep users at the mercy of those companies. By contrast, our General Public @@ -67,7 +68,7 @@ The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any program or other work which @@ -185,7 +186,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -207,9 +208,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + Appendix: 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 humanity, the best way to achieve this is to make it @@ -235,8 +236,9 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + 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. @@ -270,7 +272,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2011 by Ken Williams. +This software is Copyright (c) 2012 by Ken Williams. This is free software, licensed under: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/MANIFEST new/Path-Class-0.25/MANIFEST --- old/Path-Class-0.24/MANIFEST 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/MANIFEST 2012-02-16 03:56:28.000000000 +0100 @@ -16,4 +16,5 @@ t/02-foreign.t t/03-filesystem.t t/04-subclass.t +t/05-traverse.t t/author-critic.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/META.yml new/Path-Class-0.25/META.yml --- old/Path-Class-0.24/META.yml 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/META.yml 2012-02-16 03:56:28.000000000 +0100 @@ -6,11 +6,12 @@ Module::Build: 0.3601 Test: 0 Test::More: 0 + warnings: 0 configure_requires: ExtUtils::MakeMaker: 6.30 Module::Build: 0.3601 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.200006, CPAN::Meta::Converter version 2.102400' +generated_by: 'Dist::Zilla version 4.300002, CPAN::Meta::Converter version 2.112150' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -26,8 +27,10 @@ File::stat: 0 IO::Dir: 0 IO::File: 0 + base: 0 overload: 0 + strict: 0 resources: bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Path-Class - repository: http://perl-path-class.googlecode.com/svn/trunk -version: 0.24 + repository: git://github.com/kenahoo/Path-Class.git +version: 0.25 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/Makefile.PL new/Path-Class-0.25/Makefile.PL --- old/Path-Class-0.24/Makefile.PL 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/Makefile.PL 2012-02-16 03:56:28.000000000 +0100 @@ -9,36 +9,39 @@ my %WriteMakefileArgs = ( - 'ABSTRACT' => 'Cross-platform path specification manipulation', - 'AUTHOR' => 'Ken Williams <kwilliams(a)cpan.org>', - 'BUILD_REQUIRES' => { - 'Module::Build' => '0.3601', - 'Test' => '0', - 'Test::More' => '0' + "ABSTRACT" => "Cross-platform path specification manipulation", + "AUTHOR" => "Ken Williams <kwilliams\(a)cpan.org>", + "BUILD_REQUIRES" => { + "Module::Build" => "0.3601", + "Test" => 0, + "Test::More" => 0, + "warnings" => 0 }, - 'CONFIGURE_REQUIRES' => { - 'ExtUtils::MakeMaker' => '6.30', - 'Module::Build' => '0.3601' + "CONFIGURE_REQUIRES" => { + "ExtUtils::MakeMaker" => "6.30", + "Module::Build" => "0.3601" }, - 'DISTNAME' => 'Path-Class', - 'EXE_FILES' => [], - 'LICENSE' => 'perl', - 'NAME' => 'Path::Class', - 'PREREQ_PM' => { - 'Carp' => '0', - 'Cwd' => '0', - 'Exporter' => '0', - 'File::Path' => '0', - 'File::Spec' => '0.87', - 'File::Temp' => '0', - 'File::stat' => '0', - 'IO::Dir' => '0', - 'IO::File' => '0', - 'overload' => '0' + "DISTNAME" => "Path-Class", + "EXE_FILES" => [], + "LICENSE" => "perl", + "NAME" => "Path::Class", + "PREREQ_PM" => { + "Carp" => 0, + "Cwd" => 0, + "Exporter" => 0, + "File::Path" => 0, + "File::Spec" => "0.87", + "File::Temp" => 0, + "File::stat" => 0, + "IO::Dir" => 0, + "IO::File" => 0, + "base" => 0, + "overload" => 0, + "strict" => 0 }, - 'VERSION' => '0.24', - 'test' => { - 'TESTS' => 't/*.t' + "VERSION" => "0.25", + "test" => { + "TESTS" => "t/*.t" } ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/README new/Path-Class-0.25/README --- old/Path-Class-0.24/README 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/README 2012-02-16 03:56:28.000000000 +0100 @@ -1,11 +1,11 @@ This archive contains the distribution Path-Class, -version 0.24: +version 0.25: Cross-platform path specification manipulation -This software is copyright (c) 2011 by Ken Williams. +This software is copyright (c) 2012 by Ken Williams. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/SIGNATURE new/Path-Class-0.25/SIGNATURE --- old/Path-Class-0.24/SIGNATURE 2011-05-29 03:53:52.000000000 +0200 +++ new/Path-Class-0.25/SIGNATURE 2012-02-16 03:56:28.000000000 +0100 @@ -1,5 +1,5 @@ This file contains message digests of all files listed in MANIFEST, -signed via the Module::Signature module, version 0.66. +signed via the Module::Signature module, version 0.68. To verify the content in this distribution, first make sure you have Module::Signature installed, then type: @@ -14,28 +14,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 ea792bf52b566bff462a76a5d4d50433e0b527ea Build.PL -SHA1 247c8647d187a81327719ee36cf6d4f9703db733 Changes -SHA1 066a2dba8084a0c2a7e4b6996ad21872bc16beb5 INSTALL -SHA1 da0b89eff79e9d5128ab28d63e099b840cca39bf LICENSE -SHA1 52cb7d3f48ff3c95c8459535d1bd6e123ec44501 MANIFEST -SHA1 fb09dac402763a91c50f3e1949a51813f509afdb META.yml -SHA1 ce72ebc3d68832477effb18bc248d92211874f14 Makefile.PL -SHA1 243b575c9d7769d2cfd29c189ec2be8c883c4ece README -SHA1 a6ebbb825cd8d9c406a02ac08f3b7680d5d285f2 dist.ini -SHA1 07aaa412631cc8e6ea4276b3f3ea1fffbe5065f5 lib/Path/Class.pm -SHA1 8d6415121b20b7a701290105646ac48f0f691b5b lib/Path/Class/Dir.pm -SHA1 0549c1d2150621445a31f7688b2f5a878bb662f2 lib/Path/Class/Entity.pm -SHA1 8193c8bd639e4e5c01bbaf4f173970fa3a992507 lib/Path/Class/File.pm +SHA1 b0e7caad5afe531b3c9dbb6946d4d62d40fb64ea Build.PL +SHA1 c019faeb9674c167d60997e6e4321f7de7ac7096 Changes +SHA1 3baefa5156f90435f40c793b7f071e2f89a74006 INSTALL +SHA1 b33df3650303ca968f350ac6a976f34f41762851 LICENSE +SHA1 e0b6ae90f3672e071e3e8d77f1d100dda38e9c24 MANIFEST +SHA1 5aefe0dfeafcb343beb080a3f6c7297131fef7ae META.yml +SHA1 9186a51736835d4795e0ff71dd7e1d1c95fea61d Makefile.PL +SHA1 fb3fff92bcd540665c40fea342f8377c72d5d597 README +SHA1 b56785d5c081896083dc4398194e1286e68371a0 dist.ini +SHA1 58a9698bacf9f6d62356a31a7b10b46b7b411910 lib/Path/Class.pm +SHA1 6240803f25d3c7a5b2589e8a82c3684096e6294c lib/Path/Class/Dir.pm +SHA1 7fd839b0aa96c90489b62504ddf993883dd5575d lib/Path/Class/Entity.pm +SHA1 323141c5eefea8cc3f55f0106f54fd4db508131c lib/Path/Class/File.pm SHA1 212c128d87fa012c36016210e6e9213112fc3c23 t/01-basic.t SHA1 a42f4b07e4c42e7a59b960b13c5466d7cd82e17a t/02-foreign.t SHA1 ff702cdbf0bb4c25959cbc5a5c7db17772b7aa5b t/03-filesystem.t SHA1 a163d4cf70142b45974ed39c78571e7ce2ba5a7f t/04-subclass.t +SHA1 a154070d2cb1369f6cebf4228742edea39c43c63 t/05-traverse.t SHA1 fa45d6e6ab1cd421349dea4ef527bfd5cdc8a09e t/author-critic.t -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (Darwin) +Version: GnuPG/MacGPG2 v2.0.17 (Darwin) +Comment: GPGTools - http://gpgtools.org -iD8DBQFN4acwgrvMBLfvlHYRAmIXAKC4w/k04B/Pm3pj3AUHDLUBxEKmFgCgpr+J -vFWvOuqcL5jRV9XPXUxGOCI= -=+Fzk +iEYEARECAAYFAk88cFsACgkQgrvMBLfvlHboawCgw86uYQhnD3A06Nec9W1ZKD2a +04kAmwbu2yyS2/XXyhHa+ql9R79+V1lS +=UPVQ -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/dist.ini new/Path-Class-0.25/dist.ini --- old/Path-Class-0.24/dist.ini 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/dist.ini 2012-02-16 03:56:28.000000000 +0100 @@ -1,5 +1,5 @@ name = Path-Class -version = 0.24 +version = 0.25 author = Ken Williams <kwilliams(a)cpan.org> license = Perl_5 copyright_holder = Ken Williams @@ -17,9 +17,12 @@ [Bugtracker] [Repository] [ModuleBuild] +[InstallGuide] -[CriticTests] +[Test::Perl::Critic] ;[PodCoverageTests] [AutoPrereqs] skip = ^English$ + +[Git::Tag] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/lib/Path/Class/Dir.pm new/Path-Class-0.25/lib/Path/Class/Dir.pm --- old/Path-Class-0.24/lib/Path/Class/Dir.pm 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/lib/Path/Class/Dir.pm 2012-02-16 03:56:28.000000000 +0100 @@ -1,8 +1,8 @@ use strict; package Path::Class::Dir; -BEGIN { - $Path::Class::Dir::VERSION = '0.24'; +{ + $Path::Class::Dir::VERSION = '0.25'; } use Path::Class::File; @@ -138,6 +138,19 @@ rmdir( shift() ); } +sub traverse { + my $self = shift; + my ($callback, @args) = @_; + my @children = $self->children; + return $self->$callback( + sub { + my @inner_args = @_; + return map { $_->traverse($callback, @inner_args) } @children; + }, + @args + ); +} + sub recurse { my $self = shift; my %opts = (preorder => 1, depthfirst => 0, @_); @@ -271,7 +284,7 @@ =head1 VERSION -version 0.24 +version 0.25 =head1 SYNOPSIS @@ -650,6 +663,41 @@ doesn't exist or isn't readable), C<next()> will throw an exception with the value of C<$!>. +=item $dir->traverse( sub { ... }, @args ) + +Calls the given callback for the root, passing it a continuation +function which, when called, will call this recursively on each of its +children. The callback function should be of the form: + + sub { + my ($child, $cont, @args) = @_; + # ... + } + +For instance, to calculate the number of files in a directory, you +can do this: + + my $nfiles = $dir->traverse(sub { + my ($child, $cont) = @_; + return sum($cont->(), ($child->is_dir ? 0 : 1)); + }); + +or to calculate the maximum depth of a directory: + + my $depth = $dir->traverse(sub { + my ($child, $cont, $depth) = @_; + return max($cont->($depth + 1), $depth); + }, 0); + +You can also choose not to call the callback in certain situations: + + $dir->traverse(sub { + my ($child, $cont) = @_; + return if -l $child; # don't follow symlinks + # do something with $child + return $cont->(); + }); + =item $dir->recurse( callback => sub {...} ) Iterates through this directory and all of its children, and all of @@ -696,4 +744,4 @@ Path::Class, Path::Class::File, File::Spec -=cut \ No newline at end of file +=cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/lib/Path/Class/Entity.pm new/Path-Class-0.25/lib/Path/Class/Entity.pm --- old/Path-Class-0.24/lib/Path/Class/Entity.pm 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/lib/Path/Class/Entity.pm 2012-02-16 03:56:28.000000000 +0100 @@ -1,13 +1,14 @@ use strict; package Path::Class::Entity; -BEGIN { - $Path::Class::Entity::VERSION = '0.24'; +{ + $Path::Class::Entity::VERSION = '0.25'; } use File::Spec 0.87; use File::stat (); use Cwd; +use Carp(); use overload ( @@ -63,7 +64,7 @@ sub resolve { my $self = shift; - die $! unless -e $self; # No such file or directory + Carp::croak($!) unless -e $self; # No such file or directory my $cleaned = $self->new( scalar Cwd::realpath($self->stringify) ); # realpath() always returns absolute path, kind of annoying @@ -96,7 +97,7 @@ =head1 VERSION -version 0.24 +version 0.25 =head1 DESCRIPTION @@ -111,4 +112,4 @@ Path::Class -=cut \ No newline at end of file +=cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/lib/Path/Class/File.pm new/Path-Class-0.25/lib/Path/Class/File.pm --- old/Path-Class-0.24/lib/Path/Class/File.pm 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/lib/Path/Class/File.pm 2012-02-16 03:56:28.000000000 +0100 @@ -1,8 +1,8 @@ use strict; package Path::Class::File; -BEGIN { - $Path::Class::File::VERSION = '0.24'; +{ + $Path::Class::File::VERSION = '0.25'; } use Path::Class::Dir; @@ -95,6 +95,12 @@ return not -e $file; } +sub traverse { + my $self = shift; + my ($callback, @args) = @_; + return $self->$callback(sub { () }, @args); +} + 1; __END__ @@ -104,7 +110,7 @@ =head1 VERSION -version 0.24 +version 0.25 =head1 SYNOPSIS @@ -315,6 +321,11 @@ The default C<iomode> is C<r>. +=item $file->traverse(sub { ... }, @args) + +Calls the given callback on $file. This doesn't do much on its own, +but see the associated documentation in L<Path::Class::Dir>. + =item $file->remove() This method will remove the file in a way that works well on all @@ -352,4 +363,4 @@ Path::Class, Path::Class::Dir, File::Spec -=cut \ No newline at end of file +=cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/lib/Path/Class.pm new/Path-Class-0.25/lib/Path/Class.pm --- old/Path-Class-0.24/lib/Path/Class.pm 2011-05-29 03:53:45.000000000 +0200 +++ new/Path-Class-0.25/lib/Path/Class.pm 2012-02-16 03:56:28.000000000 +0100 @@ -1,8 +1,8 @@ use strict; package Path::Class; -BEGIN { - $Path::Class::VERSION = '0.24'; +{ + $Path::Class::VERSION = '0.25'; } { @@ -32,7 +32,7 @@ =head1 VERSION -version 0.24 +version 0.25 =head1 SYNOPSIS @@ -160,7 +160,7 @@ =item * -Some platforms, notably VMS and some older versions of DOS (I think), +On some platforms, notably VMS and some older versions of DOS (I think), all filenames must have an extension. Thus if you create a file called F<foo/bar> and then ask for a list of files in the directory F<foo>, you may find a file called F<bar.> instead of the F<bar> you @@ -185,4 +185,4 @@ Path::Class::Dir, Path::Class::File, File::Spec -=cut \ No newline at end of file +=cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.24/t/05-traverse.t new/Path-Class-0.25/t/05-traverse.t --- old/Path-Class-0.24/t/05-traverse.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Path-Class-0.25/t/05-traverse.t 2012-02-16 03:56:28.000000000 +0100 @@ -0,0 +1,51 @@ +#!/usr/bin/env perl +use strict; +use warnings; +use Cwd; +use Test::More; +use File::Temp qw(tempdir); + +plan tests => 4; + +use_ok 'Path::Class'; + +my $cwd = getcwd; +my $tmp = dir(tempdir(CLEANUP => 1)); + +# Test recursive iteration through the following structure: +# a +# / \ +# b c +# / \ \ +# d e f +# / \ \ +# g h i +(my $abe = $tmp->subdir(qw(a b e)))->mkpath; +(my $acf = $tmp->subdir(qw(a c f)))->mkpath; +$acf->file('i')->touch; +$abe->file('h')->touch; +$abe->file('g')->touch; +$tmp->file(qw(a b d))->touch; + +my $a = $tmp->subdir('a'); + +my $nnodes = $a->traverse(sub { + my ($child, $cont) = @_; + return sum($cont->(), 1); +}); +is($nnodes, 9); + +my $ndirs = $a->traverse(sub { + my ($child, $cont) = @_; + return sum($cont->(), ($child->is_dir ? 1 : 0)); +}); +is($ndirs, 5); + +my $max_depth = $a->traverse(sub { + my ($child, $cont, $depth) = @_; + return max($cont->($depth + 1), $depth); +}, 0); +is($max_depth, 3); + +sub sum { my $total = 0; $total += $_ for @_; $total } +sub max { my $max = 0; for (@_) { $max = $_ if $_ > $max } $max } -- 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-MooseX-Role-Parameterized for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-MooseX-Role-Parameterized for openSUSE:Factory checked in at 2012-03-01 17:25:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MooseX-Role-Parameterized (Old) and /work/SRC/openSUSE:Factory/.perl-MooseX-Role-Parameterized.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MooseX-Role-Parameterized", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MooseX-Role-Parameterized/perl-MooseX-Role-Parameterized.changes 2011-12-21 10:02:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-MooseX-Role-Parameterized.new/perl-MooseX-Role-Parameterized.changes 2012-03-01 17:25:11.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Feb 27 10:09:25 UTC 2012 - coolo(a)suse.com + +- updated to 1.00 + * MooseX::Role::Parameterized now depends on Moose 2.0300 + released 2011-09-23 for its several core improvements, hence the + major version number bump. + * MXRP now uses the new meta_lookup feature added to Moose 2.0300 + (specifically for MXRP) to avoid duplicating Moose-0.60-era + Moose::Role sugar. This means the error messages you get are + better, and there's a lot less ugly code in MXRP. + * Remove alias/excludes special case errors. They have long since been + replaced in core Moose by -alias and -excludes, and were finally + removed in Moose 2.0200. + * Expressly forbid using role { } inside role { } (which makes no + sense but I suppose you could accidentally trigger it) + * Documentation fix from cweyl(a)alumni.drew.edu + https://github.com/sartak/MooseX-Role-Parameterized/pull/5 + +------------------------------------------------------------------- Old: ---- MooseX-Role-Parameterized-0.27.tar.gz New: ---- MooseX-Role-Parameterized-1.00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MooseX-Role-Parameterized.spec ++++++ --- /var/tmp/diff_new_pack.0QHeDY/_old 2012-03-01 17:25:12.000000000 +0100 +++ /var/tmp/diff_new_pack.0QHeDY/_new 2012-03-01 17:25:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-MooseX-Role-Parameterized # -# 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,11 +17,11 @@ Name: perl-MooseX-Role-Parameterized -Version: 0.27 +Version: 1.00 Release: 0 %define cpan_name MooseX-Role-Parameterized Summary: Roles with composition parameters -License: GPL-1.0+ or Artistic-1.0 +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/MooseX-Role-Parameterized/ Source: http://www.cpan.org/authors/id/S/SA/SARTAK/%{cpan_name}-%{version}.tar.gz @@ -30,11 +30,47 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Moose) >= 0.78 +BuildRequires: perl(Moose) >= 2.0300 BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::Moose) BuildRequires: perl(Test::More) >= 0.96 -Requires: perl(Moose) >= 0.78 +#BuildRequires: perl(Bar) +#BuildRequires: perl(Foo) +#BuildRequires: perl(Foo::Role) +#BuildRequires: perl(inc::Module::Install) +#BuildRequires: perl(JSON) +#BuildRequires: perl(LWP::Simple) +#BuildRequires: perl(Module::Build) +#BuildRequires: perl(Module::Install::AutoManifest) +#BuildRequires: perl(Module::Install::Base) +#BuildRequires: perl(Module::Install::GithubMeta) +#BuildRequires: perl(Module::Install::ManifestSkip) +#BuildRequires: perl(Moose::Exporter) +#BuildRequires: perl(Moose::Meta::Role) +#BuildRequires: perl(Moose::Role) +#BuildRequires: perl(Moose::Util::TypeConstraints) +#BuildRequires: perl(MooseX::Role::Parameterized) +#BuildRequires: perl(MooseX::Role::Parameterized::Meta::Role::Parameterizable) +#BuildRequires: perl(MooseX::Role::Parameterized::Meta::Role::Parameterized) +#BuildRequires: perl(MooseX::Role::Parameterized::Meta::Trait::Parameterized) +#BuildRequires: perl(MooseX::Role::Parameterized::Parameters) +#BuildRequires: perl(MyCompositeRoleA) +#BuildRequires: perl(MyItem::Role::Equippable) +#BuildRequires: perl(MyItem::Role::Wearable) +#BuildRequires: perl(MyPRole) +#BuildRequires: perl(MyRole) +#BuildRequires: perl(MyRole::Delegator) +#BuildRequires: perl(MyRole::LogMethod) +#BuildRequires: perl(MyRole::Parameterized) +#BuildRequires: perl(MyRole::Sans::Block) +#BuildRequires: perl(MyRole::Storage) +#BuildRequires: perl(MyTrait) +#BuildRequires: perl(OtherRole) +#BuildRequires: perl(Parse::CPAN::Meta) +#BuildRequires: perl(P::Role) +#BuildRequires: perl(Test::Consumer) +#BuildRequires: perl(YAML::Tiny) +Requires: perl(Moose) >= 2.0300 %{perl_requires} %description @@ -81,9 +117,6 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) %doc Changes ++++++ MooseX-Role-Parameterized-0.27.tar.gz -> MooseX-Role-Parameterized-1.00.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Role-Parameterized-0.27/Changes new/MooseX-Role-Parameterized-1.00/Changes --- old/MooseX-Role-Parameterized-0.27/Changes 2011-08-22 20:58:49.000000000 +0200 +++ new/MooseX-Role-Parameterized-1.00/Changes 2012-01-12 18:46:02.000000000 +0100 @@ -1,5 +1,22 @@ Changes for MooseX-Role-Parameterized +1.00 January 12, 2012 + * MooseX::Role::Parameterized now depends on Moose 2.0300 + released 2011-09-23 for its several core improvements, hence the + major version number bump. + + * MXRP now uses the new meta_lookup feature added to Moose 2.0300 + (specifically for MXRP) to avoid duplicating Moose-0.60-era + Moose::Role sugar. This means the error messages you get are + better, and there's a lot less ugly code in MXRP. + * Remove alias/excludes special case errors. They have long since been + replaced in core Moose by -alias and -excludes, and were finally + removed in Moose 2.0200. + * Expressly forbid using role { } inside role { } (which makes no + sense but I suppose you could accidentally trigger it) + * Documentation fix from cweyl(a)alumni.drew.edu + https://github.com/sartak/MooseX-Role-Parameterized/pull/5 + 0.27 August 22, 2011 * Remove MooseX::Role::Parameterized::Meta::Parameter; instead, the default for parameters of (is => 'ro') is set by the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Role-Parameterized-0.27/META.yml new/MooseX-Role-Parameterized-1.00/META.yml --- old/MooseX-Role-Parameterized-0.27/META.yml 2011-08-22 20:58:54.000000000 +0200 +++ new/MooseX-Role-Parameterized-1.00/META.yml 2012-01-12 18:45:11.000000000 +0100 @@ -21,7 +21,7 @@ - inc - t requires: - Moose: 0.78 + Moose: 2.0300 perl: 5.8.1 resources: homepage: http://github.com/sartak/MooseX-Role-Parameterized/tree @@ -30,4 +30,4 @@ type: git url: git://github.com/sartak/MooseX-Role-Parameterized.git web: http://github.com/sartak/MooseX-Role-Parameterized/tree -version: 0.27 +version: 1.00 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Role-Parameterized-0.27/Makefile.PL new/MooseX-Role-Parameterized-1.00/Makefile.PL --- old/MooseX-Role-Parameterized-0.27/Makefile.PL 2011-08-22 20:58:49.000000000 +0200 +++ new/MooseX-Role-Parameterized-1.00/Makefile.PL 2011-09-26 20:54:02.000000000 +0200 @@ -9,7 +9,7 @@ all_from 'lib/MooseX/Role/Parameterized.pm'; githubmeta; -requires 'Moose' => '0.78'; +requires 'Moose' => '2.0300'; test_requires 'Test::Moose'; test_requires 'Test::More' => '0.96'; test_requires 'Test::Fatal'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Role-Parameterized-0.27/lib/MooseX/Role/Parameterized/Meta/Role/Parameterizable.pm new/MooseX-Role-Parameterized-1.00/lib/MooseX/Role/Parameterized/Meta/Role/Parameterizable.pm --- old/MooseX-Role-Parameterized-0.27/lib/MooseX/Role/Parameterized/Meta/Role/Parameterizable.pm 2011-08-22 20:58:49.000000000 +0200 +++ new/MooseX-Role-Parameterized-1.00/lib/MooseX/Role/Parameterized/Meta/Role/Parameterizable.pm 2012-01-12 18:38:14.000000000 +0100 @@ -7,7 +7,11 @@ use MooseX::Role::Parameterized::Meta::Role::Parameterized; use MooseX::Role::Parameterized::Parameters; -use constant parameterized_role_metaclass => 'MooseX::Role::Parameterized::Meta::Role::Parameterized'; +has parameterized_role_metaclass => ( + is => 'ro', + isa => 'ClassName', + default => 'MooseX::Role::Parameterized::Meta::Role::Parameterized', +); has parameters_class => ( is => 'ro', @@ -19,15 +23,11 @@ is => 'rw', isa => 'Moose::Meta::Class', lazy => 1, - default => sub { - my $self = shift; - - $self->parameters_class->meta->create_anon_class( - superclasses => [$self->parameters_class], - ); - }, + builder => '_build_parameters_metaclass', handles => { - has_parameter => 'has_attribute', + has_parameter => 'has_attribute', + add_parameter => 'add_attribute', + construct_parameters => 'new_object', }, ); @@ -37,30 +37,12 @@ predicate => 'has_role_generator', ); -sub add_parameter { +sub _build_parameters_metaclass { my $self = shift; - my $name = shift; - - confess "You must provide a name for the parameter" - if !defined($name); - confess "The parameter name ($name) is currently forbidden" - if $name eq 'alias' - || $name eq 'excludes'; - - $self->parameters_metaclass->add_attribute($name => @_); -} - -sub construct_parameters { - my $self = shift; - my %args = @_; - - for my $name ('alias', 'excludes') { - confess "The parameter name ($name) is currently forbidden" - if exists $args{$name}; - } - - $self->parameters_metaclass->new_object(\%args); + return $self->parameters_class->meta->create_anon_class( + superclasses => [$self->parameters_class], + ); } sub generate_role { @@ -146,14 +128,19 @@ =head1 DESCRIPTION -This is the metaclass for parameterizable roles, roles that have their -parameters currently unbound. These are the roles that you use L<Moose/with>, -but instead of composing the parameterizable role, we construct a new -parameterized role -(L<MooseX::Role::Parameterized::Meta::Role::Parameterized>). +This is the metaclass for parameterizable roles, roles that have +their parameters currently unbound. These are the roles that you +use L<Moose/with>, but instead of composing the parameterizable +role, we construct a new parameterized role +(L<MooseX::Role::Parameterized::Meta::Role::Parameterized>) and use +that new parameterized instead. =head1 ATTRIBUTES +=head2 parameterized_role_metaclass + +The name of the class that will be used to construct the parameterized role. + =head2 parameters_class The name of the class that will be used to construct the parameters object. @@ -177,9 +164,8 @@ =head2 add_parameter $name, %options -Basically delegates to L<Moose::Meta::Class/add_attribute> on the -L</parameters_metaclass> but with error messages that refer to a "parameter" -not an "attribute". +Delegates to L<Moose::Meta::Class/add_attribute> on the +L</parameters_metaclass> object. =head2 construct_parameters %arguments @@ -190,11 +176,27 @@ =head2 generate_role %arguments -Returns a new instance of -L<MooseX::Role::Parameterized::Meta::Role::Parameterized> based on the -arguments. The arguments are a hash reference of C<parameters> and, if -available, a C<consumer> metaobject. A C<package> argument may be given to use -a specific package name instead of autogenerating one. +This method generates and returns a new instance of +L</parameterized_role_metaclass>. It can take any combination of +three named parameters: + +=over 4 + +=item arguments + +A hashref of parameters for the role, same as would be passed in at a "with" +statement. + +=item package + +A package name that, if present, we will use for the generated role; if not, +we generate an anonymous role. + +=item consumer + +A consumer metaobject, if available. + +=back =head2 apply diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Role-Parameterized-0.27/lib/MooseX/Role/Parameterized/Tutorial.pod new/MooseX-Role-Parameterized-1.00/lib/MooseX/Role/Parameterized/Tutorial.pod --- old/MooseX-Role-Parameterized-0.27/lib/MooseX/Role/Parameterized/Tutorial.pod 2011-04-22 22:28:58.000000000 +0200 +++ new/MooseX-Role-Parameterized-1.00/lib/MooseX/Role/Parameterized/Tutorial.pod 2011-08-29 18:20:30.000000000 +0200 @@ -29,10 +29,11 @@ =head3 C<with> -The syntax of a class consuming a parameterized role has not changed from the -standard C<with>. You pass in parameters just like you pass in C<-alias> and -C<-excludes> to ordinary roles (though without hyphens, since these are not -core Moose composition parameters): +The syntax of a class consuming a parameterized role has not changed +from the standard C<with>. You pass in parameters just like you +pass in C<-alias> and C<-excludes> to ordinary roles (though your +custom parameters do not get hyphens, since these are not core Moose +composition parameters): with 'MyRole::InstrumentMethod' => { method_name => 'dbh_do', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Role-Parameterized-0.27/lib/MooseX/Role/Parameterized.pm new/MooseX-Role-Parameterized-1.00/lib/MooseX/Role/Parameterized.pm --- old/MooseX-Role-Parameterized-0.27/lib/MooseX/Role/Parameterized.pm 2011-08-22 20:58:49.000000000 +0200 +++ new/MooseX-Role-Parameterized-1.00/lib/MooseX/Role/Parameterized.pm 2012-01-12 18:44:03.000000000 +0100 @@ -3,29 +3,28 @@ use Moose::Role (); use Moose::Exporter; use Carp 'confess'; -use Scalar::Util 'blessed'; use MooseX::Role::Parameterized::Meta::Role::Parameterizable; -our $VERSION = '0.27'; +our $VERSION = '1.00'; our $CURRENT_METACLASS; +sub current_metaclass { $CURRENT_METACLASS } + Moose::Exporter->setup_import_methods( - with_caller => ['parameter', 'role', 'method', 'has', 'with', 'extends', - 'requires', 'excludes', 'augment', 'inner', 'before', - 'after', 'around', 'super', 'override'], - as_is => [ 'confess', 'blessed' ], + also => 'Moose::Role', + with_caller => ['parameter', 'role'], + with_meta => ['method'], + meta_lookup => sub { current_metaclass || Class::MOP::class_of(shift) }, ); -sub current_metaclass { $CURRENT_METACLASS } - sub parameter { my $caller = shift; confess "'parameter' may not be used inside of the role block" - if $CURRENT_METACLASS && $CURRENT_METACLASS->genitor->name eq $caller; + if current_metaclass && current_metaclass->genitor->name eq $caller; - my $meta = Class::MOP::class_of($caller); + my $meta = Class::MOP::class_of($caller); my $names = shift; $names = [$names] if !ref($names); @@ -41,6 +40,10 @@ sub role (&) { my $caller = shift; my $role_generator = shift; + + confess "'role' may not be used inside of the role block" + if current_metaclass && current_metaclass->genitor->name eq $caller; + Class::MOP::class_of($caller)->role_generator($role_generator); } @@ -52,27 +55,13 @@ return Moose::Role->init_meta(%options); } -sub has { - my $caller = shift; - my $meta = $CURRENT_METACLASS || Class::MOP::class_of($caller); - - my $names = shift; - $names = [$names] if !ref($names); - - for my $name (@$names) { - $meta->add_attribute($name, @_); - } -} - sub method { - my $caller = shift; - my $meta = $CURRENT_METACLASS || Class::MOP::class_of($caller); - - my $name = shift; - my $body = shift; + my $meta = shift; + my $name = shift; + my $body = shift; my $method = $meta->method_metaclass->wrap( - package_name => $caller, + package_name => $meta->name, name => $name, body => $body, ); @@ -80,79 +69,6 @@ $meta->add_method($name => $method); } -sub _add_method_modifier { - my $type = shift; - my $caller = shift; - my $meta = $CURRENT_METACLASS || Class::MOP::class_of($caller); - - my $code = pop @_; - - for (@_) { - Carp::croak "Roles do not currently support " - . ref($_) - . " references for $type method modifiers" - if ref $_; - - my $add_method = "add_${type}_method_modifier"; - $meta->$add_method($_, $code); - } -} - -sub before { - _add_method_modifier('before', @_); -} - -sub after { - _add_method_modifier('after', @_); -} - -sub around { - _add_method_modifier('around', @_); -} - -sub with { - my $caller = shift; - my $meta = $CURRENT_METACLASS || Class::MOP::class_of($caller); - - Moose::Util::apply_all_roles($meta, @_); -} - -sub requires { - my $caller = shift; - my $meta = $CURRENT_METACLASS || Class::MOP::class_of($caller); - - Carp::croak "Must specify at least one method" unless @_; - $meta->add_required_methods(@_); -} - -sub excludes { - my $caller = shift; - my $meta = $CURRENT_METACLASS || Class::MOP::class_of($caller); - - Carp::croak "Must specify at least one role" unless @_; - $meta->add_excluded_roles(@_); -} - -# see Moose.pm for discussion -sub super { - return unless $Moose::SUPER_BODY; - $Moose::SUPER_BODY->(@Moose::SUPER_ARGS); -} - -sub override { - my $caller = shift; - my $meta = $CURRENT_METACLASS || Class::MOP::class_of($caller); - - my ($name, $code) = @_; - $meta->add_override_method_modifier($name, $code); -} - -sub extends { Carp::croak "Roles do not currently support 'extends'" } - -sub inner { Carp::croak "Roles cannot support 'inner'" } - -sub augment { Carp::croak "Roles cannot support 'augment'" } - 1; __END__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Role-Parameterized-0.27/t/100-erroneous-keywords.t new/MooseX-Role-Parameterized-1.00/t/100-erroneous-keywords.t --- old/MooseX-Role-Parameterized-0.27/t/100-erroneous-keywords.t 2011-08-22 20:52:36.000000000 +0200 +++ new/MooseX-Role-Parameterized-1.00/t/100-erroneous-keywords.t 2011-08-29 18:23:15.000000000 +0200 @@ -10,12 +10,12 @@ ::like( ::exception { parameter() - }, qr/^You must provide a name for the parameter/); + }, qr/^You must provide a name for the attribute/); role { ::like( ::exception { extends 'MyRole::Parameterized'; - }, qr/^Roles do not currently support 'extends'/); + }, qr/^Roles do not support 'extends' $you can use 'with' to specialize a role$/); ::like( ::exception { inner() }, qr/^Roles cannot support 'inner'/); @@ -25,6 +25,9 @@ ::like( ::exception { parameter() }, qr/^'parameter' may not be used inside of the role block/); + ::like( ::exception { + role {} + }, qr/^'role' may not be used inside of the role block/); }; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Role-Parameterized-0.27/t/101-alias-excludes.t new/MooseX-Role-Parameterized-1.00/t/101-alias-excludes.t --- old/MooseX-Role-Parameterized-0.27/t/101-alias-excludes.t 2011-04-22 22:54:24.000000000 +0200 +++ new/MooseX-Role-Parameterized-1.00/t/101-alias-excludes.t 2011-08-29 18:22:12.000000000 +0200 @@ -8,30 +8,32 @@ package MyRole; use MooseX::Role::Parameterized; - ::like( ::exception { + ::is( ::exception { parameter 'alias'; - }, qr/^The parameter name $alias$ is currently forbidden/); + }, undef); - ::like( ::exception { + ::is( ::exception { parameter 'excludes'; - }, qr/^The parameter name $excludes$ is currently forbidden/); + }, undef); + + role { } }; do { package MyClass; use Moose; - ::like( ::exception { + ::is( ::exception { with MyRole => { alias => 1, }; - }, qr/^The parameter name $alias$ is currently forbidden/); + }, undef); - ::like( ::exception { + ::is( ::exception { with MyRole => { excludes => 1, }; - }, qr/^The parameter name $excludes$ is currently forbidden/); + }, undef); }; 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 perl-Modern-Perl for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-Modern-Perl for openSUSE:Factory checked in at 2012-03-01 17:25:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Modern-Perl (Old) and /work/SRC/openSUSE:Factory/.perl-Modern-Perl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Modern-Perl", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Modern-Perl/perl-Modern-Perl.changes 2011-11-21 12:43:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Modern-Perl.new/perl-Modern-Perl.changes 2012-03-01 17:25:05.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 20 10:48:53 UTC 2012 - coolo(a)suse.com + +- updated to 1.20120130 + - fixed t/year_imports.t for 5.10 (ANDK and sprout again) + - fixed t/regressions.t for 5.10 + - made raw numbers work in import + - fixed for Perl 5.15.5 and later (ANDK and sprout) + - loaded IO::File/IO::Handle to allow methods on lexical filehandles + - added unimporting + - removed use of autodie; moved it to a distribution prerequisite + - enabled unicode_strings by default when your Perl supports it + - migrated to Dist::Zilla + - added autodie dependency/import + +------------------------------------------------------------------- Old: ---- Modern-Perl-1.03.tar.gz New: ---- Modern-Perl-1.20120130.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Modern-Perl.spec ++++++ --- /var/tmp/diff_new_pack.YCeazr/_old 2012-03-01 17:25:06.000000000 +0100 +++ /var/tmp/diff_new_pack.YCeazr/_new 2012-03-01 17:25:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Modern-Perl # -# 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,26 +16,32 @@ # - Name: perl-Modern-Perl -Version: 1.03 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 1.20120130 +Release: 0 %define cpan_name Modern-Perl -Summary: enable all of the features of Modern Perl with one command -Url: http://search.cpan.org/dist/Modern-Perl/ +Summary: enable all of the features of Modern Perl with one import +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Modern-Perl-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/Modern-Perl/ +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Module::Build) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: perl(Module::Build) >= 0.3601 +BuildRequires: perl(Test::More) >= 0.98 +BuildRequires: perl(autodie) >= 2.10 +BuildRequires: perl(feature) +BuildRequires: perl(mro) +#BuildRequires: perl(Modern::Perl) >= 2010 +Requires: perl(autodie) >= 2.10 +Requires: perl(feature) +Requires: perl(mro) %{perl_requires} %description -sorry, no description found +enable all of the features of Modern Perl with one import %prep %setup -q -n %{cpan_name}-%{version} @@ -51,11 +57,8 @@ ./Build install destdir=%{buildroot} create_packlist=0 %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) -%doc Changes README +%defattr(-,root,root,755) +%doc Changes LICENSE README %changelog ++++++ Modern-Perl-1.03.tar.gz -> Modern-Perl-1.20120130.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/Build.PL new/Modern-Perl-1.20120130/Build.PL --- old/Modern-Perl-1.03/Build.PL 2009-02-18 01:43:58.000000000 +0100 +++ new/Modern-Perl-1.20120130/Build.PL 2012-01-30 20:38:10.000000000 +0100 @@ -1,20 +1,43 @@ -BEGIN { require 5.010 } use strict; use warnings; -use Module::Build; +use Module::Build 0.3601; -my $builder = Module::Build->new( - module_name => 'Modern::Perl', - license => 'perl', - dist_author => 'chromatic <chromatic(a)wgz.org>', - dist_version_from => 'lib/Modern/Perl.pm', - build_requires => { - 'Test::Simple' => 0.80, - 'perl' => 5.010, - }, - add_to_cleanup => [ 'Modern-Perl-*' ], + +my %module_build_args = ( + "build_requires" => { + "Module::Build" => "0.3601", + "Test::More" => "0.98" + }, + "configure_requires" => { + "ExtUtils::MakeMaker" => "6.30", + "Module::Build" => "0.3601" + }, + "dist_abstract" => "enable all of the features of Modern Perl with one import", + "dist_author" => [ + "chromatic" + ], + "dist_name" => "Modern-Perl", + "dist_version" => "1.20120130", + "license" => "perl", + "module_name" => "Modern::Perl", + "recommends" => {}, + "recursive_test_files" => 1, + "requires" => { + "IO::File" => 0, + "IO::Handle" => 0, + "autodie" => "2.10", + "feature" => 0, + "mro" => 0, + "perl" => "5.010", + "strict" => 0, + "warnings" => 0 + }, + "script_files" => [] ); -$builder->create_build_script(); + +my $build = Module::Build->new(%module_build_args); + +$build->create_build_script; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/Changes new/Modern-Perl-1.20120130/Changes --- old/Modern-Perl-1.03/Changes 2009-02-18 01:43:58.000000000 +0100 +++ new/Modern-Perl-1.20120130/Changes 2012-01-30 20:38:10.000000000 +0100 @@ -1,5 +1,27 @@ Revision history for Modern::Perl +1.20120130 2012-01-30 11:38:08 America/Los_Angeles + - fixed t/year_imports.t for 5.10 (ANDK and sprout again) + +1.20120126 2012-01-25 22:15:50 America/Los_Angeles + - fixed t/regressions.t for 5.10 + +1.20120123 2012-01-23 10:16:10 America/Los_Angeles + - made raw numbers work in import + +1.20120119 2012-01-19 15:01:10 America/Los_Angeles + - fixed for Perl 5.15.5 and later (ANDK and sprout) + +1.20120106 2012-01-05 16:26:09 America/Los_Angeles + - loaded IO::File/IO::Handle to allow methods on lexical filehandles + - added unimporting + - removed use of autodie; moved it to a distribution prerequisite + - enabled unicode_strings by default when your Perl supports it + +1.20120105 2012-01-04 21:01:10 America/Los_Angeles + - migrated to Dist::Zilla + - added autodie dependency/import + 1.03 Wed Feb 18 00:40:40 UTC 2009 - removed duplicate use lines (Damien Learns Perl) - fixed (hopefully) v-string warnings (Damien, David Moreno) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/LICENSE new/Modern-Perl-1.20120130/LICENSE --- old/Modern-Perl-1.03/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/Modern-Perl-1.20120130/LICENSE 2012-01-30 20:38:10.000000000 +0100 @@ -0,0 +1,379 @@ +This software is copyright (c) 2012 by chromatic(a)wgz.org. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +Terms of the Perl programming language system itself + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" + +--- The GNU General Public License, Version 1, February 1989 --- + +This software is Copyright (c) 2012 by chromatic(a)wgz.org. + +This is free software, licensed under: + + The GNU General Public License, Version 1, February 1989 + + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The license agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our 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. The +General Public License applies to the Free Software Foundation's +software and to any other program whose authors commit to using it. +You can use it for your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public License is designed to make +sure that you have the freedom to give away or sell copies of free +software, 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 a 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 tell them 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. + + 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 Agreement 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 work containing the +Program or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 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 +General Public License and to the absence of any warranty; and give any +other recipients of the Program a copy of this General Public License +along with the Program. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Program or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Program or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public License (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual 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 General + Public License. + + d) 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. + +Mere aggregation of another independent work with the Program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 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 + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Program except as expressly provided under this General Public License. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Program is void, and will automatically terminate your rights to use +the Program under this License. However, parties who have received +copies, or rights to use copies, from you under this General Public +License will not have their licenses terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying 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. + + 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. + + 7. 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 the 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 +the license, you may choose any version ever published by the Free Software +Foundation. + + 8. 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 + + 9. 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. + + 10. 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 + + Appendix: 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 humanity, 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) 19yy <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 1, 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) 19xx 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 a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! + + +--- The Artistic License 1.0 --- + +This software is Copyright (c) 2012 by chromatic(a)wgz.org. + +This is free software, licensed under: + + The Artistic License 1.0 + +The Artistic License + +Preamble + +The intent of this document is to state the conditions under which a Package +may be copied, such that the Copyright Holder maintains some semblance of +artistic control over the development of the package, while giving the users of +the package the right to use and distribute the Package in a more-or-less +customary fashion, plus the right to make reasonable modifications. + +Definitions: + + - "Package" refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created through + textual modification. + - "Standard Version" refers to such a Package if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder. + - "Copyright Holder" is whoever is named in the copyright or copyrights for + the package. + - "You" is you, if you're thinking about copying or distributing this Package. + - "Reasonable copying fee" is whatever you can justify on the basis of media + cost, duplication charges, time of people involved, and so on. (You will + not be required to justify it to the Copyright Holder, but only to the + computing community at large as a market that must bear the fee.) + - "Freely Available" means that no fee is charged for the item itself, though + there may be fees involved in handling the item. It also means that + recipients of the item may redistribute it under the same conditions they + received it. + +1. You may make and give away verbatim copies of the source form of the +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes and other modifications derived +from the Public Domain or from the Copyright Holder. A Package modified in such +a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided that +you insert a prominent notice in each changed file stating how and when you +changed that file, and provided that you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided, and provide a separate + manual page for each non-standard executable that clearly documents how it + differs from the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or executable +form, provided that you do at least ONE of the following: + + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where to + get the Standard Version. + + b) accompany the distribution with the machine-readable source of the Package + with your modifications. + + c) accompany any non-standard executables with their corresponding Standard + Version executables, giving the non-standard executables non-standard + names, and clearly documenting the differences in manual pages (or + equivalent), together with instructions on where to get the Standard + Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this Package. You +may not charge a fee for this Package itself. However, you may distribute this +Package in aggregate with other (possibly commercial) programs as part of a +larger (possibly commercial) software distribution provided that you do not +advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as output +from the programs of this Package do not automatically fall under the copyright +of this Package, but belong to whomever generated them, and may be sold +commercially, and may be aggregated with this Package. + +7. C or perl subroutines supplied by you and linked into this Package shall not +be considered part of this Package. + +8. The name of the Copyright Holder may not be used to endorse or promote +products derived from this software without specific prior written permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +The End + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/MANIFEST new/Modern-Perl-1.20120130/MANIFEST --- old/Modern-Perl-1.03/MANIFEST 2009-02-18 01:43:58.000000000 +0100 +++ new/Modern-Perl-1.20120130/MANIFEST 2012-01-30 20:38:10.000000000 +0100 @@ -1,7 +1,13 @@ Build.PL Changes +LICENSE MANIFEST +META.yml +Makefile.PL README +dist.ini lib/Modern/Perl.pm t/base.t -META.yml +t/regressions.t +t/unimport.t +t/year_imports.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/META.yml new/Modern-Perl-1.20120130/META.yml --- old/Modern-Perl-1.03/META.yml 2009-02-18 01:43:58.000000000 +0100 +++ new/Modern-Perl-1.20120130/META.yml 2012-01-30 20:38:10.000000000 +0100 @@ -1,20 +1,30 @@ --- -name: Modern-Perl -version: 1.03 +abstract: 'enable all of the features of Modern Perl with one import' author: - - 'chromatic <chromatic(a)wgz.org>' -abstract: enable all of the features of Modern Perl with one command -license: perl -resources: - license: ~ + - chromatic build_requires: - Test::Simple: 0.8 - perl: 5.01 -provides: - Modern::Perl: - file: lib/Modern/Perl.pm - version: 1.03 -generated_by: Module::Build version 0.31 + Module::Build: 0.3601 + Test::More: 0.98 +configure_requires: + ExtUtils::MakeMaker: 6.30 + Module::Build: 0.3601 +dynamic_config: 0 +generated_by: 'Dist::Zilla version 4.300006, CPAN::Meta::Converter version 2.113640' +license: perl meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.2.html - version: 1.2 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Modern-Perl +requires: + IO::File: 0 + IO::Handle: 0 + autodie: 2.10 + feature: 0 + mro: 0 + perl: 5.010 + strict: 0 + warnings: 0 +resources: + homepage: https://github.com/chromatic/Modern-Perl + repository: https://github.com/chromatic/Modern-Perl.git +version: 1.20120130 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/Makefile.PL new/Modern-Perl-1.20120130/Makefile.PL --- old/Modern-Perl-1.03/Makefile.PL 1970-01-01 01:00:00.000000000 +0100 +++ new/Modern-Perl-1.20120130/Makefile.PL 2012-01-30 20:38:10.000000000 +0100 @@ -0,0 +1,61 @@ + +use strict; +use warnings; + +use 5.010; + +use ExtUtils::MakeMaker 6.30; + + + +my %WriteMakefileArgs = ( + "ABSTRACT" => "enable all of the features of Modern Perl with one import", + "AUTHOR" => "chromatic", + "BUILD_REQUIRES" => { + "Module::Build" => "0.3601", + "Test::More" => "0.98" + }, + "CONFIGURE_REQUIRES" => { + "ExtUtils::MakeMaker" => "6.30", + "Module::Build" => "0.3601" + }, + "DISTNAME" => "Modern-Perl", + "EXE_FILES" => [], + "LICENSE" => "perl", + "NAME" => "Modern::Perl", + "PREREQ_PM" => { + "IO::File" => 0, + "IO::Handle" => 0, + "autodie" => "2.10", + "feature" => 0, + "mro" => 0, + "strict" => 0, + "warnings" => 0 + }, + "VERSION" => "1.20120130", + "test" => { + "TESTS" => "t/*.t" + } +); + + +unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) { + my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; + my $pp = $WriteMakefileArgs{PREREQ_PM}; + for my $mod ( keys %$br ) { + if ( exists $pp->{$mod} ) { + $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod}; + } + else { + $pp->{$mod} = $br->{$mod}; + } + } +} + +delete $WriteMakefileArgs{CONFIGURE_REQUIRES} + unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; + +WriteMakefile(%WriteMakefileArgs); + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/dist.ini new/Modern-Perl-1.20120130/dist.ini --- old/Modern-Perl-1.03/dist.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/Modern-Perl-1.20120130/dist.ini 2012-01-30 20:38:10.000000000 +0100 @@ -0,0 +1,41 @@ +name = Modern-Perl +author = chromatic +license = Perl_5 +copyright_holder = chromatic(a)wgz.org +copyright_year = 2012 + +[AutoVersion] +format = {{ cldr('1.yyyyMMdd') }} + +[AutoPrereqs] + +[Prereqs] +perl = 5.010 +autodie = 2.10 + +[@Filter] +-bundle = @Basic +-remove = Readme + +[PodWeaver] +finder = :InstallModules + +[PkgVersion] +[PodVersion] +[NextRelease] +[ModuleBuild] + +[@Git] +changelog = Changes ; this is the default +allow_dirty = dist.ini ; see Git::Check... +allow_dirty = Changes ; ... and Git::Commit +commit_msg = v%v%n%n%c ; see Git::Commit +tag_format = %v ; see Git::Tag +tag_message = %v ; see Git::Tag +push_to = origin ; see Git::Push + +[MetaResources] +homepage = https://github.com/chromatic/Modern-Perl +repository.url = https://github.com/chromatic/Modern-Perl.git +repository.web = https://github.com/chromatic/Modern-Perl +repository.type = git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/lib/Modern/Perl.pm new/Modern-Perl-1.20120130/lib/Modern/Perl.pm --- old/Modern-Perl-1.03/lib/Modern/Perl.pm 2009-02-18 01:43:58.000000000 +0100 +++ new/Modern-Perl-1.20120130/lib/Modern/Perl.pm 2012-01-30 20:38:10.000000000 +0100 @@ -1,16 +1,8 @@ package Modern::Perl; - -=head1 NAME - -Modern::Perl - enable all of the features of Modern Perl with one command - -=head1 VERSION - -Version 1.03 - -=cut - -our $VERSION = '1.03'; +{ + $Modern::Perl::VERSION = '1.20120130'; +} +# ABSTRACT: enable all of the features of Modern Perl with one import use 5.010_000; @@ -20,13 +12,82 @@ use mro (); use feature (); -sub import { +# enable methods on filehandles; unnecessary when 5.14 autoloads them +use IO::File (); +use IO::Handle (); + +our $VERSION; + +my $wanted_date; +sub VERSION +{ + my ($self, $version) = @_; + return $VERSION if $version < 2009; + + $wanted_date = $version if (caller(1))[3] =~ /::BEGIN/; + return 2012; +} + +sub import +{ + my ($class, $date) = @_; + $date = $wanted_date unless defined $date; + + my $feature_tag = validate_date( $date ); + undef $wanted_date; + warnings->import(); strict->import(); - feature->import( ':5.10' ); + feature->import( $feature_tag ); mro::set_mro( scalar caller(), 'c3' ); } +sub unimport +{ + warnings->unimport; + strict->unimport; + feature->unimport; +} + +my %dates = +( + 2009 => ':5.10', + 2010 => ':5.10', + 2011 => ':5.12', + 2012 => ':5.14', +); + +sub validate_date +{ + my $date = shift; + + # always enable unicode_strings when available + unless ($date) + { + return ':5.12' if $] > 5.011003; + return ':5.10'; + } + + my $year = substr $date, 0, 4; + return $dates{$year} if exists $dates{$year}; + + die "Unknown date '$date' requested\n"; +} + + +1; + +__END__ +=pod + +=head1 NAME + +Modern::Perl - enable all of the features of Modern Perl with one import + +=head1 VERSION + +version 1.20120130 + =head1 SYNOPSIS Modern Perl programs use several modules to enable additional features of Perl @@ -35,14 +96,45 @@ use Modern::Perl; -For now, this only enables the L<strict> and L<warnings> pragmas, as well as -all of the features available in Perl 5.10. It also enables C3 method -resolution order; see C<perldoc mro> for an explanation. In the future, it -will include additional CPAN modules which have proven useful and stable. +This enables the L<strict> and L<warnings> pragmas, as well as all of the +features available in Perl 5.10. It also enables C3 method resolution order as +documented in C<perldoc mro> and loads L<IO::File> and L<IO::Handle> so that +you may call methods on filehandles. In the future, it may include additional +core modules and pragmas. + +Because so much of this module's behavior uses lexically scoped pragmas, you +may disable these pragmas within an inner scope with: + + no Modern::Perl; See L<http://www.modernperlbooks.com/mt/2009/01/toward-a-modernperl.html> for -more information, and L<http://www.modernperlbooks.com/> for further discussion -of Modern Perl and its implications. +more information, L<http://www.modernperlbooks.com/> for further discussion of +Modern Perl and its implications, and +L<http://onyxneon.com/books/modern_perl/index.html> for a freely-downloadable +Modern Perl tutorial. + +=head2 Forward Compatibility + +For forward compatibility, I recommend you specify a I<year> as the single +optional import tag. For example: + + use Modern::Perl '2009'; + use Modern::Perl '2010'; + +... both enable 5.10 features, while: + + use Modern::Perl '2011'; + +... enables 5.12 features and: + + use Modern::Perl '2012'; + +... enables 5.14 features. Obviously you cannot use 5.14 features on earlier +versions, and Perl will throw the appropriate exception if you try. + +In the future--probably the C<Modern::Perl> 2013 timeframe--this module may +drop support for 5.10 and will complain (once per process) if you use a year +too old. =head1 AUTHOR @@ -90,17 +182,27 @@ Damian Conway (inspiration from L<Toolkit>), Florian Ragwitz (L<B::Hooks::Parser>, so I didn't have to write it myself), chocolateboy (for -suggesting that I don't even need L<B::Hooks::Parser>, at least for now), -Damien Learns Perl, David Moreno, and Evan Carroll for reporting bugs and -requesting features. +suggesting that I don't even need L<B::Hooks::Parser>), Damien Learns Perl, +David Moreno, Evan Carroll, Elliot Shank, Andreas König, and Father +Chrysostomos for reporting bugs, filing patches, and requesting features. =head1 COPYRIGHT & LICENSE -Copyright 2009 chromatic, all rights reserved. +Copyright 2009-2012 chromatic, all rights reserved. This program is free software; you can redistribute it and/or modify it -under the same terms as Perl 5.10 itself. +under the same terms as Perl 5.14 itself. + +=head1 AUTHOR + +chromatic + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 2012 by chromatic(a)wgz.org. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. =cut -1; # End of Modern::Perl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/t/base.t new/Modern-Perl-1.20120130/t/base.t --- old/Modern-Perl-1.03/t/base.t 2009-02-18 01:43:58.000000000 +0100 +++ new/Modern-Perl-1.20120130/t/base.t 2012-01-30 20:38:10.000000000 +0100 @@ -1,10 +1,16 @@ #! perl -use Test::More tests => 5; +use Test::More 0.98; BEGIN { + local $INC{'IO/File.pm'}; + local $INC{'IO/Handle.pm'}; + use_ok( 'Modern::Perl' ) or exit; + ok exists $INC{'IO/File.pm'}, 'M::P should load IO::File'; + ok exists $INC{'IO/Handle.pm'}, 'M::P should load IO::Handle'; + Modern::Perl->import(); } @@ -45,3 +51,17 @@ package main; is_deeply( mro::get_linear_isa( 'D' ), [qw( D B C A )], 'mro should use C3' ); + +if ($] > 5.011003) +{ + eval q| + use Modern::Perl; + BEGIN + { + ok exists $^H{feature_unicode}, + '... and should unilaterally enable unicode_strings, when available'; + } + |; +} + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/t/regressions.t new/Modern-Perl-1.20120130/t/regressions.t --- old/Modern-Perl-1.03/t/regressions.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Modern-Perl-1.20120130/t/regressions.t 2012-01-30 20:38:10.000000000 +0100 @@ -0,0 +1,81 @@ +#! perl + +use Test::More 0.98; + +use Modern::Perl (); + +$SIG{__WARN__} = sub +{ + return if $_[0] =~ /Number found where operator expected/; + return if $_[0] =~ /Do you need to predeclare/; + return if $_[0] =~ /future reserved word/; + warn shift +}; + +eval 'sub { given (0) {} }'; +isnt $@, '', 'use Modern::Perl () does not enable switch'; +eval 'sub { say 0 }'; +isnt $@, '', 'use Modern::Perl () does not enable say'; +eval 'state $x;'; +isnt $@, '', 'use Modern::Perl () does not enable state'; +is uc "\xdf", "\xdf", 'Modern::Perl () does not enable unicode_strings'; + +{ + use Modern::Perl 2009; + eval 'sub { given (0) {} }'; + is $@, '', q|use Modern::Perl 2009 enables switch|; + eval 'sub { say 0 }'; + is $@, '', q|use Modern::Perl 2009 enables say|; + eval 'state $x'; + is $@, '', q|use Modern::Perl 2009 enables state|; + is uc "\xdf", "\xdf", 'but not unicode_strings'; +} + +{ + use Modern::Perl 2010; + eval 'sub { given (0) {} }'; + is $@, '', q|use Modern::Perl 2010 enables switch|; + eval 'sub { say 0 }'; + is $@, '', q|use Modern::Perl 2010 enables say|; + eval 'state $x'; + is $@, '', q|use Modern::Perl 2010 enables state|; + is uc "\xdf", "\xdf", 'but not unicode_strings'; +} + +if ($] >= 5.012) +{ + eval <<'END_HERE'; + use Modern::Perl 2011; + eval 'sub { given (0) {} }'; + is $@, '', q|use Modern::Perl 2011 enables switch|; + eval 'sub { say 0 }'; + is $@, '', q|use Modern::Perl 2011 enables say|; + eval 'state $x'; + is $@, '', q|use Modern::Perl 2011 enables state|; + is uc "\xdf", "SS", '2011 enables unicode_strings'; +END_HERE +} + +if ($] >= 5.014) +{ + eval <<'END_HERE'; + use Modern::Perl 2012; + eval 'sub { given (0) {} }'; + is $@, '', q|use Modern::Perl 2012 enables switch|; + eval 'sub { say 0 }'; + is $@, '', q|use Modern::Perl 2012 enables say|; + eval 'state $x'; + is $@, '', q|use Modern::Perl 2012 enables state|; + is uc "\xdf", "SS", '2012 enables unicode_strings'; +END_HERE +} + +eval 'sub { given (0) {} }'; +isnt $@, "", 'switch feature does not leak out'; +eval 'sub { say 0 }'; +isnt $@, '', 'say feature does not leak out'; +eval 'state $x'; +isnt $@, '', 'state feature does not leak out'; +is uc "\xdf", "\xdf", 'unicode_strings feature does not leak out'; + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/t/unimport.t new/Modern-Perl-1.20120130/t/unimport.t --- old/Modern-Perl-1.03/t/unimport.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Modern-Perl-1.20120130/t/unimport.t 2012-01-30 20:38:10.000000000 +0100 @@ -0,0 +1,24 @@ +#! perl + +use Test::More 0.98; +use Modern::Perl; + +eval 'say "# say() should be available";'; +is $@, '', 'say() should be available'; + +{ + no Modern::Perl; + eval 'say "# say() should be unavailable when unimported"'; + like $@, qr/syntax error.+near "say /, + 'unimport should disable say feature'; + eval '$x = 1'; + is $@, '', 'unimport should disable strictures'; + + my $warnings; + local $SIG{__WARN__} = sub { $warnings = shift }; + my $y =~ s/hi//; + unlike $warnings, qr/Use of uninitialized value/, + 'unimport should disable warnings'; +} + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Modern-Perl-1.03/t/year_imports.t new/Modern-Perl-1.20120130/t/year_imports.t --- old/Modern-Perl-1.03/t/year_imports.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Modern-Perl-1.20120130/t/year_imports.t 2012-01-30 20:38:10.000000000 +0100 @@ -0,0 +1,81 @@ +#! perl + +use Test::More 0.98; + +use Modern::Perl (); + +$SIG{__WARN__} = sub +{ + return if $_[0] =~ /Number found where operator expected/; + return if $_[0] =~ /Do you need to predeclare/; + return if $_[0] =~ /future reserved word/; + warn shift +}; + +eval 'sub { given (0) {} }'; +isnt $@, '', 'use Modern::Perl () does not enable switch'; +eval 'sub { say 0 }'; +isnt $@, '', 'use Modern::Perl () does not enable say'; +eval 'state $x;'; +isnt $@, '', 'use Modern::Perl () does not enable state'; +is uc "\xdf", "\xdf", 'Modern::Perl () does not enable unicode_strings'; + +{ + use Modern::Perl '2009'; + eval 'sub { given (0) {} }'; + is $@, '', q|use Modern::Perl '2009' enables switch|; + eval 'sub { say 0 }'; + is $@, '', q|use Modern::Perl '2009' enables say|; + eval 'state $x'; + is $@, '', q|use Modern::Perl '2009' enables state|; + is uc "\xdf", "\xdf", 'but not unicode_strings'; +} + +{ + use Modern::Perl '2010'; + eval 'sub { given (0) {} }'; + is $@, '', q|use Modern::Perl '2010' enables switch|; + eval 'sub { say 0 }'; + is $@, '', q|use Modern::Perl '2010' enables say|; + eval 'state $x'; + is $@, '', q|use Modern::Perl '2010' enables state|; + is uc "\xdf", "\xdf", 'but not unicode_strings'; +} + +if ($] >= 5.012) +{ + eval q{ + use Modern::Perl '2011'; + eval 'sub { given (0) {} }'; + is $@, '', q|use Modern::Perl '2011' enables switch|; + eval 'sub { say 0 }'; + is $@, '', q|use Modern::Perl '2011' enables say|; + eval 'state $x'; + is $@, '', q|use Modern::Perl '2011' enables state|; + is uc "\xdf", "SS", '2011 enables unicode_strings'; + }; +} + +if ($] >= 5.014) +{ + eval q{ + use Modern::Perl '2012'; + eval 'sub { given (0) {} }'; + is $@, '', q|use Modern::Perl '2012' enables switch|; + eval 'sub { say 0 }'; + is $@, '', q|use Modern::Perl '2012' enables say|; + eval 'state $x'; + is $@, '', q|use Modern::Perl '2012' enables state|; + is uc "\xdf", "SS", '2012 enables unicode_strings'; + }; +} + +eval 'sub { given (0) {} }'; +isnt $@, "", 'switch feature does not leak out'; +eval 'sub { say 0 }'; +isnt $@, '', 'say feature does not leak out'; +eval 'state $x'; +isnt $@, '', 'state feature does not leak out'; +is uc "\xdf", "\xdf", 'unicode_strings feature does not leak out'; + +done_testing; -- 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-LWP-Protocol-https for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-LWP-Protocol-https for openSUSE:Factory checked in at 2012-03-01 17:24:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-LWP-Protocol-https (Old) and /work/SRC/openSUSE:Factory/.perl-LWP-Protocol-https.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-LWP-Protocol-https", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-LWP-Protocol-https/perl-LWP-Protocol-https.changes 2011-09-23 12:37:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-LWP-Protocol-https.new/perl-LWP-Protocol-https.changes 2012-03-01 17:25:00.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 21 11:26:38 UTC 2012 - coolo(a)suse.com + +- updated to 6.03 + * Skip test if offline [RT#74163] + * Typo fixes + * Restore perl-5.8.1 compatibility. + +------------------------------------------------------------------- Old: ---- LWP-Protocol-https-6.02-systemca.diff LWP-Protocol-https-6.02.tar.gz New: ---- LWP-Protocol-https-6.03-systemca.diff LWP-Protocol-https-6.03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-LWP-Protocol-https.spec ++++++ --- /var/tmp/diff_new_pack.BYVvws/_old 2012-03-01 17:25:01.000000000 +0100 +++ /var/tmp/diff_new_pack.BYVvws/_new 2012-03-01 17:25:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-LWP-Protocol-https # -# 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,33 +16,34 @@ # - Name: perl-LWP-Protocol-https -Version: 6.02 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 6.03 +Release: 0 %define cpan_name LWP-Protocol-https Summary: Provide https support for LWP::UserAgent -Url: http://search.cpan.org/dist/LWP-Protocol-https/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/G/GA/GAAS/LWP-Protocol-https-%{version}.tar.… -Source: %{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/LWP-Protocol-https/ +Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz # patch for using system certificates -Patch0: %{cpan_name}-%{version}-systemca.diff -BuildRequires: perl(IO::Socket::SSL) >= 1.38 -BuildRequires: perl(LWP::UserAgent) >= 6.02 -BuildRequires: perl(Net::HTTPS) >= 6 +Patch0: %{cpan_name}-6.03-systemca.diff +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -Requires: perl(IO::Socket::SSL) >= 1.38 -Requires: perl(LWP::UserAgent) >= 6.02 +BuildRequires: perl(IO::Socket::SSL) >= 1.54 +BuildRequires: perl(LWP::UserAgent) >= 6.04 +#BuildRequires: perl(Mozilla::CA) >= 20110101 +BuildRequires: perl(Net::HTTPS) >= 6 +#BuildRequires: perl(LWP::Protocol::http) +Requires: perl(IO::Socket::SSL) >= 1.54 +Requires: perl(LWP::UserAgent) >= 6.04 +#Requires: perl(Mozilla::CA) >= 20110101 Requires: perl(Net::HTTPS) >= 6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} %description -The LWP::Protocol::https module provide support for using https schemed +The LWP::Protocol::https module provides support for using https schemed URLs with LWP. This module is a plug-in to the LWP protocol handling, so you don't use it directly. Once the module is installed LWP is able to access sites using HTTP over SSL/TLS. @@ -68,19 +69,15 @@ %{__make} %{?_smp_mflags} %check -# tests will fail without network -#%{__make} test +%{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++ LWP-Protocol-https-6.02-systemca.diff -> LWP-Protocol-https-6.03-systemca.diff ++++++ --- /work/SRC/openSUSE:Factory/perl-LWP-Protocol-https/LWP-Protocol-https-6.02-systemca.diff 2011-09-23 12:37:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-LWP-Protocol-https.new/LWP-Protocol-https-6.03-systemca.diff 2012-03-01 17:25:00.000000000 +0100 @@ -1,31 +1,12 @@ -Index: LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm +Index: LWP-Protocol-https-6.03/lib/LWP/Protocol/https.pm =================================================================== ---- LWP-Protocol-https-6.02.orig/lib/LWP/Protocol/https.pm -+++ LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm -@@ -21,25 +21,7 @@ sub _extra_sock_opts +--- LWP-Protocol-https-6.03.orig/lib/LWP/Protocol/https.pm 2012-02-18 23:53:36.000000000 +0100 ++++ LWP-Protocol-https-6.03/lib/LWP/Protocol/https.pm 2012-02-21 12:32:56.614080436 +0100 +@@ -20,6 +20,7 @@ sub _extra_sock_opts + $ssl_opts{SSL_verifycn_scheme} = 'www'; } if ($ssl_opts{SSL_verify_mode}) { ++ $ssl_opts{SSL_ca_path} ||= '/etc/ssl/certs'; unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -- eval { -- require Mozilla::CA; -- }; -- if ($@) { -- if ($@ =! /^Can't locate Mozilla\/CA\.pm/) { -- $@ = <<'EOT'; --Can't verify SSL peers without knowning which Certificate Authorities to trust -- --This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE --envirionment variable or by installing the Mozilla::CA module. -- --To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME --envirionment variable to 0. If you do this you can't be sure that you --communicate with the expected peer. --EOT -- } -- die $@; -- } -- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file(); -+ $ssl_opts{SSL_ca_path} = '/etc/ssl/certs'; - } - } - $self->{ssl_opts} = \%ssl_opts; + eval { + require Mozilla::CA; ++++++ LWP-Protocol-https-6.02.tar.gz -> LWP-Protocol-https-6.03.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.02/Changes new/LWP-Protocol-https-6.03/Changes --- old/LWP-Protocol-https-6.02/Changes 2011-03-27 13:54:01.000000000 +0200 +++ new/LWP-Protocol-https-6.03/Changes 2012-02-18 23:58:00.000000000 +0100 @@ -1,4 +1,15 @@ _______________________________________________________________________________ +2012-02-18 LWP-Protocol-https 6.03 + +Skip test if offline [RT#74163] + +Typo fixes + +Restore perl-5.8.1 compatibility. + + + +_______________________________________________________________________________ 2011-03-27 LWP-Protocol-https 6.02 Initial release of LWP-Protocol-https as a separate distribution. There are no code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.02/META.yml new/LWP-Protocol-https-6.03/META.yml --- old/LWP-Protocol-https-6.02/META.yml 2011-03-27 13:55:12.000000000 +0200 +++ new/LWP-Protocol-https-6.03/META.yml 2012-02-18 23:58:49.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: LWP-Protocol-https -version: 6.02 +version: 6.03 abstract: Provide https support for LWP::UserAgent author: - Gisle Aas <gisle(a)activestate.com> @@ -11,14 +11,14 @@ build_requires: ExtUtils::MakeMaker: 0 requires: - IO::Socket::SSL: 1.38 - LWP::UserAgent: 6.02 + IO::Socket::SSL: 1.54 + LWP::UserAgent: 6.04 Mozilla::CA: 20110101 Net::HTTPS: 6 - perl: 5.008008 + perl: 5.008001 resources: MailingList: mailto:libwww@perl.org - repository: http://github.com/gisle/libwww-perl/tree/LWP-Protocol-https/master + repository: http://github.com/gisle/lwp-protocol-https no_index: directory: - t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.02/Makefile.PL new/LWP-Protocol-https-6.03/Makefile.PL --- old/LWP-Protocol-https-6.02/Makefile.PL 2011-03-27 13:54:01.000000000 +0200 +++ new/LWP-Protocol-https-6.03/Makefile.PL 2012-02-18 23:39:38.000000000 +0100 @@ -1,6 +1,6 @@ #!perl -w -require 5.008008; +require 5.008001; use strict; use ExtUtils::MakeMaker; use Getopt::Long qw(GetOptions); @@ -11,16 +11,16 @@ ABSTRACT_FROM => 'lib/LWP/Protocol/https.pm', AUTHOR => 'Gisle Aas <gisle(a)activestate.com>', LICENSE => "perl", - MIN_PERL_VERSION => 5.008008, + MIN_PERL_VERSION => 5.008001, PREREQ_PM => { - 'LWP::UserAgent' => '6.02', + 'LWP::UserAgent' => '6.04', 'Net::HTTPS' => 6, - 'IO::Socket::SSL' => "1.38", + 'IO::Socket::SSL' => "1.54", 'Mozilla::CA' => "20110101", }, META_MERGE => { resources => { - repository => 'http://github.com/gisle/libwww-perl/tree/LWP-Protocol-https/master', + repository => 'http://github.com/gisle/lwp-protocol-https', MailingList => 'mailto:libwww@perl.org', } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm new/LWP-Protocol-https-6.03/lib/LWP/Protocol/https.pm --- old/LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm 2011-03-27 13:54:01.000000000 +0200 +++ new/LWP-Protocol-https-6.03/lib/LWP/Protocol/https.pm 2012-02-18 23:53:36.000000000 +0100 @@ -1,7 +1,7 @@ package LWP::Protocol::https; use strict; -our $VERSION = "6.02"; +our $VERSION = "6.03"; require LWP::Protocol::http; our @ISA = qw(LWP::Protocol::http); @@ -27,7 +27,7 @@ if ($@) { if ($@ =! /^Can't locate Mozilla\/CA\.pm/) { $@ = <<'EOT'; -Can't verify SSL peers without knowning which Certificate Authorities to trust +Can't verify SSL peers without knowing which Certificate Authorities to trust This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE envirionment variable or by installing the Mozilla::CA module. @@ -103,7 +103,7 @@ =head1 DESCRIPTION -The LWP::Protocol::https module provide support for using https schemed +The LWP::Protocol::https module provides support for using https schemed URLs with LWP. This module is a plug-in to the LWP protocol handling, so you don't use it directly. Once the module is installed LWP is able to access sites using HTTP over SSL/TLS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.02/t/apache.t new/LWP-Protocol-https-6.03/t/apache.t --- old/LWP-Protocol-https-6.02/t/apache.t 2011-03-27 13:46:19.000000000 +0200 +++ new/LWP-Protocol-https-6.03/t/apache.t 2012-02-18 23:49:49.000000000 +0100 @@ -1,15 +1,17 @@ #!perl -w use strict; -use Test; +use Test::More; use LWP::UserAgent; my $ua = LWP::UserAgent->new(); -my $res = $ua->simple_request(HTTP::Request->new(GET => "https://www.apache.org")); +plan skip_all => "Not online" unless $ua->is_online; plan tests => 2; +my $res = $ua->simple_request(HTTP::Request->new(GET => "https://www.apache.org")); + ok($res->is_success); -ok($res->content =~ /Apache Software Foundation/); +like($res->content, qr/Apache Software Foundation/); $res->dump(prefix => "# "); -- 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-LWP-MediaTypes for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-LWP-MediaTypes for openSUSE:Factory checked in at 2012-03-01 17:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-LWP-MediaTypes (Old) and /work/SRC/openSUSE:Factory/.perl-LWP-MediaTypes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-LWP-MediaTypes", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-LWP-MediaTypes/perl-LWP-MediaTypes.changes 2011-09-23 12:37:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-LWP-MediaTypes.new/perl-LWP-MediaTypes.changes 2012-03-01 17:24:41.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 20 10:48:49 UTC 2012 - coolo(a)suse.com + +- updated to 6.02 + * Update the media.types database + * Restore perl-5.6 compatiblity. + +------------------------------------------------------------------- Old: ---- LWP-MediaTypes-6.01.tar.gz New: ---- LWP-MediaTypes-6.02.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-LWP-MediaTypes.spec ++++++ --- /var/tmp/diff_new_pack.jAAbwJ/_old 2012-03-01 17:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.jAAbwJ/_new 2012-03-01 17:24:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-LWP-MediaTypes # -# 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,21 +16,20 @@ # - Name: perl-LWP-MediaTypes -Version: 6.01 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 6.02 +Release: 0 %define cpan_name LWP-MediaTypes Summary: guess media type for a file or a URL -Url: http://search.cpan.org/dist/LWP-MediaTypes/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/G/GA/GAAS/LWP-MediaTypes-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/LWP-MediaTypes/ +Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +#BuildRequires: perl(LWP::MediaTypes) %{perl_requires} %description @@ -40,6 +39,58 @@ is used instead. For backwards compatibility we will also look for _~/.mime.types_. +The following functions are exported by default: + +* guess_media_type( $filename ) + +* guess_media_type( $uri ) + +* guess_media_type( $filename_or_uri, $header_to_modify ) + + This function tries to guess media type and encoding for a file or a URI. + It returns the content type, which is a string like '"text/html"'. In + array context it also returns any content encodings applied (in the order + used to encode the file). You can pass a URI object reference, instead of + the file name. + + If the type can not be deduced from looking at the file name, then + guess_media_type() will let the '-T' Perl operator take a look. If this + works (and '-T' returns a TRUE value) then we return _text/plain_ as the + type, otherwise we return _application/octet-stream_ as the type. + + The optional second argument should be a reference to a HTTP::Headers + object or any object that implements the $obj->header method in a similar + way. When it is present the values of the 'Content-Type' and + 'Content-Encoding' will be set for this header. + +* media_suffix( $type, ... ) + + This function will return all suffixes that can be used to denote the + specified media type(s). Wildcard types can be used. In a scalar context + it will return the first suffix found. Examples: + + @suffixes = media_suffix('image/*', 'audio/basic'); + $suffix = media_suffix('text/html'); + +The following functions are only exported by explicit request: + +* add_type( $type, @exts ) + + Associate a list of file extensions with the given media type. Example: + + add_type("x-world/x-vrml" => qw(wrl vrml)); + +* add_encoding( $type, @ext ) + + Associate a list of file extensions with an encoding type. Example: + + add_encoding("x-gzip" => "gz"); + +* read_media_types( @files ) + + Parse media types files and add the type mappings found there. Example: + + read_media_types("conf/mime.types"); %prep %setup -q -n %{cpan_name}-%{version} @@ -56,11 +107,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++ LWP-MediaTypes-6.01.tar.gz -> LWP-MediaTypes-6.02.tar.gz ++++++ ++++ 2090 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-IO-Socket-SSL for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-IO-Socket-SSL for openSUSE:Factory checked in at 2012-03-01 17:24:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-IO-Socket-SSL (Old) and /work/SRC/openSUSE:Factory/.perl-IO-Socket-SSL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-IO-Socket-SSL", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-IO-Socket-SSL/perl-IO-Socket-SSL.changes 2012-02-14 13:09:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-IO-Socket-SSL.new/perl-IO-Socket-SSL.changes 2012-03-01 17:24:27.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 22 02:35:27 UTC 2012 - vcizek(a)suse.com + +- update to 1.55 +- work around IO::Sockets work around for systems returning EISCONN etc + on connect retry for non-blocking sockets by clearing $! if SUPER::connect + returned true. + https://rt.cpan.org/Ticket/Display.html?id=75101 + Thanks for Manoj Kumar for reporting. + +------------------------------------------------------------------- Old: ---- IO-Socket-SSL-1.54.tar.gz New: ---- IO-Socket-SSL-1.55.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-IO-Socket-SSL.spec ++++++ --- /var/tmp/diff_new_pack.ip8H6o/_old 2012-03-01 17:24:29.000000000 +0100 +++ /var/tmp/diff_new_pack.ip8H6o/_new 2012-03-01 17:24:29.000000000 +0100 @@ -16,14 +16,15 @@ # + Name: perl-IO-Socket-SSL -Version: 1.54 +Version: 1.55 Release: 0 +License: Artistic-1.0 or GPL-1.0+ %define cpan_name IO-Socket-SSL Summary: Nearly transparent SSL encapsulation for IO::Socket::INET -License: Artistic-1.0 or GPL-1.0+ -Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/IO-Socket-SSL/ +Group: Development/Libraries/Perl Source: http://www.cpan.org/authors/id/S/SU/SULLR/%{cpan_name}-%{version}.tar.gz BuildRequires: perl # MANUAL BEGIN ++++++ IO-Socket-SSL-1.54.tar.gz -> IO-Socket-SSL-1.55.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.54/Changes new/IO-Socket-SSL-1.55/Changes --- old/IO-Socket-SSL-1.54/Changes 2012-01-11 09:10:47.000000000 +0100 +++ new/IO-Socket-SSL-1.55/Changes 2012-02-20 07:46:42.000000000 +0100 @@ -1,3 +1,9 @@ +v1.55 2012.02.22 +- work around IO::Sockets work around for systems returning EISCONN etc + on connect retry for non-blocking sockets by clearing $! if SUPER::connect + returned true. + https://rt.cpan.org/Ticket/Display.html?id=75101 + Thanks for Manoj Kumar for reporting. v1.54 2012.01.11 - return 0 instead of undef in SSL_verify_callback to fix unitialized warnings. Thanks to d[DOT]thomas[AT]its[DOT]uq[DOT]edu[DOT]au for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.54/META.yml new/IO-Socket-SSL-1.55/META.yml --- old/IO-Socket-SSL-1.54/META.yml 2012-01-11 09:12:49.000000000 +0100 +++ new/IO-Socket-SSL-1.55/META.yml 2012-02-20 07:48:00.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: IO-Socket-SSL -version: 1.54 +version: 1.55 abstract: Nearly transparent SSL encapsulation for IO::Socket::INET. author: - Steffen Ullrich & Peter Behroozi & Marko Asplund diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.54/SSL.pm new/IO-Socket-SSL-1.55/SSL.pm --- old/IO-Socket-SSL-1.54/SSL.pm 2012-01-11 09:07:33.000000000 +0100 +++ new/IO-Socket-SSL-1.55/SSL.pm 2012-02-20 07:44:25.000000000 +0100 @@ -78,7 +78,7 @@ }) { @ISA = qw(IO::Socket::INET); } - $VERSION = '1.54'; + $VERSION = '1.55'; $GLOBAL_CONTEXT_ARGS = {}; #Make $DEBUG another name for $Net::SSLeay::trace @@ -334,6 +334,11 @@ DEBUG(2, 'socket not yet connected' ); $self->SUPER::connect(@_) || return; DEBUG(2,'socket connected' ); + + # IO::Socket works around systems, which return EISCONN or similar + # on non-blocking re-connect by returning true, even if $! is set + # but it does not clear $!, so do it here + $! = undef; } return $self->connect_SSL; } -- 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-HTTP-Negotiate for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-HTTP-Negotiate for openSUSE:Factory checked in at 2012-03-01 17:23:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-HTTP-Negotiate (Old) and /work/SRC/openSUSE:Factory/.perl-HTTP-Negotiate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-HTTP-Negotiate", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-HTTP-Negotiate/perl-HTTP-Negotiate.changes 2011-09-23 12:37:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-HTTP-Negotiate.new/perl-HTTP-Negotiate.changes 2012-03-01 17:23:56.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 20 10:48:40 UTC 2012 - coolo(a)suse.com + +- updated to 6.01 + * Restore perl-5.8.1 compatiblity. + +------------------------------------------------------------------- Old: ---- HTTP-Negotiate-6.00.tar.gz New: ---- HTTP-Negotiate-6.01.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTTP-Negotiate.spec ++++++ --- /var/tmp/diff_new_pack.srhJs1/_old 2012-03-01 17:23:58.000000000 +0100 +++ /var/tmp/diff_new_pack.srhJs1/_new 2012-03-01 17:23:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-HTTP-Negotiate # -# 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,23 +16,23 @@ # - Name: perl-HTTP-Negotiate -Version: 6.00 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 6.01 +Release: 0 %define cpan_name HTTP-Negotiate Summary: choose a variant to serve -Url: http://search.cpan.org/dist/HTTP-Negotiate/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/G/GA/GAAS/HTTP-Negotiate-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz -BuildRequires: perl(HTTP::Headers) >= 6 +Url: http://search.cpan.org/dist/HTTP-Negotiate/ +Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(HTTP::Headers) >= 6 +#BuildRequires: perl(HTTP::Negotiate) +#BuildRequires: perl(HTTP::Request) Requires: perl(HTTP::Headers) >= 6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} %description @@ -42,6 +42,36 @@ representation based upon attributes of the negotiable variants and the value of the various Accept* header fields in the request. +The variants are ordered by preference by calling the function choose(). + +The first parameter is reference to an array of the variants to choose +among. Each element in this array is an array with the values [$id, $qs, +$content_type, $content_encoding, $charset, $content_language, +$content_length] whose meanings are described below. The $content_encoding +and $content_language can be either a single scalar value or an array +reference if there are several values. + +The second optional parameter is either a HTTP::Headers or a HTTP::Request +object which is searched for "Accept*" headers. If this parameter is +missing, then the accept specification is initialized from the CGI +environment variables HTTP_ACCEPT, HTTP_ACCEPT_CHARSET, +HTTP_ACCEPT_ENCODING and HTTP_ACCEPT_LANGUAGE. + +In an array context, choose() returns a list of [variant identifier, +calculated quality, size] tuples. The values are sorted by quality, highest +quality first. If the calculated quality is the same for two variants, then +they are sorted by size (smallest first). _E.g._: + + (['var1', 1, 2000], ['var2', 0.3, 512], ['var3', 0.3, 1024]); + +Note that also zero quality variants are included in the return list even +if these should never be served to the client. + +In a scalar context, it returns the identifier of the variant with the +highest score or 'undef' if none have non-zero quality. + +If the $HTTP::Negotiate::DEBUG variable is set to TRUE, then a lot of noise +is generated on STDOUT during evaluation of choose(). %prep %setup -q -n %{cpan_name}-%{version} @@ -58,11 +88,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++ HTTP-Negotiate-6.00.tar.gz -> HTTP-Negotiate-6.01.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Negotiate-6.00/Changes new/HTTP-Negotiate-6.01/Changes --- old/HTTP-Negotiate-6.00/Changes 2011-02-27 23:37:48.000000000 +0100 +++ new/HTTP-Negotiate-6.01/Changes 2012-02-18 13:31:08.000000000 +0100 @@ -1,4 +1,12 @@ _______________________________________________________________________________ +2012-02-18 HTTP-Negotiate 6.01 + +Restore perl-5.8.1 compatiblity. + + + + +_______________________________________________________________________________ 2011-02-27 HTTP-Negotiate 6.00 Initial release of HTTP-Negotiate as a separate distribution. There are no code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Negotiate-6.00/META.yml new/HTTP-Negotiate-6.01/META.yml --- old/HTTP-Negotiate-6.00/META.yml 2011-02-27 23:38:04.000000000 +0100 +++ new/HTTP-Negotiate-6.01/META.yml 2012-02-18 13:31:54.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: HTTP-Negotiate -version: 6.00 +version: 6.01 abstract: choose a variant to serve author: - Gisle Aas <gisle(a)activestate.com> @@ -12,15 +12,15 @@ ExtUtils::MakeMaker: 0 requires: HTTP::Headers: 6 - perl: 5.008008 + perl: 5.008001 resources: MailingList: mailto:libwww@perl.org - repository: http://github.com/gisle/libwww-perl + repository: http://github.com/gisle/http-negotiate no_index: directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.56 +generated_by: ExtUtils::MakeMaker version 6.57_05 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Negotiate-6.00/Makefile.PL new/HTTP-Negotiate-6.01/Makefile.PL --- old/HTTP-Negotiate-6.00/Makefile.PL 2011-02-27 23:37:43.000000000 +0100 +++ new/HTTP-Negotiate-6.01/Makefile.PL 2012-02-18 13:28:46.000000000 +0100 @@ -1,6 +1,6 @@ #!perl -w -require 5.008008; +require 5.008001; use strict; use ExtUtils::MakeMaker; @@ -10,13 +10,13 @@ ABSTRACT_FROM => 'lib/HTTP/Negotiate.pm', AUTHOR => 'Gisle Aas <gisle(a)activestate.com>', LICENSE => "perl", - MIN_PERL_VERSION => 5.008008, + MIN_PERL_VERSION => 5.008001, PREREQ_PM => { 'HTTP::Headers' => 6, }, META_MERGE => { resources => { - repository => 'http://github.com/gisle/libwww-perl', + repository => 'http://github.com/gisle/http-negotiate', MailingList => 'mailto:libwww@perl.org', } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Negotiate-6.00/lib/HTTP/Negotiate.pm new/HTTP-Negotiate-6.01/lib/HTTP/Negotiate.pm --- old/HTTP-Negotiate-6.00/lib/HTTP/Negotiate.pm 2011-02-27 23:37:48.000000000 +0100 +++ new/HTTP-Negotiate-6.01/lib/HTTP/Negotiate.pm 2012-02-18 13:30:22.000000000 +0100 @@ -1,9 +1,8 @@ package HTTP::Negotiate; -$VERSION = "6.00"; +$VERSION = "6.01"; sub Version { $VERSION; } -require 5.002; require Exporter; @ISA = qw(Exporter); @EXPORT = qw(choose); -- 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-HTTP-Daemon for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-HTTP-Daemon for openSUSE:Factory checked in at 2012-03-01 17:23:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-HTTP-Daemon (Old) and /work/SRC/openSUSE:Factory/.perl-HTTP-Daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-HTTP-Daemon", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-HTTP-Daemon/perl-HTTP-Daemon.changes 2011-09-23 12:37:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-HTTP-Daemon.new/perl-HTTP-Daemon.changes 2012-03-01 17:23:40.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 20 10:48:36 UTC 2012 - coolo(a)suse.com + +- updated to 6.01 + If you bind localhost, don't trust gethostbyaddr() to resolve the + address. [RT#67247] + Restore perl-5.8.1 compatiblity. + +------------------------------------------------------------------- Old: ---- HTTP-Daemon-6.00.tar.gz New: ---- HTTP-Daemon-6.01.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTTP-Daemon.spec ++++++ --- /var/tmp/diff_new_pack.AdmrAG/_old 2012-03-01 17:23:41.000000000 +0100 +++ /var/tmp/diff_new_pack.AdmrAG/_new 2012-03-01 17:23:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-HTTP-Daemon # -# 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,33 +16,33 @@ # - Name: perl-HTTP-Daemon -Version: 6.00 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 6.01 +Release: 0 %define cpan_name HTTP-Daemon Summary: a simple http server class -Url: http://search.cpan.org/dist/HTTP-Daemon/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/G/GA/GAAS/HTTP-Daemon-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/HTTP-Daemon/ +Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl +BuildRequires: perl-macros BuildRequires: perl(HTTP::Date) >= 6 BuildRequires: perl(HTTP::Request) >= 6 BuildRequires: perl(HTTP::Response) >= 6 BuildRequires: perl(HTTP::Status) >= 6 -BuildRequires: perl(IO::Socket) BuildRequires: perl(LWP::MediaTypes) >= 6 -BuildRequires: perl -BuildRequires: perl-macros +#BuildRequires: perl(HTTP::Daemon) +#BuildRequires: perl(LWP::RobotUA) +#BuildRequires: perl(LWP::UserAgent) +#BuildRequires: perl(URI) Requires: perl(HTTP::Date) >= 6 Requires: perl(HTTP::Request) >= 6 Requires: perl(HTTP::Response) >= 6 Requires: perl(HTTP::Status) >= 6 -Requires: perl(IO::Socket) Requires: perl(LWP::MediaTypes) >= 6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} %description @@ -51,9 +51,16 @@ 'IO::Socket::INET', so you can perform socket operations directly on it too. +The accept() method will return when a connection from a client is +available. The returned value will be an 'HTTP::Daemon::ClientConn' object +which is another 'IO::Socket::INET' subclass. Calling the get_request() +method on this object will read data from the client and return an +'HTTP::Request' object. The ClientConn object also provide methods to send +back various responses. %prep %setup -q -n %{cpan_name}-%{version} +find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -67,11 +74,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++ HTTP-Daemon-6.00.tar.gz -> HTTP-Daemon-6.01.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Daemon-6.00/Changes new/HTTP-Daemon-6.01/Changes --- old/HTTP-Daemon-6.00/Changes 2011-02-27 23:46:57.000000000 +0100 +++ new/HTTP-Daemon-6.01/Changes 2012-02-18 13:23:43.000000000 +0100 @@ -1,4 +1,15 @@ _______________________________________________________________________________ +2012-02-18 HTTP-Daemon 6.01 + +If you bind localhost, don't trust gethostbyaddr() to resolve the +address. [RT#67247] + +Restore perl-5.8.1 compatiblity. + + + + +_______________________________________________________________________________ 2011-02-25 HTTP-Daemon 6.00 Initial release of HTTP-Daemon as a separate distribution. There are no code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Daemon-6.00/META.yml new/HTTP-Daemon-6.01/META.yml --- old/HTTP-Daemon-6.00/META.yml 2011-02-27 23:47:21.000000000 +0100 +++ new/HTTP-Daemon-6.01/META.yml 2012-02-18 13:24:17.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: HTTP-Daemon -version: 6.00 +version: 6.01 abstract: a simple http server class author: - Gisle Aas <gisle(a)activestate.com> @@ -17,16 +17,16 @@ HTTP::Status: 6 IO::Socket: 0 LWP::MediaTypes: 6 - perl: 5.008008 + perl: 5.008001 Sys::Hostname: 0 resources: MailingList: mailto:libwww@perl.org - repository: http://github.com/gisle/libwww-perl + repository: http://github.com/gisle/http-daemon no_index: directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.56 +generated_by: ExtUtils::MakeMaker version 6.57_05 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Daemon-6.00/Makefile.PL new/HTTP-Daemon-6.01/Makefile.PL --- old/HTTP-Daemon-6.00/Makefile.PL 2011-02-27 23:46:50.000000000 +0100 +++ new/HTTP-Daemon-6.01/Makefile.PL 2012-02-18 12:54:36.000000000 +0100 @@ -1,6 +1,6 @@ #!perl -w -require 5.008008; +require 5.008001; use strict; use ExtUtils::MakeMaker; @@ -10,7 +10,7 @@ ABSTRACT_FROM => 'lib/HTTP/Daemon.pm', AUTHOR => 'Gisle Aas <gisle(a)activestate.com>', LICENSE => "perl", - MIN_PERL_VERSION => 5.008008, + MIN_PERL_VERSION => 5.008001, PREREQ_PM => { 'Sys::Hostname' => 0, 'IO::Socket' => 0, @@ -22,7 +22,7 @@ }, META_MERGE => { resources => { - repository => 'http://github.com/gisle/libwww-perl', + repository => 'http://github.com/gisle/http-daemon', MailingList => 'mailto:libwww@perl.org', } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Daemon-6.00/lib/HTTP/Daemon.pm new/HTTP-Daemon-6.01/lib/HTTP/Daemon.pm --- old/HTTP-Daemon-6.00/lib/HTTP/Daemon.pm 2011-02-27 23:46:57.000000000 +0100 +++ new/HTTP-Daemon-6.01/lib/HTTP/Daemon.pm 2012-02-18 13:21:23.000000000 +0100 @@ -3,9 +3,9 @@ use strict; use vars qw($VERSION @ISA $PROTO $DEBUG); -$VERSION = "6.00"; +$VERSION = "6.01"; -use IO::Socket qw(AF_INET INADDR_ANY inet_ntoa); +use IO::Socket qw(AF_INET INADDR_ANY INADDR_LOOPBACK inet_ntoa); @ISA=qw(IO::Socket::INET); $PROTO = "HTTP/1.1"; @@ -44,6 +44,9 @@ require Sys::Hostname; $url .= lc Sys::Hostname::hostname(); } + elsif ($addr eq INADDR_LOOPBACK) { + $url .= inet_ntoa($addr); + } else { $url .= gethostbyaddr($addr, AF_INET) || inet_ntoa($addr); } -- 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-HTML-Form for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-HTML-Form for openSUSE:Factory checked in at 2012-03-01 17:23:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-HTML-Form (Old) and /work/SRC/openSUSE:Factory/.perl-HTML-Form.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-HTML-Form", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-HTML-Form/perl-HTML-Form.changes 2011-09-23 12:37:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-HTML-Form.new/perl-HTML-Form.changes 2012-03-01 17:23:38.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 20 10:48:17 UTC 2012 - coolo(a)suse.com + +- updated to 6.01 + Don't pick up label text from textarea [RT#72925] + Restore perl-5.8.1 compatiblity. + +------------------------------------------------------------------- Old: ---- HTML-Form-6.00.tar.gz New: ---- HTML-Form-6.01.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTML-Form.spec ++++++ --- /var/tmp/diff_new_pack.jyDVtc/_old 2012-03-01 17:23:40.000000000 +0100 +++ /var/tmp/diff_new_pack.jyDVtc/_new 2012-03-01 17:23:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-HTML-Form # -# 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,29 +16,29 @@ # - Name: perl-HTML-Form -Version: 6.00 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 6.01 +Release: 0 %define cpan_name HTML-Form Summary: Class that represents an HTML form element -Url: http://search.cpan.org/dist/HTML-Form/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Form-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/HTML-Form/ +Source: http://www.cpan.org/authors/id/G/GA/GAAS/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl +BuildRequires: perl-macros BuildRequires: perl(HTML::TokeParser) BuildRequires: perl(HTTP::Request) >= 6 BuildRequires: perl(HTTP::Request::Common) >= 6 BuildRequires: perl(URI) >= 1.10 -BuildRequires: perl -BuildRequires: perl-macros +#BuildRequires: perl(HTML::Form) +#BuildRequires: perl(HTTP::Response) Requires: perl(HTML::TokeParser) Requires: perl(HTTP::Request) >= 6 Requires: perl(HTTP::Request::Common) >= 6 Requires: perl(URI) >= 1.10 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} %description @@ -48,7 +48,6 @@ be tweaked and it can then be asked to provide 'HTTP::Request' objects that can be passed to the request() method of 'LWP::UserAgent'. - %prep %setup -q -n %{cpan_name}-%{version} @@ -64,11 +63,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++ HTML-Form-6.00.tar.gz -> HTML-Form-6.01.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Form-6.00/Changes new/HTML-Form-6.01/Changes --- old/HTML-Form-6.00/Changes 2011-02-27 20:46:36.000000000 +0100 +++ new/HTML-Form-6.01/Changes 2012-02-18 14:38:00.000000000 +0100 @@ -1,4 +1,14 @@ _______________________________________________________________________________ +2012-02-18 HTML-Form 6.01 + +Don't pick up label text from textarea [RT#72925] + +Restore perl-5.8.1 compatiblity. + + + + +_______________________________________________________________________________ 2011-02-27 HTML-Form 6.00 Initial release of HTML-Form as a separate distribution. There are no code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Form-6.00/MANIFEST new/HTML-Form-6.01/MANIFEST --- old/HTML-Form-6.00/MANIFEST 2011-02-27 20:47:37.000000000 +0100 +++ new/HTML-Form-6.01/MANIFEST 2012-02-18 14:38:39.000000000 +0100 @@ -3,6 +3,7 @@ Makefile.PL MANIFEST This list of files README +t/form-label.t t/form-maxlength.t t/form-multi-select.t t/form-param.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Form-6.00/META.yml new/HTML-Form-6.01/META.yml --- old/HTML-Form-6.00/META.yml 2011-02-27 20:47:37.000000000 +0100 +++ new/HTML-Form-6.01/META.yml 2012-02-18 14:38:39.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: HTML-Form -version: 6.00 +version: 6.01 abstract: Class that represents an HTML form element author: - Gisle Aas <gisle(a)activestate.com> @@ -15,16 +15,16 @@ HTML::TokeParser: 0 HTTP::Request: 6 HTTP::Request::Common: 6 - perl: 5.008008 + perl: 5.008001 URI: 1.10 resources: MailingList: mailto:libwww@perl.org - repository: http://github.com/gisle/libwww-perl + repository: http://github.com/gisle/html-form no_index: directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.56 +generated_by: ExtUtils::MakeMaker version 6.57_05 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Form-6.00/Makefile.PL new/HTML-Form-6.01/Makefile.PL --- old/HTML-Form-6.00/Makefile.PL 2011-02-27 20:46:31.000000000 +0100 +++ new/HTML-Form-6.01/Makefile.PL 2012-02-18 14:17:40.000000000 +0100 @@ -1,6 +1,6 @@ #!perl -w -require 5.008008; +require 5.008001; use strict; use ExtUtils::MakeMaker; @@ -10,7 +10,7 @@ ABSTRACT_FROM => 'lib/HTML/Form.pm', AUTHOR => 'Gisle Aas <gisle(a)activestate.com>', LICENSE => "perl", - MIN_PERL_VERSION => 5.008008, + MIN_PERL_VERSION => 5.008001, PREREQ_PM => { 'URI' => "1.10", 'Encode' => "2", @@ -20,7 +20,7 @@ }, META_MERGE => { resources => { - repository => 'http://github.com/gisle/libwww-perl', + repository => 'http://github.com/gisle/html-form', MailingList => 'mailto:libwww@perl.org', } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Form-6.00/lib/HTML/Form.pm new/HTML-Form-6.01/lib/HTML/Form.pm --- old/HTML-Form-6.00/lib/HTML/Form.pm 2011-02-27 20:46:36.000000000 +0100 +++ new/HTML-Form-6.01/lib/HTML/Form.pm 2012-02-18 14:36:26.000000000 +0100 @@ -6,7 +6,7 @@ use Encode (); use vars qw($VERSION); -$VERSION = "6.00"; +$VERSION = "6.01"; my %form_tags = map {$_ => 1} qw(input textarea button select option); @@ -194,13 +194,15 @@ my($tag, $attr) = @$t; last if $tag eq "/form"; - # if we are inside a label tag, then keep - # appending any text to the current label - if(defined $current_label) { - $current_label = join " ", - grep { defined and length } - $current_label, - $p->get_phrase; + if ($tag ne 'textarea') { + # if we are inside a label tag, then keep + # appending any text to the current label + if(defined $current_label) { + $current_label = join " ", + grep { defined and length } + $current_label, + $p->get_phrase; + } } if ($tag eq "input") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTML-Form-6.00/t/form-label.t new/HTML-Form-6.01/t/form-label.t --- old/HTML-Form-6.00/t/form-label.t 1970-01-01 01:00:00.000000000 +0100 +++ new/HTML-Form-6.01/t/form-label.t 2012-02-18 14:26:49.000000000 +0100 @@ -0,0 +1,33 @@ +#!perl + +use strict; +use warnings; +use Test qw(plan ok); + +plan tests => 2; + +use HTML::Form; + +{ +my $form = HTML::Form->parse(<<"EOT", base => "http://example.com", strict => 1); +<form> + <label> + <input name="tt" type="text" value="test content"> + </label> +</form> +EOT +ok($form->param('tt'), 'test content'); + +} + +{ +my $form = HTML::Form->parse(<<"EOT", base => "http://example.com", strict => 1); +<form> + <label> + <textarea name="tt">test content</textarea> + </label> +</form> +EOT + +ok($form->param('tt'), 'test content'); +} -- 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-Data-Visitor for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-Data-Visitor for openSUSE:Factory checked in at 2012-03-01 17:23:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Data-Visitor (Old) and /work/SRC/openSUSE:Factory/.perl-Data-Visitor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Data-Visitor", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Data-Visitor/perl-Data-Visitor.changes 2011-09-23 12:36:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Data-Visitor.new/perl-Data-Visitor.changes 2012-03-01 17:23:04.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Feb 27 08:47:42 UTC 2012 - coolo(a)suse.com + +- updated to 0.28 + - convert to dzil + - bump namespace::clean dep + - better error message if Data::Alias isn't found + - doc fixes + +------------------------------------------------------------------- Old: ---- Data-Visitor-0.27.tar.gz New: ---- Data-Visitor-0.28.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-Visitor.spec ++++++ --- /var/tmp/diff_new_pack.p6byp5/_old 2012-03-01 17:23:05.000000000 +0100 +++ /var/tmp/diff_new_pack.p6byp5/_new 2012-03-01 17:23:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Data-Visitor # -# 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,33 +16,34 @@ # - Name: perl-Data-Visitor -Version: 0.27 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 0.28 +Release: 0 %define cpan_name Data-Visitor Summary: Visitor style traversal of Perl data structures -Url: http://search.cpan.org/dist/Data-Visitor/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -Source: http://www.cpan.org/authors/id/F/FL/FLORA/%{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/Data-Visitor/ +Source: http://www.cpan.org/authors/id/D/DO/DOY/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Data::Alias) +BuildRequires: perl(Class::Load) >= 0.06 BuildRequires: perl(Moose) >= 0.89 -BuildRequires: perl(namespace::clean) >= 0.08 -BuildRequires: perl(ok) -BuildRequires: perl(Sub::Name) BuildRequires: perl(Task::Weaken) -BuildRequires: perl(Test::use::ok) +BuildRequires: perl(Test::More) >= 0.88 +BuildRequires: perl(Test::Requires) BuildRequires: perl(Tie::ToObject) >= 0.01 +BuildRequires: perl(namespace::clean) >= 0.19 +#BuildRequires: perl(Data::Visitor) +#BuildRequires: perl(Data::Visitor::Callback) +#BuildRequires: perl(Sub::Name) +Requires: perl(Class::Load) >= 0.06 Requires: perl(Moose) >= 0.89 -Requires: perl(namespace::clean) >= 0.08 Requires: perl(Task::Weaken) -Requires: perl(Test::use::ok) Requires: perl(Tie::ToObject) >= 0.01 +Requires: perl(namespace::clean) >= 0.19 %{perl_requires} %description @@ -74,11 +75,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes +%doc Changes LICENSE README %changelog ++++++ Data-Visitor-0.27.tar.gz -> Data-Visitor-0.28.tar.gz ++++++ ++++ 1786 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-Config-GitLike for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-Config-GitLike for openSUSE:Factory checked in at 2012-03-01 17:22:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Config-GitLike (Old) and /work/SRC/openSUSE:Factory/.perl-Config-GitLike.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Config-GitLike", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Config-GitLike/perl-Config-GitLike.changes 2011-12-25 17:38:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Config-GitLike.new/perl-Config-GitLike.changes 2012-03-01 17:22:54.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 27 08:47:27 UTC 2012 - coolo(a)suse.com + +- updated to 1.08 +* Fix loading of user_file, broken in dcdd01f, due to unexpanded ~ + (alexmv, clkao(a)clkao.org) + +------------------------------------------------------------------- Old: ---- Config-GitLike-1.07.tar.gz New: ---- Config-GitLike-1.08.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Config-GitLike.spec ++++++ --- /var/tmp/diff_new_pack.Nz4AR9/_old 2012-03-01 17:22:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Nz4AR9/_new 2012-03-01 17:22:55.000000000 +0100 @@ -1,8 +1,7 @@ -# vim: set sw=4 ts=4 et nu: # # spec file for package perl-Config-GitLike # -# 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,60 +14,88 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: perl-Config-GitLike -Version: 1.07 +Version: 1.08 Release: 0 +%define cpan_name Config-GitLike Summary: Git-compatible config file parsing License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -Source: http://search.cpan.org/CPAN/authors/id/A/AL/ALEXMV/Config-GitLike-%{version… -Url: http://search.cpan.org/dist/Config-GitLike +Url: http://search.cpan.org/dist/Config-GitLike/ +Source: http://www.cpan.org/authors/id/A/AL/ALEXMV/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} -BuildRequires: make BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Any::Moose) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 -BuildRequires: perl(File::Spec) -BuildRequires: perl(File::Temp) BuildRequires: perl(Test::Exception) -BuildRequires: perl(Test::More) +#BuildRequires: perl(Config::GitLike) +#BuildRequires: perl(inc::Module::Install) +#BuildRequires: perl(JSON) +#BuildRequires: perl(LWP::Simple) +#BuildRequires: perl(Module::Build) +#BuildRequires: perl(Module::Install::Base) +#BuildRequires: perl(Parse::CPAN::Meta) +#BuildRequires: perl(TestConfig) +#BuildRequires: perl(YAML::Tiny) Requires: perl(Any::Moose) +%{perl_requires} %description This module handles interaction with configuration files of the style used by the version control system Git. It can both parse and modify these files, as well as create entirely new ones. +You only need to know a few things about the configuration format in order +to use this module. First, a configuration file is made up of key/value +pairs. Every key must be contained in a section. Sections can have +subsections, but they don't have to. For the purposes of setting and +getting configuration variables, we join the section name, subsection name, +and variable name together with dots to get a key name that looks like +"section.subsection.variable". These are the strings that you'll be passing +in to 'key' arguments. + +Configuration files inherit from each other. By default, 'Config::GitLike' +loads data from a system-wide configuration file, a per-user configuration +file, and a per-directory configuration file, but by subclassing and +overriding methods you can obtain any combination of configuration files. +By default, configuration files that don't exist are just skipped. + +See the +http://www.kernel.org/pub/software/scm/git/docs/git-config.html#_configurat +ion_file manpage for details on the syntax of git configuration files. We +won't waste pixels on the nitty gritty here. + +While the behavior of a couple of this module's methods differ slightly +from the 'git config' equivalents, this module can read any config file +written by git. The converse is usually true, but only if you don't take +advantage of this module's increased permissiveness when it comes to key +names. (See the DIFFERENCES FROM GIT-CONFIG manpage for details.) + +This is an object-oriented module using Any::Moose. All subroutines are +object method calls. + +A few methods have parameters that are always used for the same purpose: + %prep -%setup -q -n "Config-GitLike-%{version}" -%__sed -i '/^auto_install/d' Makefile.PL +%setup -q -n %{cpan_name}-%{version} %build -%__perl Makefile.PL PREFIX="%{_prefix}" -%__make %{?jobs:-j%{jobs}} +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__make} %{?_smp_mflags} + +%check +%{__make} test %install %perl_make_install %perl_process_packlist +%perl_gen_filelist -%check -%__make test - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - -%files -%defattr(-,root,root) +%files -f %{name}.files +%defattr(-,root,root,755) %doc Changes -%dir %{perl_vendorlib}/Config -%{perl_vendorlib}/Config/GitLike.pm -%{perl_vendorlib}/Config/GitLike -%dir %{perl_vendorarch}/auto/Config -%{perl_vendorarch}/auto/Config/GitLike -%doc %{perl_man3dir}/Config::GitLike.%{perl_man3ext}%{ext_man} -%doc %{perl_man3dir}/Config::GitLike::*.%{perl_man3ext}%{ext_man} %changelog ++++++ Config-GitLike-1.07.tar.gz -> Config-GitLike-1.08.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-GitLike-1.07/Changes new/Config-GitLike-1.08/Changes --- old/Config-GitLike-1.07/Changes 2011-10-26 04:57:40.000000000 +0200 +++ new/Config-GitLike-1.08/Changes 2012-02-16 05:16:37.000000000 +0100 @@ -1,3 +1,8 @@ +1.08 2012-02-15 + +* Fix loading of user_file, broken in dcdd01f, due to unexpanded ~ + (alexmv, clkao(a)clkao.org) + 1.07 2011-10-25 * Fix a spelling mistake in Config::GitLike::Cascaded diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-GitLike-1.07/META.yml new/Config-GitLike-1.08/META.yml --- old/Config-GitLike-1.07/META.yml 2011-10-26 05:07:34.000000000 +0200 +++ new/Config-GitLike-1.08/META.yml 2012-02-16 05:24:31.000000000 +0100 @@ -25,4 +25,4 @@ resources: license: http://dev.perl.org/licenses/ repository: http://github.com/bestpractical/config-gitlike -version: 1.07 +version: 1.08 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-GitLike-1.07/SIGNATURE new/Config-GitLike-1.08/SIGNATURE --- old/Config-GitLike-1.07/SIGNATURE 2011-10-26 05:10:15.000000000 +0200 +++ new/Config-GitLike-1.08/SIGNATURE 2012-02-22 03:30:20.000000000 +0100 @@ -14,9 +14,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 d927e040b1552f8139aca51826ba82a30614ff6a Changes +SHA1 618657d3e94d75ea3eb0210214ba317e9fb34bc9 Changes SHA1 c978a1d6e9ccefe9c8512ce409451c70004db59c MANIFEST -SHA1 3a2dd13ea080aa9dace3bedfda3849f126b584b2 META.yml +SHA1 2a1698a924867daa5305daf5e548932d4b8df285 META.yml SHA1 14f45ca5f7c2a1117289045d76281a8eab0ca2e8 Makefile.PL SHA1 7b4ae50ebac72d20761171c4c2b50c206344ea40 inc/Module/Install.pm SHA1 d9fe55a427fe2fd75b5029afeeaa61b592e07f79 inc/Module/Install/Base.pm @@ -27,7 +27,7 @@ SHA1 8ce3f2b414e4617e6233dd4ba10830f8c5d672ec inc/Module/Install/Metadata.pm SHA1 3b0acd2eeac93a0afe48120f5648f0db362e5bbf inc/Module/Install/Win32.pm SHA1 f08924f051e623f8e09fa6a121993c4a9cf7d9eb inc/Module/Install/WriteAll.pm -SHA1 124dff75ccebd8b8c363b9110f44c8450fdf464c lib/Config/GitLike.pm +SHA1 92ef71379489cfa4d5410c15ae92c8967728ac25 lib/Config/GitLike.pm SHA1 f87bd57755c1973e80f988b6bfecc498b7bb4604 lib/Config/GitLike/Cascaded.pm SHA1 7ada70145453fc5adbacf1d1d22af3e2932a5a33 lib/Config/GitLike/Git.pm SHA1 8c30f69743e7a9d743d7206f2306ff9f12bb59a0 t/00_use.t @@ -37,7 +37,7 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) -iEYEARECAAYFAk6nehcACgkQMflWJZZAbqDyeQCcDAHg4REPDxJssN+C4ScTsfTd -lc4AniahLg3rVPAEwdMqVPrv2u2P+EsX -=LETn +iEYEARECAAYFAk9EUzYACgkQMflWJZZAbqBf7gCfWJ87ZothsUpUK3A2W2j+WffM +xfwAoK2GUknpP+ZOZiuoqgvcw5NZivjc +=WA2D -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-GitLike-1.07/lib/Config/GitLike.pm new/Config-GitLike-1.08/lib/Config/GitLike.pm --- old/Config-GitLike-1.07/lib/Config/GitLike.pm 2011-10-26 04:56:22.000000000 +0200 +++ new/Config-GitLike-1.08/lib/Config/GitLike.pm 2012-02-16 05:17:29.000000000 +0100 @@ -7,7 +7,7 @@ use Fcntl qw(O_CREAT O_EXCL O_WRONLY); use 5.008; -our $VERSION = '1.07'; +our $VERSION = '1.08'; has 'confname' => ( @@ -114,7 +114,6 @@ sub load_global { my $self = shift; - return unless -f $self->global_file; return $self->load_file( $self->global_file ); } @@ -126,7 +125,6 @@ sub load_user { my $self = shift; - return unless -f $self->user_file; return $self->load_file( $self->user_file ); } @@ -135,6 +133,7 @@ my $self = shift; my $filename = shift; + return unless -f $filename and -r $filename; open(my $fh, '<', $filename) or return; my $c = do {local $/; <$fh>}; @@ -1554,7 +1553,8 @@ variables (a hashref). This method can also be called as a class method, which will die if the -file cannot be read. +file cannot be read. If called as an instance method, returns undef on +failure. =head2 parse_content -- 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-Class-XSAccessor for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-Class-XSAccessor for openSUSE:Factory checked in at 2012-03-01 17:22:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Class-XSAccessor (Old) and /work/SRC/openSUSE:Factory/.perl-Class-XSAccessor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Class-XSAccessor", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Class-XSAccessor/perl-Class-XSAccessor.changes 2011-09-23 12:36:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Class-XSAccessor.new/perl-Class-XSAccessor.changes 2012-03-01 17:22:43.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 27 08:47:13 UTC 2012 - coolo(a)suse.com + +- updated to 1.13 + - Removes the cached read-only and read-write accessors + for the time being. (These were only available from another + development releasse. + - Much more brutal thread-safety testing. + - Fixed thread-safety problem with the global hashkey storage. + - Lots of refactoring in the C code. + - Instead of storing an index in the CV, we store a pointer to + the hashkey struct. + - Implements cached read-only and read-write accessors. + Details on what that means are in the documentation. + +------------------------------------------------------------------- Old: ---- Class-XSAccessor-1.12.tar.gz New: ---- Class-XSAccessor-1.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-XSAccessor.spec ++++++ --- /var/tmp/diff_new_pack.fgiDq3/_old 2012-03-01 17:22:44.000000000 +0100 +++ /var/tmp/diff_new_pack.fgiDq3/_new 2012-03-01 17:22:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Class-XSAccessor # -# 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: perl-Class-XSAccessor -Version: 1.12 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 1.13 +Release: 0 %define cpan_name Class-XSAccessor Summary: Generate fast XS accessors without runtime compilation -Url: http://search.cpan.org/dist/Class-XSAccessor/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/Class-XSAccessor/ Source: http://www.cpan.org/authors/id/S/SM/SMUELLER/%{cpan_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl ++++++ Class-XSAccessor-1.12.tar.gz -> Class-XSAccessor-1.13.tar.gz ++++++ ++++ 1837 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-Class-Accessor-Grouped for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-Class-Accessor-Grouped for openSUSE:Factory checked in at 2012-03-01 17:22:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Class-Accessor-Grouped (Old) and /work/SRC/openSUSE:Factory/.perl-Class-Accessor-Grouped.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Class-Accessor-Grouped", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Class-Accessor-Grouped/perl-Class-Accessor-Grouped.changes 2011-09-23 12:36:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Class-Accessor-Grouped.new/perl-Class-Accessor-Grouped.changes 2012-03-01 17:22:32.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 27 08:44:38 UTC 2012 - coolo(a)suse.com + +- updated to 0.10006 + - Silence warnings resulting from incomplete can() overrides + hiding get/set_simple methods + - Depend on newer bugfixed Class::XSAccessor + - Repack with correct metadata (RT#73100) + - No longer leak internal __CAG* methods into the inheritable + namespace + +------------------------------------------------------------------- Old: ---- Class-Accessor-Grouped-0.10003.tar.gz New: ---- Class-Accessor-Grouped-0.10006.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-Accessor-Grouped.spec ++++++ --- /var/tmp/diff_new_pack.VgSoHM/_old 2012-03-01 17:22:34.000000000 +0100 +++ /var/tmp/diff_new_pack.VgSoHM/_new 2012-03-01 17:22:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Class-Accessor-Grouped # -# 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: perl-Class-Accessor-Grouped -Version: 0.10003 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 0.10006 +Release: 0 %define cpan_name Class-Accessor-Grouped Summary: Lets you build groups of accessors -Url: http://search.cpan.org/dist/Class-Accessor-Grouped/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -Source: http://www.cpan.org/authors/id/F/FR/FREW/%{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/Class-Accessor-Grouped/ +Source: http://www.cpan.org/authors/id/C/CL/CLACO/%{cpan_name}-%{version}.tar.gz Patch1: perl-Class-Accessor-Grouped-use_lib.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,10 +33,30 @@ BuildRequires: perl(Class::Inspector) BuildRequires: perl(Test::Exception) >= 0.31 BuildRequires: perl(Test::More) >= 0.94 -BuildRequires: perl(Sub::Name) => 0.05 -BuildRequires: perl(Class::XSAccessor) >= 1.11 -Requires: perl(Sub::Name) => 0.05 -Requires: perl(Class::XSAccessor) >= 1.11 +#BuildRequires: perl(AccessorGroups) +#BuildRequires: perl(AccessorGroupsComp) +#BuildRequires: perl(AccessorGroupsRO) +#BuildRequires: perl(AccessorGroupsSubclass) +#BuildRequires: perl(AccessorGroupsWO) +#BuildRequires: perl(BaseInheritedGroups) +#BuildRequires: perl(Class::Accessor::Grouped) +#BuildRequires: perl(Class::XSAccessor) +#BuildRequires: perl(CPANPLUS::Backend) +#BuildRequires: perl(Devel::Hide) +#BuildRequires: perl(ExtraInheritedGroups) +#BuildRequires: perl(inc::Module::Install) >= 1 +#BuildRequires: perl(JSON) +#BuildRequires: perl(LWP::Simple) +#BuildRequires: perl(Module::AutoInstall) +#BuildRequires: perl(Module::Build) +#BuildRequires: perl(Module::Install::Base) +#BuildRequires: perl(mro) +#BuildRequires: perl(MRO::Compat) +#BuildRequires: perl(NotHashBased) +#BuildRequires: perl(Parse::CPAN::Meta) +#BuildRequires: perl(Sub::Name) +#BuildRequires: perl(SuperInheritedGroups) +#BuildRequires: perl(YAML::Tiny) Requires: perl(Class::Inspector) %{perl_requires} @@ -64,9 +83,6 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) %doc Changes README ++++++ Class-Accessor-Grouped-0.10003.tar.gz -> Class-Accessor-Grouped-0.10006.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/Changes new/Class-Accessor-Grouped-0.10006/Changes --- old/Class-Accessor-Grouped-0.10003/Changes 2011-05-03 02:12:23.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/Changes 2011-12-30 05:04:18.000000000 +0100 @@ -1,5 +1,17 @@ Revision history for Class::Accessor::Grouped. +0.10006 2011-12-30 03:52 (UTC) + - Silence warnings resulting from incomplete can() overrides + hiding get/set_simple methods + +0.10005 2011-12-26 12:43 (UTC) + - Depend on newer bugfixed Class::XSAccessor + - Repack with correct metadata (RT#73100) + +0.10004 2011-11-28 21:20 (UTC) + - No longer leak internal __CAG* methods into the inheritable + namespace + 0.10003 2011-05-03 00:15 (UTC) - Only require MRO::Compat for older perls - Add SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/MANIFEST new/Class-Accessor-Grouped-0.10006/MANIFEST --- old/Class-Accessor-Grouped-0.10003/MANIFEST 2011-05-03 02:23:28.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/MANIFEST 2011-12-28 20:47:27.000000000 +0100 @@ -13,7 +13,6 @@ lib/Class/Accessor/Grouped.pm Makefile.PL MANIFEST This list of files -MANIFEST.SKIP META.yml README t/accessors.t @@ -37,6 +36,7 @@ t/lib/SuperInheritedGroups.pm t/manifest.t t/pod_coverage.t +t/pod_spelling.t t/pod_syntax.t t/strict.t t/style_no_tabs.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/MANIFEST.SKIP new/Class-Accessor-Grouped-0.10006/MANIFEST.SKIP --- old/Class-Accessor-Grouped-0.10003/MANIFEST.SKIP 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/MANIFEST.SKIP 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -# Avoid version control files. -\bRCS\b -\bCVS\b -,v$ -,B$ -,D$ -\B\.svn\b -aegis.log$ -\bconfig$ -\bbuild$ -\.DS_Store$ -\.git - - -# Avoid Makemaker generated and utility files. -\bMakefile$ -\bblib -\bMakeMaker-\d -\bpm_to_blib$ -\bblibdirs$ - -# Avoid Module::Build generated and utility files. -\bBuild$ -\b_build -Build.PL -Build.bat - -# Avoid temp and backup files. -~$ -\.gz$ -\.old$ -\.bak$ -\.swp$ -\.tdy$ -\.tmp$ -\#$ -\b\.# - -# Avoid author test files. -\bpod_spelling.t$ - -^benchmark diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/META.yml new/Class-Accessor-Grouped-0.10006/META.yml --- old/Class-Accessor-Grouped-0.10003/META.yml 2011-05-03 02:23:18.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/META.yml 2011-12-30 05:04:31.000000000 +0100 @@ -3,13 +3,14 @@ author: - 'Matt S. Trout <mst(a)shadowcatsystems.co.uk>' build_requires: - ExtUtils::MakeMaker: 6.42 + ExtUtils::MakeMaker: 6.62 Test::Exception: 0.31 Test::More: 0.94 configure_requires: - ExtUtils::MakeMaker: 6.42 + ExtUtils::MakeMaker: 6.62 distribution_type: module -generated_by: 'Module::Install version 1.01' +dynamic_config: 1 +generated_by: 'Module::Install version 1.04' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -27,4 +28,4 @@ resources: license: http://dev.perl.org/licenses/ repository: git://git.shadowcat.co.uk/p5sagit/Class-Accessor-Grouped.git -version: 0.10003 +version: 0.10006 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/Makefile.PL new/Class-Accessor-Grouped-0.10006/Makefile.PL --- old/Class-Accessor-Grouped-0.10003/Makefile.PL 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/Makefile.PL 2011-12-28 20:33:26.000000000 +0100 @@ -1,4 +1,3 @@ -# $Id$ use strict; use warnings; use inc::Module::Install 1; @@ -16,7 +15,8 @@ if (can_cc or $Module::Install::AUTHOR) { requires 'Sub::Name' => '0.05'; - requires 'Class::XSAccessor' => '1.11' + # when changing don't forget to adjust lib/Class/Accessor/Grouped.pm as well + requires 'Class::XSAccessor' => '1.13' if $] > '5.008'; } @@ -43,4 +43,3 @@ print "Regenerating META with XS requires excluded\n"; Meta->write; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/README new/Class-Accessor-Grouped-0.10006/README --- old/Class-Accessor-Grouped-0.10003/README 2011-05-03 02:24:34.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/README 2011-12-30 05:04:30.000000000 +0100 @@ -16,7 +16,7 @@ METHODS mk_group_accessors - __PACKAGE__->mk_group_accessors(simple => 'hair_length'); + __PACKAGE__->mk_group_accessors(simple => 'hair_length', [ hair_color => 'hc' ]); Arguments: $group, @fieldspec Returns: none @@ -36,7 +36,7 @@ expected to be of the form [ $accessor, $field ]. mk_group_ro_accessors - __PACKAGE__->mk_group_ro_accessors(simple => 'birthdate'); + __PACKAGE__->mk_group_ro_accessors(simple => 'birthdate', [ social_security_number => 'ssn' ]); Arguments: $group, @fieldspec Returns: none @@ -46,7 +46,7 @@ rather than setting the value. mk_group_wo_accessors - __PACKAGE__->mk_group_wo_accessors(simple => 'lie'); + __PACKAGE__->mk_group_wo_accessors(simple => 'lie', [ subject => 'subj' ]); Arguments: $group, @fieldspec Returns: none @@ -55,36 +55,6 @@ "mk_group_accessors" but accessors will throw an error if not passed a value rather than getting the value. - make_group_accessor - __PACKAGE__->make_group_accessor(simple => 'hair_length', 'hair_length'); - - Arguments: $group, $field, $method - Returns: \&accessor_coderef ? - - Called by mk_group_accessors for each entry in @fieldspec. Either - returns a coderef which will be installed at "&__PACKAGE__::$method", or - returns "undef" if it elects to install the coderef on its own. - - make_group_ro_accessor - __PACKAGE__->make_group_ro_accessor(simple => 'birthdate', 'birthdate'); - - Arguments: $group, $field, $method - Returns: \&accessor_coderef ? - - Called by mk_group_ro_accessors for each entry in @fieldspec. Either - returns a coderef which will be installed at "&__PACKAGE__::$method", or - returns "undef" if it elects to install the coderef on its own. - - make_group_wo_accessor - __PACKAGE__->make_group_wo_accessor(simple => 'lie', 'lie'); - - Arguments: $group, $field, $method - Returns: \&accessor_coderef ? - - Called by mk_group_wo_accessors for each entry in @fieldspec. Either - returns a coderef which will be installed at "&__PACKAGE__::$method", or - returns "undef" if it elects to install the coderef on its own. - get_simple Arguments: $field Returns: $value @@ -147,9 +117,47 @@ $self->result_class->method(); +INTERNAL METHODS + These methods are documented for clarity, but are never meant to be + called directly, and are not really meant for overriding either. + get_super_paths Returns a list of 'parent' or 'super' class names that the current class - inherited from. + inherited from. This is what drives the traversal done by + "get_inherited". + + make_group_accessor + __PACKAGE__->make_group_accessor('simple', 'hair_length', 'hair_length'); + __PACKAGE__->make_group_accessor('simple', 'hc', 'hair_color'); + + Arguments: $group, $field, $accessor + Returns: \&accessor_coderef ? + + Called by mk_group_accessors for each entry in @fieldspec. Either + returns a coderef which will be installed at "&__PACKAGE__::$accessor", + or returns "undef" if it elects to install the coderef on its own. + + make_group_ro_accessor + __PACKAGE__->make_group_ro_accessor('simple', 'birthdate', 'birthdate'); + __PACKAGE__->make_group_ro_accessor('simple', 'ssn', 'social_security_number'); + + Arguments: $group, $field, $accessor + Returns: \&accessor_coderef ? + + Called by mk_group_ro_accessors for each entry in @fieldspec. Either + returns a coderef which will be installed at "&__PACKAGE__::$accessor", + or returns "undef" if it elects to install the coderef on its own. + + make_group_wo_accessor + __PACKAGE__->make_group_wo_accessor('simple', 'lie', 'lie'); + __PACKAGE__->make_group_wo_accessor('simple', 'subj', 'subject'); + + Arguments: $group, $field, $accessor + Returns: \&accessor_coderef ? + + Called by mk_group_wo_accessors for each entry in @fieldspec. Either + returns a coderef which will be installed at "&__PACKAGE__::$accessor", + or returns "undef" if it elects to install the coderef on its own. PERFORMANCE To provide total flexibility Class::Accessor::Grouped calls methods diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/AutoInstall.pm new/Class-Accessor-Grouped-0.10006/inc/Module/AutoInstall.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/AutoInstall.pm 2011-05-03 02:23:18.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/AutoInstall.pm 2011-12-30 05:04:30.000000000 +0100 @@ -7,7 +7,7 @@ use vars qw{$VERSION}; BEGIN { - $VERSION = '1.03'; + $VERSION = '1.04'; } # special map on pre-defined feature sets @@ -17,11 +17,14 @@ ); # various lexical flags -my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS ); +my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $InstallDepsTarget, $HasCPANPLUS ); my ( - $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps + $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps, + $UpgradeDeps ); -my ( $PostambleActions, $PostambleUsed ); +my ( $PostambleActions, $PostambleActionsNoTest, $PostambleActionsUpgradeDeps, + $PostambleActionsUpgradeDepsNoTest, $PostambleActionsListDeps, + $PostambleActionsListAllDeps, $PostambleUsed, $NoTest); # See if it's a testing or non-interactive session _accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN ); @@ -31,6 +34,10 @@ $AcceptDefault = shift; } +sub _installdeps_target { + $InstallDepsTarget = shift; +} + sub missing_modules { return @Missing; } @@ -63,6 +70,11 @@ __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) ); exit 0; } + elsif ( $arg =~ /^--upgradedeps=(.*)$/ ) { + $UpgradeDeps = 1; + __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) ); + exit 0; + } elsif ( $arg =~ /^--default(?:deps)?$/ ) { $AcceptDefault = 1; } @@ -125,7 +137,7 @@ # check entirely since we don't want to have to load (and configure) # an old CPAN just for a cosmetic message - $UnderCPAN = _check_lock(1) unless $SkipInstall; + $UnderCPAN = _check_lock(1) unless $SkipInstall || $InstallDepsTarget; while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) { my ( @required, @tests, @skiptests ); @@ -207,6 +219,7 @@ $CheckOnly or ($mandatory and $UnderCPAN) or $AllDeps + or $InstallDepsTarget or _prompt( qq{==> Auto-install the } . ( @required / 2 ) @@ -237,10 +250,17 @@ } } - if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) { + if ( @Missing and not( $CheckOnly or $UnderCPAN) ) { require Config; - print -"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n"; + my $make = $Config::Config{make}; + if ($InstallDepsTarget) { + print +"*** To install dependencies type '$make installdeps' or '$make installdeps_notest'.\n"; + } + else { + print +"*** Dependencies will be installed the next time you type '$make'.\n"; + } # make an educated guess of whether we'll need root permission. print " (You may need to do that as the 'root' user.)\n" @@ -271,6 +291,10 @@ sub _check_lock { return unless @Missing or @_; + if ($ENV{PERL5_CPANM_IS_RUNNING}) { + return _running_under('cpanminus'); + } + my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING}; if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) { @@ -332,6 +356,11 @@ } } + if ($UpgradeDeps) { + push @modules, @installed; + @installed = (); + } + return @installed unless @modules; # nothing to do return @installed if _check_lock(); # defer to the CPAN shell @@ -463,6 +492,11 @@ } else { die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n"; } + push @config, 'prereqs', $value; + } elsif ( $key eq 'force' ) { + push @config, $key, $value; + } elsif ( $key eq 'notest' ) { + push @config, 'skiptest', $value; } else { die "*** Cannot convert option $key to CPANPLUS version.\n"; } @@ -497,10 +531,14 @@ # set additional options while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) { ( $args{$opt} = $arg, next ) - if $opt =~ /^force$/; # pseudo-option + if $opt =~ /^(?:force|notest)$/; # pseudo-option $CPAN::Config->{$opt} = $arg; } + if ($args{notest} && (not CPAN::Shell->can('notest'))) { + die "Your version of CPAN is too old to support the 'notest' pragma"; + } + local $CPAN::Config->{prerequisites_policy} = 'follow'; while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) { @@ -519,8 +557,16 @@ delete $INC{$inc}; } - my $rv = $args{force} ? CPAN::Shell->force( install => $pkg ) - : CPAN::Shell->install($pkg); + my $rv = do { + if ($args{force}) { + CPAN::Shell->force( install => $pkg ) + } elsif ($args{notest}) { + CPAN::Shell->notest( install => $pkg ) + } else { + CPAN::Shell->install($pkg) + } + }; + $rv ||= eval { $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, ) ->{install} @@ -763,6 +809,35 @@ : "\$(NOECHO) \$(NOOP)" ); + my $deps_list = join( ',', @Missing, @Existing ); + + $PostambleActionsUpgradeDeps = + "\$(PERL) $0 --config=$config --upgradedeps=$deps_list"; + + my $config_notest = + join( ',', (UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config}), + 'notest', 1 ) + if $Config; + + $PostambleActionsNoTest = ( + ($missing and not $UnderCPAN) + ? "\$(PERL) $0 --config=$config_notest --installdeps=$missing" + : "\$(NOECHO) \$(NOOP)" + ); + + $PostambleActionsUpgradeDepsNoTest = + "\$(PERL) $0 --config=$config_notest --upgradedeps=$deps_list"; + + $PostambleActionsListDeps = + '@$(PERL) -le "print for @ARGV" ' + . join(' ', map $Missing[$_], grep $_ % 2 == 0, 0..$#Missing); + + my @all = (@Missing, @Existing); + + $PostambleActionsListAllDeps = + '@$(PERL) -le "print for @ARGV" ' + . join(' ', map $all[$_], grep $_ % 2 == 0, 0..$#all); + return %args; } @@ -797,11 +872,15 @@ sub postamble { $PostambleUsed = 1; + my $fragment; - return <<"END_MAKE"; + $fragment .= <<"AUTO_INSTALL" if !$InstallDepsTarget; config :: installdeps \t\$(NOECHO) \$(NOOP) +AUTO_INSTALL + + $fragment .= <<"END_MAKE"; checkdeps :: \t\$(PERL) $0 --checkdeps @@ -809,12 +888,28 @@ installdeps :: \t$PostambleActions +installdeps_notest :: +\t$PostambleActionsNoTest + +upgradedeps :: +\t$PostambleActionsUpgradeDeps + +upgradedeps_notest :: +\t$PostambleActionsUpgradeDepsNoTest + +listdeps :: +\t$PostambleActionsListDeps + +listalldeps :: +\t$PostambleActionsListAllDeps + END_MAKE + return $fragment; } 1; __END__ -#line 1071 +#line 1178 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/AutoInstall.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/AutoInstall.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/AutoInstall.pm 2011-05-03 02:23:18.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/AutoInstall.pm 2011-12-30 05:04:30.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -73,6 +73,17 @@ ); } +sub installdeps_target { + my ($self, @args) = @_; + + $self->include('Module::AutoInstall'); + require Module::AutoInstall; + + Module::AutoInstall::_installdeps_target(1); + + $self->auto_install(@args); +} + sub auto_install_now { my $self = shift; $self->auto_install(@_); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Base.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Base.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Base.pm 2011-05-03 02:23:17.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Base.pm 2011-12-30 05:04:30.000000000 +0100 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; } # Suspend handler for "redefined" warnings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Can.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Can.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Can.pm 2011-05-03 02:23:17.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Can.pm 2011-12-30 05:04:30.000000000 +0100 @@ -9,7 +9,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Fetch.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Fetch.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Fetch.pm 2011-05-03 02:23:18.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Fetch.pm 2011-12-30 05:04:30.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Include.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Include.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Include.pm 2011-05-03 02:23:18.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Include.pm 2011-12-30 05:04:30.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Makefile.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Makefile.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Makefile.pm 2011-05-03 02:23:17.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Makefile.pm 2011-12-30 05:04:30.000000000 +0100 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -219,14 +219,14 @@ # an underscore, even though its own version may contain one! # Hence the funny regexp to get rid of it. See RT #35800 # for details. - my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/; + my ($v) = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/; $self->build_requires( 'ExtUtils::MakeMaker' => $v ); $self->configure_requires( 'ExtUtils::MakeMaker' => $v ); } else { # Allow legacy-compatibility with 5.005 by depending on the # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 ); + $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); } # Generate the MakeMaker params @@ -241,7 +241,6 @@ 'all_from' if you prefer) in Makefile.PL. EOT - $DB::single = 1; if ( $self->tests ) { my @tests = split ' ', $self->tests; my %seen; @@ -412,4 +411,4 @@ __END__ -#line 541 +#line 540 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Metadata.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Metadata.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Metadata.pm 2011-05-03 02:23:17.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Metadata.pm 2011-12-30 05:04:30.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -151,15 +151,21 @@ sub install_as_vendor { $_[0]->installdirs('vendor') } sub dynamic_config { - my $self = shift; - unless ( @_ ) { - warn "You MUST provide an explicit true/false value to dynamic_config\n"; - return $self; + my $self = shift; + my $value = @_ ? shift : 1; + if ( $self->{values}->{dynamic_config} ) { + # Once dynamic we never change to static, for safety + return 0; } - $self->{values}->{dynamic_config} = $_[0] ? 1 : 0; + $self->{values}->{dynamic_config} = $value ? 1 : 0; return 1; } +# Convenience command +sub static_config { + shift->dynamic_config(0); +} + sub perl_version { my $self = shift; return $self->{values}->{perl_version} unless @_; @@ -170,7 +176,7 @@ # Normalize the version $version = $self->_perl_version($version); - # We don't support the reall old versions + # We don't support the really old versions unless ( $version >= 5.005 ) { die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; } @@ -582,7 +588,7 @@ sub requires_from { my $self = shift; my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; while ( @requires ) { my $module = shift @requires; my $version = shift @requires; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Win32.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Win32.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/Win32.pm 2011-05-03 02:23:18.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/Win32.pm 2011-12-30 05:04:30.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install/WriteAll.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install/WriteAll.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install/WriteAll.pm 2011-05-03 02:23:18.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install/WriteAll.pm 2011-12-30 05:04:30.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.04'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/inc/Module/Install.pm new/Class-Accessor-Grouped-0.10006/inc/Module/Install.pm --- old/Class-Accessor-Grouped-0.10003/inc/Module/Install.pm 2011-05-03 02:23:17.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/inc/Module/Install.pm 2011-12-30 05:04:30.000000000 +0100 @@ -31,7 +31,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '1.01'; + $VERSION = '1.04'; # Storage for the pseudo-singleton $MAIN = undef; @@ -451,7 +451,7 @@ } sub _cmp ($$) { - _version($_[0]) <=> _version($_[1]); + _version($_[1]) <=> _version($_[2]); } # Cloned from Params::Util::_CLASS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/lib/Class/Accessor/Grouped.pm new/Class-Accessor-Grouped-0.10006/lib/Class/Accessor/Grouped.pm --- old/Class-Accessor-Grouped-0.10003/lib/Class/Accessor/Grouped.pm 2011-05-03 02:08:32.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/lib/Class/Accessor/Grouped.pm 2011-12-30 05:04:18.000000000 +0100 @@ -13,15 +13,12 @@ } } -our $VERSION = '0.10003'; +our $VERSION = '0.10006'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases -# when changing minimum version don't forget to adjust L</PERFORMANCE> and -# the Makefile.PL as well +# when changing minimum version don't forget to adjust Makefile.PL as well our $__minimum_xsa_version; -BEGIN { - $__minimum_xsa_version = '1.11'; -} +BEGIN { $__minimum_xsa_version = '1.13' } our $USE_XS; # the unless defined is here so that we can override the value @@ -97,7 +94,7 @@ =head2 mk_group_accessors - __PACKAGE__->mk_group_accessors(simple => 'hair_length'); + __PACKAGE__->mk_group_accessors(simple => 'hair_length', [ hair_color => 'hc' ]); =over 4 @@ -131,7 +128,7 @@ =head2 mk_group_ro_accessors - __PACKAGE__->mk_group_ro_accessors(simple => 'birthdate'); + __PACKAGE__->mk_group_ro_accessors(simple => 'birthdate', [ social_security_number => 'ssn' ]); =over 4 @@ -155,7 +152,7 @@ =head2 mk_group_wo_accessors - __PACKAGE__->mk_group_wo_accessors(simple => 'lie'); + __PACKAGE__->mk_group_wo_accessors(simple => 'lie', [ subject => 'subj' ]); =over 4 @@ -177,66 +174,6 @@ $self->_mk_group_accessors('make_group_wo_accessor', $group, @fields); } -=head2 make_group_accessor - - __PACKAGE__->make_group_accessor(simple => 'hair_length', 'hair_length'); - -=over 4 - -=item Arguments: $group, $field, $method - -Returns: \&accessor_coderef ? - -=back - -Called by mk_group_accessors for each entry in @fieldspec. Either returns -a coderef which will be installed at C<&__PACKAGE__::$method>, or returns -C<undef> if it elects to install the coderef on its own. - -=cut - -sub make_group_accessor { $gen_accessor->('rw', @_) } - -=head2 make_group_ro_accessor - - __PACKAGE__->make_group_ro_accessor(simple => 'birthdate', 'birthdate'); - -=over 4 - -=item Arguments: $group, $field, $method - -Returns: \&accessor_coderef ? - -=back - -Called by mk_group_ro_accessors for each entry in @fieldspec. Either returns -a coderef which will be installed at C<&__PACKAGE__::$method>, or returns -C<undef> if it elects to install the coderef on its own. - -=cut - -sub make_group_ro_accessor { $gen_accessor->('ro', @_) } - -=head2 make_group_wo_accessor - - __PACKAGE__->make_group_wo_accessor(simple => 'lie', 'lie'); - -=over 4 - -=item Arguments: $group, $field, $method - -Returns: \&accessor_coderef ? - -=back - -Called by mk_group_wo_accessors for each entry in @fieldspec. Either returns -a coderef which will be installed at C<&__PACKAGE__::$method>, or returns -C<undef> if it elects to install the coderef on its own. - -=cut - -sub make_group_wo_accessor { $gen_accessor->('wo', @_) } - =head2 get_simple =over 4 @@ -422,9 +359,15 @@ return $_[0]->set_inherited($_[1], $_[2]); }; +=head1 INTERNAL METHODS + +These methods are documented for clarity, but are never meant to be called +directly, and are not really meant for overriding either. + =head2 get_super_paths -Returns a list of 'parent' or 'super' class names that the current class inherited from. +Returns a list of 'parent' or 'super' class names that the current class +inherited from. This is what drives the traversal done by L</get_inherited>. =cut @@ -432,6 +375,70 @@ return @{mro::get_linear_isa( ref($_[0]) || $_[0] )}; }; +=head2 make_group_accessor + + __PACKAGE__->make_group_accessor('simple', 'hair_length', 'hair_length'); + __PACKAGE__->make_group_accessor('simple', 'hc', 'hair_color'); + +=over 4 + +=item Arguments: $group, $field, $accessor + +Returns: \&accessor_coderef ? + +=back + +Called by mk_group_accessors for each entry in @fieldspec. Either returns +a coderef which will be installed at C<&__PACKAGE__::$accessor>, or returns +C<undef> if it elects to install the coderef on its own. + +=cut + +sub make_group_accessor { $gen_accessor->('rw', @_) } + +=head2 make_group_ro_accessor + + __PACKAGE__->make_group_ro_accessor('simple', 'birthdate', 'birthdate'); + __PACKAGE__->make_group_ro_accessor('simple', 'ssn', 'social_security_number'); + +=over 4 + +=item Arguments: $group, $field, $accessor + +Returns: \&accessor_coderef ? + +=back + +Called by mk_group_ro_accessors for each entry in @fieldspec. Either returns +a coderef which will be installed at C<&__PACKAGE__::$accessor>, or returns +C<undef> if it elects to install the coderef on its own. + +=cut + +sub make_group_ro_accessor { $gen_accessor->('ro', @_) } + +=head2 make_group_wo_accessor + + __PACKAGE__->make_group_wo_accessor('simple', 'lie', 'lie'); + __PACKAGE__->make_group_wo_accessor('simple', 'subj', 'subject'); + +=over 4 + +=item Arguments: $group, $field, $accessor + +Returns: \&accessor_coderef ? + +=back + +Called by mk_group_wo_accessors for each entry in @fieldspec. Either returns +a coderef which will be installed at C<&__PACKAGE__::$accessor>, or returns +C<undef> if it elects to install the coderef on its own. + +=cut + +sub make_group_wo_accessor { $gen_accessor->('wo', @_) } + + =head1 PERFORMANCE To provide total flexibility L<Class::Accessor::Grouped> calls methods @@ -532,7 +539,7 @@ delete $INC{'Sub/Name.pm'}; # because older perls suck $@; }; - *__CAG_NO_SUBNAME = $err + *__CAG_ENV__::NO_SUBNAME = $err ? sub () { $err } : sub () { 0 } ; @@ -548,25 +555,25 @@ delete $INC{'Class/XSAccessor.pm'}; $@; }; - *__CAG_NO_CXSA = $err + *__CAG_ENV__::NO_CXSA = $err ? sub () { $err } : sub () { 0 } ; - *__CAG_BROKEN_GOTO = ($] < '5.008009') + *__CAG_ENV__::BROKEN_GOTO = ($] < '5.008009') ? sub () { 1 } : sub () { 0 } ; - *__CAG_UNSTABLE_DOLLARAT = ($] < '5.013002') + *__CAG_ENV__::UNSTABLE_DOLLARAT = ($] < '5.013002') ? sub () { 1 } : sub () { 0 } ; - *__CAG_TRACK_UNDEFER_FAIL = ( + *__CAG_ENV__::TRACK_UNDEFER_FAIL = ( $INC{'Test/Builder.pm'} || $INC{'Test/Builder2.pm'} and $0 =~ m|^ x?t / .+ \.t $|x @@ -578,7 +585,7 @@ # Autodetect unless flag supplied my $xsa_autodetected; if (! defined $USE_XS) { - $USE_XS = __CAG_NO_CXSA ? 0 : 1; + $USE_XS = __CAG_ENV__::NO_CXSA ? 0 : 1; $xsa_autodetected++; } @@ -663,8 +670,8 @@ # Thus the final method (properly labeled and all) is installed in the # calling-package's namespace if ($USE_XS and $group eq 'simple') { - die sprintf( "Class::XSAccessor requested but not available:\n%s\n", __CAG_NO_CXSA ) - if __CAG_NO_CXSA; + die sprintf( "Class::XSAccessor requested but not available:\n%s\n", __CAG_ENV__::NO_CXSA ) + if __CAG_ENV__::NO_CXSA; my ($expected_cref, $cached_implementation); my $ret = $expected_cref = sub { @@ -675,9 +682,9 @@ # this block over and over again my $resolved_implementation = $cached_implementation->{$current_class} || do { if ( - $current_class->can('get_simple') == $original_simple_getter + ($current_class->can('get_simple')||0) == $original_simple_getter && - $current_class->can('set_simple') == $original_simple_setter + ($current_class->can('set_simple')||0) == $original_simple_setter ) { # nothing has changed, might as well use the XS crefs # @@ -719,7 +726,7 @@ # if after this shim was created someone wrapped it with an 'around', # we can not blindly reinstall the method slot - we will destroy the # wrapper. Silently chain execution further... - if ( !$expected_cref or $expected_cref != $current_class->can($methname) ) { + if ( !$expected_cref or $expected_cref != ($current_class->can($methname)||0) ) { # there is no point in re-determining it on every subsequent call, # just store for future reference @@ -727,12 +734,12 @@ # older perls segfault if the cref behind the goto throws # http://rt.perl.org/rt3/Public/Bug/Display.html?id=35878 - return $resolved_implementation->(@_) if __CAG_BROKEN_GOTO; + return $resolved_implementation->(@_) if __CAG_ENV__::BROKEN_GOTO; goto $resolved_implementation; } - if (__CAG_TRACK_UNDEFER_FAIL) { + if (__CAG_ENV__::TRACK_UNDEFER_FAIL) { my $deferred_calls_seen = do { no strict 'refs'; \%{"${current_class}::__cag_deferred_xs_shim_invocations"} @@ -769,7 +776,7 @@ # older perls segfault if the cref behind the goto throws # http://rt.perl.org/rt3/Public/Bug/Display.html?id=35878 - return $resolved_implementation->(@_) if __CAG_BROKEN_GOTO; + return $resolved_implementation->(@_) if __CAG_ENV__::BROKEN_GOTO; goto $resolved_implementation; }; @@ -779,12 +786,12 @@ } # no Sub::Name - just install the coderefs directly (compiling every time) - elsif (__CAG_NO_SUBNAME) { + elsif (__CAG_ENV__::NO_SUBNAME) { my $src = $accessor_maker_cache->{source}{$type}{$group}{$field} ||= $maker_templates->{$type}{pp_code}->($group, $field); no warnings 'redefine'; - local $@ if __CAG_UNSTABLE_DOLLARAT; + local $@ if __CAG_ENV__::UNSTABLE_DOLLARAT; eval "sub ${class}::${methname} { $src }"; undef; # so that no further attempt will be made to install anything @@ -796,7 +803,7 @@ my $src = $accessor_maker_cache->{source}{$type}{$group}{$field} ||= $maker_templates->{$type}{pp_code}->($group, $field); - local $@ if __CAG_UNSTABLE_DOLLARAT; + local $@ if __CAG_ENV__::UNSTABLE_DOLLARAT; eval "sub { my \$dummy; sub { \$dummy if 0; $src } }" or die $@; })->() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/accessors_pp.t new/Class-Accessor-Grouped-0.10006/t/accessors_pp.t --- old/Class-Accessor-Grouped-0.10003/t/accessors_pp.t 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/t/accessors_pp.t 2011-12-28 20:33:26.000000000 +0100 @@ -7,6 +7,7 @@ use lib 't/lib'; BEGIN { + local $ENV{DEVEL_HIDE_VERBOSE} = 0; eval { require Devel::Hide }; if ($@) { eval { require Sub::Name }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/basic.t new/Class-Accessor-Grouped-0.10006/t/basic.t --- old/Class-Accessor-Grouped-0.10003/t/basic.t 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/t/basic.t 2011-12-28 20:33:26.000000000 +0100 @@ -1,5 +1,3 @@ -#!perl -wT -# $Id$ use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/manifest.t new/Class-Accessor-Grouped-0.10006/t/manifest.t --- old/Class-Accessor-Grouped-0.10003/t/manifest.t 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/t/manifest.t 2011-12-28 20:33:26.000000000 +0100 @@ -1,5 +1,3 @@ -#!perl -wT -# $Id$ use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/pod_coverage.t new/Class-Accessor-Grouped-0.10006/t/pod_coverage.t --- old/Class-Accessor-Grouped-0.10003/t/pod_coverage.t 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/t/pod_coverage.t 2011-12-28 20:33:26.000000000 +0100 @@ -1,5 +1,3 @@ -#!perl -wT -# $Id$ use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/pod_spelling.t new/Class-Accessor-Grouped-0.10006/t/pod_spelling.t --- old/Class-Accessor-Grouped-0.10003/t/pod_spelling.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Class-Accessor-Grouped-0.10006/t/pod_spelling.t 2011-12-28 20:33:26.000000000 +0100 @@ -0,0 +1,49 @@ +use strict; +use warnings; + +BEGIN { + use lib 't/lib'; + use Test::More; + + plan skip_all => 'set TEST_AUTHOR to enable this test' unless $ENV{TEST_AUTHOR}; + + eval 'use Test::Spelling 0.11'; + plan skip_all => 'Test::Spelling 0.11 not installed' if $@; +}; + +set_spell_cmd('aspell list'); + +add_stopwords(<DATA>); + +all_pod_files_spelling_ok(); + +__DATA__ +Bowden +Raygun +Roditi +isa +mst +behaviour +further +overridable +Laco +Pauley +claco +stylings +fieldspec +listref +getters +ribasushi +Rabbitson +groditi +Caelum +Kitover +CAF +Sep +XSA +runtime +Axel +fREW +frew +getter +subclasses diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/pod_syntax.t new/Class-Accessor-Grouped-0.10006/t/pod_syntax.t --- old/Class-Accessor-Grouped-0.10003/t/pod_syntax.t 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/t/pod_syntax.t 2011-12-28 20:33:26.000000000 +0100 @@ -1,5 +1,3 @@ -#!perl -wT -# $Id$ use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/strict.t new/Class-Accessor-Grouped-0.10006/t/strict.t --- old/Class-Accessor-Grouped-0.10003/t/strict.t 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/t/strict.t 2011-12-28 20:33:26.000000000 +0100 @@ -1,5 +1,3 @@ -#!perl -wT -# $Id$ use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/style_no_tabs.t new/Class-Accessor-Grouped-0.10006/t/style_no_tabs.t --- old/Class-Accessor-Grouped-0.10003/t/style_no_tabs.t 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/t/style_no_tabs.t 2011-12-28 20:33:26.000000000 +0100 @@ -1,5 +1,3 @@ -#!perl -wT -# $Id$ use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Accessor-Grouped-0.10003/t/warnings.t new/Class-Accessor-Grouped-0.10006/t/warnings.t --- old/Class-Accessor-Grouped-0.10003/t/warnings.t 2011-05-03 01:37:19.000000000 +0200 +++ new/Class-Accessor-Grouped-0.10006/t/warnings.t 2011-12-28 20:33:26.000000000 +0100 @@ -1,5 +1,3 @@ -#!perl -wT -# $Id$ use strict; use warnings; -- 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 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package package-translations for openSUSE:Factory checked in at 2012-03-01 17:22:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-25 07:31:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.package-translations.new/package-translations.changes 2012-03-01 17:22:26.000000000 +0100 @@ -2 +2 @@ -Fri Feb 24 16:13:31 CET 2012 - coolo(a)suse.com +Wed Feb 29 16:13:29 CET 2012 - coolo(a)suse.com @@ -4 +4 @@ -- automated update on 2012-02-24 +- automated update on 2012-02-29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-translations.tar.bz2 ++++++ Files old/mo/package-translations-it.mo and new/mo/package-translations-it.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 oxygen-gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package oxygen-gtk3 for openSUSE:Factory checked in at 2012-03-01 17:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-30 12:27:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk3.new/oxygen-gtk3.changes 2012-03-01 17:21:58.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 17 21:03:29 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to 1.0.1: + Fixes include: + * Email list in evolution. + * Warnings when parsing CSS style sheet. + * Icon background with gtk3.3. + * High memory allocation for cached pixmaps. +- Split the package into gtk3-engine-oxygen and gtk3-theme-oxygen subpackages + for consistency with other gtk engines and themes (bnc#747107). + +------------------------------------------------------------------- Old: ---- oxygen-gtk3-1.0.0.tar.bz2 New: ---- oxygen-gtk3-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk3.spec ++++++ --- /var/tmp/diff_new_pack.JRX6Gt/_old 2012-03-01 17:21:59.000000000 +0100 +++ /var/tmp/diff_new_pack.JRX6Gt/_new 2012-03-01 17:21:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: oxygen-gtk3 -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 3.x License: LGPL-2.1+ @@ -45,6 +45,48 @@ widget appearance via hard coded pixmaps, which otherwise breaks everytime some setting is changed in KDE. +%package -n gtk3-engine-oxygen +Summary: Oxygen GTK 3.x Theme Engine +Group: System/GUI/Other + +%description -n gtk3-engine-oxygen +Oxygen-Gtk3 is a port of the default KDE widget theme (Oxygen), to gtk 3.x. + +It's primary goal is to ensure visual consistency between gtk-based and qt-based +applications running under KDE. A secondary objective is to also have a +stand-alone nice looking gtk theme that would behave well on other Desktop +Environments. + +Unlike other attempts made to port the KDE oxygen theme to gtk, this attempt does +not depend on Qt (via some Qt to Gtk conversion engine), nor does render the +widget appearance via hard coded pixmaps, which otherwise breaks everytime some +setting is changed in KDE. + +This package contains the Oxygen gtk 3.x theme engine. + +%package -n gtk3-theme-oxygen +Summary: Oxygen GTK 3.x Theme +Group: System/GUI/Other +Requires: gtk3-engine-oxygen = %{version} +# oxygen-gtk3 was last used at version 1.0.0 in K:D:F +Provides: oxygen-gtk3 = %{version} +Obsoletes: oxygen-gtk3 < %{version} + +%description -n gtk3-theme-oxygen +Oxygen-Gtk3 is a port of the default KDE widget theme (Oxygen), to gtk 3.x. + +It's primary goal is to ensure visual consistency between gtk-based and qt-based +applications running under KDE. A secondary objective is to also have a +stand-alone nice looking gtk theme that would behave well on other Desktop +Environments. + +Unlike other attempts made to port the KDE oxygen theme to gtk, this attempt does +not depend on Qt (via some Qt to Gtk conversion engine), nor does render the +widget appearance via hard coded pixmaps, which otherwise breaks everytime some +setting is changed in KDE. + +This package contains the Oxygen gtk 3.x theme. + %prep %setup -q @@ -68,11 +110,15 @@ %make_install popd -%files +%files -n gtk3-engine-oxygen %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO -%{_bindir}/oxygen-gtk3-demo %{_libdir}/gtk-3.0/3.0.0/theming-engines/liboxygen-gtk.so + +%files -n gtk3-theme-oxygen +%defattr(-,root,root,-) +%doc AUTHORS COPYING README TODO +%{_bindir}/oxygen-gtk3-demo %dir %{_datadir}/themes/oxygen-gtk %{_datadir}/themes/oxygen-gtk/gtk-3.0/ ++++++ oxygen-gtk3-1.0.0.tar.bz2 -> oxygen-gtk3-1.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/CMakeLists.txt new/oxygen-gtk3-1.0.1/CMakeLists.txt --- old/oxygen-gtk3-1.0.0/CMakeLists.txt 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/CMakeLists.txt 2012-02-15 10:38:23.000000000 +0100 @@ -9,11 +9,11 @@ set( CPACK_PACKAGE_NAME "oxygen-gtk3" ) set( CPACK_SOURCE_PACKAGE_NAME "oxygen-gtk3" ) set( CPACK_SOURCE_GENERATOR TBZ2 ) -set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Oxygen Gtk theme" ) +set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Oxygen Gtk2 theme" ) set( CPACK_PACKAGE_VENDOR "hugo(a)oxygen-icons.org" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "0" ) -set( CPACK_PACKAGE_VERSION_PATCH "0" ) +set( CPACK_PACKAGE_VERSION_PATCH "1" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/metacity.patch new/oxygen-gtk3-1.0.1/metacity.patch --- old/oxygen-gtk3-1.0.0/metacity.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/metacity.patch 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,21 @@ +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-gtk3-1.0.0/oxygen-gtk.diff new/oxygen-gtk3-1.0.1/oxygen-gtk.diff --- old/oxygen-gtk3-1.0.0/oxygen-gtk.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/oxygen-gtk.diff 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,17 @@ +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-gtk3-1.0.0/rc/argb-apps.conf new/oxygen-gtk3-1.0.1/rc/argb-apps.conf --- old/oxygen-gtk3-1.0.0/rc/argb-apps.conf 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/rc/argb-apps.conf 2012-02-15 10:38:23.000000000 +0100 @@ -48,3 +48,4 @@ ############################################################ # The list of disabled applications is now empty, because the way argb is handled should now be safe for all applications # if you have non-empty user argb-apps.conf file, it is recommanded to try empty it. +disable:xfrun4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/rc/gtk.css new/oxygen-gtk3-1.0.1/rc/gtk.css --- old/oxygen-gtk3-1.0.0/rc/gtk.css 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/rc/gtk.css 2012-02-15 10:38:23.000000000 +0100 @@ -28,49 +28,49 @@ */ * { - -GtkPaned-handle-size: 3; - -GtkButton-child_displacement_x: 0; - -GtkButton-child_displacement_y: 0; + -GtkPaned-handle-size: 3px; + -GtkButton-child_displacement_x: 0px; + -GtkButton-child_displacement_y: 0px; - -GtkButton-default_border: 0; - -GtkButton-default_outside_border: 0; - -GtkButton-inner-border: 1 2 0; + -GtkButton-default_border: 0px; + -GtkButton-default_outside_border: 0px; + -GtkButton-inner-border: 1px 2px 0px; - -GtkCalendar-inner-border: 0; - -GtkCalendar-horizontal-separation: 0; - -GtkComboBox-appears-as-list: 1; + -GtkCalendar-inner-border: 0px; + -GtkCalendar-horizontal-separation: 0px; + -GtkComboBox-appears-as-list: 1px; - -GtkMenu-horizontal-padding: 3; - -GtkMenu-vertical-padding: 5; - -GtkMenu-horizontal-offset: -7; - -GtkMenuBar-internal-padding: 0; + -GtkMenu-horizontal-padding: 3px; + -GtkMenu-vertical-padding: 5px; + -GtkMenu-horizontal-offset: -7px; + -GtkMenuBar-internal-padding: 0px; - -GtkScrolledWindow-scrollbar-spacing:1; + -GtkScrolledWindow-scrollbar-spacing: 1px; - -GtkCheckButton-indicator-size: 18; - -GtkCheckMenuItem-indicator-size: 16; - -GtkExpander-expander-size: 15; - -GtkTreeView-expander-size: 15; + -GtkCheckButton-indicator-size: 18px; + -GtkCheckMenuItem-indicator-size: 16px; + -GtkExpander-expander-size: 15px; + -GtkTreeView-expander-size: 15px; - -GtkTreeView-allow-rules: 1; + -GtkTreeView-allow-rules: 1px; -GtkStatusbar-shadow-type: GTK_SHADOW_NONE; - -GtkWindow-resize-grip-height: 0; - -GtkWindow-resize-grip-width: 0; + -GtkWindow-resize-grip-height: 0px; + -GtkWindow-resize-grip-width: 0px; /* Apparently the following have become obsolete - -GtkTreeView-row-ending-details: 1; + -GtkTreeView-row-ending-details: 1px; -GtkStatusbar-has-resize-grip: false; - -GtkEntry-honors-transparent-bg-hint: 1; + -GtkEntry-honors-transparent-bg-hint: 1px; */ engine: oxygen-gtk; } -GtkScrolledWindow { border-width: 1; } +GtkScrolledWindow { border-width: 1px; } /* customize border styles */ .toolbar { border-style: none; } @@ -84,61 +84,61 @@ */ /* specialization of default widgets style properties */ -GtkToggleButton { -GtkButton-inner-border: 1 0 0; } +GtkToggleButton { -GtkButton-inner-border: 1px 0px 0px; } GtkScale { - -GtkRange-slider-width: 23; - -GtkScale-slider-length: 21; + -GtkRange-slider-width: 23px; + -GtkScale-slider-length: 21px; } GtkScrollbar { - -GtkRange-stepper-size:12; - -GtkRange-trough-border:0; + -GtkRange-stepper-size: 12px; + -GtkRange-trough-border: 0px; } /* entries */ /* do not change unless also changing Entry_SideMargin in OxygenStyle.h */ GtkEntry { - padding: 2 5; + padding: 2px 5px; } /* menuitems padding */ GtkMenuBar { - padding: 1; - border-width: 0; + padding: 1px; + border-width: 0px; } -GtkMenuBar>GtkMenuItem { padding: 2 5; } -GtkMenu>GtkMenuItem { padding: 5 1; } -GtkMenu>GtkSeparatorMenuItem { padding: 1 1; } +GtkMenuBar>GtkMenuItem { padding: 2px 5px; } +GtkMenu>GtkMenuItem { padding: 5px 1px; } +GtkMenu>GtkSeparatorMenuItem { padding: 1px 1px; } /* menu toolbutton */ GtkMenuToolButton, GtkMenuToolButton * { - border-width: 0; - -GtkButton-focus-padding: 0; - -GtkWidget-focus-line-width: 0; + border-width: 0px; + -GtkButton-focus-padding: 0px; + -GtkWidget-focus-line-width: 0px; } /* notebooks */ -GtkNotebook { padding: 4; } +GtkNotebook { padding: 4px; } /* option menu */ -GtkOptionMenu { padding: 0 4; } +GtkOptionMenu { padding: 0px 4px; } /* separators */ -GtkSeparator { border-width: 3; } +GtkSeparator { border-width: 3px; } /* frames */ -GtkFrame { padding: 1; } -GtkScrolledWindow { padding: 1; } -GtkViewport { padding: 1; } -GtkProgressBar { padding: 0; } +GtkFrame { padding: 1px; } +GtkScrolledWindow { padding: 1px; } +GtkViewport { padding: 1px; } +GtkProgressBar { padding: 0px; } /* combo boxes */ -GtkComboBox { padding: 1 0; } -GtkComboBox>GtkFrame { padding: 4; } +GtkComboBox { padding: 1px 0px; } +GtkComboBox>GtkFrame { padding: 4px; } GtkComboBox>GtkEntry { - padding: 2 5; + padding: 2px 5px; } /* headers */ -GtkTreeView>GtkButton { border-width: 0 2; } -GtkList>GtkButton { border-width: 0 2; } +GtkTreeView>GtkButton { border-width: 0px 2px; } +GtkList>GtkButton { border-width: 0px 2px; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/CMakeLists.txt new/oxygen-gtk3-1.0.1/src/CMakeLists.txt --- old/oxygen-gtk3-1.0.0/src/CMakeLists.txt 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/CMakeLists.txt 2012-02-15 10:38:23.000000000 +0100 @@ -47,6 +47,8 @@ oxygengtktypenames.cpp oxygengtkutils.cpp oxygenloghandler.cpp + oxygenobjectcounter.cpp + oxygenobjectcountermap.cpp oxygenoptionmap.cpp oxygenpalette.cpp oxygenpathlist.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygeninnershadowdata.cpp new/oxygen-gtk3-1.0.1/src/animations/oxygeninnershadowdata.cpp --- old/oxygen-gtk3-1.0.0/src/animations/oxygeninnershadowdata.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygeninnershadowdata.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -107,7 +107,8 @@ // check window window && gdk_window_get_window_type( window ) == GDK_WINDOW_CHILD && - gdk_display_supports_composite( gtk_widget_get_display( widget ) ) ) + gdk_display_supports_composite( gtk_widget_get_display( widget ) ) && + G_OBJECT_TYPE_NAME(widget) != std::string("MessageList") ) // TODO: implement proper blacklist if there appear too many bad widgets/apps { data.initiallyComposited=gdk_window_get_composited(window); gdk_window_set_composited(window,TRUE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetdata.cpp new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetdata.cpp --- old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetdata.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetdata.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -136,6 +136,18 @@ } //________________________________________________________________________________ + bool TabWidgetData::isInTab( int x, int y ) const + { + + // loop over tab rectangles and check. + for( RectangleList::const_iterator iter = _tabRects.begin(); iter != _tabRects.end(); ++iter ) + { if( Gtk::gdk_rectangle_contains( &(*iter), x, y ) ) return true; } + + return false; + + } + + //________________________________________________________________________________ void TabWidgetData::setHoveredTab( GtkWidget* widget, int index ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetdata.h new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetdata.h --- old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetdata.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetdata.h 2012-02-15 10:38:23.000000000 +0100 @@ -91,6 +91,9 @@ bool isDirty( void ) const { return _dirty; } + //! returns true if provided point is in one tab of the widget + bool isInTab( int x, int y ) const; + //@] protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetengine.h new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetengine.h --- old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetengine.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetengine.h 2012-02-15 10:38:23.000000000 +0100 @@ -90,6 +90,10 @@ int hoveredTab( GtkWidget* widget ) { return data().value( widget ).hoveredTab(); } + //! returns true if provided point is in one tab of the widget + bool isInTab( GtkWidget* widget, int x, int y ) + { return data().value( widget ).isInTab( x, y ); } + //! true when drag is in progress bool dragInProgress( GtkWidget* widget ) { return data().value( widget ).dragInProgress(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentimeline.cpp new/oxygen-gtk3-1.0.1/src/animations/oxygentimeline.cpp --- old/oxygen-gtk3-1.0.0/src/animations/oxygentimeline.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentimeline.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -27,6 +27,9 @@ { //_________________________________________________ + int TimeLine::_steps = 0; + + //_________________________________________________ TimeLine::TimeLine( int duration ): _duration( duration ), _enabled( true ), @@ -131,9 +134,13 @@ assert( _time < _duration ); assert( _time <= elapsed ); - _value = ( _value*double(_duration - elapsed) + end*double(elapsed - _time) )/double(_duration - _time); + double oldValue( _value ); + _value = digitize( ( _value*double(_duration - elapsed) + end*double(elapsed - _time) )/double(_duration - _time) ); _time = elapsed; - trigger(); + + // trigger callback if value is actually changed + if( _value != oldValue ) trigger(); + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentimeline.h new/oxygen-gtk3-1.0.1/src/animations/oxygentimeline.h --- old/oxygen-gtk3-1.0.0/src/animations/oxygentimeline.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentimeline.h 2012-02-15 10:38:23.000000000 +0100 @@ -23,6 +23,7 @@ #include <glib.h> #include <cassert> +#include <cmath> namespace Oxygen { @@ -114,12 +115,24 @@ //@} + //! steps + static void setSteps( int value ) + { _steps = value; } + protected: //! run callback void trigger( void ) const { if( _func ) (_func)(_data); } + //! digitize value, based on steps + double digitize( const double& value ) const + { + if( _steps > 0 ) return std::floor( value*_steps )/_steps; + else return value; + } + + private: //! duration @@ -149,6 +162,9 @@ //! data gpointer _data; + //! steps + static int _steps; + }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentreeviewdata.cpp new/oxygen-gtk3-1.0.1/src/animations/oxygentreeviewdata.cpp --- old/oxygen-gtk3-1.0.0/src/animations/oxygentreeviewdata.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentreeviewdata.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -256,18 +256,6 @@ } //________________________________________________________________________________ - void TreeViewData::columnsChanged( GtkTreeView*, gpointer data ) - { - - #if OXYGEN_DEBUG - std::cerr << "Oxygen::TreeViewData::columnsChanged" << std::endl; - #endif - - static_cast<TreeViewData*>(data)->updateColumnsCursor(); - return; - } - - //________________________________________________________________________________ gboolean TreeViewData::motionNotifyEvent(GtkWidget* widget, GdkEventMotion* event, gpointer data ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentreeviewdata.h new/oxygen-gtk3-1.0.1/src/animations/oxygentreeviewdata.h --- old/oxygen-gtk3-1.0.0/src/animations/oxygentreeviewdata.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentreeviewdata.h 2012-02-15 10:38:23.000000000 +0100 @@ -87,9 +87,6 @@ //! set mouse over state virtual bool setHovered( GtkWidget* widget, bool value ); - //! update columns cursor - void updateColumnsCursor( void ) const; - //! update hovered cell based on pointer position void updatePosition( GtkWidget*, int x, int y ); @@ -136,7 +133,6 @@ //@{ static gboolean childDestroyNotifyEvent( GtkWidget*, gpointer ); static void childValueChanged( GtkRange*, gpointer ); - static void columnsChanged( GtkTreeView*, gpointer ); static gboolean motionNotifyEvent( GtkWidget*, GdkEventMotion*, gpointer ); //@} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/log new/oxygen-gtk3-1.0.1/src/log --- old/oxygen-gtk3-1.0.0/src/log 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/log 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,141 @@ + + +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-gtk3-1.0.0/src/oxygencairosurfacecache.h new/oxygen-gtk3-1.0.1/src/oxygencairosurfacecache.h --- old/oxygen-gtk3-1.0.0/src/oxygencairosurfacecache.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygencairosurfacecache.h 2012-02-15 10:38:23.000000000 +0100 @@ -37,7 +37,8 @@ public: //! constructor - CairoSurfaceCache( void ) + CairoSurfaceCache( size_t size = 100 ): + Cache<T, Cairo::Surface>( size ) {} //! destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenobjectcounter.cpp new/oxygen-gtk3-1.0.1/src/oxygenobjectcounter.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenobjectcounter.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenobjectcounter.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,51 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + +#include "oxygenobjectcounter.h" +#include "oxygenobjectcountermap.h" + +namespace Oxygen +{ + //____________________________________________________________ + ObjectCounter::ObjectCounter( const std::string& name ): + count_( 0 ) + { + count_ = ObjectCounterMap::get().counter( name ); + ObjectCounterMap::get().increment( *count_ ); + return; + } + + //____________________________________________________________ + ObjectCounter::ObjectCounter( const ObjectCounter& counter ): + count_( counter.count_ ) + { + ObjectCounterMap::get().increment( *count_ ); + return; + } + + //____________________________________________________________ + ObjectCounter::~ObjectCounter( void ) + { if( count_ ) ObjectCounterMap::get().decrement( *count_ ); } + + //____________________________________________________________ + int ObjectCounter::count( void ) const + { return (count_) ? *count_:0; } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenobjectcounter.h new/oxygen-gtk3-1.0.1/src/oxygenobjectcounter.h --- old/oxygen-gtk3-1.0.0/src/oxygenobjectcounter.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenobjectcounter.h 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,61 @@ +#ifndef Counter_h +#define Counter_h + +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + + +#include <string> +#include <map> + + +namespace Oxygen +{ + + class ObjectCounter + { + + public: + + //! counter name and counts pair + typedef std::pair<std::string, int> Pair; + + //! constructor + ObjectCounter( const std::string& name ); + + //! constructor + ObjectCounter( const ObjectCounter& counter ); + + //! destructor + virtual ~ObjectCounter( void ); + + //! retrieves counter count + int count( void ) const; + + private: + + //! pointer to integer counter + int* count_; + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenobjectcountermap.cpp new/oxygen-gtk3-1.0.1/src/oxygenobjectcountermap.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenobjectcountermap.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenobjectcountermap.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,33 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + +#include "oxygenobjectcountermap.h" + +namespace Oxygen +{ + + //___________________________________________________ + ObjectCounterMap& ObjectCounterMap::get( void ) + { + static ObjectCounterMap singleton; + return singleton; + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenobjectcountermap.h new/oxygen-gtk3-1.0.1/src/oxygenobjectcountermap.h --- old/oxygen-gtk3-1.0.0/src/oxygenobjectcountermap.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenobjectcountermap.h 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,68 @@ +#ifndef ObjectCounterMap_h +#define ObjectCounterMap_h + +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + +#include <map> +#include <string> + +//! thread-safe Object counter storage map +namespace Oxygen +{ + class ObjectCounterMap: public std::map<std::string, int> + { + + public: + + //! singleton + static ObjectCounterMap& get( void ); + + //! get counter for a given name + /*! + if the name is found, returns adress of the existing counter + creates new counter otherwise and returns adress + */ + int* counter( const std::string& name ) + { + iterator iter = find( name ); + if( iter == end() ) return &(insert( std::make_pair( name, 0 ) ).first->second); + else return &(iter->second); + } + + //! increment + void increment( int& counter ) + { counter++; } + + //! increment + void decrement( int& counter ) + { counter--; } + + private: + + //! constructor + ObjectCounterMap( void ) + {} + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenqtsettings.cpp new/oxygen-gtk3-1.0.1/src/oxygenqtsettings.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenqtsettings.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenqtsettings.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -23,6 +23,7 @@ #include "oxygencoloreffect.h" #include "oxygencolorutils.h" #include "oxygenfontinfo.h" +#include "oxygentimeline.h" #include "config.h" #include <gtk/gtk.h> @@ -193,11 +194,11 @@ if( gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL ) { - _css.addToCurrentSection( " -GtkButton-inner-border: 1 0 0 10;" ); + _css.addToCurrentSection( " -GtkButton-inner-border: 1px 0px 0px 10px;" ); } else { - _css.addToCurrentSection( " -GtkButton-inner-border: 1 10 0 0;" ); + _css.addToCurrentSection( " -GtkButton-inner-border: 1px 10px 0px 0px;" ); } @@ -667,7 +668,7 @@ // tooltips _css.addSection( "GtkWindow#gtk-tooltip" ); _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_BACKGROUND_COLOR, _palette.color( Palette::Tooltip ) ) ); - _css.addToCurrentSection( Gtk::CSSOption<int>( "padding", 3 ) ); + _css.addToCurrentSection( " padding: 3px;" ); _css.addSection( "GtkWindow#gtk-tooltip GtkLabel" ); _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_COLOR, _palette.color( Palette::TooltipText ) ) ); @@ -899,6 +900,9 @@ _menuFollowMouseAnimationsDuration = oxygen.getOption( "[Style]", "MenuFollowMouseAnimationsDuration" ).toVariant<int>(40); _toolBarAnimationsDuration = oxygen.getOption( "[Style]", "ToolBarAnimationsDuration" ).toVariant<int>(50); + // animation steps + TimeLine::setSteps( oxygen.getOption( "[Style]", "AnimationSteps" ).toVariant<int>( 10 ) ); + // window decoration button size std::string buttonSize( oxygen.getValue( "[Windeco]", "ButtonSize", "Normal") ); if( buttonSize == "Small" ) _buttonSize = ButtonSmall; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenshadowhelper.cpp new/oxygen-gtk3-1.0.1/src/oxygenshadowhelper.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenshadowhelper.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenshadowhelper.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -365,6 +365,9 @@ << std::endl; #endif + // check widget + if( !GTK_IS_WIDGET( widget ) ) return; + // make sure handles and atom are defined createPixmapHandles(); @@ -408,7 +411,7 @@ void ShadowHelper::uninstallX11Shadows( GtkWidget* widget ) const { - if( !widget ) return; + if( !GTK_IS_WIDGET( widget ) ) return; GdkWindow *window = gtk_widget_get_window( widget ); GdkDisplay *display = gtk_widget_get_display( widget ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenthemingengine.cpp new/oxygen-gtk3-1.0.1/src/oxygenthemingengine.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenthemingengine.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenthemingengine.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -446,6 +446,7 @@ gtk_widget_path_is_type( path, GTK_TYPE_INFO_BAR ) || gtk_widget_path_is_type( path, GTK_TYPE_BUTTON ) || gtk_widget_path_is_type( path, GTK_TYPE_MENU_ITEM ) || + gtk_widget_path_is_type( path, GTK_TYPE_IMAGE ) || gtk_widget_path_is_type( path, GTK_TYPE_EXPANDER ) ) { @@ -624,6 +625,10 @@ gtk_theming_engine_get_background_color( engine, state, &background ); Style::instance().renderInfoBar( widget, context, x, y, w, h, Gtk::gdk_get_color( background ) ); + } else if( Gtk::gtk_widget_path_has_type( path, GTK_TYPE_STATUSBAR ) && borderStyle == GTK_BORDER_STYLE_INSET ) { + + return; + } else if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_TOOLTIP ) ) { // do nothing for tooltips diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygentileset.cpp new/oxygen-gtk3-1.0.1/src/oxygentileset.cpp --- old/oxygen-gtk3-1.0.0/src/oxygentileset.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygentileset.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -95,37 +95,6 @@ } //______________________________________________________________ - TileSet::TileSet( const TileSet& other ): - _surfaces( other._surfaces ), - _w1( other._w1 ), - _h1( other._h1 ), - _w3( other._w3 ), - _h3( other._h3 ) - { - - // increase ref counter - for( SurfaceList::iterator iter = _surfaces.begin(); iter != _surfaces.end(); ++iter ) - { cairo_surface_reference( *iter ); } - - } - - //______________________________________________________________ - TileSet& TileSet::operator = ( const TileSet& other ) - { - - _w1 = other._w1; - _h1 = other._h1; - _w3 = other._w3; - _h3 = other._h3; - - // copy pixmap list - _surfaces = other._surfaces; - - return *this; - - } - - //______________________________________________________________ TileSet::~TileSet( void ) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygentileset.h new/oxygen-gtk3-1.0.1/src/oxygentileset.h --- old/oxygen-gtk3-1.0.0/src/oxygentileset.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygentileset.h 2012-02-15 10:38:23.000000000 +0100 @@ -74,12 +74,6 @@ //! destructor virtual ~TileSet(); - //! copy constructor - TileSet( const TileSet& ); - - //! assignment operator - TileSet& operator = ( const TileSet& ); - /*! Flags specifying what sides to draw in ::render. Corners are drawn when the sides forming that corner are drawn, e.g. Top|Left draws the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygentilesetcache.h new/oxygen-gtk3-1.0.1/src/oxygentilesetcache.h --- old/oxygen-gtk3-1.0.0/src/oxygentilesetcache.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygentilesetcache.h 2012-02-15 10:38:23.000000000 +0100 @@ -36,7 +36,8 @@ public: //! constructor - TileSetCache( size_t size = 100 ) + TileSetCache( size_t size = 100 ): + Cache<T, TileSet>( size ) {} //! destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenwidgetlookup.cpp new/oxygen-gtk3-1.0.1/src/oxygenwidgetlookup.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenwidgetlookup.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenwidgetlookup.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -121,12 +121,14 @@ } } + #if OXYGEN_DEBUG std::cerr << "Oxygen::WidgetLookup::find -" << " context: " << context << " type: " << g_type_name( type ) << " - no match found" << std::endl; + #endif return 0L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenwindowmanager.cpp new/oxygen-gtk3-1.0.1/src/oxygenwindowmanager.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenwindowmanager.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenwindowmanager.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -384,6 +384,7 @@ //_________________________________________________ bool WindowManager::isWindowDragWidget( GtkWidget* widget, GdkEventButton* event ) { + if( _mode == Disabled ) return false; else if( (!_drag) && withinWidget(widget, event ) && useEvent( widget, event ) ) { @@ -442,8 +443,14 @@ const GtkAllocation local( Gtk::gtk_widget_get_allocation( widget ) ); Gtk::gtk_notebook_get_tabbar_rect( GTK_NOTEBOOK( widget ), &allocation ); - allocation.x += wx - local.x; - allocation.y += wy - local.y; + + const int xLocal = int(event->x_root) - wx + local.x; + const int yLocal = int(event->y_root) - wy + local.y; + + // compare to event root position + if( !Gtk::gdk_rectangle_contains( &allocation, xLocal, yLocal ) ) return false; + else if( !Style::instance().animations().tabWidgetEngine().contains( widget ) ) return false; + else return !Style::instance().animations().tabWidgetEngine().isInTab( widget, xLocal, yLocal ); } else { @@ -451,10 +458,10 @@ allocation.x = wx; allocation.y = wy; - } + // compare to event root position + return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_root) ); - // compare to event root position - return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_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 oxygen-gtk2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2012-03-01 17:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-19 16:56:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2012-03-01 17:21:54.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 17 20:44:42 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to 1.2.1: + Fixes include: + * Crash in metacity. + * Display issue for widgets with custom background. + * High memory allocation for cached pixmaps. + * Navigation between tabs in some application. +- Split the package into gtk2-engine-oxygen and gtk2-theme-oxygen subpackages + for consistency with other gtk engines and themes (bnc#747107). + +------------------------------------------------------------------- Old: ---- oxygen-gtk2-1.2.0.tar.bz2 New: ---- oxygen-gtk2-1.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.sbAVll/_old 2012-03-01 17:21:55.000000000 +0100 +++ /var/tmp/diff_new_pack.sbAVll/_new 2012-03-01 17:21:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: oxygen-gtk2 -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x License: LGPL-2.1+ @@ -30,12 +30,52 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gtk+-2.0) +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Oxygen-Gtk2 is a port of the default KDE widget theme (Oxygen), to gtk 2.x. + +It's primary goal is to ensure visual consistency between gtk-based and qt-based +applications running under KDE. A secondary objective is to also have a +stand-alone nice looking gtk theme that would behave well on other Desktop +Environments. + +Unlike other attempts made to port the KDE oxygen theme to gtk, this attempt does +not depend on Qt (via some Qt to Gtk conversion engine), nor does render the +widget appearance via hard coded pixmaps, which otherwise breaks everytime some +setting is changed in KDE. + +%package -n gtk2-engine-oxygen +Summary: Oxygen GTK 2.x Theme Engine +Group: System/GUI/Other + +%description -n gtk2-engine-oxygen +Oxygen-Gtk2 is a port of the default KDE widget theme (Oxygen), to gtk 2.x. + +It's primary goal is to ensure visual consistency between gtk-based and qt-based +applications running under KDE. A secondary objective is to also have a +stand-alone nice looking gtk theme that would behave well on other Desktop +Environments. + +Unlike other attempts made to port the KDE oxygen theme to gtk, this attempt does +not depend on Qt (via some Qt to Gtk conversion engine), nor does render the +widget appearance via hard coded pixmaps, which otherwise breaks everytime some +setting is changed in KDE. + +This package contains the Oxygen gtk 2.x theme engine. + +%package -n gtk2-theme-oxygen +Summary: Oxygen GTK 2.x Theme +Group: System/GUI/Other +Requires: gtk2-engine-oxygen = %{version} # oxygen-gtk was last used at version 1.1.6 in openSUSE 12.1 Provides: oxygen-gtk = %{version} Obsoletes: oxygen-gtk < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# oxygen-gtk2 was last used at version 1.2.0 in K:D:F +Provides: oxygen-gtk2 = %{version} +Obsoletes: oxygen-gtk2 < %{version} -%description +%description -n gtk2-theme-oxygen Oxygen-Gtk2 is a port of the default KDE widget theme (Oxygen), to gtk 2.x. It's primary goal is to ensure visual consistency between gtk-based and qt-based @@ -48,6 +88,8 @@ widget appearance via hard coded pixmaps, which otherwise breaks everytime some setting is changed in KDE. +This package contains the Oxygen gtk 2.x theme. + %prep %setup -q @@ -71,12 +113,16 @@ %make_install popd -%files +%files -n gtk2-engine-oxygen +%defattr(-,root,root,-) +%doc AUTHORS COPYING README TODO +%{_libdir}/gtk-2.0/2.10.0/engines/liboxygen-gtk.so + +%files -n gtk2-theme-oxygen %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO %{_bindir}/oxygen-gtk-deco %{_bindir}/oxygen-gtk-demo -%{_libdir}/gtk-2.0/2.10.0/engines/liboxygen-gtk.so %dir %{_datadir}/themes/oxygen-gtk %{_datadir}/themes/oxygen-gtk/gtk-2.0/ ++++++ oxygen-gtk2-1.2.0.tar.bz2 -> oxygen-gtk2-1.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/CMakeLists.txt new/oxygen-gtk2-1.2.1/CMakeLists.txt --- old/oxygen-gtk2-1.2.0/CMakeLists.txt 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/CMakeLists.txt 2012-02-15 10:22:29.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 "0" ) +set( CPACK_PACKAGE_VERSION_PATCH "1" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/metacity.patch new/oxygen-gtk2-1.2.1/metacity.patch --- old/oxygen-gtk2-1.2.0/metacity.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/metacity.patch 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,21 @@ +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.0/oxygen-gtk.diff new/oxygen-gtk2-1.2.1/oxygen-gtk.diff --- old/oxygen-gtk2-1.2.0/oxygen-gtk.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/oxygen-gtk.diff 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,17 @@ +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.0/rc/argb-apps.conf new/oxygen-gtk2-1.2.1/rc/argb-apps.conf --- old/oxygen-gtk2-1.2.0/rc/argb-apps.conf 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/rc/argb-apps.conf 2012-02-15 10:22:29.000000000 +0100 @@ -48,3 +48,4 @@ ############################################################ # The list of disabled applications is now empty, because the way argb is handled should now be safe for all applications # if you have non-empty user argb-apps.conf file, it is recommanded to try empty it. +disable:xfrun4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/CMakeLists.txt new/oxygen-gtk2-1.2.1/src/CMakeLists.txt --- old/oxygen-gtk2-1.2.0/src/CMakeLists.txt 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/CMakeLists.txt 2012-02-15 10:22:29.000000000 +0100 @@ -11,6 +11,7 @@ animations/oxygencomboboxdata.cpp animations/oxygencomboboxentrydata.cpp animations/oxygendialogengine.cpp + animations/oxygenflatwidgetengine.cpp animations/oxygenfollowmousedata.cpp animations/oxygenhook.cpp animations/oxygenhoverdata.cpp @@ -48,6 +49,8 @@ oxygengtktypenames.cpp oxygengtkutils.cpp oxygenloghandler.cpp + oxygenobjectcounter.cpp + oxygenobjectcountermap.cpp oxygenoptionmap.cpp oxygenpalette.cpp oxygenpathlist.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygenanimations.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygenanimations.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -41,6 +41,7 @@ registerEngine( _comboBoxEngine = new ComboBoxEngine( this ) ); registerEngine( _comboBoxEntryEngine = new ComboBoxEntryEngine( this ) ); registerEngine( _dialogEngine = new DialogEngine( this ) ); + registerEngine( _flatWidgetEngine = new FlatWidgetEngine( this ) ); registerEngine( _groupBoxEngine = new GroupBoxEngine( this ) ); registerEngine( _groupBoxLabelEngine = new GroupBoxLabelEngine( this ) ); registerEngine( _hoverEngine = new HoverEngine( this ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygenanimations.h new/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygenanimations.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.h 2012-02-15 10:22:29.000000000 +0100 @@ -28,6 +28,7 @@ #include "oxygencomboboxengine.h" #include "oxygencomboboxentryengine.h" #include "oxygendialogengine.h" +#include "oxygenflatwidgetengine.h" #include "oxygengroupboxengine.h" #include "oxygengroupboxlabelengine.h" #include "oxygenhook.h" @@ -110,6 +111,10 @@ DialogEngine& dialogEngine( void ) const { return *_dialogEngine; } + //! flat widget + FlatWidgetEngine& flatWidgetEngine( void ) const + { return *_flatWidgetEngine; } + //! groupbox engine GroupBoxEngine& groupBoxEngine( void ) const { return *_groupBoxEngine; } @@ -236,6 +241,9 @@ //! dialog engine DialogEngine* _dialogEngine; + //! flat widget + FlatWidgetEngine* _flatWidgetEngine; + //! groupbox engine GroupBoxEngine* _groupBoxEngine; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygenflatwidgetengine.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygenflatwidgetengine.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygenflatwidgetengine.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygenflatwidgetengine.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,49 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2010 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + +#include "oxygenflatwidgetengine.h" +#include "../oxygengtktypenames.h" +#include "../oxygengtkutils.h" +#include "../config.h" + +#include <string> + +namespace Oxygen +{ + //_________________________________________________________ + bool FlatWidgetEngine::registerWidget( GtkWidget* widget ) + { + if( contains( widget ) ) return false; + _data.insert( widget ); + BaseEngine::registerWidget( widget ); + return true; + } + + //_________________________________________________________ + GtkWidget* FlatWidgetEngine::flatParent( GtkWidget* widget ) + { + + for( GtkWidget* parent = widget; parent; parent = gtk_widget_get_parent( parent ) ) + { if( contains( parent ) ) return parent; } + + return 0L; + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygenflatwidgetengine.h new/oxygen-gtk2-1.2.1/src/animations/oxygenflatwidgetengine.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygenflatwidgetengine.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygenflatwidgetengine.h 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,71 @@ +#ifndef oxygenflatwidgetengine_h +#define oxygenflatwidgetengine_h +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2010 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + +#include "oxygenbaseengine.h" + +#include <gtk/gtk.h> +#include <set> + +namespace Oxygen +{ + //! forward declaration + class Animations; + + //! associates widgets with some type of data + class FlatWidgetEngine: public BaseEngine + { + + public: + + //! constructor + FlatWidgetEngine( Animations* widget ): + BaseEngine( widget ) + {} + + //! destructor + virtual ~FlatWidgetEngine( void ) + {} + + //! register widget + virtual bool registerWidget( GtkWidget* ); + + //! unregister widget + virtual void unregisterWidget( GtkWidget* widget ) + { _data.erase( widget ); } + + //! true if widget is included + virtual bool contains( GtkWidget* widget ) + { return _data.find( widget ) != _data.end(); } + + //! true if one of widgets parent is included + virtual GtkWidget* flatParent( GtkWidget* ); + + private: + + //! store registered widgets + std::set<GtkWidget*> _data; + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetdata.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetdata.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -130,6 +130,18 @@ } //________________________________________________________________________________ + bool TabWidgetData::isInTab( int x, int y ) const + { + + // loop over tab rectangles and check. + for( RectangleList::const_iterator iter = _tabRects.begin(); iter != _tabRects.end(); ++iter ) + { if( Gtk::gdk_rectangle_contains( &(*iter), x, y ) ) return true; } + + return false; + + } + + //________________________________________________________________________________ void TabWidgetData::setHoveredTab( GtkWidget* widget, int index ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetdata.h new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetdata.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.h 2012-02-15 10:22:29.000000000 +0100 @@ -91,6 +91,9 @@ bool isDirty( void ) const { return _dirty; } + //! returns true if provided point is in one tab of the widget + bool isInTab( int x, int y ) const; + //@] protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetengine.h new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetengine.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetengine.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetengine.h 2012-02-15 10:22:29.000000000 +0100 @@ -90,6 +90,10 @@ int hoveredTab( GtkWidget* widget ) { return data().value( widget ).hoveredTab(); } + //! returns true if provided point is in one tab of the widget + bool isInTab( GtkWidget* widget, int x, int y ) + { return data().value( widget ).isInTab( x, y ); } + //! true when drag is in progress bool dragInProgress( GtkWidget* widget ) { return data().value( widget ).dragInProgress(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentimeline.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygentimeline.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygentimeline.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentimeline.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -27,6 +27,9 @@ { //_________________________________________________ + int TimeLine::_steps = 0; + + //_________________________________________________ TimeLine::TimeLine( int duration ): _duration( duration ), _enabled( true ), @@ -131,9 +134,13 @@ assert( _time < _duration ); assert( _time <= elapsed ); - _value = ( _value*double(_duration - elapsed) + end*double(elapsed - _time) )/double(_duration - _time); + double oldValue( _value ); + _value = digitize( ( _value*double(_duration - elapsed) + end*double(elapsed - _time) )/double(_duration - _time) ); _time = elapsed; - trigger(); + + // trigger callback if value is actually changed + if( _value != oldValue ) trigger(); + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentimeline.h new/oxygen-gtk2-1.2.1/src/animations/oxygentimeline.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentimeline.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentimeline.h 2012-02-15 10:22:29.000000000 +0100 @@ -23,6 +23,7 @@ #include <glib.h> #include <cassert> +#include <cmath> namespace Oxygen { @@ -114,12 +115,24 @@ //@} + //! steps + static void setSteps( int value ) + { _steps = value; } + protected: //! run callback void trigger( void ) const { if( _func ) (_func)(_data); } + //! digitize value, based on steps + double digitize( const double& value ) const + { + if( _steps > 0 ) return std::floor( value*_steps )/_steps; + else return value; + } + + private: //! duration @@ -149,6 +162,9 @@ //! data gpointer _data; + //! steps + static int _steps; + }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstatedata.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstatedata.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -325,6 +325,7 @@ if( data._target ) { + data.setDirty( true ); const GdkRectangle rect( data.dirtyRect() ); Gtk::gtk_widget_queue_draw( data._target, &rect ); } @@ -344,6 +345,7 @@ data.updateAnimatedRect(); + data.setDirty( true ); GdkRectangle rect( data.dirtyRect() ); Gtk::gtk_widget_queue_draw( data._target, &rect ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstatedata.h new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstatedata.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.h 2012-02-15 10:22:29.000000000 +0100 @@ -41,7 +41,8 @@ //! constructor ToolBarStateData( void ): _target( 0L ), - _dirtyRect( Gtk::gdk_rectangle() ) + _dirtyRect( Gtk::gdk_rectangle() ), + _dirty( false ) {} //! destructor @@ -83,6 +84,10 @@ _previous._timeLine.setDuration( value ); } + //! dirty state + void setDirty( bool value ) + { _dirty = value; } + //@} //!@name accessors @@ -117,6 +122,10 @@ bool isLocked( void ) const { return _timer.isRunning(); } + //! dirty state + bool isDirty( void ) const + { return _dirty; } + //@} protected: @@ -241,7 +250,13 @@ //! additional dirty rect GdkRectangle _dirtyRect; + //! dirty state + bool _dirty; + + //! previous button animation data Data _previous; + + //! current button animation data Data _current; //@} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstateengine.h new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstateengine.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstateengine.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstateengine.h 2012-02-15 10:22:29.000000000 +0100 @@ -122,6 +122,10 @@ return true; } + //! dirty state + void setDirty( GtkWidget* widget, bool value ) + { data().value( widget ).setDirty( value ); } + //@} //!@name accessors @@ -168,6 +172,10 @@ bool isLocked( GtkWidget* widget ) { return data().value( widget ).isLocked(); } + //! dirty state + bool isDirty( GtkWidget* widget ) + { return data().value( widget ).isDirty(); } + //@} private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/log new/oxygen-gtk2-1.2.1/src/log --- old/oxygen-gtk2-1.2.0/src/log 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/log 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,141 @@ + + +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.0/src/oxygencairosurfacecache.h new/oxygen-gtk2-1.2.1/src/oxygencairosurfacecache.h --- old/oxygen-gtk2-1.2.0/src/oxygencairosurfacecache.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygencairosurfacecache.h 2012-02-15 10:22:29.000000000 +0100 @@ -37,7 +37,8 @@ public: //! constructor - CairoSurfaceCache( void ) + CairoSurfaceCache( size_t size = 100 ): + Cache<T, Cairo::Surface>( size ) {} //! destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygengtkutils.cpp new/oxygen-gtk2-1.2.1/src/oxygengtkutils.cpp --- old/oxygen-gtk2-1.2.0/src/oxygengtkutils.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygengtkutils.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -34,6 +34,7 @@ namespace Oxygen { + GQuark Gtk::Quarks::_rcStyle = 0L; //____________________________________________________________ void Gtk::gtk_container_adjust_buttons_state(GtkContainer* container,gpointer data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygengtkutils.h new/oxygen-gtk2-1.2.1/src/oxygengtkutils.h --- old/oxygen-gtk2-1.2.0/src/oxygengtkutils.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygengtkutils.h 2012-02-15 10:22:29.000000000 +0100 @@ -415,6 +415,44 @@ //! returns a widget which has response_id as response id for dialog GtkWidget* gtk_dialog_find_button( GtkDialog*, gint ); + + //! store quarks + class Quarks + { + public: + + //! parent class + inline static GQuark rcStyle( void ) + { + + // try initialize + if( !_rcStyle ) + { _rcStyle = g_quark_try_string( "gtk-rc-style" ); } + + return _rcStyle; + + } + + + private: + + //! RC style quark + /*! + used to check whether an RCStyle was installed on a given widget or not. + See gtkwidet::gtk_widget_get_modifier_style() + */ + static GQuark _rcStyle; + + }; + + //! returns true if widget style color is modified + inline bool gtk_widget_style_is_modified( GtkWidget* widget, GtkStateType state, GtkRcFlags flag ) + { + const bool hasRCStyle( g_object_get_qdata (G_OBJECT (widget), Quarks::rcStyle() ) ); + return ( hasRCStyle && gtk_widget_get_modifier_style(widget)->color_flags[state]&flag ); + } + + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenobjectcounter.cpp new/oxygen-gtk2-1.2.1/src/oxygenobjectcounter.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenobjectcounter.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenobjectcounter.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,51 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + +#include "oxygenobjectcounter.h" +#include "oxygenobjectcountermap.h" + +namespace Oxygen +{ + //____________________________________________________________ + ObjectCounter::ObjectCounter( const std::string& name ): + count_( 0 ) + { + count_ = ObjectCounterMap::get().counter( name ); + ObjectCounterMap::get().increment( *count_ ); + return; + } + + //____________________________________________________________ + ObjectCounter::ObjectCounter( const ObjectCounter& counter ): + count_( counter.count_ ) + { + ObjectCounterMap::get().increment( *count_ ); + return; + } + + //____________________________________________________________ + ObjectCounter::~ObjectCounter( void ) + { if( count_ ) ObjectCounterMap::get().decrement( *count_ ); } + + //____________________________________________________________ + int ObjectCounter::count( void ) const + { return (count_) ? *count_:0; } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenobjectcounter.h new/oxygen-gtk2-1.2.1/src/oxygenobjectcounter.h --- old/oxygen-gtk2-1.2.0/src/oxygenobjectcounter.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenobjectcounter.h 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,61 @@ +#ifndef Counter_h +#define Counter_h + +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + + +#include <string> +#include <map> + + +namespace Oxygen +{ + + class ObjectCounter + { + + public: + + //! counter name and counts pair + typedef std::pair<std::string, int> Pair; + + //! constructor + ObjectCounter( const std::string& name ); + + //! constructor + ObjectCounter( const ObjectCounter& counter ); + + //! destructor + virtual ~ObjectCounter( void ); + + //! retrieves counter count + int count( void ) const; + + private: + + //! pointer to integer counter + int* count_; + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenobjectcountermap.cpp new/oxygen-gtk2-1.2.1/src/oxygenobjectcountermap.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenobjectcountermap.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenobjectcountermap.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,33 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + +#include "oxygenobjectcountermap.h" + +namespace Oxygen +{ + + //___________________________________________________ + ObjectCounterMap& ObjectCounterMap::get( void ) + { + static ObjectCounterMap singleton; + return singleton; + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenobjectcountermap.h new/oxygen-gtk2-1.2.1/src/oxygenobjectcountermap.h --- old/oxygen-gtk2-1.2.0/src/oxygenobjectcountermap.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenobjectcountermap.h 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,68 @@ +#ifndef ObjectCounterMap_h +#define ObjectCounterMap_h + +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* 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 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. +*/ + +#include <map> +#include <string> + +//! thread-safe Object counter storage map +namespace Oxygen +{ + class ObjectCounterMap: public std::map<std::string, int> + { + + public: + + //! singleton + static ObjectCounterMap& get( void ); + + //! get counter for a given name + /*! + if the name is found, returns adress of the existing counter + creates new counter otherwise and returns adress + */ + int* counter( const std::string& name ) + { + iterator iter = find( name ); + if( iter == end() ) return &(insert( std::make_pair( name, 0 ) ).first->second); + else return &(iter->second); + } + + //! increment + void increment( int& counter ) + { counter++; } + + //! increment + void decrement( int& counter ) + { counter--; } + + private: + + //! constructor + ObjectCounterMap( void ) + {} + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenqtsettings.cpp new/oxygen-gtk2-1.2.1/src/oxygenqtsettings.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenqtsettings.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenqtsettings.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -25,6 +25,7 @@ #include "oxygenfontinfo.h" #include "oxygengtkicons.h" #include "oxygengtkrc.h" +#include "oxygentimeline.h" #include "config.h" #include <gtk/gtk.h> @@ -444,12 +445,7 @@ // update icon search path // put existing default path in a set - PathSet searchPath; - 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 ); + PathSet searchPath( defaultIconSearchPath() ); // 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 ) @@ -465,12 +461,6 @@ { gtk_icon_theme_prepend_search_path(gtk_icon_theme_get_default(), path.c_str() ); } } - #if OXYGEN_DEBUG - gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); - for( int i=0; i<nElements; i++ ) - { std::cerr << "Oxygen::QtSettings::loadKdeIcons - icon theme search path: " << gtkSearchPath[i] << std::endl; } - #endif - // load icon theme and path to gtk _iconThemes.clear(); _kdeIconTheme = _kdeGlobals.getValue( "[Icons]", "Theme", "oxygen" ); @@ -513,6 +503,29 @@ } //_________________________________________________________ + PathSet QtSettings::defaultIconSearchPath( void ) const + { + PathSet searchPath; + + // load icon theme + GtkIconTheme* theme( gtk_icon_theme_get_default() ); + if( !GTK_IS_ICON_THEME( theme ) ) return searchPath; + + // get default + gchar** gtkSearchPath; + int nElements; + + gtk_icon_theme_get_search_path( theme, &gtkSearchPath, &nElements ); + for( int i=0; i<nElements; i++ ) + { searchPath.insert( gtkSearchPath[i] ); } + + // free + g_strfreev( gtkSearchPath ); + + return searchPath; + } + + //_________________________________________________________ void QtSettings::loadKdePalette( bool forced ) { @@ -918,6 +931,9 @@ _menuFollowMouseAnimationsDuration = oxygen.getOption( "[Style]", "MenuFollowMouseAnimationsDuration" ).toVariant<int>(40); _toolBarAnimationsDuration = oxygen.getOption( "[Style]", "ToolBarAnimationsDuration" ).toVariant<int>(50); + // animation steps + TimeLine::setSteps( oxygen.getOption( "[Style]", "AnimationSteps" ).toVariant<int>( 10 ) ); + // window decoration button size std::string buttonSize( oxygen.getValue( "[Windeco]", "ButtonSize", "Normal") ); if( buttonSize == "Small" ) _buttonSize = ButtonSmall; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenqtsettings.h new/oxygen-gtk2-1.2.1/src/oxygenqtsettings.h --- old/oxygen-gtk2-1.2.0/src/oxygenqtsettings.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenqtsettings.h 2012-02-15 10:22:29.000000000 +0100 @@ -341,6 +341,9 @@ //! load kde icons void loadKdeIcons( void ); + //! default icon search path + PathSet defaultIconSearchPath( void ) const; + //! load palette from kdeglobals void loadKdePalette( bool forced = false ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenshadowhelper.cpp new/oxygen-gtk2-1.2.1/src/oxygenshadowhelper.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenshadowhelper.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenshadowhelper.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -354,6 +354,9 @@ << std::endl; #endif + // check widget + if( !GTK_IS_WIDGET( widget ) ) return; + // make sure handles and atom are defined createPixmapHandles(); @@ -410,7 +413,7 @@ void ShadowHelper::uninstallX11Shadows( GtkWidget* widget ) const { - if( !widget ) return; + if( !GTK_IS_WIDGET( widget ) ) return; GdkWindow *window = gtk_widget_get_window( widget ); GdkDisplay *display = gtk_widget_get_display( widget ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenstyle.cpp new/oxygen-gtk2-1.2.1/src/oxygenstyle.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenstyle.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenstyle.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -754,22 +754,36 @@ // do nothing if not enough room if( w < 14 || h < 14 ) return; - // test for flatness + // add hole mask + Cairo::Context context( window, clipRect ); + renderHoleMask( context, x, y, w, h, tiles, sideMargin ); + if( (options&Flat) || Style::instance().settings().applicationName().useFlatBackground( widget ) ) { // create a rounded-rect antimask for renderHoleBackground - Cairo::Context context( window, clipRect ); - renderHoleMask( context, x, y, w, h, tiles, sideMargin ); cairo_set_source( context, settings().palette().color( Palette::Window ) ); cairo_rectangle( context, x, y, w, h ); cairo_fill( context ); - } else { + } else if( GtkWidget* parent = animations().flatWidgetEngine().flatParent( widget ) ) { + + // get background color and fill + if( Gtk::gtk_widget_style_is_modified( parent, GTK_STATE_NORMAL, GTK_RC_BG ) ) + { + + cairo_set_source( context, Gtk::gdk_get_color( gtk_widget_get_modifier_style( parent )->bg[GTK_STATE_NORMAL] ) ); + + } else { + + cairo_set_source( context, settings().palette().color( Palette::Window ) ); - // add hole if required (this can be done before translating the context) - Cairo::Context context( window, clipRect ); - renderHoleMask( context, x, y, w, h, tiles, sideMargin ); + } + + cairo_rectangle( context, x, y, w, h ); + cairo_fill( context ); + + } else { // normal window background renderWindowBackground( context, window, 0L, clipRect, x, y, w, h, options, tiles); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenstylewrapper.cpp new/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenstylewrapper.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -50,7 +50,6 @@ GtkStyleClass* StyleWrapper::_parentClass = 0L; GTypeInfo StyleWrapper::_typeInfo; GType StyleWrapper::_type = 0L; - GQuark StyleWrapper::_quarkRCStyle = 0L; XulInfo StyleWrapper::_xulInfo = XulInfo(); //___________________________________________________________________________________________________________ @@ -69,7 +68,7 @@ ToolBarStateEngine& engine( Style::instance().animations().toolBarStateEngine() ); engine.registerWidget(widget); - + engine.setDirty( widget, false ); if( engine.animatedRectangleIsValid( widget ) ) { @@ -154,9 +153,9 @@ - register the widgets to the relevant engines as below - pass the modified color to renderWindowBackground */ - const bool hasRCStyle( g_object_get_qdata (G_OBJECT (widget), StyleWrapper::quarkRCStyle() ) ); - if( hasRCStyle && gtk_widget_get_modifier_style(widget)->color_flags[state]&GTK_RC_BG ) + if( Gtk::gtk_widget_style_is_modified( widget, state, GTK_RC_BG ) ) { + Style::instance().animations().flatWidgetEngine().registerWidget( widget ); Style::instance().fill( window, clipRect, x, y, w, h, Gtk::gdk_get_color( style->bg[state] ) ); return; } @@ -179,7 +178,9 @@ { Style::instance().animations().dialogEngine().registerWidget( toplevel ); } // render background gradient - const bool success( Style::instance().renderWindowBackground( window, clipRect, x, y, w, h ) ); + StyleOptions options; + options._customColors.insert( Palette::Window, Gtk::gdk_get_color( style->bg[state] ) ); + const bool success( Style::instance().renderWindowBackground( window, clipRect, x, y, w, h, options ) ); // register to window manager if( success && @@ -194,7 +195,10 @@ // possible groupbox background if( d.isEventBox() && Gtk::gtk_parent_groupbox( widget ) ) - { Style::instance().renderGroupBoxBackground( window, widget, clipRect, x, y, w, h, Blend ); } + { + options |= Blend; + Style::instance().renderGroupBoxBackground( window, widget, clipRect, x, y, w, h, options ); + } // also draw possible animated tool button draw_animated_button( window, clipRect, widget ); @@ -207,8 +211,7 @@ if( Gtk::gtk_widget_is_applet( widget ) ) return; // for modified bg, fill with flat custom color - const bool hasRCStyle( g_object_get_qdata (G_OBJECT (widget), StyleWrapper::quarkRCStyle() ) ); - if( hasRCStyle && gtk_widget_get_modifier_style(widget)->color_flags[state]&GTK_RC_BG ) + if( Gtk::gtk_widget_style_is_modified( widget, state, GTK_RC_BG ) ) { Style::instance().fill( window, clipRect, x, y, w, h, Gtk::gdk_get_color( style->bg[state] ) ); @@ -309,8 +312,7 @@ bool drawTreeLines( true ); ColorUtils::Rgba background; - const bool hasRCStyle( g_object_get_qdata (G_OBJECT (widget), StyleWrapper::quarkRCStyle() ) ); - if( hasRCStyle && gtk_widget_get_modifier_style(widget)->color_flags[GTK_STATE_NORMAL]&GTK_RC_BASE ) + if( Gtk::gtk_widget_style_is_modified( widget, GTK_STATE_NORMAL, GTK_RC_BASE ) ) { /* @@ -1041,7 +1043,7 @@ toolPalette=Gtk::gtk_widget_find_parent( widget, GTK_TYPE_TOOL_PALETTE ); #endif - if( !toolPalette && (parent = engine.findParent( widget ) ) ) + if( !toolPalette && (parent = engine.findParent( widget ) ) && !engine.isDirty( parent ) ) { // register child @@ -3527,6 +3529,15 @@ pango_cairo_show_layout( context, layout ); + } else if( GtkWidget* parent = Gtk::gtk_parent_button( widget ) ) { + + // for flat buttons, do not use PRELIGHT color, since there is no PRELIGHT background rendered. + if( Gtk::gtk_button_is_flat( parent ) && ( state == GTK_STATE_PRELIGHT || state == GTK_STATE_ACTIVE ) ) state = GTK_STATE_NORMAL; + StyleWrapper::parentClass()->draw_layout( + style, window, state, use_text, + clipRect, widget, detail, x, y, layout ); + + } else { // in all other cases, fallback on default rendering, for now diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenstylewrapper.h new/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.h --- old/oxygen-gtk2-1.2.0/src/oxygenstylewrapper.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.h 2012-02-15 10:22:29.000000000 +0100 @@ -51,18 +51,6 @@ inline static GtkStyleClass* parentClass( void ) { return _parentClass; } - //! parent class - inline static GQuark quarkRCStyle( void ) - { - - // try initialize - if( !_quarkRCStyle ) - { _quarkRCStyle = g_quark_try_string( "gtk-rc-style" ); } - - return _quarkRCStyle; - - } - //! xul info inline static XulInfo& xulInfo( void ) { return _xulInfo; } @@ -86,13 +74,6 @@ //! registered type static GType _type; - //! RC style quark - /*! - used to check whether an RCStyle was installed on a given widget or not. - See gtkwidet::gtk_widget_get_modifier_style() - */ - static GQuark _quarkRCStyle; - //! xul info, needed to properly render focus in checkboxes and radio buttons static XulInfo _xulInfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygentileset.cpp new/oxygen-gtk2-1.2.1/src/oxygentileset.cpp --- old/oxygen-gtk2-1.2.0/src/oxygentileset.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygentileset.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -95,37 +95,6 @@ } //______________________________________________________________ - TileSet::TileSet( const TileSet& other ): - _surfaces( other._surfaces ), - _w1( other._w1 ), - _h1( other._h1 ), - _w3( other._w3 ), - _h3( other._h3 ) - { - - // increase ref counter - for( SurfaceList::iterator iter = _surfaces.begin(); iter != _surfaces.end(); ++iter ) - { cairo_surface_reference( *iter ); } - - } - - //______________________________________________________________ - TileSet& TileSet::operator = ( const TileSet& other ) - { - - _w1 = other._w1; - _h1 = other._h1; - _w3 = other._w3; - _h3 = other._h3; - - // copy pixmap list - _surfaces = other._surfaces; - - return *this; - - } - - //______________________________________________________________ TileSet::~TileSet( void ) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygentileset.h new/oxygen-gtk2-1.2.1/src/oxygentileset.h --- old/oxygen-gtk2-1.2.0/src/oxygentileset.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygentileset.h 2012-02-15 10:22:29.000000000 +0100 @@ -74,12 +74,6 @@ //! destructor virtual ~TileSet(); - //! copy constructor - TileSet( const TileSet& ); - - //! assignment operator - TileSet& operator = ( const TileSet& ); - /*! Flags specifying what sides to draw in ::render. Corners are drawn when the sides forming that corner are drawn, e.g. Top|Left draws the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygentilesetcache.h new/oxygen-gtk2-1.2.1/src/oxygentilesetcache.h --- old/oxygen-gtk2-1.2.0/src/oxygentilesetcache.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygentilesetcache.h 2012-02-15 10:22:29.000000000 +0100 @@ -36,7 +36,8 @@ public: //! constructor - TileSetCache( size_t size = 100 ) + TileSetCache( size_t size = 100 ): + Cache<T, TileSet>( size ) {} //! destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenwindowmanager.cpp new/oxygen-gtk2-1.2.1/src/oxygenwindowmanager.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenwindowmanager.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenwindowmanager.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -376,6 +376,7 @@ //_________________________________________________ bool WindowManager::isWindowDragWidget( GtkWidget* widget, GdkEventButton* event ) { + if( _mode == Disabled ) return false; else if( (!_drag) && withinWidget(widget, event ) && useEvent( widget, event ) ) { @@ -434,8 +435,14 @@ const GtkAllocation local( Gtk::gtk_widget_get_allocation( widget ) ); Gtk::gtk_notebook_get_tabbar_rect( GTK_NOTEBOOK( widget ), &allocation ); - allocation.x += wx - local.x; - allocation.y += wy - local.y; + + const int xLocal = int(event->x_root) - wx + local.x; + const int yLocal = int(event->y_root) - wy + local.y; + + // compare to event root position + if( !Gtk::gdk_rectangle_contains( &allocation, xLocal, yLocal ) ) return false; + else if( !Style::instance().animations().tabWidgetEngine().contains( widget ) ) return false; + else return !Style::instance().animations().tabWidgetEngine().isInTab( widget, xLocal, yLocal ); } else { @@ -443,10 +450,10 @@ allocation.x = wx; allocation.y = wy; - } + // compare to event root position + return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_root) ); - // compare to event root position - return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_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 obs-service-tar_scm for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package obs-service-tar_scm for openSUSE:Factory checked in at 2012-03-01 17:21:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old) and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-tar_scm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes 2012-02-17 12:18:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes 2012-03-01 17:21:40.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 29 18:32:12 GMT 2012 - aspiers(a)suse.com + +- Remove accidental reference to keep-source parameter + which was never pushed upstream (obsoleted by new cache). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar_scm.service ++++++ --- /var/tmp/diff_new_pack.0DDKgi/_old 2012-03-01 17:21:42.000000000 +0100 +++ /var/tmp/diff_new_pack.0DDKgi/_new 2012-03-01 17:21:42.000000000 +0100 @@ -17,7 +17,7 @@ <description>package just a sub directory</description> </parameter> <parameter name="version"> - <description>Specify version to be used in tarball. Defaults to automatically detected value formatted by versionformat parameter. If using keep-source, you should set this to a fixed constant which will be used to name the checked out directory.</description> + <description>Specify version to be used in tarball. Defaults to automatically detected value formatted by versionformat parameter.</description> </parameter> <parameter name="versionformat"> <description>Auto-generate version from checked out source using this format string. For git, value is passed via git show --pretty=format:... (default '%at'); for hg, via hg log --template=... (default '{rev}'); for bzr and svn, %r is revision (default '%r'). Overrides tarball name defined by version parameter.</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 nbd for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package nbd for openSUSE:Factory checked in at 2012-03-01 17:21:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nbd (Old) and /work/SRC/openSUSE:Factory/.nbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nbd", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nbd/nbd.changes 2012-01-09 16:01:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nbd.new/nbd.changes 2012-03-01 17:21:19.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 29 15:51:37 UTC 2012 - tabraham(a)novell.com + +- Update to nbd-3.0 + * minor bug fixes + +- removed obsolete nbd-2.9.25-have_falloc_ph.diff +- compile with -fno-strict-aliasing to prevent breakage with new gcc + +------------------------------------------------------------------- Old: ---- nbd-2.9.25-have_falloc_ph.diff nbd-2.9.25.tar.bz2 New: ---- nbd-3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbd.spec ++++++ --- /var/tmp/diff_new_pack.svGCWM/_old 2012-03-01 17:21:20.000000000 +0100 +++ /var/tmp/diff_new_pack.svGCWM/_new 2012-03-01 17:21:20.000000000 +0100 @@ -21,7 +21,7 @@ Name: nbd BuildRequires: doxygen glib2-devel >= 2.26.0 PreReq: %insserv_prereq coreutils -Version: 2.9.25 +Version: 3.0 Release: 1 License: GPL-2.0+ Group: Productivity/Networking/Other @@ -30,7 +30,6 @@ Source2: init.nbd-server Patch2: nbd-2.9.25-close.diff Patch3: nbd-2.9.25-doxyfile.diff -Patch4: nbd-2.9.25-have_falloc_ph.diff Summary: Network Block Device Server and Client Utilities Url: http://nbd.sourceforge.net/ Prefix: /usr @@ -98,10 +97,9 @@ %setup %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" +export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing" ./configure --with-gnu-ld --prefix=/usr --mandir=%{_mandir} \ --infodir=%{_infodir} --libdir=%{_libdir} --libexecdir=%{_libdir} \ --program-prefix="" --sysconfdir=/etc --build=%{_target_cpu}-suse-linux ++++++ nbd-2.9.25.tar.bz2 -> nbd-3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/Makefile.in new/nbd-3.0/Makefile.in --- old/nbd-2.9.25/Makefile.in 2011-11-29 08:38:51.000000000 +0100 +++ new/nbd-3.0/Makefile.in 2012-02-10 11:23:23.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -111,9 +111,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^$[^/]*$/.*$$,\1,'; \ @@ -142,6 +144,8 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -268,7 +272,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -304,10 +308,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -398,19 +400,19 @@ clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -make-integrityhuge$(EXEEXT): $(make_integrityhuge_OBJECTS) $(make_integrityhuge_DEPENDENCIES) +make-integrityhuge$(EXEEXT): $(make_integrityhuge_OBJECTS) $(make_integrityhuge_DEPENDENCIES) $(EXTRA_make_integrityhuge_DEPENDENCIES) @rm -f make-integrityhuge$(EXEEXT) $(LINK) $(make_integrityhuge_OBJECTS) $(make_integrityhuge_LDADD) $(LIBS) -nbd-client$(EXEEXT): $(nbd_client_OBJECTS) $(nbd_client_DEPENDENCIES) +nbd-client$(EXEEXT): $(nbd_client_OBJECTS) $(nbd_client_DEPENDENCIES) $(EXTRA_nbd_client_DEPENDENCIES) @rm -f nbd-client$(EXEEXT) $(LINK) $(nbd_client_OBJECTS) $(nbd_client_LDADD) $(LIBS) -nbd-server$(EXEEXT): $(nbd_server_OBJECTS) $(nbd_server_DEPENDENCIES) +nbd-server$(EXEEXT): $(nbd_server_OBJECTS) $(nbd_server_DEPENDENCIES) $(EXTRA_nbd_server_DEPENDENCIES) @rm -f nbd-server$(EXEEXT) $(nbd_server_LINK) $(nbd_server_OBJECTS) $(nbd_server_LDADD) $(LIBS) -nbd-tester-client$(EXEEXT): $(nbd_tester_client_OBJECTS) $(nbd_tester_client_DEPENDENCIES) +nbd-tester-client$(EXEEXT): $(nbd_tester_client_OBJECTS) $(nbd_tester_client_DEPENDENCIES) $(EXTRA_nbd_tester_client_DEPENDENCIES) @rm -f nbd-tester-client$(EXEEXT) $(nbd_tester_client_LINK) $(nbd_tester_client_OBJECTS) $(nbd_tester_client_LDADD) $(LIBS) -nbd-trdump$(EXEEXT): $(nbd_trdump_OBJECTS) $(nbd_trdump_DEPENDENCIES) +nbd-trdump$(EXEEXT): $(nbd_trdump_OBJECTS) $(nbd_trdump_DEPENDENCIES) $(EXTRA_nbd_trdump_DEPENDENCIES) @rm -f nbd-trdump$(EXEEXT) $(nbd_trdump_LINK) $(nbd_trdump_OBJECTS) $(nbd_trdump_LDADD) $(LIBS) @@ -698,14 +700,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -783,7 +786,11 @@ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -791,7 +798,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -809,7 +816,7 @@ dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -823,6 +830,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -842,6 +851,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -870,8 +880,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -907,10 +925,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1002,20 +1025,21 @@ all all-am am--refresh check check-TESTS check-am clean \ clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-sbinPROGRAMS ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-sbinPROGRAMS + dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-sbinPROGRAMS dist-hook: rm -Rf `find $(distdir) -name '.svn' -type d -print` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/aclocal.m4 new/nbd-3.0/aclocal.m4 --- old/nbd-2.9.25/aclocal.m4 2011-11-29 08:38:50.000000000 +0100 +++ new/nbd-3.0/aclocal.m4 2012-02-10 11:23:21.000000000 +0100 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -391,12 +392,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -406,7 +410,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -422,19 +426,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -516,14 +522,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -563,6 +569,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -627,7 +634,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -692,10 +699,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -917,12 +927,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -962,8 +975,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -983,7 +996,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -1094,12 +1107,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -1122,13 +1138,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1136,13 +1153,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1218,12 +1235,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -1246,13 +1265,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1261,13 +1280,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1289,10 +1308,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/configure new/nbd-3.0/configure --- old/nbd-2.9.25/configure 2011-11-29 08:38:50.000000000 +0100 +++ new/nbd-3.0/configure 2012-02-10 11:23:22.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for nbd 2.9.25. +# Generated by GNU Autoconf 2.68 for nbd 3.0. # # Report bugs to <wouter(a)debian.org>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='nbd' PACKAGE_TARNAME='nbd' -PACKAGE_VERSION='2.9.25' -PACKAGE_STRING='nbd 2.9.25' +PACKAGE_VERSION='3.0' +PACKAGE_STRING='nbd 3.0' PACKAGE_BUGREPORT='wouter(a)debian.org' PACKAGE_URL='' @@ -629,6 +629,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1271,7 +1272,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 nbd 2.9.25 to adapt to many kinds of systems. +\`configure' configures nbd 3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1341,7 +1342,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nbd 2.9.25:";; + short | recursive ) echo "Configuration of nbd 3.0:";; esac cat <<\_ACEOF @@ -1443,7 +1444,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nbd configure 2.9.25 +nbd configure 3.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2090,7 +2091,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nbd $as_me 2.9.25, which was +It was created by nbd $as_me 3.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2905,7 +2906,7 @@ # Define the identity of the package. PACKAGE='nbd' - VERSION='2.9.25' + VERSION='3.0' cat >>confdefs.h <<_ACEOF @@ -2935,11 +2936,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3125,6 +3126,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3938,6 +3940,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3997,7 +4000,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -6647,7 +6650,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nbd $as_me 2.9.25, which was +This file was extended by nbd $as_me 3.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6713,7 +6716,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nbd config.status 2.9.25 +nbd config.status 3.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/configure.ac new/nbd-3.0/configure.ac --- old/nbd-2.9.25/configure.ac 2011-11-29 08:37:13.000000000 +0100 +++ new/nbd-3.0/configure.ac 2012-02-21 11:04:29.000000000 +0100 @@ -1,7 +1,7 @@ dnl Configure script for NBD system dnl (c) 1998 Martin Mares <mj(a)ucw.cz>, (c) 2000 Pavel Machek <pavel(a)ucw.cz>, dnl (c) 2003-2006 Wouter Verhelst <wouter(a)debian.org> -AC_INIT([nbd],[2.9.25],[wouter(a)debian.org]) +AC_INIT([nbd],[3.0],[wouter(a)debian.org]) AM_INIT_AUTOMAKE(foreign dist-bzip2) AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/lfs.h new/nbd-3.0/lfs.h --- old/nbd-2.9.25/lfs.h 2011-10-01 12:28:58.000000000 +0200 +++ new/nbd-3.0/lfs.h 2012-02-21 11:04:29.000000000 +0100 @@ -3,17 +3,17 @@ #include "config.h" #if NBD_LFS -#define _FILE_OFFSET_BITS 64 -#ifndef _LARGEFILE_SOURCE -#define _LARGEFILE_SOURCE -#define PARAM_OFFT PARAM_INT64 +# define _FILE_OFFSET_BITS 64 +# ifndef _LARGEFILE_SOURCE +# define _LARGEFILE_SOURCE +# endif +# define PARAM_OFFT PARAM_INT64 #else -#define PARAM_OFFT PARAM_INT -#endif +# define PARAM_OFFT PARAM_INT +#endif /* NBD_LFS */ #ifdef HAVE_SYNC_FILE_RANGE -#define USE_SYNC_FILE_RANGE -#define _GNU_SOURCE +# define USE_SYNC_FILE_RANGE +# define _GNU_SOURCE #endif /* HAVE_SYNC_FILE_RANGE */ -#endif /* NBD_LFS */ #endif /* LFS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/man/Makefile.in new/nbd-3.0/man/Makefile.in --- old/nbd-2.9.25/man/Makefile.in 2011-11-29 08:38:51.000000000 +0100 +++ new/nbd-3.0/man/Makefile.in 2012-02-10 11:23:23.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -69,6 +69,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ "$(DESTDIR)$(man8dir)" @@ -263,9 +269,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-man5: $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" @@ -301,9 +305,7 @@ sed -n '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) install-man8: $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" @@ -339,9 +341,7 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -409,10 +409,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/nbd-client.c new/nbd-3.0/nbd-client.c --- old/nbd-2.9.25/nbd-client.c 2011-10-01 12:28:58.000000000 +0200 +++ new/nbd-3.0/nbd-client.c 2012-02-21 11:03:32.000000000 +0100 @@ -453,7 +453,7 @@ #endif do { #ifndef NOFORK - if (fork()) { + if (!fork()) { /* Due to a race, the kernel NBD driver cannot * call for a reread of the partition table * in the handling of the NBD_DO_IT ioctl(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/nbd-server.c new/nbd-3.0/nbd-server.c --- old/nbd-2.9.25/nbd-server.c 2011-11-29 08:32:28.000000000 +0100 +++ new/nbd-3.0/nbd-server.c 2012-02-21 11:04:29.000000000 +0100 @@ -83,7 +83,7 @@ #include <stdlib.h> #include <string.h> #include <fcntl.h> -#ifdef HAVE_FALLOC_PH +#if HAVE_FALLOC_PH #include <linux/falloc.h> #endif #include <arpa/inet.h> @@ -324,7 +324,7 @@ inet_aton(opts->clientname, &client); while (fgets(line,LINELEN,f)!=NULL) { - if((tmp=index(line, '/'))) { + if((tmp=strchr(line, '/'))) { if(strlen(line)<=tmp-line) { msg4(LOG_CRIT, ERRMSG, line, opts->server->authname); return 0; @@ -1461,7 +1461,7 @@ * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM) */ int exptrim(struct nbd_request* req, CLIENT* client) { -#ifdef HAVE_FALLOC_PH +#if HAVE_FALLOC_PH FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0); FILE_INFO cur = prev; int i = 1; @@ -1498,6 +1498,7 @@ uint64_t magic; memset(zeros, '\0', sizeof(zeros)); + g_assert(((phase & NEG_INIT) && (phase & NEG_MODERN)) || client); if(phase & NEG_INIT) { /* common */ if (write(net, INIT_PASSWD, 8) < 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 mysql-community-server for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2012-03-01 17:21:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-community-server", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2011-11-05 11:26:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes 2012-03-01 17:21:11.000000000 +0100 @@ -1,0 +2,32 @@ +Wed Feb 22 14:06:55 CET 2012 - mhrusecky(a)suse.cz + +- updated to 5.5.21, see + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-21.html + +------------------------------------------------------------------- +Wed Feb 15 10:54:25 UTC 2012 - cfarrell(a)suse.com + +- license update: SUSE-GPL-2.0-with-FLOSS-exception + +------------------------------------------------------------------- +Wed Feb 1 18:22:20 UTC 2012 - mhrusecky(a)suse.cz + +- updated to 5.5.20, see + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-20.html + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-19.html + +------------------------------------------------------------------- +Mon Jan 30 08:36:04 UTC 2012 - mhrusecky(a)suse.cz + +- adding /usr/share/aclocal to the files list +- renaming *-debug package to *-debug-version to avoid conflicts + +------------------------------------------------------------------- +Mon Dec 5 17:54:38 CET 2011 - mhrusecky(a)suse.cz + +- migrated to the common packaging +- updated to 5.5.18, see + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-18.html + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-17.html + +------------------------------------------------------------------- Old: ---- default_plugins.cnf mysql-5.5.15-arm.patch mysql-5.5.16.tar.bz2 old-ssl.series New: ---- configuration-tweaks.tar.bz2 mysql-5.5.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ ++++ 688 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.spec ++++ and /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.spec ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.5VdYWm/_old 2012-03-01 17:21:15.000000000 +0100 +++ /var/tmp/diff_new_pack.5VdYWm/_new 2012-03-01 17:21:15.000000000 +0100 @@ -1,6 +1,2 @@ libmysqlclient18 libmysqlclient_r18 -libmysqlclient-devel - requires -libmysqlclient-<targettype> - requires "libmysqlclient18-<targettype> = <version>" - requires "libmysqlclient_r18-<targettype> = <version>" ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.5VdYWm/_old 2012-03-01 17:21:15.000000000 +0100 +++ /var/tmp/diff_new_pack.5VdYWm/_new 2012-03-01 17:21:15.000000000 +0100 @@ -3,7 +3,10 @@ %else %define socketpath /var/run/mysql %endif -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing -Wno-unused-parameter" +%if 0%{?suse_version} > 1140 +export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter " +%endif +export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS " export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" %if 0%{use_cmake} < 1 @@ -17,7 +20,7 @@ pushd _build$suffix ../configure \ --enable-assembler \ - --without-readline \ + --with-readline \ --infodir=%{_infodir} \ --libdir=%{_libdir} \ --libexecdir=/usr/sbin \ @@ -45,6 +48,7 @@ %endif --with-ssl=/usr \ --with-plugins=%{builtin_plugins} \ + --without-plugin-handlersocket \ HOSTNAME="/bin/hostname -f" \ "$@" # Add this for MyISAM RAID support: @@ -66,7 +70,11 @@ popd } # Build the client, extra tools, libraries +%if 0%{?prefered} > 0 BuildMySQL "" --with-embedded-server +%else +BuildMySQL "" --without-embedded-server +%endif # build mysqld-debug BuildMySQL "-debug" --with-debug --without-embedded-server @@ -109,5 +117,4 @@ BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug - %endif ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.5VdYWm/_old 2012-03-01 17:21:15.000000000 +0100 +++ /var/tmp/diff_new_pack.5VdYWm/_new 2012-03-01 17:21:15.000000000 +0100 @@ -7,6 +7,10 @@ # install the client, extra tools, libraries and the standard server make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym +# remove handler socket client +rm -f %buildroot%_libdir/libhsclient* +rm -f %buildroot%_bindir/hsclient* +rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so # remove most static libs (FIXME: don't build them at all...) rm -f %buildroot%_libdir/libmysqlclient*a rm -f %buildroot%_libdir/libmysqlservices*a @@ -15,7 +19,8 @@ # XXX: package these? The ndb tools are linked statically atm rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run -rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} @@ -46,12 +51,11 @@ filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) -filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mysql_plugin >mysql-tools.files +filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mytop hsclient >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files -filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files -rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini +filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) @@ -114,17 +118,21 @@ rm -rf '%buildroot'/%_libdir/libmysqld.* rm -rf '%buildroot'/%_libdir/*.la rm -rf '%buildroot'/%_libdir/*.so -rm -rf '%buildroot'/%_libdir/*.a rm -rf '%buildroot'/%_includedir rm -rf '%buildroot'/%_datadir/man/*/mysql_config* rm -rf '%buildroot'/%_datadir/aclocal +rm -rf '%buildroot'/%_libdir/*.a %endif sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +%if 0%{?cluster} > 1 +ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6.0 +ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6 +%endif if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf fi mkdir -p '%buildroot'/etc/mysql -[ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql +bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf - ++++++ mysql-5.5.16.tar.bz2 -> mysql-5.5.21.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mysql-community-server/mysql-5.5.16.tar.bz2 /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-5.5.21.tar.bz2 differ: char 11, line 1 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -PATCH-P0-HACK-UPSTREAM: Make federated plugin to compile - -Really ugly way to force federated plugin to compile if it is choosed to be -dynamically loadable. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - ---- storage/federated/ha_federated.cc -+++ storage/federated/ha_federated.cc -@@ -385,6 +385,12 @@ - - #include <mysql/plugin.h> - -+ -+// Quick and ugly plugin workaround -+#ifdef MYSQL_DYNAMIC_PLUGIN -+#include "../../mysys/string.c" -+#endif -+ - /* Variables for federated share methods */ - static HASH federated_open_tables; // To track open tables - pthread_mutex_t federated_mutex; // To init the hash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Fix building in different directory -BUGS: upstream#45616 - -Makes it possible to run compilation somewhere else then source code is. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - ---- scripts/Makefile.am 2009-04-02 18:29:00.292563355 +0200 -+++ scripts/Makefile.am 2009-04-02 18:21:50.462559739 +0200 -@@ -110,7 +110,7 @@ - mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ - mysql_system_tables_fix.sql - @echo "Building $@"; -- @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@ -+ @cat $(top_srcdir)/scripts/mysql_system_tables.sql $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@ - - # - # Build mysql_fix_privilege_tables_sql.c from -@@ -123,7 +123,7 @@ - sleep 2 - $(top_builddir)/scripts/comp_sql$(EXEEXT) \ - mysql_fix_privilege_tables \ -- $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ -+ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@ - - - SUFFIXES = .sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -PATCH-P0-HACK-UPSTREAM: Add lib64 dir to the library path - -On x86_64 systems openssl library is installed into /usr/lib64 directory and -MySQL couldn't find as it was searching only in /usr/lib. We can add it quite -safelly even on i586 as this directory wouldn't exist on them so no harm done. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - ---- config/ac-macros/ssl.m4 2009-04-10 14:05:07.000000000 +0200 -+++ config/ac-macros/ssl.m4 2009-04-10 14:15:15.000000000 +0200 -@@ -102,7 +102,7 @@ - # - # Try to link with openSSL libs in <location> - # -- openssl_libs="-L$location/lib/ -lssl -lcrypto" -+ openssl_libs="-L$location/lib -L$location/lib64 -lssl -lcrypto" - MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) - - if test "$mysql_ssl_found" == "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Better handling of memcpy -BUGS: upstream#19975 - -Standard memcpy should behave better then self made one. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysys/mf_keycache.c -=================================================================== ---- mysys/mf_keycache.c.orig -+++ mysys/mf_keycache.c -@@ -2646,10 +2646,7 @@ uchar *key_cache_read(KEY_CACHE *keycach - #endif - - /* Copy data from the cache buffer */ -- if (!(read_length & 511)) -- bmove512(buff, block->buffer+offset, read_length); -- else -- memcpy(buff, block->buffer+offset, (size_t) read_length); -+ memcpy(buff, block->buffer+offset, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); -@@ -2857,10 +2854,7 @@ int key_cache_insert(KEY_CACHE *keycache - #endif - - /* Copy data from buff */ -- if (!(read_length & 511)) -- bmove512(block->buffer+offset, buff, read_length); -- else -- memcpy(block->buffer+offset, buff, (size_t) read_length); -+ memcpy(block->buffer+offset, buff, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); -@@ -3164,10 +3158,7 @@ int key_cache_write(KEY_CACHE *keycache, - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_unlock(&keycache->cache_lock); - #endif -- if (!(read_length & 511)) -- bmove512(block->buffer+offset, buff, read_length); -- else -- memcpy(block->buffer+offset, buff, (size_t) read_length); -+ memcpy(block->buffer+offset, buff, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -PATCH-P0-FIX-SUSE: Tweak default configuration - -This patch adds log file locations and socket location as they should be in -SuSE to the default configuration files. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: support-files/my-huge.cnf.sh -=================================================================== ---- support-files/my-huge.cnf.sh.orig -+++ support-files/my-huge.cnf.sh -@@ -131,7 +131,15 @@ server-id = 1 - #innodb_flush_log_at_trx_commit = 1 - #innodb_lock_wait_timeout = 50 - -+# The safe_mysqld script -+[safe_mysqld] -+log-error=/var/log/mysql/mysqld.log -+socket = @MYSQL_UNIX_ADDR@ -+ -+!include_dir /etc/mysql -+ - [mysqldump] -+socket = @MYSQL_UNIX_ADDR@ - quick - max_allowed_packet = 16M - -Index: support-files/my-large.cnf.sh -=================================================================== ---- support-files/my-large.cnf.sh.orig -+++ support-files/my-large.cnf.sh -@@ -131,7 +131,15 @@ server-id = 1 - #innodb_flush_log_at_trx_commit = 1 - #innodb_lock_wait_timeout = 50 - -+# The safe_mysqld script -+[safe_mysqld] -+log-error=/var/log/mysql/mysqld.log -+socket = @MYSQL_UNIX_ADDR@ -+ -+!include_dir /etc/mysql -+ - [mysqldump] -+socket = @MYSQL_UNIX_ADDR@ - quick - max_allowed_packet = 16M - -Index: support-files/my-medium.cnf.sh -=================================================================== ---- support-files/my-medium.cnf.sh.orig -+++ support-files/my-medium.cnf.sh -@@ -26,6 +26,8 @@ socket = @MYSQL_UNIX_ADDR@ - [mysqld] - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ -+# Change following line if you want to store your database elsewhere -+datadir = /var/lib/mysql - skip-locking - key_buffer_size = 16M - max_allowed_packet = 1M -@@ -129,7 +131,15 @@ server-id = 1 - #innodb_flush_log_at_trx_commit = 1 - #innodb_lock_wait_timeout = 50 - -+# The safe_mysqld script -+[safe_mysqld] -+log-error = /var/log/mysql/mysqld.log -+socket = @MYSQL_UNIX_ADDR@ -+ -+!include_dir /etc/mysql -+ - [mysqldump] -+socket = @MYSQL_UNIX_ADDR@ - quick - max_allowed_packet = 16M - -Index: support-files/my-small.cnf.sh -=================================================================== ---- support-files/my-small.cnf.sh.orig -+++ support-files/my-small.cnf.sh -@@ -65,7 +65,15 @@ server-id = 1 - #innodb_flush_log_at_trx_commit = 1 - #innodb_lock_wait_timeout = 50 - -+# The safe_mysqld script -+[safe_mysqld] -+log-error = /var/log/mysql/mysqld.log -+socket = @MYSQL_UNIX_ADDR@ -+ -+!include_dir /etc/mysql -+ - [mysqldump] -+socket = @MYSQL_UNIX_ADDR@ - quick - max_allowed_packet = 16M - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Adds group option - -This patch let's you specify not only user to use but also group that MySQL -should use. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -793,6 +793,14 @@ AC_ARG_WITH(mysqld-user, - [ MYSQLD_USER=mysql ] - ) - AC_SUBST(MYSQLD_USER) -+AC_ARG_WITH(mysqld-group, -+ [ --with-mysqld-group=groupname -+ What group the mysqld daemon shall be run as.], -+ [ MYSQLD_GROUP=$withval ], -+ [ MYSQLD_GROUP=mysql ] -+ ) -+AC_SUBST(MYSQLD_GROUP) -+ - - # If we should allow LOAD DATA LOCAL - AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default) -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig -+++ scripts/Makefile.am -@@ -185,6 +185,7 @@ SUFFIXES = .sh - -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \ - -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ - -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ -+ -e 's!@''MYSQLD_GROUP''@!@MYSQLD_GROUP@!' \ - -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \ - -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \ - -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \ -Index: scripts/mysqld_safe.sh -=================================================================== ---- scripts/mysqld_safe.sh.orig -+++ scripts/mysqld_safe.sh -@@ -19,6 +19,7 @@ logging=init - want_syslog=0 - syslog_tag= - user='@MYSQLD_USER@' -+group='@MYSQLD_GROUP@' - pid_file= - err_log= - -@@ -162,6 +163,7 @@ parse_arguments() { - --datadir=*) DATADIR="$val" ;; - --pid-file=*) pid_file="$val" ;; - --user=*) user="$val"; SET_USER=1 ;; -+ --group=*) group="$val"; SET_USER=1 ;; - - # these might have been set in a [mysqld_safe] section of my.cnf - # they are added to mysqld command line to override settings from my.cnf -@@ -388,11 +390,17 @@ then - if test "$user" != "root" -o $SET_USER = 1 - then - USER_OPTION="--user=$user" -+ GROUP_OPTION="--group=$group" - fi - # Change the err log to the right user, if it is in use - if [ $want_syslog -eq 0 ]; then - touch "$err_log" -- chown $user "$err_log" -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $err_log -+ else -+ [ "$user" ] && chown $user $err_log -+ [ "$group" ] && chgrp $group $err_log -+ fi - fi - if test -n "$open_files" - then -@@ -407,7 +415,12 @@ mysql_unix_port_dir=`dirname $safe_mysql - if [ ! -d $mysql_unix_port_dir ] - then - mkdir $mysql_unix_port_dir -- chown $user $mysql_unix_port_dir -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $mysql_unix_port_dir -+ else -+ [ "$user" ] && chown $user $mysql_unix_port_dir -+ [ "$group" ] && chgrp $group $mysql_unix_port_dir -+ fi - chmod 755 $mysql_unix_port_dir - fi - -Index: scripts/mysql_install_db.sh -=================================================================== ---- scripts/mysql_install_db.sh.orig -+++ scripts/mysql_install_db.sh -@@ -28,6 +28,7 @@ args="" - defaults="" - mysqld_opt="" - user="" -+group="" - - force=0 - in_rpm=0 -@@ -63,6 +64,11 @@ Usage: $0 [OPTIONS] - user. You must be root to use this option. By default - mysqld runs using your current login name and files and - directories that it creates will be owned by you. -+ --group=group_name The login group to use for running mysqld. Files and -+ directories created by mysqld will be owned by this -+ group. You must be root to use this option. By default -+ mysqld runs using your current group and files and -+ directories that it creates will be owned by you. - - All other options are passed to the mysqld program - -@@ -103,11 +109,11 @@ parse_arguments() - --builddir=*) builddir=`parse_arg "$arg"` ;; - --srcdir=*) srcdir=`parse_arg "$arg"` ;; - --ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;; -- --user=*) - # Note that the user will be passed to mysqld so that it runs - # as 'user' (crucial e.g. if log-bin=/some_other_path/ - # where a chown of datadir won't help) -- user=`parse_arg "$arg"` ;; -+ --user=*) user=`parse_arg "$arg"` ;; -+ --group=*) group=`parse_arg "$arg"` ;; - --skip-name-resolve) ip_only=1 ;; - --verbose) verbose=1 ;; # Obsolete - --rpm) in_rpm=1 ;; -@@ -360,7 +366,12 @@ do - fi - if test -w / -a ! -z "$user" - then -- chown $user $dir -+ if test -z "$group" -+ then -+ chown $user $dir -+ else -+ chown $user:$group $dir -+ fi - fi - done - -@@ -369,6 +380,11 @@ then - args="$args --user=$user" - fi - -+if test -n "$group" -+then -+ args="$args --group=$group" -+fi -+ - # When doing a "cross bootstrap" install, no reference to the current - # host should be added to the system tables. So we filter out any - # lines which contain the current host name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Moving SafeProcess to /usr/bin - -We prefer to have this script somewhere else, so we moved it out of -the mysql-test directory. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysql-test/lib/My/SafeProcess.pm -=================================================================== ---- mysql-test/lib/My/SafeProcess.pm.orig -+++ mysql-test/lib/My/SafeProcess.pm -@@ -89,7 +89,7 @@ sub find_bin { - if (IS_WIN32PERL or IS_CYGWIN) - { - # Use my_safe_process.exe -- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], -+ my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - push(@safe_process_cmd, $exe); - -@@ -99,7 +99,7 @@ sub find_bin { - else - { - # Use my_safe_process -- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], -+ my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - push(@safe_process_cmd, $exe); - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Fix possible buffer overflow - -strncat function is used with n not depending on current length of string we -are appending to. Result might be buffer overflow. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysys/mf_loadpath.c -=================================================================== ---- mysys/mf_loadpath.c.orig -+++ mysys/mf_loadpath.c -@@ -42,7 +42,7 @@ char * my_load_path(char * to, const cha - if (is_cur) - is_cur=2; /* Remove current dir */ - if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0))) -- VOID(strncat(buff, path+is_cur, FN_REFLEN-1)); -+ VOID(strncat(buff, path+is_cur, FN_REFLEN-strlen(buff)-1)); - else - VOID(strnmov(buff, path, FN_REFLEN)); /* Return org file name */ - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Use lib_LIBRARIES instead of pkglib_LIBRARIES - -Make more sense and is more intuitive when compiling. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: libmysql/Makefile.shared -=================================================================== ---- libmysql/Makefile.shared.orig -+++ libmysql/Makefile.shared -@@ -26,7 +26,7 @@ MYSQLBASEdir= $(prefix) - ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded - ## until someone complains that they need separate options. - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) --pkglib_LTLIBRARIES = $(target) -+lib_LTLIBRARIES = $(target) - - noinst_PROGRAMS = conf_to_src - -Index: libmysqld/Makefile.am -=================================================================== ---- libmysqld/Makefile.am.orig -+++ libmysqld/Makefile.am -@@ -37,7 +37,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - @condition_dependent_plugin_includes@ - - noinst_LIBRARIES = libmysqld_int.a --pkglib_LIBRARIES = libmysqld.a -+lib_LIBRARIES = libmysqld.a - SUBDIRS = . examples - libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc - libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Tests in $(datadir) - -By default tests would get installed to /usr and as we want it LSB compilant, -we install them into /usr/share. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysql-test/Makefile.am -=================================================================== ---- mysql-test/Makefile.am.orig -+++ mysql-test/Makefile.am -@@ -17,7 +17,7 @@ - - ## Process this file with automake to create Makefile.in - --testroot = $(prefix) -+testroot = $(datadir) - testdir = $(testroot)/mysql-test - - test_SCRIPTS = mtr \ -Index: mysql-test/lib/My/SafeProcess/Makefile.am -=================================================================== ---- mysql-test/lib/My/SafeProcess/Makefile.am.orig -+++ mysql-test/lib/My/SafeProcess/Makefile.am -@@ -13,7 +13,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - --testroot = $(prefix) -+testroot = $(datadir) - safedir = $(testroot)/mysql-test/lib/My/SafeProcess - #nobase_bin_PROGRAMS = ... - safe_PROGRAMS = my_safe_process diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch 2010-12-23 16:15:03.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -PATCH-P0-FEATURE-DOWNSTREAM: Avoid version for all plugins - -Making all storage plugins unversioned. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: storage/blackhole/Makefile.am -=================================================================== ---- storage/blackhole/Makefile.am.orig -+++ storage/blackhole/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h - - EXTRA_LTLIBRARIES = ha_blackhole.la - pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ --ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) -+ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) - ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_SOURCES=ha_blackhole.cc -Index: storage/archive/Makefile.am -=================================================================== ---- storage/archive/Makefile.am.orig -+++ storage/archive/Makefile.am -@@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r - - EXTRA_LTLIBRARIES = ha_archive.la - pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ --ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_SOURCES = ha_archive.cc azio.c -Index: storage/example/Makefile.am -=================================================================== ---- storage/example/Makefile.am.orig -+++ storage/example/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h - - EXTRA_LTLIBRARIES = ha_example.la - pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ --ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_example_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_example_la_SOURCES = ha_example.cc -Index: storage/federated/Makefile.am -=================================================================== ---- storage/federated/Makefile.am.orig -+++ storage/federated/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_federated.h - - EXTRA_LTLIBRARIES = ha_federated.la - pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ --ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_federated_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_federated_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_SOURCES = ha_federated.cc -Index: storage/innodb_plugin/Makefile.am -=================================================================== ---- storage/innodb_plugin/Makefile.am.orig -+++ storage/innodb_plugin/Makefile.am -@@ -331,7 +331,7 @@ libinnobase_a_CFLAGS= $(AM_CFLAGS) - EXTRA_LTLIBRARIES= ha_innodb_plugin.la - pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@ - --ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) -+ha_innodb_plugin_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) - ha_innodb_plugin_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -PATCH-P0-FIX-SUSE: Fix test results confused by utf-8 - -We are using utf-8 as a default charset during the compilation and it has some -effect on the test results. Correct sollution would be to make these results -charset independent, but easiest one is obviously to modify them to reflect our -default settings. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysql-test/r/information_schema.result -=================================================================== ---- mysql-test/r/information_schema.result.orig -+++ mysql-test/r/information_schema.result -@@ -9,7 +9,7 @@ create user mysqltest_3@localhost; - create user mysqltest_3; - select * from information_schema.SCHEMATA where schema_name > 'm'; - CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH --NULL mtr latin1 latin1_swedish_ci NULL -+NULL mtr utf8 utf8_unicode_ci NULL - NULL mysql latin1 latin1_swedish_ci NULL - NULL test latin1 latin1_swedish_ci NULL - select schema_name from information_schema.schemata; -Index: mysql-test/r/mysql_comments.result -=================================================================== ---- mysql-test/r/mysql_comments.result.orig -+++ mysql-test/r/mysql_comments.result -@@ -13,23 +13,23 @@ drop trigger if exists t1_bi; - foofct("call 1") - call 1 - Function sql_mode Create Function character_set_client collation_connection Database Collation --foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx latin1 latin1_swedish_ci latin1_swedish_ci -+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx utf8 utf8_unicode_ci latin1_swedish_ci - foofct("call 2") - call 2 - Function sql_mode Create Function character_set_client collation_connection Database Collation --foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci -+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci -+empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci - id data - foo 42 - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) latin1 latin1_swedish_ci latin1_swedish_ci -+foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) utf8 utf8_unicode_ci latin1_swedish_ci - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend latin1 latin1_swedish_ci latin1_swedish_ci -+nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend utf8 utf8_unicode_ci latin1_swedish_ci - Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation --t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci -+t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci - Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation --t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci -+t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci - id data - trig 12 - "Pass 2 : --enable-comments" -@@ -40,23 +40,23 @@ trig 12 - foofct("call 1") - call 1 - Function sql_mode Create Function character_set_client collation_connection Database Collation --foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line latin1 latin1_swedish_ci latin1_swedish_ci -+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line utf8 utf8_unicode_ci latin1_swedish_ci - foofct("call 2") - call 2 - Function sql_mode Create Function character_set_client collation_connection Database Collation --foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci -+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci -+empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci - id data - foo 42 - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body latin1 latin1_swedish_ci latin1_swedish_ci -+foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body utf8 utf8_unicode_ci latin1_swedish_ci - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend latin1 latin1_swedish_ci latin1_swedish_ci -+nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend utf8 utf8_unicode_ci latin1_swedish_ci - Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation --t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci -+t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci - Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation --t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci -+t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci - id data - trig 12 - End of 5.0 tests -Index: mysql-test/r/mysql_upgrade.result -=================================================================== ---- mysql-test/r/mysql_upgrade.result.orig -+++ mysql-test/r/mysql_upgrade.result -@@ -166,8 +166,8 @@ mysql.time_zone_transition_type - mysql.user OK - CALL testproc(); - DROP PROCEDURE testproc; --WARNING: NULL values of the 'character_set_client' column ('mysql.proc' table) have been updated with a default value (latin1). Please verify if necessary. --WARNING: NULL values of the 'collation_connection' column ('mysql.proc' table) have been updated with a default value (latin1_swedish_ci). Please verify if necessary. -+WARNING: NULL values of the 'character_set_client' column ('mysql.proc' table) have been updated with a default value (utf8). Please verify if necessary. -+WARNING: NULL values of the 'collation_connection' column ('mysql.proc' table) have been updated with a default value (utf8_unicode_ci). Please verify if necessary. - WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been updated with default values. Please verify if necessary. - # - # Bug #53613: mysql_upgrade incorrectly revokes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch 2011-05-06 20:33:26.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,174 +0,0 @@ -PATCH-P0-HACK-SUSE: Fixing few compilation problems - -Mostly minor things. Mostly just to make compiler happy as it can't determine -that everything is ok. But few things might actually worth reporting as they -could be handled better (mostly the write calls). - -Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> - -Index: client/readline.cc -=================================================================== ---- client/readline.cc.orig -+++ client/readline.cc -@@ -55,7 +55,7 @@ LINE_BUFFER *batch_readline_init(ulong m - char *batch_readline(LINE_BUFFER *line_buff) - { - char *pos; -- ulong out_length; -+ ulong out_length=0; - - if (!(pos=intern_read_line(line_buff, &out_length))) - return 0; -Index: storage/innobase/ut/ut0ut.c -=================================================================== ---- storage/innobase/ut/ut0ut.c.orig -+++ storage/innobase/ut/ut0ut.c -@@ -495,7 +495,9 @@ ut_print_namel( - trx ? trx->mysql_thd : NULL, - table_id); - -- fwrite(buf, 1, bufend - buf, f); -+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) { -+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n"); -+ } - } - - /************************************************************************** -@@ -516,7 +518,8 @@ ut_copy_file( - ? (size_t) len - : sizeof buf; - size_t size = fread(buf, 1, maxs, src); -- fwrite(buf, 1, size, dest); -+ if(fwrite(buf, size, 1, dest)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/innodb_plugin/ut/ut0ut.c -=================================================================== ---- storage/innodb_plugin/ut/ut0ut.c.orig -+++ storage/innodb_plugin/ut/ut0ut.c -@@ -553,7 +553,9 @@ ut_print_namel( - trx ? trx->mysql_thd : NULL, - table_id); - -- fwrite(buf, 1, bufend - buf, f); -+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) { -+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n"); -+ } - } - - /**********************************************************************//** -@@ -574,7 +576,8 @@ ut_copy_file( - ? (size_t) len - : sizeof buf; - size_t size = fread(buf, 1, maxs, src); -- fwrite(buf, 1, size, dest); -+ if(fwrite(buf, size, 1, dest)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/ndb/src/common/util/ndb_init.c -=================================================================== ---- storage/ndb/src/common/util/ndb_init.c.orig -+++ storage/ndb/src/common/util/ndb_init.c -@@ -31,7 +31,7 @@ ndb_init() - { - if (my_init()) { - const char* err = "my_init() failed - exit\n"; -- write(2, err, strlen(err)); -+ fprintf(stderr, err, strlen(err)); - exit(1); - } - ndb_init_internal(); -Index: sql/log.cc -=================================================================== ---- sql/log.cc.orig -+++ sql/log.cc -@@ -1854,7 +1854,7 @@ static void setup_windows_event_source() - - static int find_uniq_filename(char *name) - { -- long number; -+ long number=0; - uint i; - char buff[FN_REFLEN]; - struct st_my_dir *dir_info; -Index: sql/filesort.cc -=================================================================== ---- sql/filesort.cc.orig -+++ sql/filesort.cc -@@ -438,16 +438,20 @@ static void dbug_print_record(TABLE *tab - Field *field= *pfield; - - if (field->is_null()) -- fwrite("NULL", sizeof(char), 4, DBUG_FILE); -+ if(fwrite("NULL", sizeof(char), 4, DBUG_FILE) != sizeof(char) * 4) -+ break; - - if (field->type() == MYSQL_TYPE_BIT) - (void) field->val_int_as_str(&tmp, 1); - else - field->val_str(&tmp); - -- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); -+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE) != -+ sizeof(char) * tmp.length()) -+ break; - if (pfield[1]) -- fwrite(", ", sizeof(char), 2, DBUG_FILE); -+ if(fwrite(", ", sizeof(char), 2, DBUG_FILE) != sizeof(char) * 2) -+ break; - } - fprintf(DBUG_FILE, ")"); - if (print_rowid) -Index: sql/opt_range.cc -=================================================================== ---- sql/opt_range.cc.orig -+++ sql/opt_range.cc -@@ -11344,7 +11344,8 @@ print_key(KEY_PART *key_part, const ucha - { - if (*key) - { -- fwrite("NULL",sizeof(char),4,DBUG_FILE); -+ if(fwrite("NULL",sizeof(char),4,DBUG_FILE)!=4*sizeof(char)) -+ break; - continue; - } - key++; // Skip null byte -@@ -11355,7 +11356,8 @@ print_key(KEY_PART *key_part, const ucha - (void) field->val_int_as_str(&tmp, 1); - else - field->val_str(&tmp); -- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); -+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE)!=sizeof(char)*tmp.length()) -+ break; - if (key+store_length < key_end) - fputc('/',DBUG_FILE); - } -Index: sql/sql_table.cc -=================================================================== ---- sql/sql_table.cc.orig -+++ sql/sql_table.cc -@@ -6955,7 +6955,7 @@ view_err: - need_copy_table= ALTER_TABLE_DATA_CHANGED; - else - { -- enum_alter_table_change_level need_copy_table_res; -+ enum_alter_table_change_level need_copy_table_res = ALTER_TABLE_DATA_CHANGED; - /* Check how much the tables differ. */ - if (compare_tables(table, alter_info, - create_info, order_num, -Index: sql/debug_sync.cc -=================================================================== ---- sql/debug_sync.cc.orig -+++ sql/debug_sync.cc -@@ -1721,6 +1721,7 @@ static void debug_sync_execute(THD *thd, - const char *UNINIT_VAR(old_proc_info); - - action->execute--; -+ old_proc_info = NULL; - - /* - If we will be going to wait, set proc_info for the PROCESSLIST table. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/tools/apply-series.sh new/mysql-patches/tools/apply-series.sh --- old/mysql-patches/tools/apply-series.sh 2011-05-06 17:01:22.000000000 +0200 +++ new/mysql-patches/tools/apply-series.sh 2011-10-11 12:30:00.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################################################################## # # @@ -81,5 +81,5 @@ else echo " ! Patch \"$patch\" can't be applied !!!" exit 3 - fi + fi done < "$series" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mtpaint for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package mtpaint for openSUSE:Factory checked in at 2012-03-01 17:21:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtpaint (Old) and /work/SRC/openSUSE:Factory/.mtpaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mtpaint", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mtpaint/mtpaint.changes 2011-09-23 02:13:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mtpaint.new/mtpaint.changes 2012-03-01 17:21:06.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Feb 27 08:41:15 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-3.0+ + For the docs look at the COPYING (1.2 _not_ 1.3). For the main package + there is no indication that GPLv3 only is intended + +------------------------------------------------------------------- +Thu Jan 12 11:30:48 UTC 2012 - coolo(a)suse.com + +- change license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtpaint.spec ++++++ --- /var/tmp/diff_new_pack.B7NRyZ/_old 2012-03-01 17:21:07.000000000 +0100 +++ /var/tmp/diff_new_pack.B7NRyZ/_new 2012-03-01 17:21:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mtpaint # -# 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,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Summary: Painting program for creating icons and pixel-based artwork +License: GPL-3.0+ +Group: Productivity/Graphics/Bitmap Editors Name: mtpaint Version: 3.31 -Release: 13 -License: GPLv3 -Group: Productivity/Graphics/Bitmap Editors +Release: 0 Url: http://mtpaint.sourceforge.net/ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://downloads.sf.net/%{name}/%{name}_handbook-%{version}.tar.bz2 @@ -34,10 +32,16 @@ Patch4: %{name}-fix-no-add-needed.patch Patch5: %{name}-3.31-ld_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on -BuildRequires: gtk2-devel libpng-devel update-desktop-files zlib-devel -BuildRequires: giflib-devel libjpeg-devel libtiff-devel -BuildRequires: desktop-file-utils dos2unix gettext +BuildRequires: desktop-file-utils +BuildRequires: dos2unix +BuildRequires: gettext +BuildRequires: giflib-devel +BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: update-desktop-files +BuildRequires: zlib-devel %description mtPaint is a simple painting program designed for creating icons and @@ -48,8 +52,8 @@ %package handbook Summary: Handbook for the mtpaint painting application +License: GFDL-1.2 Group: Productivity/Graphics/Bitmap Editors -License: GFDL Requires: %{name} = %{version} %if 0%{?suse_version} >= 1120 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 libmspack for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package libmspack for openSUSE:Factory checked in at 2012-03-01 17:20:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmspack (Old) and /work/SRC/openSUSE:Factory/.libmspack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmspack", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libmspack/libmspack.changes 2011-11-21 15:47:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmspack.new/libmspack.changes 2012-03-01 17:21:05.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 27 15:14:56 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-2.1+ + No indication of GPL-2.0+ code in the package + +------------------------------------------------------------------- +Mon Feb 13 10:48:55 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Sun Nov 20 20:44:56 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Use %_smp_mflags for parallel building + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmspack.spec ++++++ --- /var/tmp/diff_new_pack.EfNENe/_old 2012-03-01 17:21:06.000000000 +0100 +++ /var/tmp/diff_new_pack.EfNENe/_new 2012-03-01 17:21:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmspack # -# 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,21 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define _version 0.2alpha Name: libmspack -License: GPLv2+ ; LGPLv2.1+ -Group: System/Libraries Version: 0.1.99_%{_version} -Release: 1 +Release: 0 Summary: Library That Implements Different Microsoft Compressions +License: LGPL-2.1+ +Group: System/Libraries Url: http://www.cabextract.org.uk/libmspack/ Source: %{name}-%{_version}.tar.bz2 Patch: %{name}-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libtool pkg-config +BuildRequires: libtool +BuildRequires: pkg-config %description The purpose of libmspack is to provide both compression and @@ -37,7 +37,6 @@ Currently the most common formats are implemented. %package -n libmspack0 -License: GPLv2+ ; LGPLv2.1+ Summary: Library That Implements Different Microsoft Compressions Group: System/Libraries # OpenSUSE <= 10.3, SLES <= 10: @@ -50,7 +49,6 @@ Currently the most common formats are implemented. %package devel -License: LGPLv2.1+ Summary: Static libraries, header files and documentation for libmspack Group: Development/Libraries/C and C++ Requires: libmspack0 = %{version} @@ -67,15 +65,12 @@ autoreconf -f -i %configure\ --disable-static -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall rm $RPM_BUILD_ROOT%{_libdir}/*.*a -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libmspack0 -p /sbin/ldconfig %postun -n libmspack0 -p /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 libgit2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package libgit2 for openSUSE:Factory checked in at 2012-03-01 17:20:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgit2 (Old) and /work/SRC/openSUSE:Factory/.libgit2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgit2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libgit2/libgit2.changes 2011-10-27 19:23:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgit2.new/libgit2.changes 2012-03-01 17:20:55.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 31 17:12:58 UTC 2012 - jengelh(a)medozas.de + +- Provide pkgconfig symbols + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgit2.spec ++++++ --- /var/tmp/diff_new_pack.up8UZ0/_old 2012-03-01 17:20:57.000000000 +0100 +++ /var/tmp/diff_new_pack.up8UZ0/_new 2012-03-01 17:20:57.000000000 +0100 @@ -1,6 +1,7 @@ # # spec file for package libgit2 # +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011, Sascha Peilicke <saschpe(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -12,15 +13,18 @@ # 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: libgit2 Version: 0.15.0 Release: 0 -License: GPL-2.0 with linking Summary: C git library -Url: http://libgit2.github.com/ +License: GPL-2.0 with linking Group: Development/Libraries/C and C++ +Url: http://libgit2.github.com/ Source0: https://github.com/downloads/libgit2/libgit2/libgit2-%{version}.tar.gz BuildRequires: cmake +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: openssl-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim3 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package kdepim3 for openSUSE:Factory checked in at 2012-03-01 17:20:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim3 (Old) and /work/SRC/openSUSE:Factory/.kdepim3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim3/kdepim3.changes 2011-12-13 11:48:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3.changes 2012-03-01 17:20:48.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Feb 13 10:48:04 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Tue Jan 31 14:48:08 UTC 2012 - anixx(a)opensuse.org + +- reverting back to gcc-4.3 due to another crash when starting kmail from kontact + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.GBGYIf/_old 2012-03-01 17:20:51.000000000 +0100 +++ /var/tmp/diff_new_pack.GBGYIf/_new 2012-03-01 17:20:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdepim3 # -# 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 @@ -13,20 +13,31 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: kdepim3 -BuildRequires: cyrus-sasl-devel flex kdelibs3-devel libassuan-devel libmal-devel python-devel fdupes +BuildRequires: cyrus-sasl-devel +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: kdelibs3-devel +BuildRequires: libassuan-devel +BuildRequires: libmal-devel +BuildRequires: python-devel %if %suse_version < 1210 BuildRequires: hal-devel %endif -BuildRequires: gnokii-devel libopensync-devel pilot-link-devel -BuildRequires: gpgme-devel gpg2 +BuildRequires: gnokii-devel +BuildRequires: libopensync-devel +BuildRequires: pilot-link-devel +BuildRequires: gpg2 +BuildRequires: gpgme-devel +BuildRequires: gcc43-c++ +Summary: Personal Information Manager Software for KDE License: GPL-2.0 Group: System/GUI/KDE -Summary: Personal Information Manager Software for KDE Version: 3.5.10 -Release: 9 +Release: 0 Url: http://www.kde.org/ Requires: suse_help_viewer Requires: libkcal2 @@ -84,32 +95,32 @@ * Various wizards to connect to groupware servers %package -n libktnef1 -License: GPL-2.0 Summary: Library to read TNEF +License: GPL-2.0 Group: System/GUI/KDE %description -n libktnef1 This package contains a library to read the TNEF format. %package -n libkmime2 -License: GPL-2.0 Summary: Library to read MIME messages +License: GPL-2.0 Group: System/GUI/KDE %description -n libkmime2 This package contains a library to read MIME messages. %package -n libkmime-devel -License: GPL-2.0 Summary: Library to read MIME messages +License: GPL-2.0 Group: System/GUI/KDE %description -n libkmime-devel This package contains a library to read MIME messages. %package -n libktnef-devel -License: GPL-2.0 Summary: Library to read TNEF +License: GPL-2.0 Group: System/GUI/KDE Requires: libktnef1 @@ -117,8 +128,8 @@ This package contains a library to read the TNEF format. %package -n libkcal2 -License: GPL-2.0 Summary: Calendaring Classes +License: GPL-2.0 Group: System/GUI/KDE Requires: libkcal @@ -129,8 +140,8 @@ be GUI independent and suitable for writing command line applications. %package -n libkcal-devel -License: GPL-2.0 Summary: Calendering Classes +License: GPL-2.0 Group: System/GUI/KDE Requires: libkcal2 @@ -141,8 +152,8 @@ be GUI independent and suitable for writing command line applications. %package -n libkcal -License: GPL-2.0 Summary: Calendaring Classes +License: GPL-2.0 Group: System/GUI/KDE Requires: libkcal2 @@ -153,10 +164,10 @@ be GUI independent and suitable for writing command line applications. %package devel -License: GPL-2.0 Provides: kdenetwork3-devel = 3.2.1 Obsoletes: kdenetwork3-devel <= 3.2.1 Summary: Personal Information Manager software for KDE +License: GPL-2.0 Group: System/GUI/KDE Requires: %name = %version libktnef-devel libkmime-devel libkcal-devel @@ -164,10 +175,10 @@ This package contains tools for address and date organization. %package mobile -License: LGPL-2.0.1 or later # usesubdirs kandy kmobile Provides: kdepim3:/opt/kde3/bin/kandy Summary: Cell Phone Support +License: LGPL-2.1+ Group: Hardware/Mobile %description mobile @@ -179,10 +190,10 @@ cell phones) %package time-management -License: GPL-2.0 # usesubdirs karm konsolekalendar kalarm Provides: kdepim3:/opt/kde3/bin/karm Summary: Personal Information Manager +License: GPL-2.0 Group: System/GUI/KDE %description time-management @@ -190,9 +201,9 @@ %package kpilot -License: LGPL-2.0.1 or later # usesubdirs kpilot Summary: This Package allows Communication with the 3COM Palm Pilot +License: LGPL-2.1+ Group: Hardware/Mobile %description kpilot @@ -200,8 +211,8 @@ Pilot via the Palm Cradle. %package notes -License: GPL-2.0 Summary: Note taking application +License: GPL-2.0 Group: System/GUI/KDE Provides: kdepim3:/opt/kde3/bin/knotes Requires: kdepim3 @@ -210,8 +221,8 @@ This package contains the notes application KNotes. %package -n kitchensync -License: GPL-2.0; LGPL-2.0.1 or later Summary: KDE Synchronization application based on OpenSync +License: GPL-2.0 ; LGPL-2.1+ Group: Hardware/PDA Provides: kdepim3-sync Obsoletes: kdepim3-sync @@ -252,13 +263,13 @@ %patch130 -p1 %patch131 -p3 %patch132 -p1 -%patch133 -p1 - +#%patch133 -p1 . /etc/opt/kde3/common_options update_admin %build - +export CC=gcc-4.3 +export CXX=g++-4.3 . /etc/opt/kde3/common_options export CXXFLAGS="$CXXFLAGS -Wl,--add-needed" configopts="--disable-final" @@ -266,7 +277,7 @@ --without-arts --disable-final \ --enable-newdistrlists=no # may fail with higher number of jobs -do_make -j4 +do_make -j2 %install . /etc/opt/kde3/common_options @@ -320,7 +331,6 @@ %postun -n kitchensync -p /sbin/ldconfig - %files %defattr(-,root,root) %dir /opt/kde3/share/icons/hicolor/16x16 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde3-krecord for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package kde3-krecord for openSUSE:Factory checked in at 2012-03-01 17:20:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde3-krecord (Old) and /work/SRC/openSUSE:Factory/.kde3-krecord.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde3-krecord", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kde3-krecord/kde3-krecord.changes 2012-02-24 12:05:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde3-krecord.new/kde3-krecord.changes 2012-03-01 17:20:40.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 25 08:42:05 UTC 2012 - coolo(a)suse.com + +- sync spec file name with package name + +------------------------------------------------------------------- Old: ---- krecord.spec New: ---- kde3-krecord.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-krecord.spec ++++++ # # spec file for package kde3-krecord # # 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: kde3-krecord BuildRequires: kdelibs3-devel Url: http://linux.bytesex.org/misc/krecord.html Summary: A Sound Recorder License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities Version: 1.16 Release: 0 Source: krecord-%{version}.tar.bz2 Source1: krecord.png Patch: krecord.diff Patch2: updated-hu-translation.diff Patch3: krecord-ld_fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: krecord = %{version} Obsoletes: krecord %description This program records sound from your sound card and saves it to WAV files. %prep %setup -q -n krecord-%{version} %patch %patch2 %patch3 %build export QTDIR=/usr/lib/qt3 export KDEDIR=/opt/kde3 sed -i 's|-Wall|-Wall -Wl,--add-needed|g' mk/Variables.mk export LDFLAGS="$LDLAGS -Wl,--add-needed" make %install export QTDIR=/usr/lib/qt3 export KDEDIR=/opt/kde3 make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/32x32/apps/ install -m 0644 %SOURCE1 \ $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/32x32/apps/ %suse_update_desktop_file -G "Sound Recorder" krecord AudioVideo Recorder %find_lang krecord %files -f krecord.lang %defattr(-,root,root) %doc README /opt/kde3/bin/krecord /opt/kde3/share/appl*/*/krecord.desktop /opt/kde3/share/apps/krecord /opt/kde3/share/icons/hicolor/32x32/apps/*.png %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 jpackage-utils for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package jpackage-utils for openSUSE:Factory checked in at 2012-03-01 17:20:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jpackage-utils (Old) and /work/SRC/openSUSE:Factory/.jpackage-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jpackage-utils", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/jpackage-utils/jpackage-utils.changes 2012-01-27 15:17:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.jpackage-utils.new/jpackage-utils.changes 2012-03-01 17:20:36.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Feb 29 11:00:51 UTC 2012 - mvyskocil(a)suse.cz + +- update javapackages to 0.3.0 + * fixes in maven_depmap.py + * new macro create_javadoc_subpackage +- fix a typo in maven_depmap.py installation + +------------------------------------------------------------------- Old: ---- javapackages-0.2.6.tar.xz New: ---- javapackages-0.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jpackage-utils.spec ++++++ --- /var/tmp/diff_new_pack.D7ExYV/_old 2012-03-01 17:20:38.000000000 +0100 +++ /var/tmp/diff_new_pack.D7ExYV/_new 2012-03-01 17:20:38.000000000 +0100 @@ -19,13 +19,14 @@ %define distver 1.7 %define section free -%global fj_version 0.2.6 +%global fj_version 0.3.0 Name: jpackage-utils Version: 1.7.5 -Release: 15 +Release: 0 Summary: JPackage Utilities License: BSD-3-Clause +Group: Development/Languages/Java Url: http://www.jpackage.org/ Source0: %{name}-%{version}.tar.bz2 Source1: jpackage-utils-1.7.5-man-pages.tar.bz2 @@ -44,7 +45,6 @@ #PATCH-FIX-SUSE: in set_jvm_dirs call set_javacmd explicitelly and change #JAVAVER_LIBDIR to JAVA_LIBDIR if it does not exists Patch1000: jpackage-utils-jnidir-suse.patch -Group: Development/Languages/Java BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: xz @@ -53,13 +53,16 @@ Requires: coreutils Requires: grep Requires: python +Requires: python-xml Requires: sed +# Fedora have splitted it into separate package, which seems not needed +# atm in SUSE, so let use Provides to stay compatible +Provides: javapackages-tools = %{fj_version} + %description Utilities for the JPackage project <http://www.jpackage.org/>. - - %prep %setup -q -b 1 -a 8 @@ -181,7 +184,7 @@ $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/osgi.attr install -pm 644 macros.fjava ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm -install -pm 644 scripts/maven_depmap.py ${RPM_BUILD_ROOT}${_javadir}-utils +install -pm 644 scripts/maven_depmap.py ${RPM_BUILD_ROOT}%{_javadir}-utils/ popd cat <<EOF > %{name}-%{version}.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 jcip-annotations for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package jcip-annotations for openSUSE:Factory checked in at 2012-03-01 17:20:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jcip-annotations (Old) and /work/SRC/openSUSE:Factory/.jcip-annotations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jcip-annotations", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/jcip-annotations/jcip-annotations.changes 2011-09-23 02:04:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jcip-annotations.new/jcip-annotations.changes 2012-03-01 17:20:31.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Feb 27 14:46:50 UTC 2012 - cfarrell(a)suse.com + +- license update: CC-BY-2.5 + Most of the pattern matches in the package are for CC-BY-2.5, not + CC-BY-3.0 + +------------------------------------------------------------------- +Thu Jan 12 11:30:39 UTC 2012 - coolo(a)suse.com + +- change license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jcip-annotations.spec ++++++ --- /var/tmp/diff_new_pack.2mWodx/_old 2012-03-01 17:20:33.000000000 +0100 +++ /var/tmp/diff_new_pack.2mWodx/_new 2012-03-01 17:20:33.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package jcip-annotations (Version 1.0) +# spec file for package jcip-annotations # -# 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,14 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define section free Name: jcip-annotations Version: 1.0 -Release: 1 +Release: 0 Summary: Java Concurrency in Practice -License: Creative Commons Attribution License +License: CC-BY-2.5 Group: Development/Libraries/Java Url: http://www.jcip.net/ Source0: http://www.jcip.net/jcip-annotations-src.jar @@ -31,8 +30,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: java-devel = 1.5.0 +BuildRequires: jpackage-utils >= 1.7.5 Requires: java >= 1.5.0 Requires(post): jpackage-utils >= 1.7.4 @@ -43,7 +42,6 @@ policies. %package javadoc -License: Creative Commons Attribution License Summary: Javadoc for %{name} Group: Development/Documentation -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit intltool for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package intltool for openSUSE:Factory checked in at 2012-03-01 17:20:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/intltool (Old) and /work/SRC/openSUSE:Factory/.intltool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "intltool", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/intltool/intltool.changes 2012-02-16 16:16:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.intltool.new/intltool.changes 2012-03-01 17:20:25.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 27 08:07:15 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.50.2: + + Use --no-translations only if intltool >= 0.50 is available + (lp#903340). + +------------------------------------------------------------------- Old: ---- intltool-0.50.1.tar.gz New: ---- intltool-0.50.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ intltool.spec ++++++ --- /var/tmp/diff_new_pack.Erm2EH/_old 2012-03-01 17:20:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Erm2EH/_new 2012-03-01 17:20:27.000000000 +0100 @@ -21,7 +21,7 @@ Summary: Internationalization Tool Collection License: GPL-2.0+ Group: Development/Tools/Other -Version: 0.50.1 +Version: 0.50.2 Release: 0 BuildArch: noarch Requires: gettext-tools ++++++ intltool-0.50.1.tar.gz -> intltool-0.50.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/intltool-0.50.1/ChangeLog new/intltool-0.50.2/ChangeLog --- old/intltool-0.50.1/ChangeLog 2012-02-05 10:20:31.000000000 +0100 +++ new/intltool-0.50.2/ChangeLog 2012-02-26 19:47:53.000000000 +0100 @@ -1,3 +1,15 @@ + 735 Danilo Šegan 2012-02-26 + Up the version number to 0.50.2. + + 734 Danilo Šegan 2012-02-26 [merge] + Fix #903340: Use --no-translations only if detected intltool on the system is 0.50 or better. Patch by Hib Eric. + + 733 Danilo Šegan 2012-02-05 + Update NEWS: Include a missed contribution by doko in 0.50.1 and reconstruct 0.50.0 stuff from the release notes on LP. + + 732 Danilo Šegan 2012-02-05 + Up the version to 0.50.1. + 731 Danilo Šegan 2012-02-05 [merge] Fix #924386: include ChangeLog in dist tarballs and create a NEWS file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/intltool-0.50.1/NEWS new/intltool-0.50.2/NEWS --- old/intltool-0.50.1/NEWS 2012-02-05 10:18:28.000000000 +0100 +++ new/intltool-0.50.2/NEWS 2012-02-26 19:38:05.000000000 +0100 @@ -1,3 +1,12 @@ +intltool 0.50.2 +=============== + +intltool 0.50.2 is another minor release improving backwards compatibility. +Only one bug is fixed in this release: + + * Use --no-translations only if intltool >= 0.50 is available (#903340). + Patch contributed by Hib Eris (https://launchpad.net/~hiberis). + intltool 0.50.1 =============== @@ -15,3 +24,35 @@ * Start including a ChangeLog in tarballs and provide a NEWS file (#924386). This introduces a soft dependency on "bzr": it's only required for maintainers who wish to regenerate a ChangeLog file from the bzr checkout. + + * Fix quoting of XGETTEXT variable when setting MSGMERGE and GENPOT + in Makefile (#900738). + Patch contributed by Matthias Klose (https://launchpad.net/~doko). + + +intltool 0.50.0 +=============== + +intltool 0.50.0 is a major bug fix release. + +Among the fixes, the following stand out: + + * Bug #580526 + Finally, support for gsettings gschema.xml files is merged in, which + should enable maintainers to get a slightly simpler build setup + (i.e. no need to use NOMERGE rule anymore, and you can have intltool + directly extract translations from .gschema.xml files). + + * Bug #790574: + Let xgettext extract Scheme strings out, and add support for + `intltool-update -m` to find files with marked strings. + + * Bug #806006: + Improve handling of quotes in `intltool-update -m` so you get less + (no?) warnings about mismatched quotes, and Python processing doesn't + get messed up with docstrings and similar. + + * Bug #520986: + One for the translators—messages are extracted in the order they appear + in original files now, thus allowing translators to infer more of the + context from the ordering. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/intltool-0.50.1/configure new/intltool-0.50.2/configure --- old/intltool-0.50.1/configure 2012-02-05 10:20:29.000000000 +0100 +++ new/intltool-0.50.2/configure 2012-02-26 19:42:22.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for intltool 0.50.1. +# Generated by GNU Autoconf 2.68 for intltool 0.50.2. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -556,8 +556,8 @@ # Identity of this package. PACKAGE_NAME='intltool' PACKAGE_TARNAME='intltool' -PACKAGE_VERSION='0.50.1' -PACKAGE_STRING='intltool 0.50.1' +PACKAGE_VERSION='0.50.2' +PACKAGE_STRING='intltool 0.50.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1178,7 +1178,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 intltool 0.50.1 to adapt to many kinds of systems. +\`configure' configures intltool 0.50.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1244,7 +1244,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of intltool 0.50.1:";; + short | recursive ) echo "Configuration of intltool 0.50.2:";; esac cat <<\_ACEOF @@ -1311,7 +1311,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -intltool configure 0.50.1 +intltool configure 0.50.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1328,7 +1328,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by intltool $as_me 0.50.1, which was +It was created by intltool $as_me 0.50.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='intltool' - VERSION='0.50.1' + VERSION='0.50.2' cat >>confdefs.h <<_ACEOF @@ -2851,7 +2851,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by intltool $as_me 0.50.1, which was +This file was extended by intltool $as_me 0.50.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2904,7 +2904,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -intltool config.status 0.50.1 +intltool config.status 0.50.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/intltool-0.50.1/configure.ac new/intltool-0.50.2/configure.ac --- old/intltool-0.50.1/configure.ac 2012-02-05 10:20:07.000000000 +0100 +++ new/intltool-0.50.2/configure.ac 2012-02-26 19:41:48.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.53]) -AC_INIT([intltool], [0.50.1]) +AC_INIT([intltool], [0.50.2]) AC_CONFIG_SRCDIR([intltoolize.in]) AM_INIT_AUTOMAKE([foreign]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/intltool-0.50.1/intltool.m4 new/intltool-0.50.2/intltool.m4 --- old/intltool-0.50.1/intltool.m4 2012-02-05 09:28:34.000000000 +0100 +++ new/intltool-0.50.2/intltool.m4 2012-02-26 19:31:06.000000000 +0100 @@ -23,7 +23,7 @@ ## the same distribution terms that you use for the rest of that program. dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 41 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -36,13 +36,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -85,7 +83,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icinga for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2012-03-01 17:20:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icinga", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2011-10-14 09:51:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2012-03-01 17:20:10.000000000 +0100 @@ -1,0 +2,48 @@ +Tue Feb 21 16:41:40 UTC 2012 - thardeck(a)suse.com + +- Added changelog entry about the icinga-api removal + +------------------------------------------------------------------- +Thu Feb 16 09:03:31 UTC 2012 - saschpe(a)suse.de + +- Added some detail about the last version updates + +------------------------------------------------------------------- +Mon Feb 13 10:47:45 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Fri Dec 2 15:32:05 UTC 2011 - thardeck(a)suse.com + +- Imported Upstream version 1.6.1: + * core: fix freshness checks are generating stale alerts, even + if result was received in time + +------------------------------------------------------------------- +Fri Dec 01 14:29:26 UTC 2011 - thardeck(a)suse.com + +- imported Upstream version 1.6.0 + * package: complete remove icinga-api as module #1935 + ** Development is being discontinued for now, 1.5.0 was last combined release. + * core: fix downtime and comments delete with wrong loop pointers + causing segfaults + * core: fix $NOTIFICATIONRECIPIENTS$ macro contains all contacts + assigned to host|service, not only notified contacts + * core: plug memory leak in downtimes comment add + * core: make first_notification_delay depend on the first !OK hard state + change and don't reset timer for new hard states which would replace it + * core: fix memory leak in xodtemplate.c + * classic ui: fix for Classic-UI displays bad timeperiods + * classic ui: fixed wrong color in histogram and trends for unknown/unreachable + * classic ui: fixed search not returning all results, only first match + * classic ui: fixed wrong output from status.cgi with option hostservicedetail + * classic ui: fix typo in histogram.c + * idoutils: host state change last_hard_state overrides last_state, + last_hard_state always -1 + * idoutils: extend conninfo.agent_version field to varchar(16) + * idoutils: terminate threads cleanly, including db connection + * install: rework the version updates in icinga and idoutils + - See ChangeLog for more details + +------------------------------------------------------------------- Old: ---- icinga-1.5.1.tar.gz icinga-remove-obsolete-api.patch New: ---- icinga-1.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.Nb4BY2/_old 2012-03-01 17:20:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Nb4BY2/_new 2012-03-01 17:20:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icinga # -# 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,11 @@ # -# set to 1 to also build the obsolete api packages -%define build_api 0 - %define logdir %{_localstatedir}/log/icinga Name: icinga -Version: 1.5.1 -Release: 2 -License: GPLv2 +Version: 1.6.1 +Release: 0 %define nsusr icinga %define nsgrp icinga %define cmdgrp icingacmd @@ -34,8 +30,9 @@ %define apacheuser wwwrun %define apachegroup www Summary: Host/service/network monitoring program -Url: http://www.icinga.org/ +License: GPL-2.0 Group: System/Monitoring +Url: http://www.icinga.org/ Source0: %{name}-%{version}.tar.gz Source1: rc%{name} Source2: rcido2db @@ -49,10 +46,6 @@ Source12: htpasswd.users # PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch Patch0: icinga-add-ifdefine-to-apache.patch -%if 0%{?build_api} == 0 -# PATCH-FIX-OPENSUSE icinga-remove-obsolete-api.patch -Patch1: icinga-remove-obsolete-api.patch -%endif BuildRequires: apache2-devel %if 0%{?suse_version} >= 1110 BuildRequires: fdupes @@ -214,44 +207,9 @@ monitoring, redundancy and disabling and enabling service checks and notifications. -%if 0%{?build_api} != 0 - -%package api -Summary: PHP api for icinga -Group: System/Monitoring -Recommends: %{name}-idoutils -Recommends: php5-mysql -Recommends: php5-pgsql -Requires(pre): %{name} = %{version} - -%description api -PHP based, the Icinga API is free from complex data schemas, and has no -dependencies on other libraries or frameworks. It also supports various -interfaces, from database PHP-PDO output to pipe and SSH input. - -Data collected from the IDODB by the Icinga API is then presented in the Icinga -Web or any other portal interface addon. Writing addons and plugins for Icinga -is made much easier through this structure as the API acts as an interpreter -for the extensions, saving a lot of coding stress. - -In short: This package provides the API needed to access idoutils and -livestatus information from PHP. - -%package api-doc -Summary: Online documentation for %{name}-api -Group: System/Monitoring -Recommends: %{name}-web = %{version} - -%description api-doc -This package provides the online documentation for %{name}-api. -%endif - %prep %setup -q %patch0 -p1 -%if 0%{?build_api} == 0 -%patch1 -p1 -%endif # replace default ido2db lock and socket file settings sed -ie "s|@localstatedir@/ido2db.lock|%{_localstatedir}/run/%{name}/ido2db.pid|g; \ @@ -292,10 +250,7 @@ --enable-event-broker \ --enable-embedded-perl \ --enable-idoutils \ - --enable-ssl \ -%if 0%{?build_api} != 0 - --with-phpapi-log-dir=%{logdir}/api \ -%endif + --enable-ssl # # make daemonchk.cgi and event handlers @@ -361,11 +316,6 @@ # remove unnecessary files from www log directory rm %{buildroot}/%{logdir}/www/{.htaccess,index.htm} -%if 0%{?build_api} != 0 -### remove API PLACEHOLDER -rm %{buildroot}/%{logdir}/api/PLACEHOLDER -%endif - # REST of special SUSE stuff here, if needed.... # init-scripts # remove the default init script as SUSE uses an adapted one @@ -563,6 +513,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/ido2db.cfg %config(noreplace) %{_sysconfdir}/%{name}/idomod.cfg %config(noreplace) %{_sysconfdir}/%{name}/modules/idoutils.cfg +%config(noreplace) %{_sysconfdir}/icinga/objects/ido2db_check_proc.cfg %{_sbindir}/rcido2db %{_sbindir}/ido2db %{_sbindir}/log2ido @@ -600,20 +551,4 @@ %defattr(0755,root,root) %{_prefix}/lib/nagios/plugins/eventhandlers/ -%if 0%{?build_api} != 0 - -%files api -%defattr(-,%{nsusr},%{nsgrp}) -%dir %{_datadir}/icinga/icinga-api -%{_datadir}/icinga/icinga-api/IcingaApi.php -%{_datadir}/icinga/icinga-api/contrib -%{_datadir}/icinga/icinga-api/objects -%{_datadir}/icinga/icinga-api/tests -%attr(0775,%{apacheuser},%{apachegroup}) %dir %{logdir}/api - -%files api-doc -%defattr(-,root,root) -%doc module/icinga-api/doc/* -%endif - %changelog ++++++ icinga-1.5.1.tar.gz -> icinga-1.6.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/icinga/icinga-1.5.1.tar.gz /work/SRC/openSUSE:Factory/.icinga.new/icinga-1.6.1.tar.gz differ: char 5, 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 gupnp-dlna for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package gupnp-dlna for openSUSE:Factory checked in at 2012-03-01 17:19:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gupnp-dlna (Old) and /work/SRC/openSUSE:Factory/.gupnp-dlna.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gupnp-dlna", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gupnp-dlna/gupnp-dlna.changes 2012-01-06 11:44:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gupnp-dlna.new/gupnp-dlna.changes 2012-03-01 17:19:59.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 15 07:51:01 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.6.5: + + Update autotools integration. + + Add missing functions to documentation. + + Fix warnings during GIR generation. + + Fix GIR namespace to not clash with GUPnP's. +- Rename typelib-1_0-GUPnP-DLNA-1_0 subpackage to + typelib-1_0-GUPnPDLNA-1_0, following typelib name change. There + is no Provides/Obsoletes, as this should work like SLPP packages. + +------------------------------------------------------------------- Old: ---- gupnp-dlna-0.6.4.tar.bz2 New: ---- gupnp-dlna-0.6.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gupnp-dlna.spec ++++++ --- /var/tmp/diff_new_pack.2rY5sT/_old 2012-03-01 17:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.2rY5sT/_new 2012-03-01 17:20:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gupnp-dlna # -# 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: gupnp-dlna -Version: 0.6.4 +Version: 0.6.5 Release: 0 Summary: A collection of helpers for building DLNA applications License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://www.gupnp.org/ -Source: http://download.gnome.org/sources/gupnp-dlna/0.6/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gupnp-dlna/0.6/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel @@ -41,11 +42,11 @@ GUPnP-DLNA is a collection of helpers for building DLNA media sharing applications using GUPnP. -%package -n typelib-1_0-GUPnP-DLNA-1_0 +%package -n typelib-1_0-GUPnPDLNA-1_0 Summary: A collection of helpers for building DLNA applications -- Introspection bindings Group: Development/Libraries/C and C++ -%description -n typelib-1_0-GUPnP-DLNA-1_0 +%description -n typelib-1_0-GUPnPDLNA-1_0 GUPnP-DLNA is a collection of helpers for building DLNA media sharing applications using GUPnP. @@ -55,7 +56,7 @@ Summary: A collection of helpers for building DLNA applications - Development Files Group: Development/Libraries/C and C++ Requires: libgupnp-dlna-1_0-2 = %{version} -Requires: typelib-1_0-GUPnP-DLNA-1_0 = %{version} +Requires: typelib-1_0-GUPnPDLNA-1_0 = %{version} %description -n libgupnp-dlna-devel GUPnP-DLNA is a collection of helpers for building DLNA media sharing @@ -95,16 +96,16 @@ %{_datadir}/%{name}/ %{_libdir}/lib*.so.2* -%files -n typelib-1_0-GUPnP-DLNA-1_0 +%files -n typelib-1_0-GUPnPDLNA-1_0 %defattr(-,root,root) -%{_libdir}/girepository-1.0/GUPnP-DLNA-1.0.typelib +%{_libdir}/girepository-1.0/GUPnPDLNA-1.0.typelib %files -n libgupnp-dlna-devel %defattr(-,root,root) %{_includedir}/%{name}-1.0/ %{_libdir}/lib*.so %{_libdir}/pkgconfig/gupnp-dlna-1.0.pc -%{_datadir}/gir-1.0/GUPnP-DLNA-1.0.gir +%{_datadir}/gir-1.0/GUPnPDLNA-1.0.gir %doc %{_datadir}/gtk-doc/html/%{name}/ %files -n gupnp-dlna-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 gobby04 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package gobby04 for openSUSE:Factory checked in at 2012-03-01 17:19:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gobby04 (Old) and /work/SRC/openSUSE:Factory/.gobby04.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gobby04", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gobby04/gobby04.changes 2012-01-20 20:23:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gobby04.new/gobby04.changes 2012-03-01 17:19:50.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Feb 23 17:41:21 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.4.13: + + Fix compilation with glibmm 2.31 or greater. + + Updated translations. +- Drop gobby04-new-glibmm.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- gobby-0.4.12.tar.bz2 gobby04-new-glibmm.patch New: ---- gobby-0.4.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gobby04.spec ++++++ --- /var/tmp/diff_new_pack.kJ8ixk/_old 2012-03-01 17:19:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kJ8ixk/_new 2012-03-01 17:19:52.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gobby04 %define _name gobby BuildRequires: fdupes @@ -31,16 +32,14 @@ BuildRequires: pkgconfig(libxml++-2.6) BuildRequires: pkgconfig(net6-1.3) BuildRequires: pkgconfig(obby-0.4) -Version: 0.4.12 +Version: 0.4.13 Release: 0 Summary: Gobby collaborative editor (old protocol) License: GPL-2.0 ; GPL-2.0+ Group: System/GUI/GNOME -Source: %{_name}-%{version}.tar.bz2 +Source: http://releases.0x539.de/gobby/%{_name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE gobby04-desktop.patch vuntz(a)novell.com -- Remove icon extension, and make it call gobby-0.4 (to have it parallel-installable with 0.5) Patch0: gobby04-desktop.patch -# PATCH-FIX-UPSTREAM gobby04-new-glibmm.patch vuntz(a)opensuse.org -- Fix build with glibmm >= 2.31, sent upstream by mail (2012-01-19) -Patch1: gobby04-new-glibmm.patch Url: http://gobby.0x539.de/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: obby >= 0.4.6 @@ -67,7 +66,6 @@ %prep %setup -q -n %{_name}-%{version} %patch0 -%patch1 -p1 %build %configure \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit freeglut for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package freeglut for openSUSE:Factory checked in at 2012-03-01 17:19:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freeglut (Old) and /work/SRC/openSUSE:Factory/.freeglut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "freeglut", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/freeglut/freeglut.changes 2012-02-21 07:30:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.freeglut.new/freeglut.changes 2012-03-01 17:19:48.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 29 21:26:32 UTC 2012 - tabraham(a)novell.com + +- Update to 2.8.0 + * There are now callbacks to support multitouch capability. + * Solaris and OSX support have improved. + * Fullscreen mode and Game mode behave better. + * Addition of Visual Studio 2010 projects & solutions. + * Many bugs have been fixed. + +------------------------------------------------------------------- Old: ---- freeglut.tar.bz2 New: ---- freeglut-2.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeglut.spec ++++++ --- /var/tmp/diff_new_pack.SBoXCj/_old 2012-03-01 17:19:49.000000000 +0100 +++ /var/tmp/diff_new_pack.SBoXCj/_new 2012-03-01 17:19:49.000000000 +0100 @@ -19,13 +19,13 @@ %define debug 0 Name: freeglut -Version: 2.7.99.svn20111107.0422 +Version: 2.8.0 Release: 0 Summary: Freely licensed alternative to the GLUT library License: MIT Group: System/Libraries Url: http://freeglut.sourceforge.net/ -Source: freeglut.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source1: glutman.tar.bz2 BuildRequires: Mesa-devel BuildRequires: gcc-c++ @@ -119,7 +119,7 @@ joystick functions on a wide range of platforms. %prep -%setup -q -b0 -b1 -n freeglut +%setup -q -b0 -b1 -n %{name}-%{version} %build ./autogen.sh -- 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-tray for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package evolution-tray for openSUSE:Factory checked in at 2012-03-01 17:19:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-tray (Old) and /work/SRC/openSUSE:Factory/.evolution-tray.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-tray", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-tray/evolution-tray.changes 2011-10-02 10:00:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-tray.new/evolution-tray.changes 2012-03-01 17:19:36.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Feb 29 07:46:17 UTC 2012 - vuntz(a)opensuse.org + +- Add evolution-tray-git-00c08ae8.patch: update to current git + (last commit from January 21), to update the code to work with + evolution 3.4 and get build fixes. +- This patch brings the following changes: + + Add minimize to tray ability. + + Port to GSettings, following evolution changes. + + Build fixes. +- Add evolution-tray-evo-3.4.patch: additional fixes for latest + evolution 3.3.x. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for evolution-tray-git-00c08ae8.patch. +- Use %glib2_gsettings_schema_* macros. + +------------------------------------------------------------------- New: ---- evolution-tray-evo-3.4.patch evolution-tray-git-00c08ae8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-tray.spec ++++++ --- /var/tmp/diff_new_pack.uW6RfV/_old 2012-03-01 17:19:37.000000000 +0100 +++ /var/tmp/diff_new_pack.uW6RfV/_new 2012-03-01 17:19:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package evolution-tray # -# 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,17 +16,22 @@ # - Name: evolution-tray Version: 0.0.8 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Evolution plugin to minimize in tray -Url: http://gnome.eu.org/evo/index.php/Evolution_Tray +License: GPL-2.0+ Group: Productivity/Office/Other +Url: http://gnome.eu.org/evo/index.php/Evolution_Tray Source0: http://gnome.eu.org/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM evolution-tray-fix-include.patch vuntz(a)opensuse.org -- Add missing include; sent upstream by mail Patch0: evolution-tray-fix-include.patch +# PATCH-FIX-UPSTREAM evolution-tray-git-00c08ae8.patch vuntz(a)opensuse.org -- Update to latest git +Patch1: evolution-tray-git-00c08ae8.patch +# PATCH-FIX-UPSTREAM evolution-tray-evo-3.4.patch vuntz(a)opensuse.org -- Fix build with latest evo 3.3.x; sent upstream by mail +Patch2: evolution-tray-evo-3.4.patch +# needed for patch1 +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: pkgconfig(evolution-plugin-3.0) BuildRequires: pkgconfig(evolution-shell-3.0) @@ -35,6 +40,7 @@ Requires: evolution Enhances: evolution BuildRoot: %{_tmppath}/%{name}-%{version}-build +%glib2_gsettings_schema_requires %description This plugin is useful when you want to put evolution in the "tray" @@ -45,8 +51,12 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build +# needed for patch1 +NOCONFIGURE=1 gnome-autogen.sh %configure %__make %{?_smp_mflags} V=1 @@ -54,9 +64,17 @@ %makeinstall find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +%post +%glib2_gsettings_schema_post + +%postun +%glib2_gsettings_schema_postun + %files %defattr(-,root,root) %doc AUTHORS COPYING +%{_datadir}/GConf/gsettings/evolution-tray.convert +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.evolution-tray.gschema.xml %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-tray.so %{_libdir}/evolution/*/plugins/org-gnome-evolution-tray.eplug ++++++ evolution-tray-evo-3.4.patch ++++++ Index: evolution-tray-0.0.8/src/tray.c =================================================================== --- evolution-tray-0.0.8.orig/src/tray.c +++ evolution-tray-0.0.8/src/tray.c @@ -43,6 +43,10 @@ #include <shell/e-shell-view.h> #include <shell/e-shell-window.h> #endif +#if EVOLUTION_VERSION >= 30305 +#include <libemail-utils/e-account-utils.h> +#include <mail/e-mail.h> +#else #if EVOLUTION_VERSION >= 29101 #include <e-util/e-account-utils.h> #include <mail/e-mail.h> @@ -50,7 +54,13 @@ #include <mail/mail-config.h> #include <mail/mail-session.h> #endif +#endif +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/e-mail-folder-utils.h> +#include <libemail-engine/mail-ops.h> +#else #include <mail/mail-ops.h> +#endif #include <e-util/e-plugin.h> #include <mail/em-event.h> ++++++ evolution-tray-git-00c08ae8.patch ++++++ ++++ 800 lines (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 evolution-rss for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package evolution-rss for openSUSE:Factory checked in at 2012-03-01 17:19:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-rss (Old) and /work/SRC/openSUSE:Factory/.evolution-rss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-rss", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-rss/evolution-rss.changes 2012-01-09 15:16:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution-rss.new/evolution-rss.changes 2012-03-01 17:19:31.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Feb 29 07:29:14 UTC 2012 - vuntz(a)opensuse.org + +- Add evolution-rss-evo-3.4.patch: commits from git to fix build + with evolution 3.4. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for above patch. + +------------------------------------------------------------------- New: ---- evolution-rss-evo-3.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-rss.spec ++++++ --- /var/tmp/diff_new_pack.B3f2bL/_old 2012-03-01 17:19:33.000000000 +0100 +++ /var/tmp/diff_new_pack.B3f2bL/_new 2012-03-01 17:19:33.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _evo_branch %(pkg-config --variable execversion evolution-shell-3.0) %define _evo_plugindir %(pkg-config --variable plugindir evolution-plugin-3.0) %define _evo_errordir %(pkg-config --variable errordir evolution-plugin-3.0) @@ -30,7 +31,11 @@ Group: Productivity/Networking/Email/Clients Url: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Source: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM evolution-rss-evo-3.4.patch vuntz(a)opensuse.org -- Fix build with evo 3.4, taken from git +Patch0: evolution-rss-evo-3.4.patch BuildRequires: gcc-c++ +# needed for patch0 +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: update-desktop-files # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 @@ -62,8 +67,11 @@ %lang_package -n %{_name} %prep %setup -q +%patch0 -p1 %build +# needed for patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure --disable-schemas-install %__make %{?_smp_mflags} ++++++ evolution-rss-evo-3.4.patch ++++++ >From 5bfb98b00894700b8d62e3107fc06cacfb048563 Mon Sep 17 00:00:00 2001 From: Milan Crha <mcrha(a)redhat.com> Date: Wed, 08 Feb 2012 09:01:30 +0000 Subject: Be able to build against eds/evo 3.3.4 --- diff --git a/configure.ac b/configure.ac index 550fffc..2c7f5f1 100644 --- a/configure.ac +++ b/configure.ac @@ -79,12 +79,14 @@ LIBGLIB_REQUIRED=2.16.2 LIBGTK_VERSION=2 LIBGTK_REQUIRED=2.12.0 EVOLUTION_REQUIRED=2.4.1 +EVOLUTION_ADDITIONAL= LIBSOUP_REQUIRED=2.2 if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then LIBGTK_VERSION=3 LIBGTK_REQUIRED=2.99.3 EVOLUTION_REQUIRED=2.91.6 + EVOLUTION_ADDITIONAL="libemail-utils libemail-engine" fi PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN, @@ -93,6 +95,7 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN, libsoup$SOUP >= $LIBSOUP_REQUIRED dnl evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl + $EVOLUTION_ADDITIONAL dnl libebook-1.2 dnl ]) diff --git a/src/parser.c b/src/parser.c index 91484a5..f5b422b 100644 --- a/src/parser.c +++ b/src/parser.c @@ -25,7 +25,11 @@ #include <libxml/HTMLparser.h> #include <libxml/HTMLtree.h> #include <libxml/debugXML.h> +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/mail-ops.h> +#else #include <mail/mail-ops.h> +#endif #include <mail/em-format-html.h> #if (DATASERVER_VERSION >= 2031001) #include <camel/camel.h> diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c index ebb8bb1..1f85541 100644 --- a/src/rss-config-factory.c +++ b/src/rss-config-factory.c @@ -50,9 +50,13 @@ #include <mail/e-mail-local.h> #endif #include <mail/em-folder-selector.h> +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/e-mail-folder-utils.h> +#else #if EVOLUTION_VERSION >= 30101 #include <mail/e-mail-folder-utils.h> #endif +#endif #include <mail/em-utils.h> #include <shell/e-shell.h> diff --git a/src/rss-evo-common.c b/src/rss-evo-common.c index 2300e57..ee5603f 100644 --- a/src/rss-evo-common.c +++ b/src/rss-evo-common.c @@ -26,9 +26,13 @@ #if (EVOLUTION_VERSION < 30303) #include <mail/e-mail-local.h> #endif +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/e-mail-folder-utils.h> +#else #if EVOLUTION_VERSION >= 30101 #include <mail/e-mail-folder-utils.h> #endif +#endif #include <mail/e-mail-reader.h> #include <mail/em-folder-utils.h> #include <libedataserver/e-proxy.h> diff --git a/src/rss.c b/src/rss.c index 47a18fd..7a6f611 100644 --- a/src/rss.c +++ b/src/rss.c @@ -51,9 +51,6 @@ int rss_verbose_debug = 0; #include <mail/em-event.h> #include <mail/em-utils.h> #include <mail/em-folder-tree.h> -#if EVOLUTION_VERSION >= 30101 -#include <mail/e-mail-folder-utils.h> -#endif #if EVOLUTION_VERSION < 22900 //kb// #include <e-util/e-error.h> @@ -69,9 +66,7 @@ int rss_verbose_debug = 0; #if EVOLUTION_VERSION < 30303 #include <mail/e-mail-local.h> #endif -#if EVOLUTION_VERSION >= 29101 -#include <mail/e-mail-session.h> -#else +#if EVOLUTION_VERSION < 29101 #include <mail/mail-session.h> #endif #include <shell/e-shell.h> @@ -81,8 +76,21 @@ int rss_verbose_debug = 0; #endif #endif +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/mail-tools.h> +#include <libemail-engine/mail-ops.h> +#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/e-mail-folder-utils.h> +#else +#if EVOLUTION_VERSION >= 30101 +#include <mail/e-mail-folder-utils.h> +#endif #include <mail/mail-tools.h> #include <mail/mail-ops.h> +#if EVOLUTION_VERSION >= 29101 +#include <mail/e-mail-session.h> +#endif +#endif #include <mail/em-format-html.h> #include <mail/em-format-hook.h> -- cgit v0.9.0.2 >From ea3b0faef0a508f0fdf9a356e974c027c9f7fe21 Mon Sep 17 00:00:00 2001 From: Milan Crha <mcrha(a)redhat.com> Date: Wed, 15 Feb 2012 13:05:22 +0000 Subject: Adapt to recent changes in e_preferences_window_add_page() --- diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c index 1f85541..555b28a 100644 --- a/src/rss-config-factory.c +++ b/src/rss-config-factory.c @@ -4177,6 +4177,9 @@ init_rss_prefs(void) "page-rss", "rss", _("News And Blogs"), +#if EVOLUTION_VERSION >= 30390 + NULL, +#endif (EPreferencesWindowCreatePageFn)rss_config_control_new, 800); } -- cgit v0.9.0.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 dita for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package dita for openSUSE:Factory checked in at 2012-03-01 17:19:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dita (Old) and /work/SRC/openSUSE:Factory/.dita.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dita", Maintainer is "ke(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dita/dita.changes 2011-09-23 01:55:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dita.new/dita.changes 2012-03-01 17:19:22.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 7 10:04:26 UTC 2012 - cfarrell(a)suse.com + +- license update: SUSE-Oasis-Specification-Notice + Use this SUSE- spdx proprietary prefix until the oasis spec license + notice is pushed upstream + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dita.spec ++++++ --- /var/tmp/diff_new_pack.x9K5vw/_old 2012-03-01 17:19:23.000000000 +0100 +++ /var/tmp/diff_new_pack.x9K5vw/_new 2012-03-01 17:19:23.000000000 +0100 @@ -20,7 +20,7 @@ Name: dita BuildRequires: sgml-skel unzip Url: http://www.oasis-open.org/committees/dita/ -License: Other uncritical OpenSource License +License: SUSE-Oasis-Specification-Notice Group: Productivity/Publishing/XML Requires: sgml-skel %define regcat /usr/bin/sgml-register-catalog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dhcpcd for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package dhcpcd for openSUSE:Factory checked in at 2012-03-01 17:19:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhcpcd (Old) and /work/SRC/openSUSE:Factory/.dhcpcd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dhcpcd", Maintainer is "varkoly(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dhcpcd/dhcpcd.changes 2011-10-02 09:57:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dhcpcd.new/dhcpcd.changes 2012-03-01 17:19:13.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 8 15:45:13 UTC 2012 - rschweikert(a)suse.com + +- place binary into /usr tree (UsrMerge project) + +------------------------------------------------------------------- +Fri Oct 21 18:51:10 UTC 2011 - eich(a)suse.com + +- N_When-getting-a-new-lease-send-the-serverID-and-lease-addr-in-a-DHCP_REQUEST-package.patch + When getting a new lease send the serverID and lease + addr in a DHCP_REQUEST package (bnc #725856). + +------------------------------------------------------------------- New: ---- N_When-getting-a-new-lease-send-the-serverID-and-lease-addr-in-a-DHCP_REQUEST-package.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.sc1tka/_old 2012-03-01 17:19:15.000000000 +0100 +++ /var/tmp/diff_new_pack.sc1tka/_new 2012-03-01 17:19:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dhcpcd # -# 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,11 +16,12 @@ # - Name: dhcpcd Version: 3.2.3 Release: 47.<RELEASE6> Summary: A DHCP Client Daemon +License: GPL-2.0+ +Group: Productivity/Networking/Boot/Clients Url: http://developer.berlios.de/projects/dhcpcd/ #Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2 Source: dhcpcd-%{version}.tar.bz2 @@ -49,8 +50,7 @@ Patch20: dhcpcd-3.2.3-renew-unicast.diff Patch21: dhcpcd-3.2.3-xen-checksum.diff Patch22: dhcpcd-3.2.3-option-checks.diff -License: GPLv2+ -Group: Productivity/Networking/Boot/Clients +Patch23: N_When-getting-a-new-lease-send-the-serverID-and-lease-addr-in-a-DHCP_REQUEST-package.patch Provides: dhcp_client Requires: net-tools PreReq: sysconfig @@ -86,6 +86,7 @@ %patch20 -p0 %patch21 -p0 %patch22 -p0 +%patch23 -p2 cp %{S:1} . cp %{S:3} . @@ -93,8 +94,12 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -O2 -pipe -fpie -DENABLE_SYSV=1 -UENABLE_DUID" LDFLAGS="-pie" %install -make install DESTDIR="$RPM_BUILD_ROOT" -install -D %{S:2} $RPM_BUILD_ROOT/usr/sbin/dhcpcd-test +make install DESTDIR="$RPM_BUILD_ROOT" BINDIR=%{_sbindir} +install -D %{S:2} $RPM_BUILD_ROOT/%{_sbindir}/dhcpcd-test +#UsrMerge +mkdir $RPM_BUILD_ROOT/sbin +ln -sf %{_sbindir}/dhcpcd $RPM_BUILD_ROOT/sbin +#EndUserMerge %post #remove dhcpcd 1 parameters which are not implemented in dhcpcd 3.2.3 @@ -111,7 +116,10 @@ %doc README dhcpcd-1-vs-3 README.SUSE %doc %{_mandir}/man8/dhcpcd.8* %defattr(0755,root,root) +#UsrMerge /sbin/dhcpcd -/usr/sbin/dhcpcd-test +#EndUsrMerge +%{_sbindir}/dhcpcd +%{_sbindir}/dhcpcd-test %changelog ++++++ N_When-getting-a-new-lease-send-the-serverID-and-lease-addr-in-a-DHCP_REQUEST-package.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Fri Oct 21 19:30:32 2011 +0200 Subject: [PATCH] When getting a new lease send the serverID and lease addr in a DHCP_REQUEST package. Patch-Mainline: N/A Git-commit: a29a820f4fe4dc3b05f4ee1baf344b6b5b8aa25b References: bnc #725856 Signed-off-by: Egbert Eich <eich(a)suse.de> When a lease cannot be renewed dhcpclient tries to get a new lease starting with a DHCP_DISCOVER. In this case the serverID and lease addr needs to be sent in the DHCP_REQUEST package. This only happens when the if statement if (dhcp->address.s_addr && dhcp->address.s_addr != iface->previous_address.s_addr) { is true. Thus iface->previous_address.s_addr needs to be when the lease renewal fails and we reenter STATE_INIT. (bnc #725856) Signed-off-by: Egbert Eich <eich(a)suse.de> --- dhcpcd-3.2.3/client.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dhcpcd-3.2.3/client.c b/dhcpcd-3.2.3/client.c index fd97908..2671fba 100644 --- a/dhcpcd-3.2.3/client.c +++ b/dhcpcd-3.2.3/client.c @@ -798,6 +798,7 @@ static int handle_dhcp (state_t *state, int type, const options_t *options) state->state = STATE_INIT; state->timeout = 0; state->xid = 0; + state->interface->previous_address.s_addr = 0; free_dhcp (dhcp); memset (dhcp, 0, sizeof (*dhcp)); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit csound for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package csound for openSUSE:Factory checked in at 2012-03-01 17:19:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/csound (Old) and /work/SRC/openSUSE:Factory/.csound.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "csound", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/csound/csound.changes 2011-09-23 11:43:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.csound.new/csound.changes 2012-03-01 17:19:08.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Feb 27 12:04:56 CET 2012 - tiwai(a)suse.de + +- updated to version 5.16.6, including a fix for + VUL-0: CVE-2012-0270: csound: two buffer overflow flaws in + getnum() (bnc#749073) +- drop obsoleted patches + +------------------------------------------------------------------- +Sun Jan 8 15:04:23 UTC 2012 - prusnak(a)opensuse.org + +- updated to version 5.15.0 +- drop unused patches +- fix wrong memset and strncat usage ({memset,strncat}-fix.patch) +- create -devel subpackage + +------------------------------------------------------------------- Old: ---- Csound5.06.0.tar.bz2 csound-alsa-fix.diff csound-gcc-warning-fix.diff csound-python-2.6-fix.diff csound-sanitize-sys.patch csound-tmpnam-fix.diff New: ---- Csound5.16.6.tar.gz csound-strncat-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csound.spec ++++++ --- /var/tmp/diff_new_pack.BUDADC/_old 2012-03-01 17:19:10.000000000 +0100 +++ /var/tmp/diff_new_pack.BUDADC/_new 2012-03-01 17:19:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package csound # -# 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,28 +16,37 @@ # +%define support_fltk 0 Name: csound -%define support_fltk 0 -BuildRequires: alsa-devel fdupes fluidsynth-devel gcc-c++ jack-devel liblo-devel libsndfile-devel portaudio-devel python-devel scons swig +BuildRequires: alsa-devel +BuildRequires: bison +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: fluidsynth-devel +BuildRequires: gcc-c++ +BuildRequires: jack-devel +BuildRequires: liblo-devel +BuildRequires: libsndfile-devel +BuildRequires: portaudio-devel +BuildRequires: python-devel +BuildRequires: scons +BuildRequires: swig %if %support_fltk -BuildRequires: fltk-devel libjpeg-devel libpng-devel xorg-x11-devel +BuildRequires: fltk-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: xorg-x11-devel %endif +Version: 5.16.6 +Release: 0 Summary: Computer Sound Synthesis and Composition Program -Version: 5.06.0 -Release: 130 License: GFDL-1.2 ; LGPL-2.1+ ; MIT Group: Productivity/Multimedia/Sound/Utilities -Source: Csound%{version}.tar.bz2 -Source1: README.SuSE -Patch: csound-alsa-fix.diff -Patch1: csound-tmpnam-fix.diff -Patch2: csound-gcc-warning-fix.diff -Patch3: csound-python-2.6-fix.diff -Patch4: csound-sanitize-sys.patch Url: http://www.csounds.com -AutoReq: on -Autoprov: off +Source: Csound%{version}.tar.gz +Source1: README.SuSE +Patch3: %{name}-strncat-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,59 +55,64 @@ For detailed information, refer to http://www.csounds.com. +%package devel +Summary: Development files for Csound +Group: System/Libraries +Requires: %{name} = %{version} +Provides: %{name}-devel-static = %{version} +%description devel +Development files for Csound. %prep %setup -q -n Csound%{version} -%patch -%patch1 -%patch2 %patch3 -%patch4 -p1 +# remove __DATE__ from source files, causes unnecessary rebuilds +sed -i 's:__DATE__:"":' Engine/musmon.c frontends/CsoundVST/CsoundVstFltk.cpp Top/main.c +# copy readme cp %{SOURCE1} . # fix encoding -iconv -f latin1 -t utf8 readme-csound5.txt > readme-csound5.txt.utf8 -mv readme-csound5.txt.utf8 readme-csound5.txt +iconv -f latin1 -t utf8 readme-csound5.txt > README test -f custom.py || cp custom.py.mkg custom.py %build -%if %_lib == "lib64" +%if %{_lib} == "lib64" args="Word64=1" %else args="" %endif scons prefix=%{_prefix} buildRelease=1 $args \ - customCCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - customCXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + customCCFLAGS="%{optflags} -fno-strict-aliasing" \ + customCXXFLAGS="%{optflags} -fno-strict-aliasing" %install -%if %_lib == "lib64" +%if %{_lib} == "lib64" args="--word64" %else args="" %endif -./install.py --prefix=%{_prefix} --instdir="$RPM_BUILD_ROOT" $args -rm -f $RPM_BUILD_ROOT%{_prefix}/csound5-*.md5sums -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/csound +./install.py --prefix=%{_prefix} --instdir=%{buildroot} $args +rm -f %{buildroot}%{_prefix}/csound5-*.md5sums +rm -rf %{buildroot}%{_datadir}/doc/csound # rename conflicting binary names -mv $RPM_BUILD_ROOT%{_bindir}/sndinfo $RPM_BUILD_ROOT%{_bindir}/csndinfo -mv $RPM_BUILD_ROOT%{_bindir}/extract $RPM_BUILD_ROOT%{_bindir}/csound-extract -# remove devel files -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -rf $RPM_BUILD_ROOT%{_includedir} -%fdupes -s $RPM_BUILD_ROOT +mv %{buildroot}%{_bindir}/sndinfo %{buildroot}%{_bindir}/csndinfo +mv %{buildroot}%{_bindir}/extract %{buildroot}%{_bindir}/csound-extract +%fdupes -s %{buildroot} +%find_lang %{name}5 %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files +%files -f %{name}5.lang %defattr(-,root,root) -%doc COPYING ChangeLog INSTALL readme-csound5.txt README.SuSE +%doc AUTHORS COPYING ChangeLog README README.SuSE %{_bindir}/* -%{_libdir}/csound -%{_datadir}/csound -# %{_includedir}/* -# %{_libdir}/lib* +%{_libdir}/csound/ + +%files devel +%defattr(-,root,root) +%{_includedir}/csound/ +%{_libdir}/libcsound.a %changelog ++++++ csound-strncat-fix.patch ++++++ Index: OOps/dumpf.c =================================================================== --- OOps/dumpf.c.orig +++ OOps/dumpf.c @@ -175,19 +175,19 @@ static void nkdump(CSOUND *csound, MYFLT outbuf[0] = '\0'; while (--nk) { sprintf(buf1, "%ld\t", (long) *kp++); - strncat(outbuf, buf1, 256); + strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); } sprintf(buf1, "%ld\n", (long) *kp); - strncat(outbuf, buf1, 256); + strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); len = strlen(outbuf); break; case 8: *outbuf = '\0'; while (--nk) { sprintf(buf1, "%6.4f\t", *kp++); - strncat(outbuf, buf1, 256); + strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); } sprintf(buf1, "%6.4f\n", *kp); - strncat(outbuf, buf1, 256); + strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); len = strlen(outbuf); break; default: csound->Die(csound, Str("unknown kdump format")); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ccscript3 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package ccscript3 for openSUSE:Factory checked in at 2012-03-01 17:18:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccscript3 (Old) and /work/SRC/openSUSE:Factory/.ccscript3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ccscript3", Maintainer is "kkeil(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ccscript3/ccscript3.changes 2011-12-05 12:43:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ccscript3.new/ccscript3.changes 2012-03-01 17:18:57.000000000 +0100 @@ -1,0 +2,40 @@ +Mon Feb 27 10:31:46 UTC 2012 - saschpe(a)suse.de + +- Adhere to shared library packaging policy +- Correctly provide/obsolete ccscript +- Move documentation into base (lib) package, all subpackages require + it and legal needs 'COPYING' there +- CFLAGS are already part of %configure +- Ran spec-cleaner + +------------------------------------------------------------------- +Wed Feb 22 19:00:14 UTC 2012 - kkeil(a)linux-pingi.de + +- update to version 1.1.7 + From ccScript3 1.1.5 to 1.1.6 + - minor preproc fix and dupString export + + From ccScript3 1.1.4 to 1.1.5 + - fix for some kinds of call argument parsing + - support for passing traditional positional arguments into calls + - addition of bool type + - positional argument expansion in sub with %* + + From ccScript3 1.1.3 to 1.1.4 + - packed structs + - contruct packing, deconstruct unpacking, ? expr for member search + + From ccScript3 1.1.2 to 1.1.3 + - fix fatel bug on _keydata_ method setting + + From ccScript3 1.1.1 to 1.1.2 + - exit token for keydata... + + From ccScript3 1.1.0 to 1.1.1 + - new embedded keydata support + + From ccScript3 1.0.9 to 1.1.0 + - fix for slog check levels + - standardization of arguments + +------------------------------------------------------------------- Old: ---- ccscript3-1.0.9.tar.bz2 New: ---- ccscript3-1.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccscript3.spec ++++++ --- /var/tmp/diff_new_pack.DCHfcS/_old 2012-03-01 17:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.DCHfcS/_new 2012-03-01 17:18:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ccscript3 # -# 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,23 +16,25 @@ # - Name: ccscript3 -BuildRequires: commoncpp2-devel gcc-c++ pkgconfig unixODBC-devel -BuildRequires: libtool -Url: http://www.gnu.org/software/ccscript/ +Version: 1.1.7 +Release: 0 +Summary: A GNU Common C++ framework for embedded scripting License: GPL-2.0+ Group: Productivity/Multimedia/Other -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: ccscript -Obsoletes: ccscript -Summary: a GNU Common C++ framework for embedded scripting -Version: 1.0.9 -Release: 139 +Url: http://www.gnu.org/software/ccscript/ Source: %{name}-%{version}.tar.bz2 Patch1: unixODBC.diff Patch2: ccscript3-gcc43.diff Patch3: ccscript3-libtool.diff +BuildRequires: commoncpp2-devel +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: unixODBC-devel +Provides: ccscript = %{version} +Obsoletes: ccscript < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The GNU ccScript package offers a class extensible threaded embedded @@ -44,64 +46,76 @@ execution rather than the linear and non-deterministic fashion of embedded script systems such as tcl, libguile, etc. +%package -n libccscript3-1_1-0 +Summary: A GNU Common C++ framework for embedded scripting +Group: Development/Libraries/C and C++ +Recommends: ccscript3-modules = %{version} +%description -n libccscript3-1_1-0 +The GNU ccScript package offers a class extensible threaded embedded +scripting engine for use with GNU Common C++. This engine is also used +in GNU Bayonne (the GNU telephony application server package) and other +parts of GNUCOMM (the GNU telephony meta-project). This engine differs +from traditional scripting systems in that it is used to script near +real-time state-event systems through deterministic callback step +execution rather than the linear and non-deterministic fashion of +embedded script systems such as tcl, libguile, etc. -%package devel -License: GPL-2.0+ -Summary: Header files and documentation for ccscript -Group: Productivity/Multimedia/Other -Requires: %{name} = %{version} commoncpp2-devel -Provides: ccscript-devel -Obsoletes: ccscript-devel - -%description -n ccscript3-devel -This package contains header files and documentation needed when -developing applications with ccscript. +%package modules +Summary: Modules for ccScript +Group: Development/Libraries/C and C++ +Requires: libccscript3-1_1-0 = %{version} +%description modules +This package contains ccScript modules. +%package devel +Summary: Header files and documentation for ccScript +Group: Development/Libraries/C and C++ +Requires: commoncpp2-devel +Requires: libccscript3-1_1-0 = %{version} +Provides: ccscript-devel = %{version} +Obsoletes: ccscript-devel < %{version} -Authors: --------- - David Sugar <dyfet(a)ostel.com> +%description devel +This package contains header files and documentation needed when +developing applications with ccScript. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch1 %patch2 -p1 %patch3 %build -#autoreconf --force --install -./reconfig -CFLAGS="$RPM_OPT_FLAGS" +./autogen.sh %configure \ --with-pic \ --disable-static -make CPPFLAGS="$RPM_OPT_FLAGS" +make CPPFLAGS="%{optflags}" %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install rm -f %{buildroot}%{_libdir}/libccscript*.la -cat %{buildroot}%{_libdir}/pkgconfig/libccscript3.pc - -%clean -rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post -n libccscript3-1_1-0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libccscript3-1_1-0 -p /sbin/ldconfig -%files -%defattr(-,root,root,0755) -%{_libdir}/libccscript*.so.* -%dir %{_libdir}/%{name}-1.0 -%{_libdir}/%{name}-1.0/* +%files -n libccscript3-1_1-0 +%defattr(-,root,root) +%doc AUTHORS COPYING NEWS README +%{_libdir}/libccscript3*.so.* + +%files modules +%defattr(-,root,root) +%{_libdir}/%{name}-1.1/ %files devel -%defattr(-,root,root,0755) -%doc AUTHORS COPYING NEWS README ChangeLog -%{_libdir}/libccscript*.so +%defattr(-,root,root) +%doc ChangeLog +%{_libdir}/libccscript3.so %{_libdir}/pkgconfig/libccscript3.pc -%{_includedir}/cc++/script3.h +%{_includedir}/cc++ %changelog ++++++ ccscript3-1.0.9.tar.bz2 -> ccscript3-1.1.7.tar.bz2 ++++++ ++++ 32456 lines of diff (skipped) ++++++ ccscript3-gcc43.diff ++++++ --- /var/tmp/diff_new_pack.DCHfcS/_old 2012-03-01 17:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.DCHfcS/_new 2012-03-01 17:18:59.000000000 +0100 @@ -1,7 +1,7 @@ -Index: ccscript3-1.0.9/modules/math.cpp -================================================================================ ---- ccscript3-1.0.9/modules/check.cpp -+++ ccscript3-1.0.9/modules/check.cpp +Index: ccscript3-1.1.7/modules/check.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/check.cpp ++++ ccscript3-1.1.7/modules/check.cpp @@ -36,6 +36,7 @@ // @@ -10,8 +10,10 @@ namespace ccscript3Extension { ---- ccscript3-1.0.9/modules/csv.cpp -+++ ccscript3-1.0.9/modules/csv.cpp +Index: ccscript3-1.1.7/modules/csv.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/csv.cpp ++++ ccscript3-1.1.7/modules/csv.cpp @@ -37,6 +37,7 @@ #include "script3.h" @@ -20,8 +22,10 @@ #include <cstdio> namespace ccscript3Extension { ---- ccscript3-1.0.9/modules/math.cpp -+++ ccscript3-1.0.9/modules/math.cpp +Index: ccscript3-1.1.7/modules/math.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/math.cpp ++++ ccscript3-1.1.7/modules/math.cpp @@ -36,6 +36,7 @@ // @@ -30,17 +34,19 @@ #include <cmath> #ifndef M_PI -@@ -91,7 +92,7 @@ +@@ -91,7 +92,7 @@ static long fArcTangent(long *values, un static long fPi(long *values, unsigned prec) { -- char pi[10]; -+ char pi[12]; - strcpy(pi, "3141592653"); - pi[prec + 1] = 0; - return atol(pi); ---- ccscript3-1.0.9/modules/property.cpp -+++ ccscript3-1.0.9/modules/property.cpp +- char pi[10]; ++ char pi[12]; + strcpy(pi, "3141592653"); + pi[prec + 1] = 0; + return atol(pi); +Index: ccscript3-1.1.7/modules/property.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/property.cpp ++++ ccscript3-1.1.7/modules/property.cpp @@ -36,6 +36,7 @@ // @@ -49,8 +55,10 @@ #include <cstdio> #ifdef WIN32 ---- ccscript3-1.0.9/modules/sort.cpp -+++ ccscript3-1.0.9/modules/sort.cpp +Index: ccscript3-1.1.7/modules/sort.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/sort.cpp ++++ ccscript3-1.1.7/modules/sort.cpp @@ -36,6 +36,7 @@ // @@ -59,8 +67,10 @@ namespace ccscript3Extension { ---- ccscript3-1.0.9/modules/string.cpp -+++ ccscript3-1.0.9/modules/string.cpp +Index: ccscript3-1.1.7/modules/string.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/string.cpp ++++ ccscript3-1.1.7/modules/string.cpp @@ -36,6 +36,8 @@ // @@ -70,8 +80,10 @@ namespace ccscript3Extension { ---- ccscript3-1.0.9/modules/time.cpp -+++ ccscript3-1.0.9/modules/time.cpp +Index: ccscript3-1.1.7/modules/time.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/time.cpp ++++ ccscript3-1.1.7/modules/time.cpp @@ -36,6 +36,7 @@ // @@ -80,8 +92,10 @@ namespace ccscript3Extension { ---- ccscript3-1.0.9/modules/url.cpp -+++ ccscript3-1.0.9/modules/url.cpp +Index: ccscript3-1.1.7/modules/url.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/url.cpp ++++ ccscript3-1.1.7/modules/url.cpp @@ -36,6 +36,7 @@ // @@ -90,8 +104,10 @@ namespace ccscript3Extension { ---- ccscript3-1.0.9/modules/userauth.cpp -+++ ccscript3-1.0.9/modules/userauth.cpp +Index: ccscript3-1.1.7/modules/userauth.cpp +=================================================================== +--- ccscript3-1.1.7.orig/modules/userauth.cpp ++++ ccscript3-1.1.7/modules/userauth.cpp @@ -36,6 +36,7 @@ // ++++++ ccscript3-libtool.diff ++++++ --- /var/tmp/diff_new_pack.DCHfcS/_old 2012-03-01 17:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.DCHfcS/_new 2012-03-01 17:18:59.000000000 +0100 @@ -1,4 +1,6 @@ ---- libccscript3.pc +Index: libccscript3.pc +=================================================================== +--- libccscript3.pc.orig +++ libccscript3.pc @@ -3,7 +3,7 @@ exec_prefix=${prefix} libdir=${exec_prefix}/lib @@ -6,6 +8,6 @@ -modflags=-module -shared +modflags=-XCClinker -shared - modpath=${libdir}/ccscript3-1.0 - scriptdir=${libdir}/ccscript3-1.0 + modpath=${libdir}/ccscript3-1.1 + scriptdir=${libdir}/ccscript3-1.1 ++++++ unixODBC.diff ++++++ --- /var/tmp/diff_new_pack.DCHfcS/_old 2012-03-01 17:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.DCHfcS/_new 2012-03-01 17:18:59.000000000 +0100 @@ -1,15 +1,17 @@ -diff -wruN ../orig-ccscript3-1.0.9/optional/odbc/database.cpp ./optional/odbc/database.cpp ---- ../orig-ccscript3-1.0.9/optional/odbc/database.cpp 2006-05-03 19:26:16.000000000 +0200 -+++ ./optional/odbc/database.cpp 2006-07-18 18:02:04.000000000 +0200 -@@ -47,7 +47,11 @@ +Index: optional/odbc/database.cpp +=================================================================== +--- optional/odbc/database.cpp.orig ++++ optional/odbc/database.cpp +@@ -47,8 +47,11 @@ SQLDatabase::SQLDatabase(ScriptImage *im ScriptObject(img) { char buffer[256]; +#if ODBCVER >= 0x0300 && !defined(__ppc__) + SQLINTEGER err; +#else - long err; + long err; +- +#endif - ScriptCommand *cmd = img->getCommand(); + name = ScriptCommand::findKeyword(line, "database"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bind for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package bind for openSUSE:Factory checked in at 2012-03-01 17:18:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bind (Old) and /work/SRC/openSUSE:Factory/.bind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bind", Maintainer is "ug(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bind/bind.changes 2011-10-26 15:34:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2012-03-01 17:18:53.000000000 +0100 @@ -1,0 +2,32 @@ +Mon Feb 13 10:44:33 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Wed Dec 21 22:16:02 UTC 2011 - lars(a)samba.org + +- Ensure to create the required dir or sym link in /var/run; (bnc#738156). + +------------------------------------------------------------------- +Mon Dec 5 16:47:48 CET 2011 - ug(a)suse.de + +- root nameserver updated (root.hint file) + +------------------------------------------------------------------- +Mon Dec 5 12:55:15 CET 2011 - ug(a)suse.de + +- added managed-keys-directory to named.conf + +------------------------------------------------------------------- +Tue Nov 22 11:37:01 CET 2011 - ug(a)suse.de + +- fixed apparmor profile for lib and lib64 in chroot + (bnc#716745) + +------------------------------------------------------------------- +Thu Nov 17 15:25:54 CET 2011 - fteodori(a)suse.de + +- Cache lookup could return RRSIG data associated with nonexistent + records, leading to an assertion failure. CVE-2011-4313; (bnc#730995). + +------------------------------------------------------------------- Old: ---- bind-9.8.1.tar.gz ldapdump-allow-uri.diff named-direct-proc-mount.diff tmpfs.patch New: ---- bind-9.8.1-P1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bind.spec ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bind # -# 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,20 +16,24 @@ # - Name: bind %define pkg_name bind -%define pkg_vers 9.8.1 -BuildRequires: openldap2-devel -BuildRequires: libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel -BuildRequires: update-desktop-files +%define pkg_vers 9.8.1-P1 BuildRequires: krb5-devel +BuildRequires: libcap +BuildRequires: libcap-devel +BuildRequires: libmysqlclient-devel BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: openldap2-devel +BuildRequires: openssl +BuildRequires: openssl-devel +BuildRequires: update-desktop-files Summary: Domain Name System (DNS) Server (named) -Version: 9.8.1 -Release: 1 -License: BSD3c(or similar) ; MIT License (or similar) +License: BSD-3-Clause ; MIT Group: Productivity/Networking/DNS/Servers +Version: 9.8.1P1 +Release: 0 Provides: dns_daemon bind8 bind9 Obsoletes: bind8 bind9 Requires: %{name}-utils %{name}-chrootenv @@ -44,11 +48,8 @@ Patch1: Makefile.in.diff Patch2: pid-path.diff Patch4: perl-path.diff -Patch5: tmpfs.patch -Patch6: ldapdump-allow-uri.diff Patch51: pie_compile.diff Patch52: named-bootconf.diff -Patch54: named-direct-proc-mount.diff Patch70: dlz_compile.diff Patch100: configure.in.diff2 Source60: dlz-schema.txt @@ -81,7 +82,6 @@ System. This package includes the components to operate a DNS server. %package chrootenv -License: BSD3c(or similar) ; MIT License (or similar) Summary: Chroot environment for BIND named and lwresd Group: Productivity/Networking/DNS/Servers PreReq: /usr/sbin/groupadd /usr/sbin/useradd @@ -92,7 +92,6 @@ structure below /var/lib/named. %package devel -License: BSD3c(or similar) ; MIT License (or similar) Summary: Development Libraries and Header Files of BIND Group: Development/Libraries/C and C++ Requires: %{name}-libs = %{version} @@ -111,7 +110,6 @@ System (DNS) protocols. %package doc -License: BSD3c(or similar) ; MIT License (or similar) Summary: BIND documentation Group: Documentation/Other %if 0%{?suse_version} >= 1120 @@ -124,7 +122,6 @@ includes also the BIND Administrator Reference Manual (ARM). %package libs -License: BSD3c(or similar) ; MIT License (or similar) Summary: Shared libraries of BIND Group: Development/Libraries/C and C++ # bug437293 @@ -139,7 +136,6 @@ System (DNS) protocols. %package lwresd -License: BSD3c(or similar) ; MIT License (or similar) Summary: Lightweight Resolver Daemon Group: Productivity/Networking/DNS/Utilities Requires: %{name}-chrootenv @@ -158,7 +154,6 @@ protocol. %package utils -License: BSD3c(or similar) ; MIT License (or similar) Summary: Utilities to query and test DNS Group: Productivity/Networking/DNS/Utilities Provides: dns_utils bindutil bind9-utils @@ -182,15 +177,11 @@ %patch1 -p1 %patch2 -p0 %patch4 -p0 -%patch5 -p0 -%patch6 -p1 #%patch50 %if 0%{?suse_version} >= 1000 %patch51 %endif %patch52 -#%patch53 -%patch54 -p1 %if 0%{?suse_version} <= 1010 %patch100 -p1 %endif ++++++ Makefile.in.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- bind-9.3.1/bin/named/Makefile.in -+++ bind-9.3.1/bin/named/Makefile.in 2006/05/09 13:00:18 -@@ -138,8 +138,6 @@ +Index: bind-9.8.1-P1/bin/named/Makefile.in +=================================================================== +--- bind-9.8.1-P1.orig/bin/named/Makefile.in ++++ bind-9.8.1-P1/bin/named/Makefile.in +@@ -162,8 +162,6 @@ installdirs: install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir} (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@) ++++++ configure.in.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- bind-9.2.3/configure.in -+++ bind-9.2.3/configure.in 2004-06-20 08:17:09 -@@ -1636,7 +1636,7 @@ +Index: bind-9.8.1-P1/configure.in +=================================================================== +--- bind-9.8.1-P1.orig/configure.in ++++ bind-9.8.1-P1/configure.in +@@ -2907,7 +2907,7 @@ AC_SUBST(DOXYGEN) # empty). The variable VARIABLE will be substituted into output files. # ++++++ dlz_compile.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,5 +1,7 @@ ---- contrib/dlz/drivers/sdlz_helper.c -+++ contrib/dlz/drivers/sdlz_helper.c 2011/09/05 08:09:41 +Index: contrib/dlz/drivers/sdlz_helper.c +=================================================================== +--- contrib/dlz/drivers/sdlz_helper.c.orig ++++ contrib/dlz/drivers/sdlz_helper.c @@ -50,7 +50,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ ++++++ named-bootconf.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,5 +1,7 @@ ---- contrib/named-bootconf/named-bootconf.sh -+++ contrib/named-bootconf/named-bootconf.sh 2006/11/06 08:59:04 +Index: contrib/named-bootconf/named-bootconf.sh +=================================================================== +--- contrib/named-bootconf/named-bootconf.sh.orig ++++ contrib/named-bootconf/named-bootconf.sh @@ -54,7 +54,8 @@ # POSSIBILITY OF SUCH DAMAGE. @@ -10,7 +12,7 @@ ( umask 077 ; mkdir $WORKDIR ) || { echo "unable to create work directory '$WORKDIR'" >&2 exit 1 -@@ -308,7 +309,7 @@ +@@ -308,7 +309,7 @@ if [ $DUMP -eq 1 ]; then cat $ZONEFILE $COMMENTFILE rm -f $OPTIONFILE $ZONEFILE $COMMENTFILE ++++++ named.root ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -5,12 +5,12 @@ ; ; This file is made available by InterNIC ; under anonymous FTP as -; file /domain/named.root +; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Feb 04, 2008 -; related version of root zone: 2008020400 +; last update: Jun 8, 2011 +; related version of root zone: 2011060800 ; ; formerly NS.INTERNIC.NET ; @@ -18,68 +18,71 @@ A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30 ; -; formerly NS1.ISI.EDU +; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 ; -; formerly C.PSI.NET +; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 ; -; formerly TERP.UMD.EDU +; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 +D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2D::D ; -; formerly NS.NASA.GOV +; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 ; -; formerly NS.ISC.ORG +; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 -F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F ; -; formerly NS.NIC.DDN.MIL +; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 ; -; formerly AOS.ARL.ARMY.MIL +; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 -H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803f:235 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235 ; -; formerly NIC.NORDU.NET +; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 ; -; operated by VeriSign, Inc. +; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30 ; -; operated by RIPE NCC +; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. -K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 -K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1 ; -; operated by ICANN +; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42 ; -; operated by WIDE +; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 -M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35 ; End of File ++++++ perl-path.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,21 +1,27 @@ ---- bin/tests/t_api.pl -+++ bin/tests/t_api.pl 2011/02/24 08:53:35 +Index: bin/tests/t_api.pl +=================================================================== +--- bin/tests/t_api.pl.orig ++++ bin/tests/t_api.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2001 Internet Software Consortium. ---- contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl -+++ contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl 2011/02/24 08:53:13 +Index: contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl +=================================================================== +--- contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl.orig ++++ contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl @@ -1,4 +1,4 @@ -#! /usr/local/bin/perl -w +#! /usr/bin/perl -w # $Id: generate_nameprep_data.pl,v 1.1.1.1 2003-06-04 00:27:54 marka Exp $ # # Copyright (c) 2001 Japan Network Information Center. All rights reserved. ---- contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl -+++ contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl 2011/02/24 08:53:24 +Index: contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl +=================================================================== +--- contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl.orig ++++ contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl @@ -1,4 +1,4 @@ -#! /usr/local/bin/perl -w +#! /usr/bin/perl -w ++++++ pid-path.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- bin/named/include/named/globals.h -+++ bin/named/include/named/globals.h 2009/01/28 11:01:54 -@@ -121,9 +121,9 @@ +Index: bin/named/include/named/globals.h +=================================================================== +--- bin/named/include/named/globals.h.orig ++++ bin/named/include/named/globals.h +@@ -134,9 +134,9 @@ EXTERN const char * lwresd_g_defaultpid "lwresd.pid"); #else EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR @@ -12,8 +14,10 @@ #endif EXTERN const char * ns_g_username INIT(NULL); ---- contrib/nanny/nanny.pl -+++ contrib/nanny/nanny.pl 2009/01/28 11:02:29 +Index: contrib/nanny/nanny.pl +=================================================================== +--- contrib/nanny/nanny.pl.orig ++++ contrib/nanny/nanny.pl @@ -19,7 +19,7 @@ # A simple nanny to make sure named stays running. ++++++ pie_compile.diff ++++++ --- /var/tmp/diff_new_pack.75QNCL/_old 2012-03-01 17:18:57.000000000 +0100 +++ /var/tmp/diff_new_pack.75QNCL/_new 2012-03-01 17:18:57.000000000 +0100 @@ -1,6 +1,8 @@ ---- bin/Makefile.in -+++ bin/Makefile.in 2010/02/17 10:54:34 -@@ -23,4 +23,8 @@ +Index: bin/Makefile.in +=================================================================== +--- bin/Makefile.in.orig ++++ bin/Makefile.in +@@ -23,4 +23,8 @@ SUBDIRS = named rndc dig dnssec tests to check confgen @PKCS11_TOOLS@ TARGETS = @@ -9,9 +11,11 @@ @BIND9_MAKE_RULES@ + +LDFLAGS += -pie ---- bin/dig/Makefile.in -+++ bin/dig/Makefile.in 2010/02/17 10:52:39 -@@ -67,8 +67,12 @@ +Index: bin/dig/Makefile.in +=================================================================== +--- bin/dig/Makefile.in.orig ++++ bin/dig/Makefile.in +@@ -67,8 +67,12 @@ HTMLPAGES = dig.html host.html nslookup. MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -24,9 +28,11 @@ dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS} export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \ ${FINALBUILDCMD} ---- bin/dnssec/Makefile.in -+++ bin/dnssec/Makefile.in 2010/02/17 10:53:51 -@@ -60,8 +60,12 @@ +Index: bin/dnssec/Makefile.in +=================================================================== +--- bin/dnssec/Makefile.in.orig ++++ bin/dnssec/Makefile.in +@@ -60,8 +60,12 @@ HTMLPAGES = dnssec-dsfromkey.html dnssec MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -39,9 +45,11 @@ dnssec-dsfromkey@EXEEXT@: dnssec-dsfromkey.@O@ ${OBJS} ${DEPLIBS} export BASEOBJS="dnssec-dsfromkey.@O@ ${OBJS}"; \ ${FINALBUILDCMD} ---- bin/nsupdate/Makefile.in -+++ bin/nsupdate/Makefile.in 2010/02/17 10:55:42 -@@ -64,8 +64,12 @@ +Index: bin/nsupdate/Makefile.in +=================================================================== +--- bin/nsupdate/Makefile.in.orig ++++ bin/nsupdate/Makefile.in +@@ -64,8 +64,12 @@ HTMLPAGES = nsupdate.html MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -54,9 +62,11 @@ nsupdate.@O@: nsupdate.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\" \ ---- bin/rndc/Makefile.in -+++ bin/rndc/Makefile.in 2010/02/17 10:57:03 -@@ -59,8 +59,12 @@ +Index: bin/rndc/Makefile.in +=================================================================== +--- bin/rndc/Makefile.in.orig ++++ bin/rndc/Makefile.in +@@ -59,8 +59,12 @@ HTMLPAGES = rndc.html rndc.conf.html MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -69,9 +79,11 @@ rndc.@O@: rndc.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ ---- bin/check/Makefile.in -+++ bin/check/Makefile.in 2005/06/17 13:01:56 -@@ -55,8 +55,12 @@ +Index: bin/check/Makefile.in +=================================================================== +--- bin/check/Makefile.in.orig ++++ bin/check/Makefile.in +@@ -57,8 +57,12 @@ HTMLPAGES = named-checkconf.html named-c MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -84,9 +96,11 @@ named-checkconf.@O@: named-checkconf.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ ---- bin/named/Makefile.in -+++ bin/named/Makefile.in 2005/06/17 12:41:37 -@@ -91,8 +91,12 @@ +Index: bin/named/Makefile.in +=================================================================== +--- bin/named/Makefile.in.orig ++++ bin/named/Makefile.in +@@ -109,8 +109,12 @@ HTMLPAGES = named.html lwresd.html named MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -99,18 +113,22 @@ main.@O@: main.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ ---- bin/named/unix/Makefile.in -+++ bin/named/unix/Makefile.in 2005/06/17 12:40:23 -@@ -33,4 +33,6 @@ +Index: bin/named/unix/Makefile.in +=================================================================== +--- bin/named/unix/Makefile.in.orig ++++ bin/named/unix/Makefile.in +@@ -34,4 +34,6 @@ SRCS = os.c dlz_dlopen_driver.c TARGETS = ${OBJS} +EXT_CFLAGS = -fPIE + @BIND9_MAKE_RULES@ ---- bin/confgen/Makefile.in -+++ bin/confgen/Makefile.in 2010/02/17 11:09:01 -@@ -64,8 +64,12 @@ +Index: bin/confgen/Makefile.in +=================================================================== +--- bin/confgen/Makefile.in.orig ++++ bin/confgen/Makefile.in +@@ -64,8 +64,12 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} UOBJS = unix/os.@O@ ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/apparmor/usr.sbin.named new/vendor-files/apparmor/usr.sbin.named --- old/vendor-files/apparmor/usr.sbin.named 2009-11-18 10:42:46.000000000 +0100 +++ new/vendor-files/apparmor/usr.sbin.named 2012-01-02 23:07:41.000000000 +0100 @@ -41,4 +41,7 @@ /var/opt/novell/xad/ds/krb5kdc/krb5.keytab r, /var/tmp/DNS_* rw, /tmp/DNS_* rw, + + /var/lib/named/lib64/** mrlpx, + /var/lib/named/lib/** mrlpx, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/config/named.conf new/vendor-files/config/named.conf --- old/vendor-files/config/named.conf 2009-11-20 10:08:32.000000000 +0100 +++ new/vendor-files/config/named.conf 2012-01-03 11:52:45.000000000 +0100 @@ -19,6 +19,7 @@ # The directory statement defines the name server's working directory directory "/var__NSD__/named"; + managed-keys-directory "/var__NSD__/named/dyn/"; # Write dump and statistics file to the log subdirectory. The # pathenames are relative to the chroot jail. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/lwresd new/vendor-files/init/lwresd --- old/vendor-files/init/lwresd 2008-08-22 11:03:53.000000000 +0200 +++ new/vendor-files/init/lwresd 2012-01-02 18:05:09.000000000 +0100 @@ -92,6 +92,12 @@ test "${checkAndCopyConfigFilesCalled}" = "yes" && return # Handle known configuration files. if [ "${NAMED_RUN_CHROOTED}" = "yes" ]; then + # Create link if needed, /var/run might be on tmpfs + test -d /var/run/named && \ + rm -rf /var/run/named + test ! -L /var/run/named && \ + ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named + for configfile in /etc/{localtime,lwresd.conf,resolv.conf,rndc.key}; do if [ ! -e ${configfile} ]; then case ${configfile} in @@ -111,6 +117,13 @@ rm -f ${CHROOT_PREFIX}/${configfile} cp -a -L ${configfile} ${CHROOT_PREFIX}/${configfile%/*} done + else + # NAMED_RUN_CHROOTED != yes + test -L /var/run/named && rm /var/run/named + if [ ! -d /var/run/named ]; then + mkdir -p /var/run/named + chown named: /var/run/named + fi fi export checkAndCopyConfigFilesCalled="yes" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/named new/vendor-files/init/named --- old/vendor-files/init/named 2011-10-26 11:14:22.000000000 +0200 +++ new/vendor-files/init/named 2012-01-02 18:05:02.000000000 +0100 @@ -163,47 +163,21 @@ chmod 0640 /etc/rndc.key chown root:named /etc/rndc.key fi - # Handle all include files. - ##################################################################### - # OLD --- Copies only include files mentioned in NAMED_CONF_INCLUDE - ##################################################################### -# for configfile in "${NAMED_CONF_META_INCLUDE_FILE}" ${NAMED_CONF_INCLUDE_FILES}; do -# if [ ! -f "${configfile}" ]; then -# case "${configfile}" in -# "${NAMED_CONF_META_INCLUDE_FILE}") -# warnMessage "File, ${configfile} not found. Creating it." -# initializeNamed -# ;; -# *) -# test -z "${NAMED_CONF_META_INCLUDE_FILE}" && continue -# grep -qe "^[[:space:]]*include[[:space:]]*\"${configfile}\"" "${NAMED_CONF_META_INCLUDE_FILE}" && \ -# initializeNamed || \ -# warnMessage "File, ${configfile} not found. Skipping.\nPlease check the setting of NAMED_CONF_INCLUDE_FILES in /etc/sysconfig/named." -# continue -# ;; -# esac -# fi -# if [ "${NAMED_RUN_CHROOTED}" = "yes" ]; then -# makeDestDir -# rm -f ${CHROOT_PREFIX}/${configfile} -# cp -a -L ${configfile} ${CHROOT_PREFIX}/${configfile%/*} -# fi -# done - # Handle known configuration files. if [ "${NAMED_RUN_CHROOTED}" = "yes" ]; then + # Create link if needed, /var/run might be on tmpfs + test -d /var/run/named && \ + rm -rf /var/run/named + test ! -L /var/run/named && \ + ln -s ${CHROOT_PREFIX}/var/run/named /var/run/named # mount /proc for multicore CPUs (bnc#470828) if [ ! -e "${CHROOT_PREFIX}/proc/meminfo" ]; then mkdir -p "${CHROOT_PREFIX}/proc" - mount --bind /proc "${CHROOT_PREFIX}/proc" 2>/dev/null - mount -o remount,ro,nosuid,nodev ${CHROOT_PREFIX}/proc 2>/dev/null + mount -tproc -oro,nosuid,nodev,noexec proc ${CHROOT_PREFIX}/proc 2>/dev/null fi; - ########################### - # NEW --- Copy complete /etc/named.d dir. Bug: bnc#408145 - ########################### NAMED_D="/etc/named.d" # delete old named.d test -z "${CHROOT_PREFIX}${NAMED_D}" || rm -rf ${CHROOT_PREFIX}${NAMED_D} @@ -226,6 +200,13 @@ mkdir -p ${CHROOT_PREFIX}/lib64 cp -r /lib64/engines ${CHROOT_PREFIX}/lib64/ fi + else + # NAMED_RUN_CHROOTED != yes + test -L /var/run/named && rm /var/run/named + if [ ! -d /var/run/named ]; then + mkdir -p /var/run/named + chown named: /var/run/named + fi fi export checkAndCopyConfigFilesCalled="yes" } @@ -254,6 +235,7 @@ if [ ! -e /etc/named.d/forwarders.conf ]; then touch /etc/named.d/forwarders.conf fi + checkproc -p ${NAMED_PID} ${NAMED_BIN} case $? in 0) echo -n "- Warning: named already running! " ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/ldapdump new/vendor-files/tools/ldapdump --- old/vendor-files/tools/ldapdump 2006-05-17 12:59:11.000000000 +0200 +++ new/vendor-files/tools/ldapdump 2012-01-02 23:17:29.000000000 +0100 @@ -622,6 +622,7 @@ my $data; open( FILE, "< /etc/openldap/ldap.conf" ) or die "unable to open /etc/openldap/ldap.conf. $!"; while(<FILE>) { + if ( /^uri\s+([^\s]*)\s*/i ) { $data = $1; last } if ( /^host\s+([^\s]*)\s*/i ) { $data = $1; last } } close(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 aspell-en for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package aspell-en for openSUSE:Factory checked in at 2012-03-01 17:18:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aspell-en (Old) and /work/SRC/openSUSE:Factory/.aspell-en.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aspell-en", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aspell-en/aspell-en.changes 2011-09-23 01:52:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aspell-en.new/aspell-en.changes 2012-03-01 17:18:48.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 29 13:51:11 UTC 2012 - cfarrell(a)suse.com + +- license update: MIT and BSD-3-Clause + Use SPDX format (using same license form as Fedora for this package) + +------------------------------------------------------------------- +Sat Jan 28 21:05:07 UTC 2012 - jengelh(a)medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions +- Parallel building using %_smp_mflags + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aspell-en.spec ++++++ --- /var/tmp/diff_new_pack.DtE2Vc/_old 2012-03-01 17:18:52.000000000 +0100 +++ /var/tmp/diff_new_pack.DtE2Vc/_new 2012-03-01 17:18:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package aspell-en # -# 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 aspell_dict_dir %(aspell dump config dict-dir) %define aspell_data_dir %(aspell dump config data-dir) @@ -25,7 +24,7 @@ Release: 1 Summary: English Dictionaries for ASpell -License: Collective copyright allows use, copying, modification, distribution +License: MIT and BSD-3-Clause Url: http://wordlist.sourceforge.net/ Group: Productivity/Text/Spell Source0: ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-%{version}-0.tar.bz2 @@ -48,8 +47,9 @@ %patch0 %build +#not autoconf ./configure -make +make %{?_smp_mflags} # creating extra dictionary with Novell jargon /usr/bin/word-list-compress c < Nwordlist > Nwordlist.cwl /usr/bin/word-list-compress d < Nwordlist.cwl | aspell --lang=en create master ./enNovellwords @@ -60,9 +60,6 @@ %fdupes -s %{buildroot} -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc Copyright README doc/ChangeLog doc/SCOWL-README doc/extra.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 a2ps for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package a2ps for openSUSE:Factory checked in at 2012-03-01 17:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/a2ps (Old) and /work/SRC/openSUSE:Factory/.a2ps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "a2ps", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/a2ps/a2ps.changes 2012-02-08 17:17:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps.changes 2012-03-01 17:18:46.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 21 12:22:10 UTC 2012 - werner(a)suse.de + +- Fix shared library build on all 64bit architectures (hint from + Dinar Valeev) + +------------------------------------------------------------------- New: ---- a2ps-4.13-linker.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ a2ps.spec ++++++ --- /var/tmp/diff_new_pack.3jhUor/_old 2012-03-01 17:18:48.000000000 +0100 +++ /var/tmp/diff_new_pack.3jhUor/_new 2012-03-01 17:18:48.000000000 +0100 @@ -51,6 +51,7 @@ Patch10: a2ps-4.13-types.patch Patch11: a2ps-4.13-psgen.patch Patch12: a2ps-4.13-gv-arguments.patch +Patch13: a2ps-4.13-linker.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -92,6 +93,7 @@ %patch -P 10 -p 0 -b .types %patch -P 11 -p 0 -b .psgen %patch -P 12 -p 1 -b .gvarg +%patch -P 13 -p 0 -b .ldso %patch cp -f %SOURCE1 po/ko.po rename no nb po/no.* ++++++ a2ps-4.13-linker.patch ++++++ --- auxdir/ltconfig +++ auxdir/ltconfig 2012-02-21 12:20:09.366433998 +0000 @@ -1966,19 +1966,8 @@ linux-gnu*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - - if test -f /lib/ld.so.1; then - dynamic_linker='GNU ld.so' - else - # Only the GNU ld.so supports shared libraries on MkLinux. - case "$host_cpu" in - powerpc*) dynamic_linker=no ;; - *) dynamic_linker='Linux ld.so' ;; - esac - fi + hardcode_into_libs=yes + dynamic_linker='GNU/Linux ld.so' ;; netbsd*) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cogl for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package cogl for openSUSE:Factory checked in at 2012-03-01 09:50:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cogl (Old) and /work/SRC/openSUSE:Factory/.cogl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cogl", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cogl/cogl.changes 2012-01-26 14:18:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cogl.new/cogl.changes 2012-03-01 09:50:27.000000000 +0100 @@ -1,0 +2,52 @@ +Wed Feb 22 08:16:48 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.9.6: + + New conformance tests or tests ported from Clutter. + + New public experimental functions. + + Added cogl_kms_renderer_get_kms_fd to get the KMS file + descriptor. + + Bug fixed in the KMS support where it would crash on cleanup if + it couldn't save the CRTC state. + + Bug fixed in the Wayland compositor support where it would leak + EGLImages when creating a texture from a buffer + + The swap_buffer callback in GLX is now delayed until + cogl_poll_dispatch is called so that apps can handle it more + predictably. + + Fixes for bugs with pipelines that are trying to use a layer + with a NULL texture. + + New cogl_framebuffer_* API for drawing directly to the + framebuffer without having to push the framebuffer. + + Most of the _EXP suffixes have been removed from the + experimental API symbols in the hope that the gtk-doc unstable + annotation will be enough to distinguish these. + + Add a COGL_DEBUG=winsys option + + CoglBuffer and CoglPrimitive now take an explicit CoglContext + argument in their constructor. + + Updates to the MSVC build support. + + Add cogl_pipeline_set_layer_null_texture(). + + Fix some bugs where Cogl was assuming there is a direct mapping + between the pipeline layer number and the GL texture unit + number. + + In snippets, there are now always builtin sampler uniforms for + every layer of the pipeline. + + The texture lookup snippet hook now gets passed the sampler for + the unit. + + Some public constants for CoglPixelFormat have been removed + (COGL_UNPREMULT_MASK, COGL_UNORDERED_MASK and + COGL_PIXEL_FORMAT_{24,32}). + + 30-bit pixel formats added. + + COGL_DEBUG=wireframes now correctly renders primitives using + vertex shader snippets. + + cogl_framebuffer_swap_buffers and friends have been renamed to + cogl_onscreen_swap_buffers. + + If the experimental 2.0 API is requested, as far as possible + the headers for the 1.0 API are no longer included. Define + COGL_ENABLE_EXPERIMENTAL_API instead if you want to mix both + APIs. + + Bugs fixed: bgo#660188, bgo#668385, bgo#668856, bgo#668913, + bgo#669368, bgo#669785. +- Remove xz BuildRequires now that it comes for free in the build + system. +- Rename libcogl7 to libcogl8, following upstream soversion change. + +------------------------------------------------------------------- Old: ---- cogl-1.9.4.tar.xz New: ---- cogl-1.9.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cogl.spec ++++++ --- /var/tmp/diff_new_pack.vasjbf/_old 2012-03-01 09:50:28.000000000 +0100 +++ /var/tmp/diff_new_pack.vasjbf/_new 2012-03-01 09:50:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: cogl -Version: 1.9.4 +Version: 1.9.6 Release: 0 Summary: An object oriented GL/GLES Abstraction/Utility Layer License: LGPL-2.1+ @@ -27,8 +27,6 @@ Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gtk-doc >= 1.13 -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(cairo) >= 1.10 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.0 BuildRequires: pkgconfig(gl) @@ -47,7 +45,7 @@ Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures. -%package -n libcogl7 +%package -n libcogl8 Summary: An object oriented GL/GLES Abstraction/Utility Layer Group: System/Libraries Requires: Mesa @@ -55,7 +53,7 @@ # To make the lang package installable Provides: %{name} = %{version} -%description -n libcogl7 +%description -n libcogl8 Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures. @@ -93,7 +91,7 @@ Group: Development/Libraries/GNOME # cogl-defines.h includes GL/gl.h Requires: Mesa-devel -Requires: libcogl7 = %{version} +Requires: libcogl8 = %{version} Requires: libcogl-pango0 = %{version} Requires: typelib-1_0-Cogl-1_0 = %{version} Requires: typelib-1_0-CoglPango-1_0 = %{version} @@ -119,15 +117,15 @@ %find_lang cogl %fdupes %{buildroot}%{_libdir}/pkgconfig/ -%post -n libcogl7 -p /sbin/ldconfig +%post -n libcogl8 -p /sbin/ldconfig -%postun -n libcogl7 -p /sbin/ldconfig +%postun -n libcogl8 -p /sbin/ldconfig %post -n libcogl-pango0 -p /sbin/ldconfig %postun -n libcogl-pango0 -p /sbin/ldconfig -%files -n libcogl7 +%files -n libcogl8 %defattr(-,root,root) %doc COPYING NEWS README ChangeLog %{_libdir}/libcogl.so.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.vasjbf/_old 2012-03-01 09:50:28.000000000 +0100 +++ /var/tmp/diff_new_pack.vasjbf/_new 2012-03-01 09:50:28.000000000 +0100 @@ -1,3 +1,3 @@ -libcogl7 +libcogl8 requires "Mesa-<targettype>" libcogl-pango0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openldap2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2012-03-01 07:49:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openldap2", Maintainer is "rhafer(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2-client.changes 2011-12-08 12:26:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2-client.changes 2012-03-01 07:49:50.000000000 +0100 @@ -1,0 +2,26 @@ +Mon Feb 27 14:14:23 UTC 2012 - rhafer(a)suse.de + +- Update to 2.4.29 + * Fixed slapd cn=config modification of first schema element + (ITS#7098) + * Fixed slapd operation reuse (ITS#7107) + * Fixed slapd blocked writers to not interfere with pool pause + (ITS#7115) + * Fixed slapd connection loop connindex usage (ITS#7131) + * Fixed slapd double mutex unlock via connection_done (ITS#7125) + * Fixed slapd check order in connection_write (ITS#7113) + * Fixed slapd slapadd to exit on failure (ITS#7142) + * Fixed slapd syncrepl reference to freed memory + (ITS#7127,ITS#7132) + * Fixed slapd syncrepl to ignore some errors on delete + (ITS#7052) + * Fixed slapd syncrepl to handle missing oldRDN (ITS#7144) + * Fixed slapd-monitor compare op to update cached entry + (ITS#7123) + * Fixed slapo-syncprov with already abandoned operation + (ITS#7150) +- Included patches from RE24 branch: + * only poll sockets for write as needed (ITS#7167, bnc#749082) + * sycnrepl Fixes (ITS#7162) + +------------------------------------------------------------------- openldap2.changes: same change Old: ---- openldap-2.4.28.tgz New: ---- 0008-syncrepl-fixes-post-2.4.29.dif 0009-ITS-7167-only-poll-sockets-for-write-as-needed.dif openldap-2.4.29.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openldap2-client # -# 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 @@ -24,7 +24,7 @@ %if %sles_version == 9 || %sles_version == 10 BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif -Version: 2.4.28 +Version: 2.4.29 Release: 1 Url: http://www.openldap.org License: OLDAP-2.8 @@ -60,6 +60,8 @@ Patch5: 0005-pie-compile.dif Patch6: 0006-No-Build-date-and-time-in-binaries.dif Patch7: 0007-Recover-on-DB-version-change.dif +Patch8: 0008-syncrepl-fixes-post-2.4.29.dif +Patch9: 0009-ITS-7167-only-poll-sockets-for-write-as-needed.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "openldap2" @@ -161,6 +163,8 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 cp %{SOURCE5} . cp %{SOURCE6} . cd ../openldap-2.3.37 ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openldap2 # -# 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 @@ -24,7 +24,7 @@ %if %sles_version == 9 || %sles_version == 10 BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif -Version: 2.4.28 +Version: 2.4.29 Release: 1 Url: http://www.openldap.org License: OLDAP-2.8 @@ -60,6 +60,8 @@ Patch5: 0005-pie-compile.dif Patch6: 0006-No-Build-date-and-time-in-binaries.dif Patch7: 0007-Recover-on-DB-version-change.dif +Patch8: 0008-syncrepl-fixes-post-2.4.29.dif +Patch9: 0009-ITS-7167-only-poll-sockets-for-write-as-needed.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "openldap2" @@ -154,6 +156,8 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 cp %{SOURCE5} . cp %{SOURCE6} . cd ../openldap-2.3.37 ++++++ 0001-build-adjustments.dif ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,4 +1,4 @@ -From ada0d25f62670b502166ce05fce29beb9d86ce96 Mon Sep 17 00:00:00 2001 +From e5b00828fc947aea5c6498ffffd4bfc29540c159 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:04:07 +0200 Subject: build-adjustments @@ -7,7 +7,7 @@ - don't use automake macro diff --git a/build/top.mk b/build/top.mk -index 66ac3bf..f09e0c3 100644 +index 14e291e..633c9a4 100644 --- a/build/top.mk +++ b/build/top.mk @@ -40,7 +40,7 @@ libdir = @libdir@ @@ -20,7 +20,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@$(ldap_subdir) diff --git a/configure.in b/configure.in -index e7e5a7e..ef9d4f5 100644 +index 5d7d475..f12463e 100644 --- a/configure.in +++ b/configure.in @@ -69,7 +69,9 @@ dnl Determine host platform ++++++ 0002-slapd.conf.dif ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,4 +1,4 @@ -From dc422b3d677b7bb9c0699d40623def4dc93d54f0 Mon Sep 17 00:00:00 2001 +From e5dae6859ae9179c636531c94d1f86ba8821d4cc Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:05:49 +0200 Subject: slapd.conf ++++++ 0003-LDAPI-socket-location.dif ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,11 +1,11 @@ -From daab8464b7e9269012c22566ff8406122cc1f19b Mon Sep 17 00:00:00 2001 +From 530f1d6f5af77523f041657021d49b177863861d Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:06:42 +0200 Subject: LDAPI socket location diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h -index 426d7f6..9a21f98 100644 +index 9dba666..b9780bc 100644 --- a/include/ldap_defaults.h +++ b/include/ldap_defaults.h @@ -39,7 +39,7 @@ ++++++ 0004-libldap-use-gethostbyname_r.dif ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,11 +1,11 @@ -From ae570a81db3e070d0c449fe9eb70352c8ffcf22a Mon Sep 17 00:00:00 2001 +From 3f733c7f1da53e613cf6d20f3886a679614a2d26 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Wed, 16 Jun 2010 14:08:03 +0200 Subject: libldap use gethostbyname_r diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c -index f0b5f72..ea5e178 100644 +index 85f13fc..60f640a 100644 --- a/libraries/libldap/util-int.c +++ b/libraries/libldap/util-int.c @@ -52,7 +52,7 @@ extern int h_errno; ++++++ 0005-pie-compile.dif ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,11 +1,11 @@ -From ef2b8372346fd32c21a8b19864c2f29aed5e3e63 Mon Sep 17 00:00:00 2001 +From a40157559d5dc1658787d1cbbf5fa33a30d98880 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Fri, 12 Nov 2010 09:39:11 +0100 Subject: pie compile diff --git a/build/top.mk b/build/top.mk -index f09e0c3..3cb54c7 100644 +index 633c9a4..c67289d 100644 --- a/build/top.mk +++ b/build/top.mk @@ -107,7 +107,7 @@ LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) @@ -36,7 +36,7 @@ LIBS = $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS) diff --git a/servers/slapd/back-bdb/Makefile.in b/servers/slapd/back-bdb/Makefile.in -index 93dc9a6..7172e70 100644 +index da7da0c..dcb6d92 100644 --- a/servers/slapd/back-bdb/Makefile.in +++ b/servers/slapd/back-bdb/Makefile.in @@ -33,6 +33,8 @@ LDAP_LIBDIR= ../../../libraries @@ -49,7 +49,7 @@ MOD_DEFS = $(@BUILD_BDB@_DEFS) MOD_LIBS = $(BDB_LIBS) diff --git a/servers/slapd/back-hdb/Makefile.in b/servers/slapd/back-hdb/Makefile.in -index 8f6236b..1d5ba5f 100644 +index 5af828f..6f43f7b 100644 --- a/servers/slapd/back-hdb/Makefile.in +++ b/servers/slapd/back-hdb/Makefile.in @@ -37,6 +37,8 @@ LDAP_LIBDIR= ../../../libraries @@ -62,7 +62,7 @@ MOD_DEFS = $(@BUILD_HDB@_DEFS) MOD_LIBS = $(BDB_LIBS) diff --git a/servers/slapd/back-ldap/Makefile.in b/servers/slapd/back-ldap/Makefile.in -index 418447f..8d42e72 100644 +index 392d92e..3a0663d 100644 --- a/servers/slapd/back-ldap/Makefile.in +++ b/servers/slapd/back-ldap/Makefile.in @@ -26,6 +26,8 @@ LDAP_LIBDIR= ../../../libraries @@ -75,7 +75,7 @@ MOD_DEFS = $(@BUILD_LDAP@_DEFS) diff --git a/servers/slapd/back-ldif/Makefile.in b/servers/slapd/back-ldif/Makefile.in -index a8b5a96..12fbaab 100644 +index 5e4abc1..1e8c454 100644 --- a/servers/slapd/back-ldif/Makefile.in +++ b/servers/slapd/back-ldif/Makefile.in @@ -22,6 +22,8 @@ LDAP_LIBDIR= ../../../libraries @@ -88,7 +88,7 @@ MOD_DEFS = $(yes_DEFS) diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in -index ddb474a..61e51b8 100644 +index 9aecdbc..11c962c 100644 --- a/servers/slapd/back-monitor/Makefile.in +++ b/servers/slapd/back-monitor/Makefile.in @@ -30,6 +30,8 @@ LDAP_LIBDIR= ../../../libraries @@ -101,7 +101,7 @@ MOD_DEFS = $(@BUILD_MONITOR@_DEFS) diff --git a/servers/slapd/back-relay/Makefile.in b/servers/slapd/back-relay/Makefile.in -index f93a84c..a35dd83 100644 +index 90ea4b3..ff2f429 100644 --- a/servers/slapd/back-relay/Makefile.in +++ b/servers/slapd/back-relay/Makefile.in @@ -22,6 +22,8 @@ LDAP_LIBDIR= ../../../libraries ++++++ 0006-No-Build-date-and-time-in-binaries.dif ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,4 +1,4 @@ -From b0508b1d0322491955d6ed11fc8c980f6a07dd18 Mon Sep 17 00:00:00 2001 +From a994bf2d5f145d52ce7351468b4b897a4f65d3a4 Mon Sep 17 00:00:00 2001 From: Cristian Rodriguez <cristian.rodriguez(a)opensuse.org> Date: Tue, 5 Oct 2010 13:59:40 +0200 Subject: No Build date and time in binaries @@ -7,7 +7,7 @@ the openSUSE buildservice. diff --git a/build/mkversion b/build/mkversion -index 5c020b8..0160ab1 100755 +index 3fd9565..dd9a998 100755 --- a/build/mkversion +++ b/build/mkversion @@ -50,7 +50,7 @@ if test $# != 1 ; then ++++++ 0007-Recover-on-DB-version-change.dif ++++++ --- /var/tmp/diff_new_pack.kH5GCu/_old 2012-03-01 07:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5GCu/_new 2012-03-01 07:49:52.000000000 +0100 @@ -1,4 +1,4 @@ -From e17f4d8c705ffa9080fd2ca5cf6780e30d04b0ac Mon Sep 17 00:00:00 2001 +From ab9cfed7b0f7b77b9715ec01a267b523a12c63d0 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <rhafer(a)suse.de> Date: Tue, 5 Oct 2010 14:20:22 +0200 Subject: Recover on DB version change @@ -7,7 +7,7 @@ only succeed if only the format of transaction logs changed. diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c -index 526fee8..a9f7c5a 100644 +index ac5a6d5..fea5cb4 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -330,6 +330,13 @@ shm_retry: ++++++ 0008-syncrepl-fixes-post-2.4.29.dif ++++++ >From 27f5cf4d4ebcef32c4102bbcc900b0d72383ddb9 Mon Sep 17 00:00:00 2001 From: Howard Chu <hyc(a)openldap.org> Date: Sun, 12 Feb 2012 15:54:11 -0800 Subject: syncrepl fixes post 2.4.29 ITS#6024 patch breaks MMR loop detection diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 8c6c296..e44c239 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -822,7 +822,7 @@ syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode ) { SlapReply rs = { REP_SEARCH }; LDAPControl *ctrls[2]; - struct berval cookie = BER_BVNULL, csns[2]; + struct berval cookie, csns[2]; Entry e_uuid = {0}; Attribute a_uuid = {0}; @@ -830,19 +830,17 @@ syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode ) return SLAPD_ABANDON; ctrls[1] = NULL; - if ( !BER_BVISNULL( &opc->sctxcsn )) { - csns[0] = opc->sctxcsn; - BER_BVZERO( &csns[1] ); - slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, slap_serverID ? slap_serverID : -1 ); - } + csns[0] = opc->sctxcsn; + BER_BVZERO( &csns[1] ); + slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, slap_serverID ? slap_serverID : -1 ); #ifdef LDAP_DEBUG if ( so->s_sid > 0 ) { Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: to=%03x, cookie=%s\n", - so->s_sid, cookie.bv_val ? cookie.bv_val : "", 0 ); + so->s_sid, cookie.bv_val, 0 ); } else { Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n", - cookie.bv_val ? cookie.bv_val : "", 0, 0 ); + cookie.bv_val, 0, 0 ); } #endif @@ -851,9 +849,7 @@ syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode ) a_uuid.a_nvals = &opc->suuid; rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid, mode, ctrls, 0, 1, &cookie ); - if ( !BER_BVISNULL( &cookie )) { - op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); - } + op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); rs.sr_ctrls = ctrls; rs.sr_entry = &e_uuid; diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 3938288..ff13ff9 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -131,7 +131,7 @@ static int syncrepl_message_to_op( syncinfo_t *, Operation *, LDAPMessage * ); static int syncrepl_message_to_entry( syncinfo_t *, Operation *, LDAPMessage *, - Modifications **, Entry **, int ); + Modifications **, Entry **, int, struct berval* ); static int syncrepl_entry( syncinfo_t *, Operation*, Entry*, Modifications**,int, struct berval*, @@ -833,7 +833,7 @@ do_syncrep2( tout_p, &msg ) ) > 0 ) { int match, punlock, syncstate; - struct berval *retdata, syncUUID, cookie = BER_BVNULL; + struct berval *retdata, syncUUID[2], cookie = BER_BVNULL; char *retoid; LDAPControl **rctrls = NULL, *rctrlp = NULL; BerVarray syncUUIDs; @@ -885,7 +885,7 @@ do_syncrep2( goto done; } ber_init2( ber, &rctrlp->ldctl_value, LBER_USE_DER ); - if ( ber_scanf( ber, "{em" /*"}"*/, &syncstate, &syncUUID ) + if ( ber_scanf( ber, "{em" /*"}"*/, &syncstate, &syncUUID[0] ) == LBER_ERROR ) { bdn.bv_val[bdn.bv_len] = '\0'; Debug( LDAP_DEBUG_ANY, "do_syncrep2: %s malformed message (%s)\n", @@ -896,7 +896,7 @@ do_syncrep2( } /* FIXME: what if syncUUID is NULL or empty? * (happens with back-sql...) */ - if ( BER_BVISEMPTY( &syncUUID ) ) { + if ( BER_BVISEMPTY( &syncUUID[0] ) ) { bdn.bv_val[bdn.bv_len] = '\0'; Debug( LDAP_DEBUG_ANY, "do_syncrep2: %s " "got empty syncUUID with LDAP_SYNC_%s (%s)\n", @@ -1007,10 +1007,10 @@ do_syncrep2( break; } } else if ( ( rc = syncrepl_message_to_entry( si, op, msg, - &modlist, &entry, syncstate ) ) == LDAP_SUCCESS ) + &modlist, &entry, syncstate, syncUUID ) ) == LDAP_SUCCESS ) { if ( ( rc = syncrepl_entry( si, op, entry, &modlist, - syncstate, &syncUUID, syncCookie.ctxcsn ) ) == LDAP_SUCCESS && + syncstate, syncUUID, syncCookie.ctxcsn ) ) == LDAP_SUCCESS && syncCookie.ctxcsn ) { rc = syncrepl_updateCookie( si, op, &syncCookie ); @@ -2415,7 +2415,8 @@ syncrepl_message_to_entry( LDAPMessage *msg, Modifications **modlist, Entry **entry, - int syncstate + int syncstate, + struct berval *syncUUID ) { Entry *e = NULL; @@ -2457,6 +2458,14 @@ syncrepl_message_to_entry( return LDAP_OTHER; } + /* syncUUID[0] is normalized UUID received over the wire + * syncUUID[1] is denormalized UUID, generated here + */ + (void)slap_uuidstr_from_normalized( &syncUUID[1], &syncUUID[0], op->o_tmpmemctx ); + Debug( LDAP_DEBUG_SYNC, + "syncrepl_message_to_entry: %s DN: %s, UUID: %s\n", + si->si_ridtxt, bdn.bv_val, syncUUID[1].bv_val ); + if ( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_DELETE ) { /* NOTE: this could be done even before decoding the DN, * although encoding errors wouldn't be detected */ @@ -2677,7 +2686,6 @@ syncrepl_entry( Backend *be = op->o_bd; slap_callback cb = { NULL, NULL, NULL, NULL }; int syncuuid_inserted = 0; - struct berval syncUUID_strrep = BER_BVNULL; SlapReply rs_search = {REP_RESULT}; Filter f = {0}; @@ -2707,14 +2715,13 @@ syncrepl_entry( } } - (void)slap_uuidstr_from_normalized( &syncUUID_strrep, syncUUID, op->o_tmpmemctx ); if ( syncstate != LDAP_SYNC_DELETE ) { Attribute *a = attr_find( entry->e_attrs, slap_schema.si_ad_entryUUID ); if ( a == NULL ) { /* add if missing */ attr_merge_one( entry, slap_schema.si_ad_entryUUID, - &syncUUID_strrep, syncUUID ); + &syncUUID[1], syncUUID ); } else if ( !bvmatch( &a->a_nvals[0], syncUUID ) ) { /* replace only if necessary */ @@ -2723,7 +2730,7 @@ syncrepl_entry( ber_dupbv( &a->a_nvals[0], syncUUID ); } ber_memfree( a->a_vals[0].bv_val ); - ber_dupbv( &a->a_vals[0], &syncUUID_strrep ); + ber_dupbv( &a->a_vals[0], &syncUUID[1] ); } } @@ -2734,16 +2741,16 @@ syncrepl_entry( if ( syncuuid_inserted ) { Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: %s inserted UUID %s\n", - si->si_ridtxt, syncUUID_strrep.bv_val, 0 ); + si->si_ridtxt, syncUUID[1].bv_val, 0 ); } op->ors_filter = &f; - op->ors_filterstr.bv_len = STRLENOF( "(entryUUID=)" ) + syncUUID_strrep.bv_len; + op->ors_filterstr.bv_len = STRLENOF( "(entryUUID=)" ) + syncUUID[1].bv_len; op->ors_filterstr.bv_val = (char *) slap_sl_malloc( op->ors_filterstr.bv_len + 1, op->o_tmpmemctx ); AC_MEMCPY( op->ors_filterstr.bv_val, "(entryUUID=", STRLENOF( "(entryUUID=" ) ); AC_MEMCPY( &op->ors_filterstr.bv_val[STRLENOF( "(entryUUID=" )], - syncUUID_strrep.bv_val, syncUUID_strrep.bv_len ); + syncUUID[1].bv_val, syncUUID[1].bv_len ); op->ors_filterstr.bv_val[op->ors_filterstr.bv_len - 1] = ')'; op->ors_filterstr.bv_val[op->ors_filterstr.bv_len] = '\0'; @@ -2820,23 +2827,6 @@ syncrepl_entry( */ op->o_csn = a->a_vals[0]; freecsn = 0; - /* There was no cookie CSN attached to this op, - * make sure it's new enough - */ - if ( !syncCSN ) { - int i, sid = slap_parse_csn_sid( &a->a_vals[0] ); - for ( i = 0; i<si->si_cookieState->cs_num; i++ ) { - if ( sid < si->si_cookieState->cs_sids[i] ) - break; - if ( sid == si->si_cookieState->cs_sids[i] ) { - if ( ber_bvcmp( &a->a_vals[0], &si->si_cookieState->cs_vals[i] ) <= 0 ) { - Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s entryCSN too old, ignoring %s (%s)\n", - si->si_ridtxt, a->a_vals[0].bv_val, entry->e_name.bv_val ); - goto done; - } - } - } - } } } retry_add:; @@ -3229,10 +3219,8 @@ retry_modrdn:; } done: - if ( !BER_BVISNULL( &syncUUID_strrep ) ) { - slap_sl_free( syncUUID_strrep.bv_val, op->o_tmpmemctx ); - BER_BVZERO( &syncUUID_strrep ); - } + slap_sl_free( syncUUID[1].bv_val, op->o_tmpmemctx ); + BER_BVZERO( &syncUUID[1] ); if ( !BER_BVISNULL( &dni.ndn ) ) { op->o_tmpfree( dni.ndn.bv_val, op->o_tmpmemctx ); } -- 1.7.7 ++++++ 0009-ITS-7167-only-poll-sockets-for-write-as-needed.dif ++++++ >From 867663c9b0f3468d16ba63340340edfadd8722bb Mon Sep 17 00:00:00 2001 From: Howard Chu <hyc(a)openldap.org> Date: Mon, 20 Feb 2012 14:51:30 -0800 Subject: ITS#7167 only poll sockets for write as needed diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h index b4261a1..1ef15ad 100644 --- a/libraries/libldap/ldap-int.h +++ b/libraries/libldap/ldap-int.h @@ -624,6 +624,7 @@ LDAP_F (void) ldap_free_select_info( void *sip ); LDAP_F (void) ldap_mark_select_write( LDAP *ld, Sockbuf *sb ); LDAP_F (void) ldap_mark_select_read( LDAP *ld, Sockbuf *sb ); LDAP_F (void) ldap_mark_select_clear( LDAP *ld, Sockbuf *sb ); +LDAP_F (void) ldap_clear_select_write( LDAP *ld, Sockbuf *sb ); LDAP_F (int) ldap_is_read_ready( LDAP *ld, Sockbuf *sb ); LDAP_F (int) ldap_is_write_ready( LDAP *ld, Sockbuf *sb ); diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index 6b92ba6..a920953 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -344,7 +344,6 @@ ldap_init_fd( /* Add the connection to the *LDAP's select pool */ ldap_mark_select_read( ld, conn->lconn_sb ); - ldap_mark_select_write( ld, conn->lconn_sb ); *ldp = ld; return LDAP_SUCCESS; @@ -502,7 +501,6 @@ ldap_open_internal_connection( LDAP **ldp, ber_socket_t *fdp ) /* Add the connection to the *LDAP's select pool */ ldap_mark_select_read( ld, c->lconn_sb ); - ldap_mark_select_write( ld, c->lconn_sb ); /* Make this connection an LDAP V3 protocol connection */ rc = LDAP_VERSION3; diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c index daa765e..2864256 100644 --- a/libraries/libldap/os-ip.c +++ b/libraries/libldap/os-ip.c @@ -966,6 +966,32 @@ ldap_mark_select_clear( LDAP *ld, Sockbuf *sb ) #endif } +void +ldap_clear_select_write( LDAP *ld, Sockbuf *sb ) +{ + struct selectinfo *sip; + ber_socket_t sd; + + sip = (struct selectinfo *)ld->ld_selectinfo; + + ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd ); + +#ifdef HAVE_POLL + /* for UNIX poll(2) */ + { + int i; + for(i=0; i < sip->si_maxfd; i++) { + if( sip->si_fds[i].fd == sd ) { + sip->si_fds[i].events &= ~POLL_WRITE; + } + } + } +#else + /* for UNIX select(2) */ + FD_CLR( sd, &sip->si_writefds ); +#endif +} + int ldap_is_write_ready( LDAP *ld, Sockbuf *sb ) diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c index 88190a2..071391d 100644 --- a/libraries/libldap/request.c +++ b/libraries/libldap/request.c @@ -202,6 +202,7 @@ ldap_int_flush_request( /* sent -- waiting for a response */ ldap_mark_select_read( ld, lc->lconn_sb ); + ldap_clear_select_write( ld, lc->lconn_sb ); } return 0; } diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index b6e8e75..7241df9 100644 --- a/libraries/libldap/result.c +++ b/libraries/libldap/result.c @@ -302,7 +302,7 @@ wait4msg( if ( ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_DATA_READY, NULL ) ) { - lc_ready = 1; + lc_ready = 2; /* ready at ber level, not socket level */ break; } } @@ -373,8 +373,8 @@ wait4msg( } } LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex ); - /* Quit looping if no one handled any events */ - if (!serviced) + /* Quit looping if no one handled any socket events */ + if (!serviced && lc_ready == 1) rc = -1; } LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); -- 1.7.7 ++++++ openldap-2.4.28.tgz -> openldap-2.4.29.tgz ++++++ ++++ 14980 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 libwebkit for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package libwebkit for openSUSE:Factory checked in at 2012-03-01 07:49:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwebkit (Old) and /work/SRC/openSUSE:Factory/.libwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libwebkit", Maintainer is "DMZhang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libwebkit/libwebkit.changes 2012-01-09 15:19:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libwebkit.new/libwebkit.changes 2012-03-01 07:49:34.000000000 +0100 @@ -1,0 +2,120 @@ +Thu Feb 23 08:10:15 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.7.90: + + Geolocation support is built by default now. + + requestAnimationFrame support is built by default now. + + Remove defunct WebInspector GSettings mapping. + + Lots of build fixes for Windows, GNU Hurd, A64, SPARC and + Alpha. + + WebKit will try to use the default libsoup proxy resolver + automatically. + + Now interpret plugin metadata as UTF-8. + + Web content (except plugins) should no longer steal focus from + other GTK+ widgets. +- Drop libwebkit-ia64.patch: fixed upstream. +- Rebase webkit-ld-optimization.patch. +- Add pkgconfig(zlib) BuildRequires: new dependency. +- Add explicit pkgconfig(glib-2.0) BuildRequires so we can version + it. +- Add explicit perl, python BuildRequires: those are explicitly + checked for in configure now. +- Add gtk-doc BuildRequires: the gtk-doc tools are needed at + install time, for the webkit-specific tools generating the docs. +- Add libwebkit-fix-gtk2.patch: fix build of the GTK+ 2.x version. +- Stop using %glib2_gsettings_schema_* macros for + libwebkitgtk-1_0-0 and libwebkitgtk-3_0-0: there's no GSettings + schema anymore. +- Do not use parallel build as it seems to be causing several + issues. + +------------------------------------------------------------------- +Mon Feb 20 12:22:34 UTC 2012 - vuntz(a)opensuse.org + +- Move to pkgconfig() BuildRequires: + + Old ones: enchant-devel, gstreamer-0_10-plugins-base-devel, + gtk2-devel/gtk3-devel, libgeoclue-devel, libsoup-devel, + libxslt-devel, sqlite3-devel. + + New ones: enchant, gtk+-2.0/gtk+-3.0, geoclue, gstreamer-0.10, + gstreamer-plugins-base-0.10, libsoup-2.4, libxslt, sqlite3. +- Add missing explicit BuildRequires (some are needed to fix the + build after the xorg-x11 massive packaging change): cairo, + cairo-ft, fontconfig, freetype2, freetype2, gail/gail-3.0, + libpng, libxml-2.0, pango, pangoft2, xrender, xt. + +------------------------------------------------------------------- +Thu Feb 16 09:16:51 UTC 2012 - vuntz(a)opensuse.org + +- Add webkit-ld-optimization.patch: pass options to ld (namely + -Wl,--reduce-memory-overheads -Wl,--no-keep-memory) to use less + memory when linking. This should help building on OBS. Thanks to + the openSUSE-ARM team! + +------------------------------------------------------------------- +Wed Feb 8 14:24:22 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.7.5: + + Add new signals to track resources loading. + + Add --no-timeout command line option to DumpRenderTree. + + Expose accessibility hierarchy in WebKit2 to ATK/AT-SPI based + ATs. + + Allow to build using extra jhbuild modulesets. + + Fix emission of ATK text-caret-moved and text-selection-changed + events. + + Update primary clipboard with the current selection in X11 + platforms in WebKit2. + + Implement the policy client in WebKit2 GTK+ API. + + Add basic printing support to WebKit2. + + Do not add unnecessary blanks at the end of a line of text to + fix the line returned by atk_text_get_text_at_offset(). + + Make sure input text field is repainted when value is changed. + + Add print-backgrounds setting to WebKit2 GTK+ API. + + Respect the has-backward-stepper and has-forward-stepper + properties when drawing scrollbars. + + WebKit-3.0.gir now includes information about C includes or + exported packages. + + WebKit1 API documentation was not generated when building with + gtk-2.0. + + Make WebKitWebView work inside a GtkOffscreenWindow. + + Implement DownloadClient and add downloads API to WebKit2 GTK+ + API. +- Remove xz BuildRequires now that it comes for free in the build + system. +- Add pkgconfig(atspi-2) BuildRequires: new dependency upstream. +- Add pkgconfig(gtk+-unix-print-3.0) BuildRequires for gtk3 build: + new dependency upstream. + +------------------------------------------------------------------- +Thu Feb 02 23:30:15 UTC 2012 - ro(a)suse.de + +- Add libwebkit-ia64.patch: fix build on ia64. + +------------------------------------------------------------------- +Tue Jan 17 16:09:56 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.7.4: + + Fix a11y regression: text-inserted events lack text inserted + and current line. + + Fix scrollbars in WebKit2 that were drawn behind the window + resize grip. + + Fix a memory leak in WebKitWebSourceGStreamer. + + Slider thumb is not centered on the track with the unico theme. + + Fix context menu in WebKit2 to not dissapear right after it's + shown. + + Use GtkOrientable style class in GTK+ 3 theming code. + + Change default WebSocket protocol to the latest one (hybi-17). + + Fix scrollbars size with GTK+ 3.x to follow the current theme. + + Use gdk_screen_get_monitor_workarea() when available for + screenAvailableRect(). + + Rename webkit_web_view_load_alternate_html as + webkit_web_view_replace_content in WebKit2 GTK+. + + Fix emission of ATK text-caret-moved and text-selection-changed + events. + + Add methods to get/set the WebView zoom level to WebKit2 GTK+ + API. + + Make WebProcess and PluginProcess use the same locale as the UI + process. + + Simplify WebKit2 loader client API. +- Create DerivedSources/webkit in %setup to fix build, as a + temporary workaround. + +------------------------------------------------------------------- libwebkit3.changes: same change Old: ---- webkit-1.7.3.tar.xz New: ---- libwebkit-fix-gtk2.patch webkit-1.7.90.tar.xz webkit-ld-optimization.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwebkit.spec ++++++ --- /var/tmp/diff_new_pack.KxNNos/_old 2012-03-01 07:49:37.000000000 +0100 +++ /var/tmp/diff_new_pack.KxNNos/_new 2012-03-01 07:49:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libwebkit # -# 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 @@ -43,37 +43,60 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0 ; LGPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.7.3 +Version: 1.7.90 Release: 0 -# FIXME: after 1.7.3, remove workaround in %%setup that is needed to fix the build +# FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions +# FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the build Url: http://webkit.org/ Source: http://www.webkitgtk.org/webkit-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-UPSTREAM webkit-gir-fixup.patch dimstar(a)opensuse.org -- Fix JSCore.gir to reference a real library. Patch0: webkit-gir-fixup.patch +# PATCH-FIX-OPENSUSE webkit-ld-optimization.patch vuntz(a)opensuse.org -- Add ld options to use less memory when linking, should help building on OBS, but this will be slower +Patch2: webkit-ld-optimization.patch +# PATCH-FIX-UPSTREAM libwebkit-fix-gtk2.patch vuntz(a)opensuse.org -- Fix build of the gtk+ 2 version, sent upstream by irc +Patch3: libwebkit-fix-gtk2.patch BuildRequires: Mesa-devel BuildRequires: bison -BuildRequires: enchant-devel BuildRequires: flex BuildRequires: gcc-c++ -BuildRequires: gobject-introspection-devel +BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: gperf -BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.30 -%if %{build_for_gtk3} -BuildRequires: gtk3-devel >= 3.0 -%else -BuildRequires: gtk2-devel >= 2.10 -%endif -BuildRequires: libgeoclue-devel +BuildRequires: gtk-doc BuildRequires: libicu-devel BuildRequires: libjpeg-devel -BuildRequires: libsoup-devel >= 2.37.2.1 -BuildRequires: libxslt-devel -BuildRequires: sqlite3-devel -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz +BuildRequires: perl +BuildRequires: python # Needed by make-hash-tools.pl, after move to perl 5.14 BuildRequires: perl(Switch) +BuildRequires: pkgconfig(atspi-2) >= 2.2.1 +BuildRequires: pkgconfig(cairo) >= 1.10 +BuildRequires: pkgconfig(cairo-ft) +BuildRequires: pkgconfig(enchant) >= 0.22 +BuildRequires: pkgconfig(fontconfig) >= 2.4 +BuildRequires: pkgconfig(freetype2) >= 9.0 +%if %{build_for_gtk3} +BuildRequires: pkgconfig(gail-3.0) >= 3.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 +BuildRequires: pkgconfig(gtk+-unix-print-3.0) +%else +BuildRequires: pkgconfig(gail) >= 1.8 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.10 +%endif +BuildRequires: pkgconfig(geoclue) +BuildRequires: pkgconfig(glib-2.0) >= 2.31.2 +BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10 +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.30 +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libsoup-2.4) >= 2.37.2.1 +BuildRequires: pkgconfig(libxml-2.0) >= 2.6 +BuildRequires: pkgconfig(libxslt) >= 1.1.7 +BuildRequires: pkgconfig(pango) >= 1.21.0 +BuildRequires: pkgconfig(pangoft2) +BuildRequires: pkgconfig(sqlite3) >= 3.0 +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -96,7 +119,6 @@ # We provide %{_pkgname_no_slpp}: that's the GTK+ version being used. Provides: %{_pkgname_no_slpp} = %{version} Recommends: %{_pkgname_no_slpp}-lang = %{version} -%glib2_gsettings_schema_requires %description -n libwebkitgtk%{_sover} WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -200,8 +222,12 @@ %prep %setup -q -n webkit-%{version} %patch0 -p1 -# FIXME: workaround needed in 1.7.3 to fix build +%patch2 +%patch3 -p1 +# FIXME: workaround needed in > 1.7.90 to fix build mkdir DerivedSources/ANGLE +mkdir DerivedSources/InjectedBundle +mkdir DerivedSources/WebKit2 %build %ifarch ppc64 @@ -213,20 +239,17 @@ --with-gtk=%{_gtkver} \ --enable-geolocation \ --enable-introspection -make %{?jobs:-j %jobs} +make +#make %{?jobs:-j %jobs} %install %makeinstall %find_lang webkit-%{_gtkver} find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print -%post -n libwebkitgtk%{_sover} -/sbin/ldconfig -%glib2_gsettings_schema_post - -%postun -n libwebkitgtk%{_sover} -/sbin/ldconfig -%glib2_gsettings_schema_postun +%post -n libwebkitgtk%{_sover} -p /sbin/ldconfig + +%postun -n libwebkitgtk%{_sover} -p /sbin/ldconfig %post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig @@ -239,7 +262,6 @@ %defattr(-,root,root) %doc Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE Source/WebKit/gtk/NEWS %{_libdir}/libwebkitgtk-%{_sonamever}.so.* -%{_datadir}/glib-2.0/schemas/org.webkitgtk-%{_sonamever}.gschema.xml %{_datadir}/webkitgtk-%{_sonamever}/ %files -n libjavascriptcoregtk%{_sover} @@ -257,6 +279,8 @@ %files -n libwebkitgtk%{?_develnamever}-devel %defattr(-,root,root) +# FIXME: this is wrong: libwebkitgtk-devel and libwebkitgtk3-devel will conflict on the gtk-doc files +%doc %{_datadir}/gtk-doc/html/webkitgtk/ %{_libdir}/libjavascriptcoregtk-%{_sonamever}.so %{_libdir}/libwebkitgtk-%{_sonamever}.so %{_libdir}/pkgconfig/javascriptcoregtk-%{_sonamever}.pc ++++++ libwebkit3.spec ++++++ --- /var/tmp/diff_new_pack.KxNNos/_old 2012-03-01 07:49:37.000000000 +0100 +++ /var/tmp/diff_new_pack.KxNNos/_new 2012-03-01 07:49:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libwebkit3 # -# 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 @@ -43,37 +43,60 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0 ; LGPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.7.3 +Version: 1.7.90 Release: 0 -# FIXME: after 1.7.3, remove workaround in %%setup that is needed to fix the build +# FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions +# FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the build Url: http://webkit.org/ Source: http://www.webkitgtk.org/webkit-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-UPSTREAM webkit-gir-fixup.patch dimstar(a)opensuse.org -- Fix JSCore.gir to reference a real library. Patch0: webkit-gir-fixup.patch +# PATCH-FIX-OPENSUSE webkit-ld-optimization.patch vuntz(a)opensuse.org -- Add ld options to use less memory when linking, should help building on OBS, but this will be slower +Patch2: webkit-ld-optimization.patch +# PATCH-FIX-UPSTREAM libwebkit-fix-gtk2.patch vuntz(a)opensuse.org -- Fix build of the gtk+ 2 version, sent upstream by irc +Patch3: libwebkit-fix-gtk2.patch BuildRequires: Mesa-devel BuildRequires: bison -BuildRequires: enchant-devel BuildRequires: flex BuildRequires: gcc-c++ -BuildRequires: gobject-introspection-devel +BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: gperf -BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.30 -%if %{build_for_gtk3} -BuildRequires: gtk3-devel >= 3.0 -%else -BuildRequires: gtk2-devel >= 2.10 -%endif -BuildRequires: libgeoclue-devel +BuildRequires: gtk-doc BuildRequires: libicu-devel BuildRequires: libjpeg-devel -BuildRequires: libsoup-devel >= 2.37.2.1 -BuildRequires: libxslt-devel -BuildRequires: sqlite3-devel -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz +BuildRequires: perl +BuildRequires: python # Needed by make-hash-tools.pl, after move to perl 5.14 BuildRequires: perl(Switch) +BuildRequires: pkgconfig(atspi-2) >= 2.2.1 +BuildRequires: pkgconfig(cairo) >= 1.10 +BuildRequires: pkgconfig(cairo-ft) +BuildRequires: pkgconfig(enchant) >= 0.22 +BuildRequires: pkgconfig(fontconfig) >= 2.4 +BuildRequires: pkgconfig(freetype2) >= 9.0 +%if %{build_for_gtk3} +BuildRequires: pkgconfig(gail-3.0) >= 3.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 +BuildRequires: pkgconfig(gtk+-unix-print-3.0) +%else +BuildRequires: pkgconfig(gail) >= 1.8 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.10 +%endif +BuildRequires: pkgconfig(geoclue) +BuildRequires: pkgconfig(glib-2.0) >= 2.31.2 +BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10 +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) >= 0.10.30 +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libsoup-2.4) >= 2.37.2.1 +BuildRequires: pkgconfig(libxml-2.0) >= 2.6 +BuildRequires: pkgconfig(libxslt) >= 1.1.7 +BuildRequires: pkgconfig(pango) >= 1.21.0 +BuildRequires: pkgconfig(pangoft2) +BuildRequires: pkgconfig(sqlite3) >= 3.0 +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -96,7 +119,6 @@ # We provide %{_pkgname_no_slpp}: that's the GTK+ version being used. Provides: %{_pkgname_no_slpp} = %{version} Recommends: %{_pkgname_no_slpp}-lang = %{version} -%glib2_gsettings_schema_requires %description -n libwebkitgtk%{_sover} WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -200,8 +222,12 @@ %prep %setup -q -n webkit-%{version} %patch0 -p1 -# FIXME: workaround needed in 1.7.3 to fix build +%patch2 +%patch3 -p1 +# FIXME: workaround needed in > 1.7.90 to fix build mkdir DerivedSources/ANGLE +mkdir DerivedSources/InjectedBundle +mkdir DerivedSources/WebKit2 %build %ifarch ppc64 @@ -213,20 +239,17 @@ --with-gtk=%{_gtkver} \ --enable-geolocation \ --enable-introspection -make %{?jobs:-j %jobs} +make +#make %{?jobs:-j %jobs} %install %makeinstall %find_lang webkit-%{_gtkver} find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print -%post -n libwebkitgtk%{_sover} -/sbin/ldconfig -%glib2_gsettings_schema_post - -%postun -n libwebkitgtk%{_sover} -/sbin/ldconfig -%glib2_gsettings_schema_postun +%post -n libwebkitgtk%{_sover} -p /sbin/ldconfig + +%postun -n libwebkitgtk%{_sover} -p /sbin/ldconfig %post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig @@ -239,7 +262,6 @@ %defattr(-,root,root) %doc Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE Source/WebKit/gtk/NEWS %{_libdir}/libwebkitgtk-%{_sonamever}.so.* -%{_datadir}/glib-2.0/schemas/org.webkitgtk-%{_sonamever}.gschema.xml %{_datadir}/webkitgtk-%{_sonamever}/ %files -n libjavascriptcoregtk%{_sover} @@ -257,6 +279,8 @@ %files -n libwebkitgtk%{?_develnamever}-devel %defattr(-,root,root) +# FIXME: this is wrong: libwebkitgtk-devel and libwebkitgtk3-devel will conflict on the gtk-doc files +%doc %{_datadir}/gtk-doc/html/webkitgtk/ %{_libdir}/libjavascriptcoregtk-%{_sonamever}.so %{_libdir}/libwebkitgtk-%{_sonamever}.so %{_libdir}/pkgconfig/javascriptcoregtk-%{_sonamever}.pc ++++++ libwebkit-fix-gtk2.patch ++++++ Index: webkit-1.7.90/Source/WebKit/gtk/tests/testwebview.c =================================================================== --- webkit-1.7.90.orig/Source/WebKit/gtk/tests/testwebview.c +++ webkit-1.7.90/Source/WebKit/gtk/tests/testwebview.c @@ -389,7 +389,11 @@ static void test_webkit_web_view_does_no GtkWidget *window = gtk_offscreen_window_new(); GtkWidget *webView = webkit_web_view_new(); GtkWidget *entry = gtk_entry_new(); +#ifdef GTK_API_VERSION_2 + GtkWidget *box = gtk_hbox_new(FALSE, 0); +#else GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); +#endif gtk_container_add(GTK_CONTAINER(box), webView); gtk_container_add(GTK_CONTAINER(box), entry); ++++++ webkit-ld-optimization.patch ++++++ Index: Source/WebKit/gtk/GNUmakefile.am =================================================================== --- Source/WebKit/gtk/GNUmakefile.am.orig +++ Source/WebKit/gtk/GNUmakefile.am @@ -78,7 +78,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ -version-info @LIBWEBKITGTK_VERSION@ \ - $(version_script) \ + $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \ $(no_undefined) libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ Index: Source/WebKit2/GNUmakefile.am =================================================================== --- Source/WebKit2/GNUmakefile.am.orig +++ Source/WebKit2/GNUmakefile.am @@ -1059,7 +1059,7 @@ endif libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ -version-info @LIBWEBKITGTK_VERSION@ \ - $(version_script) \ + $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \ $(no_undefined) libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ Index: GNUmakefile.in =================================================================== --- GNUmakefile.in.orig +++ GNUmakefile.in @@ -19150,7 +19150,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSIO libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ -version-info @LIBWEBKITGTK_VERSION@ \ - $(version_script) \ + $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \ $(no_undefined) libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ @@ -20509,7 +20509,7 @@ Programs_ImageDiff_LDFLAGS = \ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ -version-info @LIBWEBKITGTK_VERSION@ \ - $(version_script) \ + $(version_script) -Wl,--reduce-memory-overheads -Wl,--no-keep-memory \ $(no_undefined) libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ctdb for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package ctdb for openSUSE:Factory checked in at 2012-03-01 07:49:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ctdb (Old) and /work/SRC/openSUSE:Factory/.ctdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ctdb", Maintainer is "samba-maintainers(a)SuSE.de" Changes: -------- --- /work/SRC/openSUSE:Factory/ctdb/ctdb.changes 2012-02-10 17:12:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ctdb.new/ctdb.changes 2012-03-01 07:49:32.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 28 14:24:59 UTC 2012 - lmuelle(a)suse.de + +- Split the PreReq in separate lines. +- PreReq coreutils instead of fileutils. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ctdb.spec ++++++ --- /var/tmp/diff_new_pack.0z70Ko/_old 2012-03-01 07:49:34.000000000 +0100 +++ /var/tmp/diff_new_pack.0z70Ko/_new 2012-03-01 07:49:34.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Summary: Clustered TDB License: GPL-3.0+ Group: System/Daemons @@ -27,11 +28,15 @@ Source1: ctdb-sysconfig-suse.template Patch1: ctdb-socket-path.patch %if 0%{?suse_version} -PreReq: insserv %{?fillup_prereq} +PreReq: %{?fillup_prereq} +PreReq: insserv %else PreReq: /sbin/chkconfig %endif -PreReq: fileutils /bin/mktemp /usr/bin/killall sed +PreReq: coreutils +PreReq: /bin/mktemp +PreReq: /usr/bin/killall +PreReq: sed %define initdir %{_sysconfdir}/init.d BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bsf for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package bsf for openSUSE:Factory checked in at 2012-03-01 07:26:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsf (Old) and /work/SRC/openSUSE:Factory/.bsf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bsf", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bsf/bsf.changes 2011-09-23 11:42:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bsf.new/bsf.changes 2012-03-01 07:26:21.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 14:14:36 UTC 2012 - mvyskocil(a)suse.cz + +- ignore mysql-connector-java from build to break a build cycle + +------------------------------------------------------------------- Old: ---- bsf-java14compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsf.spec ++++++ --- /var/tmp/diff_new_pack.L3E8kK/_old 2012-03-01 07:26:22.000000000 +0100 +++ /var/tmp/diff_new_pack.L3E8kK/_new 2012-03-01 07:26:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bsf # -# 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,9 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # icecream 0 + %define name bsf %define version 2.3.0 %define release 8jpp @@ -26,15 +26,16 @@ BuildRequires: ant BuildRequires: java-devel BuildRequires: jython +#!BuildIgnore: mysql-connector-java BuildRequires: servletapi4 BuildRequires: xalan-j2 BuildRequires: xml-commons-apis Version: 2.3.0 -Release: 324 +Release: 0 Summary: Bean Scripting Framework License: Apache-2.0 -Url: http://jakarta.apache.org/bsf/ Group: Development/Libraries/Java +Url: http://jakarta.apache.org/bsf/ Source0: http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name… Source1: bsf-component-info.xml Source2: bsf-2.3.0.pom @@ -71,7 +72,6 @@ %package javadoc -License: Apache-2.0 PreReq: coreutils Summary: Javadoc for bsf Group: Development/Libraries/Java -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pm-utils for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-03-01 07:25:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pm-utils", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes 2012-02-16 16:23:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-03-01 07:26:20.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 28 14:45:13 UTC 2012 - mvyskocil(a)suse.cz + +- fix script 50rcnetwork error and update savestate/restorestate + functions(bnc#749031). +- obsolete pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch already in git + +------------------------------------------------------------------- Old: ---- pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2 New: ---- pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.MxKbEt/_old 2012-03-01 07:26:21.000000000 +0100 +++ /var/tmp/diff_new_pack.MxKbEt/_new 2012-03-01 07:26:21.000000000 +0100 @@ -29,7 +29,7 @@ Url: http://pm-utils.freedesktop.org/wiki/ Source0: %{name}-%{version}.tar.bz2 # http://gitorious.org/opensuse/pm-utils-suse -Source1: pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2 +Source1: pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2 Source2: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 #PATCH-FIX-OPENSUSE: fixes a dbus-send call Patch0: pm-utils-1.2.6.1-fix-broken-dbus-send.diff @@ -43,18 +43,17 @@ Patch4: pm-utils-1.3.0-suse-logging.patch #PATCH-FIX-OPENSUSE: export SUSE_IGNORE_FBMODES to workaround bnc#304995 Patch5: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch -Patch11: pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq # hooks requires some external tools -Requires: grep -Requires: sed +Requires: coreutils Requires: ethtool Requires: gawk -Requires: coreutils +Requires: grep Requires: module-init-tools +Requires: sed Requires: upower @@ -90,8 +89,6 @@ %patch3 -p1 -b .suse-grub %patch4 -p1 -b .suse-logging %patch5 -p1 -b .directfb-ignore-fbmodes -cd .. -%patch11 -p0 %build %{configure} \ ++++++ pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2 -> pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils-suse/bin/powersave new/pm-utils-suse/bin/powersave --- old/pm-utils-suse/bin/powersave 2010-09-20 13:36:41.000000000 +0200 +++ new/pm-utils-suse/bin/powersave 2012-02-28 15:43:13.000000000 +0100 @@ -54,7 +54,7 @@ continue fi # type 2 is battery - if upower_device_get_property "${DEVICE}" String:Type 2>/dev/null | grep -q "2$"; then + if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep uint | grep -q "2$"; then echo "${DEVICE}" fi done @@ -63,7 +63,7 @@ # print the ac_adapter found on system # Note: it prints the first match, as it expects only one per machine function upower_find_ac_adapter() { - for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices); do + for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices | grep -o '/org[A-Za-z0-9/_]*'); do # type 1 is Line Power if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep -q "1$"; then echo "${DEVICE}" @@ -193,20 +193,24 @@ done } +function dbus-getv { + sed -n "s#.*[ \t]*$1[0-9]*[ \t]*##p" +} + function upower_battery_info { C=1 for BATTERY in `upower_enumerate_batteries`; do - SEC=`upower_device_get_property "${BATTERY}" TimeToEmpty` + let SEC="`upower_device_get_property "${BATTERY}" string:TimeToEmpty | dbus-getv int`" if [ $SEC -ne 0 ]; then let MIN=SEC/60 else MIN=0 fi - PERC=`upower_device_get_property "${BATTERY}" Percentage` + PERC=`upower_device_get_property "${BATTERY}" string:Percentage | dbus-getv double` - case `upower_device_get_property "${BATTERY}" State` in + case `upower_device_get_property "${BATTERY}" string:State | dbus-getv uint` in 1) STATE="Charging" ;; 2) STATE="Discharging" ;; 3) STATE="Empty" ;; @@ -217,7 +221,7 @@ esac echo "Battery$C:" - echo -e "\t Remaining percent: $PERC" + echo -e "\t Remaining percent: $PERC%" echo -e "\t Remaining minutes: $MIN" echo -e "\t Charging state: $STATE" @@ -334,7 +338,7 @@ if [ $ret -ne 0 ]; then echo "CPU Frequency scaling not supported" - return ret + return $ret fi case "$governor" in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils-suse/hooks/sleep.d/05nfscheck new/pm-utils-suse/hooks/sleep.d/05nfscheck --- old/pm-utils-suse/hooks/sleep.d/05nfscheck 1970-01-01 01:00:00.000000000 +0100 +++ new/pm-utils-suse/hooks/sleep.d/05nfscheck 2012-02-28 15:43:14.000000000 +0100 @@ -0,0 +1,28 @@ +#!/bin/bash +# Abort the hibernation process of there are NFS mounts +# https://bugzilla.novell.com/show_bug.cgi?id=568132 +# Author Carlos Robinson <carlos.e.r(a)opensuse.org> + +. "${PM_FUNCTIONS}" + + +function checknfsmount() { + [ -n "`mount | grep "type nfs" | grep -v "/proc/fs/nfsd"`" ] +} + +RETVAL=0 +case "$1" in + hibernate|suspend) + if checknfsmount; then + MESSAGE="ERROR: active NFS mount found. Aborting $1 process." + command_exists logger && /bin/logger -t pm-utils -p syslog.err $MESSAGE + inhibit "${MESSAGE}" + RETVAL=1 + fi + ;; + thaw|resume) + ;; + *) exit $NA + ;; +esac +exit $RETVAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils-suse/hooks/sleep.d/50rcnetwork new/pm-utils-suse/hooks/sleep.d/50rcnetwork --- old/pm-utils-suse/hooks/sleep.d/50rcnetwork 2010-09-20 13:36:41.000000000 +0200 +++ new/pm-utils-suse/hooks/sleep.d/50rcnetwork 2012-02-28 15:43:14.000000000 +0100 @@ -16,21 +16,23 @@ [ -r /etc/sysconfig/network/config ] && . /etc/sysconfig/network/config [ -r /etc/sysconfig/network/scripts/functions ] && . /etc/sysconfig/network/scripts/functions -command_exists dhcp_clients || exit $NA - # NetworkManager is handled by 55NetworkManager, so skip this script if # nm is enabled in sysconfig ... -[ x"${NETWORKMANAGER}" -eq x"yes" ] && exit $NA +[ x"${NETWORKMANAGER}" = x"yes" ] && exit $NA # ... or if is running command_exists nm_running && nm_running && exit $NA +# check network/scripts/function provides dhcp_interfaces() +# function returning a list of interfaces with running dhcp. +command_exists dhcp_interfaces || exit $NA + case "$1" in hibernate|suspend) - save_state "dhcp_clients" "`dhcp_clients`" + savestate "dhcp_interfaces" "`dhcp_interfaces`" service network stop-all-dhcp-clients ;; thaw|resume) - for interface in `restore_state "dhcp_clients"`; do + for interface in `restorestate "dhcp_interfaces"`; do service network restart ${interface} done ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libilmbase6 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package libilmbase6 for openSUSE:Factory checked in at 2012-03-01 07:25:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libilmbase6 (Old) and /work/SRC/openSUSE:Factory/.libilmbase6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libilmbase6", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libilmbase6/libilmbase6.changes 2012-02-20 17:22:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libilmbase6.new/libilmbase6.changes 2012-03-01 07:26:18.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 16:45:02 UTC 2012 - reddwarf(a)opensuse.org + +- Link libIlmThread against lpthread, it was removed in SR#100972 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libilmbase6.spec ++++++ --- /var/tmp/diff_new_pack.MV3QcU/_old 2012-03-01 07:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.MV3QcU/_new 2012-03-01 07:26:19.000000000 +0100 @@ -85,6 +85,7 @@ %build ./bootstrap +export PTHREAD_LIBS="-lpthread" %configure --disable-static --with-pic make %{?_smp_mflags} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvoikko for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package libvoikko for openSUSE:Factory checked in at 2012-03-01 07:25:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvoikko (Old) and /work/SRC/openSUSE:Factory/.libvoikko.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvoikko", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libvoikko/libvoikko.changes 2012-02-15 16:16:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvoikko.new/libvoikko.changes 2012-03-01 07:26:17.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 28 21:28:47 CET 2012 - sbrabec(a)suse.cz + +- Upgrade to version 3.4.1: + * Many new features, improvements and bug fixes. See ChangeLog + for details. + * Handle embedded null input characters in Python and Java + interfaces. (bnc#699707) + +------------------------------------------------------------------- Old: ---- libvoikko-2.1-ac-macro-dir.diff libvoikko-2.1.tar.bz2 libvoikko-wrong-memset.patch New: ---- libvoikko-3.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvoikko.spec ++++++ --- /var/tmp/diff_new_pack.ltVs9L/_old 2012-03-01 07:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.ltVs9L/_new 2012-03-01 07:26:18.000000000 +0100 @@ -15,19 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: libvoikko -Version: 2.1 +Version: 3.4.1 Release: 0 Url: http://voikko.sourceforge.net/ Summary: Spellchecker and Hyphenator for Finnish Language License: GPL-2.0+ Group: Productivity/Text/Spell -Source: libvoikko-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/project/voikko/%{name}/%{version}/%{name}-… Source99: baselibs.conf -# PATCH-FIX-UPSTREAM libvoikko-2.1-ac-macro-dir.diff sf#2810258 pmladek(a)suse.cz -- can't run autoreconf because the m4 direcotry is neither in the source tarball nor in svn -Patch1: libvoikko-2.1-ac-macro-dir.diff -# PATCH-FIX-UPSTREAM libvoikko-wrong-memset.patch idoenmez(a)suse.de -- Fix wrong size parameter in memset call -Patch2: libvoikko-wrong-memset.patch BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: libmalaga-devel @@ -70,8 +68,6 @@ %prep %setup -q -%patch1 -%patch2 -p1 %build autoreconf -f -i -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit texlive-bin for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package texlive-bin for openSUSE:Factory checked in at 2012-03-01 07:25:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-bin (Old) and /work/SRC/openSUSE:Factory/.texlive-bin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-bin", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-bin/texlive-bin.changes 2011-12-27 18:39:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.texlive-bin.new/texlive-bin.changes 2012-03-01 07:25:46.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 10:03:17 CET 2012 - dmueller(a)suse.de + +- fix build in factory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-bin.spec ++++++ --- /var/tmp/diff_new_pack.8CbEX8/_old 2012-03-01 07:26:16.000000000 +0100 +++ /var/tmp/diff_new_pack.8CbEX8/_new 2012-03-01 07:26:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package texlive-bin # -# 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 @@ -50,6 +50,7 @@ BuildRequires: t1lib-devel BuildRequires: unzip BuildRequires: xaw3d-devel +BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-util-devel BuildRequires: xz @@ -70,10 +71,12 @@ BuildRequires: gcc%{gcc_version}-c++ %endif %if 0%{?_with_buildbiber} +BuildRequires: perl(Config::AutoConf) BuildRequires: perl(Config::General) BuildRequires: perl(Data::Compare) BuildRequires: perl(Data::Dump) BuildRequires: perl(Date::Simple) +BuildRequires: perl(ExtUtils::LibBuilder) BuildRequires: perl(File::Slurp::Unicode) BuildRequires: perl(IPC::Run3) BuildRequires: perl(LWP::Simple) @@ -81,13 +84,11 @@ BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Log::Log4perl) BuildRequires: perl(Readonly) +BuildRequires: perl(Readonly::XS) BuildRequires: perl(Regexp::Common) BuildRequires: perl(Unicode::Collate) >= 0.74 BuildRequires: perl(XML::LibXML::Simple) BuildRequires: perl(XML::LibXSLT) -BuildRequires: perl(Config::AutoConf) -BuildRequires: perl(ExtUtils::LibBuilder) -BuildRequires: perl(Readonly::XS) %endif Url: http://www.tug.org/texlive/ Summary: Binary coded programs for package texlive @@ -246,14 +247,25 @@ %package -n texlive Summary: The Base System of TeXLive Group: Productivity/Publishing/TeX/Base -Provides: TeX Dvips PicTeX +Provides: Dvips +Provides: PicTeX +Provides: TeX Requires(prereq): texlive-bin = %{version}-%{release} Requires(prereq): coreutils ed findutils grep permissions sed Requires(post): %fillup_prereq %install_info_prereq %suseconfig_fonts_prereq Requires(postun): %install_info_prereq %suseconfig_fonts_prereq Requires(interp): /usr/bin/env /usr/bin/perl -Requires: /usr/bin/clear /usr/bin/dialog /bin/ed perl-Tk perl-File-Which ghostscript_x11 cron -Obsoletes: te_pscm te_etex te_pdf tetex +Requires: /bin/ed +Requires: /usr/bin/clear +Requires: /usr/bin/dialog +Requires: cron +Requires: ghostscript_x11 +Requires: perl-File-Which +Requires: perl-Tk +Obsoletes: te_etex +Obsoletes: te_pdf +Obsoletes: te_pscm +Obsoletes: tetex Conflicts: te_eplai te_ams ntex Suggests: texlive-doc texlive-fonts-extra BuildArch: noarch @@ -321,9 +333,11 @@ Sebastian Rahtz %package -n texlive-devel -Provides: WEB Kpathsea +Provides: Kpathsea +Provides: WEB Requires(prereq): texlive-bin-devel = %{version}-%{release} -Obsoletes: te_kpath te_web +Obsoletes: te_kpath +Obsoletes: te_web Conflicts: tetex Summary: The WEB tools, the headers and library of the Kpathsea tools Group: Development/Languages/Other @@ -362,7 +376,8 @@ Requires(prereq): texlive = %{version} Requires(prereq): texlive-latex = %{version} Requires(prereq): texlive-bin-cjk = %{version}-%{release} -Obsoletes: te_ptex cjk-latex +Obsoletes: cjk-latex +Obsoletes: te_ptex Conflicts: tetex Summary: LaTeX Macro Package for CJK (Chinese/Japanese/Korean) Group: Productivity/Publishing/TeX/Base @@ -589,7 +604,8 @@ %package -n texlive-context -Provides: CONTeXT ConTeXt +Provides: CONTeXT +Provides: ConTeXt Requires(prereq): texlive = %{version} Requires(prereq): texlive-latex = %{version} Requires(interp): /usr/bin/env /usr/bin/perl /usr/bin/ruby @@ -612,7 +628,11 @@ %package -n texlive-omega -Provides: Omega Lambda Antomega Aleph Lamed +Provides: Aleph +Provides: Antomega +Provides: Lambda +Provides: Lamed +Provides: Omega Requires(prereq): texlive = %{version} Requires(prereq): texlive-latex = %{version} Requires(prereq): texlive-bin-omega = %{version}-%{release} @@ -642,7 +662,8 @@ %bin_package omega %package -n texlive-xetex -Provides: XeTeX XeLaTeX +Provides: XeLaTeX +Provides: XeTeX Requires(prereq): texlive = %{version} Requires(prereq): texlive-latex = %{version} Requires(prereq): texlive-context = %{version} @@ -701,7 +722,10 @@ Requires(prereq): texlive-bin-latex = %{version}-%{release} Requires(post): %install_info_prereq Requires(postun): %install_info_prereq -Obsoletes: te_latex latex-beamer latex-pgf latex-ucs +Obsoletes: latex-beamer +Obsoletes: latex-pgf +Obsoletes: latex-ucs +Obsoletes: te_latex Conflicts: tetex Suggests: texlive-latex-doc texlive-fonts-extra Summary: All About LaTeX @@ -754,7 +778,10 @@ %bin_package latex %package -n texlive-tools -Provides: TeX-Tools detex dviutils lacheck +Provides: TeX-Tools +Provides: detex +Provides: dviutils +Provides: lacheck %if %{with psutils} Provides: psutils %else @@ -821,7 +848,8 @@ Provides: TeX4ht Requires(prereq): texlive = %{version} Requires(prereq): texlive-bin-tex4ht = %{version}-%{release} -Requires: zip unzip +Requires: unzip +Requires: zip Conflicts: ht Summary: Convert (La)TeX to HTML/XML Group: Productivity/Publishing/TeX/Base @@ -862,7 +890,10 @@ %package -n texlive-xmltex -Provides: XmlTeX xmltex PassiveTeX passivetex +Provides: PassiveTeX +Provides: XmlTeX +Provides: passivetex +Provides: xmltex Requires(prereq): texlive = %{version} Requires(prereq): texlive-latex = %{version} Requires(prereq): texlive-bin-xmltex = %{version}-%{release} @@ -895,7 +926,8 @@ %bin_package xmltex %package -n texlive-jadetex -Provides: JadeTeX jadetex +Provides: JadeTeX +Provides: jadetex Requires(prereq): texlive = %{version} Requires(prereq): texlive-latex = %{version} Requires(prereq): texlive-bin-jadetex = %{version}-%{release} @@ -920,7 +952,9 @@ %bin_package jadetex %package -n texlive-musictex -Provides: MusiXTeX MusicTeX musictex +Provides: MusiXTeX +Provides: MusicTeX +Provides: musictex Requires(prereq): texlive = %{version} Requires(prereq): texlive-latex = %{version} Requires(prereq): texlive-bin-musictex = %{version}-%{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 apache-commons-parent for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package apache-commons-parent for openSUSE:Factory checked in at 2012-03-01 07:25:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-parent (Old) and /work/SRC/openSUSE:Factory/.apache-commons-parent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-parent", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-parent/apache-commons-parent.changes 2012-02-16 16:10:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache-commons-parent.new/apache-commons-parent.changes 2012-03-01 07:25:24.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 28 10:26:01 UTC 2012 - mvyskocil(a)suse.cz + +- add missing provides/obsoletes to package + now provides jakarta-commons-parent and commons-parent + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-parent.spec ++++++ --- /var/tmp/diff_new_pack.b6jvHS/_old 2012-03-01 07:25:25.000000000 +0100 +++ /var/tmp/diff_new_pack.b6jvHS/_new 2012-03-01 07:25:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache-commons-parent # -# 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,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _mavenpomdir %{_datadir}/maven2/poms %define base_name parent @@ -24,9 +25,9 @@ Version: 23 Release: 0 Summary: Apache Commons Parent Pom -Group: Development/Libraries/Java License: Apache-2.0 -URL: http://svn.apache.org/repos/asf/commons/proper/%{short_name}/tags/%{short_n… +Group: Development/Libraries/Java +Url: http://svn.apache.org/repos/asf/commons/proper/%{short_name}/tags/%{short_n… # svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-… # tar caf commons-parent-23.tar.xz commons-parent-23 @@ -56,6 +57,10 @@ Requires(post): jpackage-utils Requires(postun): jpackage-utils +Provides: jakarta-%{short_name} = %{version}-%{release} +Obsoletes: jakarta-%{short_name} < 23 +Provides: %{short_name} = %{version}-%{release} +Obsoletes: %{short_name} < 23 %description The Project Object Model files for the apache-commons 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 perl-libwww-perl for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package perl-libwww-perl for openSUSE:Factory checked in at 2012-03-01 07:25:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-libwww-perl (Old) and /work/SRC/openSUSE:Factory/.perl-libwww-perl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-libwww-perl", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-libwww-perl/perl-libwww-perl.changes 2011-10-18 14:37:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-libwww-perl.new/perl-libwww-perl.changes 2012-03-01 07:25:18.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 20 02:36:32 UTC 2012 - vcizek(a)suse.com + +- update to 6.04 +Gisle Aas (4): + Typo fix; envirionment [RT#72386] + Implement $ua->is_online test + Add separate option to enable the live jigsaw tests + Merge pull request #10 from trcjr/master +Theodore Robert Campbell Jr (3): + now with put and delete helpers + updated POD + unit tests for ua->put and ua->delete +Peter Rabbitson (1): + These modules work with 5.8.1 +_______________________________________________________________________________ + +------------------------------------------------------------------- Old: ---- libwww-perl-6.03.tar.gz New: ---- libwww-perl-6.04.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-libwww-perl.spec ++++++ --- /var/tmp/diff_new_pack.YpUEfW/_old 2012-03-01 07:25:20.000000000 +0100 +++ /var/tmp/diff_new_pack.YpUEfW/_new 2012-03-01 07:25:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-libwww-perl # -# 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 @@ -18,7 +18,7 @@ Name: perl-libwww-perl -Version: 6.03 +Version: 6.04 Release: 1 License: GPL-1.0+ or Artistic-1.0 %define cpan_name libwww-perl @@ -105,9 +105,6 @@ make %{?_smp_mflags} %check -mv t/live/jigsaw-chunk.t t/live/jigsaw-chunk.tt -mv t/live/jigsaw-md5.t t/live/jigsaw-md5.tt -mv t/live/jigsaw-md5-get.t t/live/jigsaw-md5-get.tt make test %install ++++++ libwww-perl-6.03.tar.gz -> libwww-perl-6.04.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/Changes new/libwww-perl-6.04/Changes --- old/libwww-perl-6.03/Changes 2011-10-15 15:28:21.000000000 +0200 +++ new/libwww-perl-6.04/Changes 2012-02-18 18:21:48.000000000 +0100 @@ -1,4 +1,24 @@ _______________________________________________________________________________ +2012-02-18 Release 6.04 + +Gisle Aas (4): + Typo fix; envirionment [RT#72386] + Implement $ua->is_online test + Add separate option to enable the live jigsaw tests + Merge pull request #10 from trcjr/master + +Theodore Robert Campbell Jr (3): + now with put and delete helpers + updated POD + unit tests for ua->put and ua->delete + +Peter Rabbitson (1): + These modules work with 5.8.1 + + + + +_______________________________________________________________________________ 2011-10-15 Release 6.03 Ville Skyttä (7): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/MANIFEST new/libwww-perl-6.04/MANIFEST --- old/libwww-perl-6.03/MANIFEST 2011-10-15 15:36:10.000000000 +0200 +++ new/libwww-perl-6.04/MANIFEST 2012-02-18 23:11:21.000000000 +0100 @@ -39,14 +39,15 @@ t/base/protocols.t Test protocol methods of LWP::UserAgent t/base/ua.t Basic LWP::UserAgent tests t/live/apache-http10.t -t/live/jigsaw-auth-b.t -t/live/jigsaw-auth-d.t -t/live/jigsaw-chunk.t -t/live/jigsaw-md5-get.t -t/live/jigsaw-md5.t -t/live/jigsaw-neg-get.t -t/live/jigsaw-neg.t -t/live/jigsaw-te.t +t/live/online.t +t/live/jigsaw/auth-b.t +t/live/jigsaw/auth-d.t +t/live/jigsaw/chunk.t +t/live/jigsaw/md5-get.t +t/live/jigsaw/md5.t +t/live/jigsaw/neg-get.t +t/live/jigsaw/neg.t +t/live/jigsaw/te.t t/local/autoload-get.t t/local/autoload.t Test autoloading of LWP::Protocol modules t/local/get.t Try to get a local file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/META.yml new/libwww-perl-6.04/META.yml --- old/libwww-perl-6.03/META.yml 2011-10-15 15:36:10.000000000 +0200 +++ new/libwww-perl-6.04/META.yml 2012-02-18 23:11:21.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: libwww-perl -version: 6.03 +version: 6.04 abstract: The World-Wide Web library for Perl author: - Gisle Aas <gisle(a)activestate.com> @@ -31,7 +31,7 @@ MIME::Base64: 2.1 Net::FTP: 2.58 Net::HTTP: 6 - perl: 5.008008 + perl: 5.008001 URI: 1.10 URI::Escape: 0 WWW::RobotRules: 6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/Makefile.PL new/libwww-perl-6.04/Makefile.PL --- old/libwww-perl-6.03/Makefile.PL 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/Makefile.PL 2012-02-18 16:04:35.000000000 +0100 @@ -1,6 +1,6 @@ #!perl -w -require 5.008008; +require 5.008001; use strict; use ExtUtils::MakeMaker; use Getopt::Long qw(GetOptions); @@ -9,8 +9,9 @@ 'aliases', 'no-programs|n', 'live-tests', + 'jigsaw-tests', ) or do { - die "Usage: $0 [--aliases] [--no-programs] [--live-tests]\n"; + die "Usage: $0 [--aliases] [--no-programs] [--live-tests] [--jigsaw-tests]\n"; }; my @prog; @@ -29,6 +30,7 @@ system($^X, "talk-to-ourself"); flag_file("t/CAN_TALK_TO_OURSELF", $? == 0); flag_file("t/live/ENABLED", $opt{'live-tests'}); +flag_file("t/live/jigsaw/ENABLED", $opt{'jigsaw-tests'}); WriteMakefile( NAME => 'LWP', @@ -38,7 +40,7 @@ AUTHOR => 'Gisle Aas <gisle(a)activestate.com>', EXE_FILES => [ map "bin/$_", @prog ], LICENSE => "perl", - MIN_PERL_VERSION => 5.008008, + MIN_PERL_VERSION => 5.008001, PREREQ_PM => { 'Digest::MD5' => 0, 'Encode' => "2.12", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/lib/LWP/UserAgent.pm new/libwww-perl-6.04/lib/LWP/UserAgent.pm --- old/libwww-perl-6.03/lib/LWP/UserAgent.pm 2011-10-15 15:30:33.000000000 +0200 +++ new/libwww-perl-6.04/lib/LWP/UserAgent.pm 2012-02-18 18:18:12.000000000 +0100 @@ -5,7 +5,7 @@ require LWP::MemberMixin; @ISA = qw(LWP::MemberMixin); -$VERSION = "6.03"; +$VERSION = "6.04"; use HTTP::Request (); use HTTP::Response (); @@ -427,6 +427,22 @@ } +sub put { + require HTTP::Request::Common; + my($self, @parameters) = @_; + my @suff = $self->_process_colonic_headers(\@parameters, (ref($parameters[1]) ? 2 : 1)); + return $self->request( HTTP::Request::Common::PUT( @parameters ), @suff ); +} + + +sub delete { + require HTTP::Request::Common; + my($self, @parameters) = @_; + my @suff = $self->_process_colonic_headers(\@parameters,1); + return $self->request( HTTP::Request::Common::DELETE( @parameters ), @suff ); +} + + sub _process_colonic_headers { # Process :content_cb / :content_file / :read_size_hint headers. my($self, $args, $start_index) = @_; @@ -476,6 +492,15 @@ return $arg; } + +sub is_online { + my $self = shift; + return 1 if $self->get("http://www.msftncsi.com/ncsi.txt")->content eq "Microsoft NCSI"; + return 1 if $self->get("http://www.apple.com")->content =~ m,<title>Apple</title>,; + return 0; +} + + my @ANI = qw(- \ | /); sub progress { @@ -1058,8 +1083,8 @@ request method the UserAgent, which dispatches it using the relevant protocol, and returns a C<HTTP::Response> object. There are convenience methods for sending the most common request types: get(), -head() and post(). When using these methods then the creation of the -request object is hidden as shown in the synopsis above. +head(), post(), put() and delete(). When using these methods then the +creation of the request object is hidden as shown in the synopsis above. The basic approach of the library is to use HTTP style communication for all protocol schemes. This means that you will construct @@ -1100,7 +1125,7 @@ The following additional options are also accepted: If the C<env_proxy> option is passed in with a TRUE value, then proxy settings are read from environment variables (see env_proxy() method below). If C<env_proxy> isn't provided the -C<PERL_LWP_ENV_PROXY> envirionment variable controls if env_proxy() is called +C<PERL_LWP_ENV_PROXY> environment variable controls if env_proxy() is called during initalization. If the C<keep_alive> option is passed in, then a C<LWP::ConnCache> is set up (see conn_cache() method below). The C<keep_alive> value is passed on as the C<total_capacity> for the connection cache. @@ -1356,7 +1381,7 @@ The no checks behaviour was the default for libwww-perl-5.837 and earlier releases. This option is initialized from the L<PERL_LWP_SSL_VERIFY_HOSTNAME> environment -variable. If this envirionment variable isn't set; then C<verify_hostname> +variable. If this environment variable isn't set; then C<verify_hostname> defaults to 1. =item C<SSL_ca_file> => $path @@ -1641,6 +1666,38 @@ to build the request. See L<HTTP::Request::Common> for a details on how to pass form content and other advanced features. +=item $ua->put( $url, \%form ) + +=item $ua->put( $url, \@form ) + +=item $ua->put( $url, \%form, $field_name => $value, ... ) + +=item $ua->put( $url, $field_name => $value,... Content => \%form ) + +=item $ua->put( $url, $field_name => $value,... Content => \@form ) + +=item $ua->put( $url, $field_name => $value,... Content => $content ) + +This method will dispatch a C<PUT> request on the given $url, with +%form or @form providing the key/value pairs for the fill-in form +content. Additional headers and content options are the same as for +the get() method. + +This method will use the PUT() function from C<HTTP::Request::Common> +to build the request. See L<HTTP::Request::Common> for a details on +how to pass form content and other advanced features. + +=item $ua->delete( $url ) + +=item $ua->delete( $url, $field_name => $value, ... ) + +This method will dispatch a C<DELETE> request on the given $url. Additional +headers and content options are the same as for the get() method. + +This method will use the DELETE() function from C<HTTP::Request::Common> +to build the request. See L<HTTP::Request::Common> for a details on +how to pass form content and other advanced features. + =item $ua->mirror( $url, $filename ) This method will get the document identified by $url and store it in @@ -1700,6 +1757,12 @@ handle redirects or authentication responses. The request() method will in fact invoke this method for each simple request it sends. +=item $ua->is_online + +Tries to determine if you have access to the Internet. Returns +TRUE if the built-in heuristics determine that the user agent is +able to access the Internet (over HTTP). See also L<LWP::Online>. + =item $ua->is_protocol_supported( $scheme ) You can use this method to test whether this user agent object supports the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/lib/LWP.pm new/libwww-perl-6.04/lib/LWP.pm --- old/libwww-perl-6.03/lib/LWP.pm 2011-10-15 15:29:01.000000000 +0200 +++ new/libwww-perl-6.04/lib/LWP.pm 2012-02-18 18:17:18.000000000 +0100 @@ -1,6 +1,6 @@ package LWP; -$VERSION = "6.03"; +$VERSION = "6.04"; sub Version { $VERSION; } require 5.008; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/TEST new/libwww-perl-6.04/t/TEST --- old/libwww-perl-6.03/t/TEST 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/TEST 2012-02-18 16:04:06.000000000 +0100 @@ -38,6 +38,7 @@ else { @tests = (<base/*.t>, <html/*.t>, <robot/*.t>, <local/*.t>); push(@tests, <live/*.t>) if -f "live/ENABLED"; + push(@tests, <live/jigsaw/*.t>) if -f "live/jigsaw/ENABLED"; push(@tests, <net/*.t>) if -f "net/config.pl"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw/auth-b.t new/libwww-perl-6.04/t/live/jigsaw/auth-b.t --- old/libwww-perl-6.03/t/live/jigsaw/auth-b.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/jigsaw/auth-b.t 2012-01-14 01:25:46.000000000 +0100 @@ -0,0 +1,53 @@ +use strict; +use Test; + +plan tests => 5; + +use LWP::UserAgent; + +my $ua = LWP::UserAgent->new(keep_alive => 1); + +my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/Basic/"); + +my $res = $ua->request($req); + +#print $res->as_string; + +ok($res->code, 401); + +$req->authorization_basic('guest', 'guest'); +$res = $ua->simple_request($req); + +print $req->as_string, "\n"; + +#print $res->as_string; +ok($res->code, 200); +ok($res->content =~ /Your browser made it!/); + +{ + package MyUA; + use vars qw(@ISA); + @ISA = qw(LWP::UserAgent); + + my @try = (['foo', 'bar'], ['', ''], ['guest', ''], ['guest', 'guest']); + + sub get_basic_credentials { + my($self,$realm, $uri, $proxy) = @_; + #print "$realm/$uri/$proxy\n"; + my $p = shift @try; + #print join("/", @$p), "\n"; + return @$p; + } + +} + +$ua = MyUA->new(keep_alive => 1); + +$req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/Basic/"); +$res = $ua->request($req); + +#print $res->as_string; + +ok($res->content =~ /Your browser made it!/); +ok($res->header("Client-Response-Num"), 5); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw/auth-d.t new/libwww-perl-6.04/t/live/jigsaw/auth-d.t --- old/libwww-perl-6.03/t/live/jigsaw/auth-d.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/jigsaw/auth-d.t 2012-01-14 01:25:46.000000000 +0100 @@ -0,0 +1,33 @@ +use strict; +use Test; + +plan tests => 2; + +use LWP::UserAgent; + +{ + package MyUA; + use vars qw(@ISA); + @ISA = qw(LWP::UserAgent); + + my @try = (['foo', 'bar'], ['', ''], ['guest', ''], ['guest', 'guest']); + + sub get_basic_credentials { + my($self,$realm, $uri, $proxy) = @_; + print "$realm:$uri:$proxy => "; + my $p = shift @try; + print join("/", @$p), "\n"; + return @$p; + } + +} + +my $ua = MyUA->new(keep_alive => 1); + +my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/Digest/"); +my $res = $ua->request($req); + +#print $res->as_string; + +ok($res->content =~ /Your browser made it!/); +ok($res->header("Client-Response-Num"), 5); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw/chunk.t new/libwww-perl-6.04/t/live/jigsaw/chunk.t --- old/libwww-perl-6.03/t/live/jigsaw/chunk.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/jigsaw/chunk.t 2012-01-14 01:25:46.000000000 +0100 @@ -0,0 +1,37 @@ +print "1..5\n"; + +use strict; +use LWP::UserAgent; + +my $ua = LWP::UserAgent->new(keep_alive => 1); + +my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/ChunkedScript"); +my $res = $ua->request($req); + +print "not " unless $res->is_success && $res->content_type eq "text/plain"; +print "ok 1\n"; + +print "not " unless $res->header("Client-Transfer-Encoding") eq "chunked"; +print "ok 2\n"; + +for (${$res->content_ref}) { + s/\015?\012/\n/g; + /Below this line, is 1000 repeated lines of 0-9/ || die; + s/^.*?-----+\n//s; + + my @lines = split(/^/); + print "not " if @lines != 1000; + print "ok 3\n"; + + # check that all lines are the same + my $first = shift(@lines); + my $no_they_are_not; + for (@lines) { + $no_they_are_not++ if $_ ne $first; + } + print "not " if $no_they_are_not; + print "ok 4\n"; + + print "not " unless $first =~ /^\d+$/; + print "ok 5\n"; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw/md5-get.t new/libwww-perl-6.04/t/live/jigsaw/md5-get.t --- old/libwww-perl-6.03/t/live/jigsaw/md5-get.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/jigsaw/md5-get.t 2012-01-14 01:25:46.000000000 +0100 @@ -0,0 +1,29 @@ +print "1..2\n"; + +use strict; +use LWP::UserAgent; + +my $ua = LWP::UserAgent->new(keep_alive => 1); + +my $res = $ua->get( + "http://jigsaw.w3.org/HTTP/h-content-md5.html", + "TE" => "deflate", +); + +use Digest::MD5 qw(md5_base64); +print "not " unless $res->header("Content-MD5") eq md5_base64($res->content) . "=="; +print "ok 1\n"; + +print $res->as_string; + +my $etag = $res->header("etag"); + +$res = $ua->get( + "http://jigsaw.w3.org/HTTP/h-content-md5.html", + "TE" => "deflate", + "If-None-Match" => $etag, +); +print $res->as_string; + +print "not " unless $res->code eq "304" && $res->header("Client-Response-Num") == 2; +print "ok 2\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw/md5.t new/libwww-perl-6.04/t/live/jigsaw/md5.t --- old/libwww-perl-6.03/t/live/jigsaw/md5.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/jigsaw/md5.t 2012-01-14 01:25:46.000000000 +0100 @@ -0,0 +1,26 @@ +print "1..2\n"; + +use strict; +use LWP::UserAgent; + +my $ua = LWP::UserAgent->new(keep_alive => 1); + +my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/h-content-md5.html"); +$req->header("TE", "deflate"); + +my $res = $ua->request($req); + +use Digest::MD5 qw(md5_base64); +print "not " unless $res->header("Content-MD5") eq md5_base64($res->content) . "=="; +print "ok 1\n"; + +print $res->as_string; + +my $etag = $res->header("etag"); +$req->header("If-None-Match" => $etag); + +$res = $ua->request($req); +print $res->as_string; + +print "not " unless $res->code eq "304" && $res->header("Client-Response-Num") == 2; +print "ok 2\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw/neg-get.t new/libwww-perl-6.04/t/live/jigsaw/neg-get.t --- old/libwww-perl-6.03/t/live/jigsaw/neg-get.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/jigsaw/neg-get.t 2012-01-14 01:25:46.000000000 +0100 @@ -0,0 +1,16 @@ +print "1..1\n"; + +use strict; +use LWP::UserAgent; + +my $ua = LWP::UserAgent->new(keep_alive => 1); + +my $res = $ua->get( + "http://jigsaw.w3.org/HTTP/neg", + Connection => "close", +); + +print $res->as_string, "\n"; + +print "not " unless $res->code == 300; +print "ok 1\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw/neg.t new/libwww-perl-6.04/t/live/jigsaw/neg.t --- old/libwww-perl-6.03/t/live/jigsaw/neg.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/jigsaw/neg.t 2012-01-14 01:25:46.000000000 +0100 @@ -0,0 +1,15 @@ +print "1..1\n"; + +use strict; +use LWP::UserAgent; + +my $ua = LWP::UserAgent->new(keep_alive => 1); + +my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/neg"); +$req->header(Connection => "close"); +my $res = $ua->request($req); + +print $res->as_string, "\n"; + +print "not " unless $res->code == 300; +print "ok 1\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw/te.t new/libwww-perl-6.04/t/live/jigsaw/te.t --- old/libwww-perl-6.03/t/live/jigsaw/te.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/jigsaw/te.t 2012-01-14 01:25:46.000000000 +0100 @@ -0,0 +1,33 @@ +#!perl -w + +print "1..4\n"; + +use strict; +use LWP::UserAgent; + +my $ua = LWP::UserAgent->new(keep_alive => 1); + + +my $content; +my $testno = 1; + +for my $te (undef, "", "deflate", "gzip", "trailers, deflate;q=0.4, identity;q=0.1") { + my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/TE/foo.txt"); + if (defined $te) { + $req->header(TE => $te); + $req->header(Connection => "TE"); + } + print $req->as_string; + + my $res = $ua->request($req); + if (defined $content) { + print "not " unless $content eq $res->content; + print "ok $testno\n\n"; + $testno++; + } + else { + $content = $res->content; + } + $res->content(""); + print $res->as_string; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw-auth-b.t new/libwww-perl-6.04/t/live/jigsaw-auth-b.t --- old/libwww-perl-6.03/t/live/jigsaw-auth-b.t 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/live/jigsaw-auth-b.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -use strict; -use Test; - -plan tests => 5; - -use LWP::UserAgent; - -my $ua = LWP::UserAgent->new(keep_alive => 1); - -my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/Basic/"); - -my $res = $ua->request($req); - -#print $res->as_string; - -ok($res->code, 401); - -$req->authorization_basic('guest', 'guest'); -$res = $ua->simple_request($req); - -print $req->as_string, "\n"; - -#print $res->as_string; -ok($res->code, 200); -ok($res->content =~ /Your browser made it!/); - -{ - package MyUA; - use vars qw(@ISA); - @ISA = qw(LWP::UserAgent); - - my @try = (['foo', 'bar'], ['', ''], ['guest', ''], ['guest', 'guest']); - - sub get_basic_credentials { - my($self,$realm, $uri, $proxy) = @_; - #print "$realm/$uri/$proxy\n"; - my $p = shift @try; - #print join("/", @$p), "\n"; - return @$p; - } - -} - -$ua = MyUA->new(keep_alive => 1); - -$req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/Basic/"); -$res = $ua->request($req); - -#print $res->as_string; - -ok($res->content =~ /Your browser made it!/); -ok($res->header("Client-Response-Num"), 5); - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw-auth-d.t new/libwww-perl-6.04/t/live/jigsaw-auth-d.t --- old/libwww-perl-6.03/t/live/jigsaw-auth-d.t 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/live/jigsaw-auth-d.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -use strict; -use Test; - -plan tests => 2; - -use LWP::UserAgent; - -{ - package MyUA; - use vars qw(@ISA); - @ISA = qw(LWP::UserAgent); - - my @try = (['foo', 'bar'], ['', ''], ['guest', ''], ['guest', 'guest']); - - sub get_basic_credentials { - my($self,$realm, $uri, $proxy) = @_; - print "$realm:$uri:$proxy => "; - my $p = shift @try; - print join("/", @$p), "\n"; - return @$p; - } - -} - -my $ua = MyUA->new(keep_alive => 1); - -my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/Digest/"); -my $res = $ua->request($req); - -#print $res->as_string; - -ok($res->content =~ /Your browser made it!/); -ok($res->header("Client-Response-Num"), 5); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw-chunk.t new/libwww-perl-6.04/t/live/jigsaw-chunk.t --- old/libwww-perl-6.03/t/live/jigsaw-chunk.t 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/live/jigsaw-chunk.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -print "1..5\n"; - -use strict; -use LWP::UserAgent; - -my $ua = LWP::UserAgent->new(keep_alive => 1); - -my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/ChunkedScript"); -my $res = $ua->request($req); - -print "not " unless $res->is_success && $res->content_type eq "text/plain"; -print "ok 1\n"; - -print "not " unless $res->header("Client-Transfer-Encoding") eq "chunked"; -print "ok 2\n"; - -for (${$res->content_ref}) { - s/\015?\012/\n/g; - /Below this line, is 1000 repeated lines of 0-9/ || die; - s/^.*?-----+\n//s; - - my @lines = split(/^/); - print "not " if @lines != 1000; - print "ok 3\n"; - - # check that all lines are the same - my $first = shift(@lines); - my $no_they_are_not; - for (@lines) { - $no_they_are_not++ if $_ ne $first; - } - print "not " if $no_they_are_not; - print "ok 4\n"; - - print "not " unless $first =~ /^\d+$/; - print "ok 5\n"; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw-md5-get.t new/libwww-perl-6.04/t/live/jigsaw-md5-get.t --- old/libwww-perl-6.03/t/live/jigsaw-md5-get.t 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/live/jigsaw-md5-get.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -print "1..2\n"; - -use strict; -use LWP::UserAgent; - -my $ua = LWP::UserAgent->new(keep_alive => 1); - -my $res = $ua->get( - "http://jigsaw.w3.org/HTTP/h-content-md5.html", - "TE" => "deflate", -); - -use Digest::MD5 qw(md5_base64); -print "not " unless $res->header("Content-MD5") eq md5_base64($res->content) . "=="; -print "ok 1\n"; - -print $res->as_string; - -my $etag = $res->header("etag"); - -$res = $ua->get( - "http://jigsaw.w3.org/HTTP/h-content-md5.html", - "TE" => "deflate", - "If-None-Match" => $etag, -); -print $res->as_string; - -print "not " unless $res->code eq "304" && $res->header("Client-Response-Num") == 2; -print "ok 2\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw-md5.t new/libwww-perl-6.04/t/live/jigsaw-md5.t --- old/libwww-perl-6.03/t/live/jigsaw-md5.t 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/live/jigsaw-md5.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -print "1..2\n"; - -use strict; -use LWP::UserAgent; - -my $ua = LWP::UserAgent->new(keep_alive => 1); - -my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/h-content-md5.html"); -$req->header("TE", "deflate"); - -my $res = $ua->request($req); - -use Digest::MD5 qw(md5_base64); -print "not " unless $res->header("Content-MD5") eq md5_base64($res->content) . "=="; -print "ok 1\n"; - -print $res->as_string; - -my $etag = $res->header("etag"); -$req->header("If-None-Match" => $etag); - -$res = $ua->request($req); -print $res->as_string; - -print "not " unless $res->code eq "304" && $res->header("Client-Response-Num") == 2; -print "ok 2\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw-neg-get.t new/libwww-perl-6.04/t/live/jigsaw-neg-get.t --- old/libwww-perl-6.03/t/live/jigsaw-neg-get.t 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/live/jigsaw-neg-get.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -print "1..1\n"; - -use strict; -use LWP::UserAgent; - -my $ua = LWP::UserAgent->new(keep_alive => 1); - -my $res = $ua->get( - "http://jigsaw.w3.org/HTTP/neg", - Connection => "close", -); - -print $res->as_string, "\n"; - -print "not " unless $res->code == 300; -print "ok 1\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw-neg.t new/libwww-perl-6.04/t/live/jigsaw-neg.t --- old/libwww-perl-6.03/t/live/jigsaw-neg.t 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/live/jigsaw-neg.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -print "1..1\n"; - -use strict; -use LWP::UserAgent; - -my $ua = LWP::UserAgent->new(keep_alive => 1); - -my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/neg"); -$req->header(Connection => "close"); -my $res = $ua->request($req); - -print $res->as_string, "\n"; - -print "not " unless $res->code == 300; -print "ok 1\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/jigsaw-te.t new/libwww-perl-6.04/t/live/jigsaw-te.t --- old/libwww-perl-6.03/t/live/jigsaw-te.t 2011-04-09 12:21:10.000000000 +0200 +++ new/libwww-perl-6.04/t/live/jigsaw-te.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -#!perl -w - -print "1..4\n"; - -use strict; -use LWP::UserAgent; - -my $ua = LWP::UserAgent->new(keep_alive => 1); - - -my $content; -my $testno = 1; - -for my $te (undef, "", "deflate", "gzip", "trailers, deflate;q=0.4, identity;q=0.1") { - my $req = HTTP::Request->new(GET => "http://jigsaw.w3.org/HTTP/TE/foo.txt"); - if (defined $te) { - $req->header(TE => $te); - $req->header(Connection => "TE"); - } - print $req->as_string; - - my $res = $ua->request($req); - if (defined $content) { - print "not " unless $content eq $res->content; - print "ok $testno\n\n"; - $testno++; - } - else { - $content = $res->content; - } - $res->content(""); - print $res->as_string; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/live/online.t new/libwww-perl-6.04/t/live/online.t --- old/libwww-perl-6.03/t/live/online.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.04/t/live/online.t 2012-02-18 15:52:49.000000000 +0100 @@ -0,0 +1,13 @@ +#!perl -w + +use strict; +use Test; +plan tests => 2; + +use LWP::UserAgent; +my $ua = LWP::UserAgent->new; + +ok $ua->is_online; + +$ua->protocols_allowed([]); +ok !$ua->is_online; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.03/t/local/http.t new/libwww-perl-6.04/t/local/http.t --- old/libwww-perl-6.03/t/local/http.t 2011-10-15 11:05:50.000000000 +0200 +++ new/libwww-perl-6.04/t/local/http.t 2012-02-18 16:35:09.000000000 +0100 @@ -49,8 +49,8 @@ open(DAEMON, "$perl local/http.t daemon |") or die "Can't exec daemon: $!"; } -use Test; -plan tests => 54; +use Test::More; +plan tests => 59; my $greeting = <DAEMON>; $greeting =~ /(<[^>]+>)/; @@ -77,9 +77,9 @@ $req->header(X_Foo => "Bar"); $res = $ua->request($req); -ok($res->is_error); -ok($res->code, 404); -ok($res->message, qr/not\s+found/i); +ok($res->is_error, 'is_error'); +is($res->code, 404, 'response code 404'); +like($res->message, qr/not\s+found/i, '404 message'); # we also expect a few headers ok($res->server); ok($res->date); @@ -110,23 +110,23 @@ #print $res->as_string; ok($res->is_success); -ok($res->code, 200); -ok($res->message, "OK"); +is($res->code, 200, 'status code 200'); +is($res->message, "OK", 'message OK'); $_ = $res->content; @accept = /^Accept:\s*(.*)/mg; -ok($_, qr/^From:\s*gisle\@aas\.no\n/m); -ok($_, qr/^Host:/m); -ok(@accept, 3); -ok($_, qr/^Accept:\s*text\/html/m); -ok($_, qr/^Accept:\s*text\/plain/m); -ok($_, qr/^Accept:\s*image\/\*/m); -ok($_, qr/^If-Modified-Since:\s*\w{3},\s+\d+/m); -ok($_, qr/^Long-Text:\s*This.*broken between/m); -ok($_, qr/^Foo-Bar:\s*1\n/m); -ok($_, qr/^X-Foo:\s*Bar\n/m); -ok($_, qr/^User-Agent:\s*Mozilla\/0.01/m); +like($_, qr/^From:\s*gisle\@aas\.no\n/m); +like($_, qr/^Host:/m); +is(@accept, 3, '3 items in accept'); +like($_, qr/^Accept:\s*text\/html/m); +like($_, qr/^Accept:\s*text\/plain/m); +like($_, qr/^Accept:\s*image\/\*/m); +like($_, qr/^If-Modified-Since:\s*\w{3},\s+\d+/m); +like($_, qr/^Long-Text:\s*This.*broken between/m); +like($_, qr/^Foo-Bar:\s*1\n/m); +like($_, qr/^X-Foo:\s*Bar\n/m); +like($_, qr/^User-Agent:\s*Mozilla\/0.01/m); # Try it with the higher level 'get' interface $res = $ua->get(url("/echo/path_info?query", $base), @@ -136,7 +136,50 @@ X_Foo => "Bar", ); #$res->dump; -ok($res->code, 200); +is($res->code, 200, 'response code 200'); + +#---------------------------------------------------------------- +print "UserAgent->put...\n"; +sub httpd_put_echo +{ + my($c, $req) = @_; + $c->send_basic_header(200); + print $c "Content-Type: message/http\015\012"; + $c->send_crlf; + print $c $req->as_string; +} +ok($res->content, qr/^From: gisle\(a)aas.no$/m); +# Try it with the higher level 'get' interface +$res = $ua->put(url("/echo/path_info?query", $base), + Accept => 'text/html', + Accept => 'text/plain; q=0.9', + Accept => 'image/*', + X_Foo => "Bar", +); +#$res->dump; +is($res->code, 200, 'response code 200'); +ok($res->content, qr/^From: gisle\(a)aas.no$/m); + +#---------------------------------------------------------------- +print "UserAgent->delete...\n"; +sub httpd_delete_echo +{ + my($c, $req) = @_; + $c->send_basic_header(200); + print $c "Content-Type: message/http\015\012"; + $c->send_crlf; + print $c $req->as_string; +} +ok($res->content, qr/^From: gisle\(a)aas.no$/m); +# Try it with the higher level 'get' interface +$res = $ua->delete(url("/echo/path_info?query", $base), + Accept => 'text/html', + Accept => 'text/plain; q=0.9', + Accept => 'image/*', + X_Foo => "Bar", +); +#$res->dump; +is($res->code, 200, 'response code 200'); ok($res->content, qr/^From: gisle\(a)aas.no$/m); #---------------------------------------------------------------- @@ -168,7 +211,7 @@ ok($res->is_success); ok($res->content_type, 'text/html'); -ok($res->content_length, 147); +is($res->content_length, 147, '147 content length'); ok($res->title, 'En pr�ve'); ok($res->content, qr/� v�re/); @@ -176,13 +219,13 @@ $res = $ua->request($req); #print $res->as_string; ok($res->is_error); -ok($res->code, 404); # not found - +is($res->code, 404, 'response code 404'); # not found + # Then try to list current directory $req = new HTTP::Request GET => url("/file?name=.", $base); $res = $ua->request($req); #print $res->as_string; -ok($res->code, 501); # NYI +is($res->code, 501, 'response code 501'); # NYI #---------------------------------------------------------------- @@ -200,7 +243,7 @@ ok($res->is_success); ok($res->content, qr|/echo/redirect|); ok($res->previous->is_redirect); -ok($res->previous->code, 301); +is($res->previous->code, 301, 'response code 301'); # Let's test a redirect loop too sub httpd_get_redirect2 { shift->send_redirect("/redirect3/") } @@ -212,12 +255,12 @@ #print $res->as_string; ok($res->is_redirect); ok($res->header("Client-Warning"), qr/loop detected/i); -ok($res->redirects, 5); +is($res->redirects, 5, '5 max redirects'); $ua->max_redirect(0); $res = $ua->request($req); -ok($res->previous, undef); -ok($res->redirects, 0); +is($res->previous, undef, 'undefined previous'); +is($res->redirects, 0, 'zero redirects'); $ua->max_redirect(5); #---------------------------------------------------------------- @@ -262,7 +305,7 @@ # Let's try with a $ua that does not pass out credentials $res = $ua->request($req); -ok($res->code, 401); +is($res->code, 401, 'respone code 401'); # Let's try to set credentials for this realm $ua->credentials($req->uri->host_port, "libwww-perl", "ok 12", "xyzzy"); @@ -272,7 +315,7 @@ # Then illegal credentials $ua->credentials($req->uri->host_port, "libwww-perl", "user", "passwd"); $res = $ua->request($req); -ok($res->code, 401); +is($res->code, 401, 'response code 401'); #---------------------------------------------------------------- @@ -378,5 +421,5 @@ $req = new HTTP::Request GET => url("/quit", $base); $res = $ua->request($req); -ok($res->code, 503); +is($res->code, 503, 'response code is 503'); ok($res->content, qr/Bye, bye/); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit krb5 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2012-03-01 07:25:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krb5", Maintainer is "mc(a)suse.com" Changes: -------- krb5-mini.changes: same change --- /work/SRC/openSUSE:Factory/krb5/krb5.changes 2012-02-15 16:16:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5.changes 2012-03-01 07:25:14.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 26 22:23:15 UTC 2012 - stefan.bruens(a)rwth-aachen.de + +- add autoconf macro to devel subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-doc.spec ++++++ --- /var/tmp/diff_new_pack.FJRq85/_old 2012-03-01 07:25:16.000000000 +0100 +++ /var/tmp/diff_new_pack.FJRq85/_new 2012-03-01 07:25:16.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: krb5-doc BuildRequires: ghostscript-library BuildRequires: latex2html ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.FJRq85/_old 2012-03-01 07:25:16.000000000 +0100 +++ /var/tmp/diff_new_pack.FJRq85/_new 2012-03-01 07:25:16.000000000 +0100 @@ -282,6 +282,9 @@ cd .. # Munge the krb5-config script to remove rpaths and CFLAGS. sed "s|^CC_LINK=.*|CC_LINK='\$(CC) \$(PROG_LIBPATH)'|g" src/krb5-config > $RPM_BUILD_ROOT/usr/lib/mit/bin/krb5-config +# install autoconf macro +mkdir -p %{buildroot}/%{_datadir}/aclocal +install -m 644 src/util/ac_check_krb5.m4 %{buildroot}%{_datadir}/aclocal/ # install sample config files # I'll probably do something about this later on mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir}/lib/kerberos/krb5kdc @@ -389,6 +392,7 @@ %dir /usr/lib/mit %dir /usr/lib/mit/bin %dir /usr/lib/mit/sbin +%dir %{_datadir}/aclocal %{_libdir}/libgssrpc.so %{_libdir}/libk5crypto.so %{_libdir}/libkadm5clnt_mit.so @@ -403,6 +407,7 @@ /usr/lib/mit/sbin/krb5-send-pr %{_mandir}/man1/krb5-send-pr.1* %{_mandir}/man1/krb5-config.1* +%{_datadir}/aclocal/ac_check_krb5.m4 %if %{build_mini} %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 ConsoleKit for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package ConsoleKit for openSUSE:Factory checked in at 2012-03-01 07:25:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ConsoleKit (Old) and /work/SRC/openSUSE:Factory/.ConsoleKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ConsoleKit", Maintainer is "hmacht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ConsoleKit/ConsoleKit-doc.changes 2011-10-28 19:21:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ConsoleKit.new/ConsoleKit-doc.changes 2012-03-01 07:25:07.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Feb 27 13:44:03 UTC 2012 - vuntz(a)opensuse.org + +- Fix systemd-related packaging: + + Add systemd-devel BuildRequires. + + Use %{?systemd_requires}. + + Stop passing --with-systemdsystemunitdir to configure: we'll + just use the right default value, which should be %{_unitdir}. + + Call %service_{add,del}_* macros in scriptlets for + console-kit-daemon.service. + + Note that we don't call those macros for + console-kit-log-system-{restart,start,stop}.service since those + services are used in specific cases only. + +------------------------------------------------------------------- ConsoleKit.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.IyK6cq/_old 2012-03-01 07:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.IyK6cq/_new 2012-03-01 07:25:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ConsoleKit-doc # -# 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: ConsoleKit-doc %define build_doc 1 %define pkg_name ConsoleKit @@ -27,22 +26,25 @@ BuildRequires: dbus-1-glib-devel BuildRequires: libtool BuildRequires: pam-devel -BuildRequires: xorg-x11-libX11-devel +BuildRequires: pkgconfig BuildRequires: polkit-devel +BuildRequires: systemd-devel +BuildRequires: xorg-x11-libX11-devel BuildRequires: zlib-devel -BuildRequires: pkgconfig %if %build_doc -BuildRequires: gtk2-devel xmlto +BuildRequires: gtk2-devel +BuildRequires: xmlto Provides: ConsoleKit:/usr/share/doc/packages/ConsoleKit/spec/ConcoleKit.html %endif Summary: System daemon for tracking users, sessions and seats -Version: 0.4.5 -Release: 1 License: GPL-2.0+ Group: System/Daemons +Version: 0.4.5 +Release: 0 Source: %{pkg_name}-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %if %build_doc == 0 PreReq: pwdutils login PreReq: pam-config >= 0.22 @@ -56,19 +58,18 @@ %if !%{build_doc} %package -n ConsoleKit-devel -License: GPL-2.0+ Summary: Developer package for ConsoleKit -Requires: %{pkg_name} = %{version}-%{release}, dbus-1-devel Group: Development/Libraries/Other +Requires: %{pkg_name} = %{version}-%{release} +Requires: dbus-1-devel %description -n ConsoleKit-devel Developer package for ConsoleKit and libck-connector %package -n ConsoleKit-x11 -License: GPL-2.0+ Summary: System daemon for tracking users, sessions and seats -Requires: %{pkg_name} = %{version}-%{release} Group: System/Daemons +Requires: %{pkg_name} = %{version}-%{release} Supplements: packageand(xorg-x11:ConsoleKit) %description -n ConsoleKit-x11 @@ -93,7 +94,6 @@ --enable-pam-module \ --with-pam-module-dir=/%_lib/security \ --localstatedir=%{_localstatedir} \ - --with-systemdsystemunitdir=/lib/systemd/system \ %if %{build_doc} --enable-docbook-docs \ %endif @@ -127,15 +127,23 @@ %endif %if !%{build_doc} +%pre +%service_add_pre console-kit-daemon.service + %post /sbin/ldconfig +%service_add_post console-kit-daemon.service if [ -n "$YAST_IS_RUNNING" ]; then /usr/sbin/pam-config --service login -a -f --ck_connector else /usr/sbin/pam-config --service login -a --ck_connector || echo "please call \"/usr/sbin/pam-config --service login -a --ck_connector\" manually" fi +%preun +%service_del_preun console-kit-daemon.service + %postun +%service_del_postun console-kit-daemon.service # make sure this is not called on update if [ "$1" = 0 ]; then /usr/sbin/pam-config --service login -d --ck_connector ||: @@ -172,8 +180,15 @@ %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml -/lib/systemd/system/console-kit-*.service -/lib/systemd/system/*.target.wants +%{_unitdir}/console-kit-daemon.service +%{_unitdir}/console-kit-log-system-restart.service +%{_unitdir}/console-kit-log-system-start.service +%{_unitdir}/console-kit-log-system-stop.service +%{_unitdir}/basic.target.wants/console-kit-log-system-start.service +%{_unitdir}/halt.target.wants/console-kit-log-system-stop.service +%{_unitdir}/kexec.target.wants/console-kit-log-system-restart.service +%{_unitdir}/poweroff.target.wants/console-kit-log-system-stop.service +%{_unitdir}/reboot.target.wants/console-kit-log-system-restart.service %files -n ConsoleKit-devel %defattr(-,root,root) ++++++ ConsoleKit.spec ++++++ --- /var/tmp/diff_new_pack.IyK6cq/_old 2012-03-01 07:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.IyK6cq/_new 2012-03-01 07:25:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ConsoleKit # -# 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: ConsoleKit %define build_doc 0 %define pkg_name ConsoleKit @@ -27,22 +26,25 @@ BuildRequires: dbus-1-glib-devel BuildRequires: libtool BuildRequires: pam-devel -BuildRequires: xorg-x11-libX11-devel +BuildRequires: pkgconfig BuildRequires: polkit-devel +BuildRequires: systemd-devel +BuildRequires: xorg-x11-libX11-devel BuildRequires: zlib-devel -BuildRequires: pkgconfig %if %build_doc -BuildRequires: gtk2-devel xmlto +BuildRequires: gtk2-devel +BuildRequires: xmlto Provides: ConsoleKit:/usr/share/doc/packages/ConsoleKit/spec/ConcoleKit.html %endif Summary: System daemon for tracking users, sessions and seats -Version: 0.4.5 -Release: 1 License: GPL-2.0+ Group: System/Daemons +Version: 0.4.5 +Release: 0 Source: %{pkg_name}-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %if %build_doc == 0 PreReq: pwdutils login PreReq: pam-config >= 0.22 @@ -56,19 +58,18 @@ %if !%{build_doc} %package -n ConsoleKit-devel -License: GPL-2.0+ Summary: Developer package for ConsoleKit -Requires: %{pkg_name} = %{version}-%{release}, dbus-1-devel Group: Development/Libraries/Other +Requires: %{pkg_name} = %{version}-%{release} +Requires: dbus-1-devel %description -n ConsoleKit-devel Developer package for ConsoleKit and libck-connector %package -n ConsoleKit-x11 -License: GPL-2.0+ Summary: System daemon for tracking users, sessions and seats -Requires: %{pkg_name} = %{version}-%{release} Group: System/Daemons +Requires: %{pkg_name} = %{version}-%{release} Supplements: packageand(xorg-x11:ConsoleKit) %description -n ConsoleKit-x11 @@ -93,7 +94,6 @@ --enable-pam-module \ --with-pam-module-dir=/%_lib/security \ --localstatedir=%{_localstatedir} \ - --with-systemdsystemunitdir=/lib/systemd/system \ %if %{build_doc} --enable-docbook-docs \ %endif @@ -127,15 +127,23 @@ %endif %if !%{build_doc} +%pre +%service_add_pre console-kit-daemon.service + %post /sbin/ldconfig +%service_add_post console-kit-daemon.service if [ -n "$YAST_IS_RUNNING" ]; then /usr/sbin/pam-config --service login -a -f --ck_connector else /usr/sbin/pam-config --service login -a --ck_connector || echo "please call \"/usr/sbin/pam-config --service login -a --ck_connector\" manually" fi +%preun +%service_del_preun console-kit-daemon.service + %postun +%service_del_postun console-kit-daemon.service # make sure this is not called on update if [ "$1" = 0 ]; then /usr/sbin/pam-config --service login -d --ck_connector ||: @@ -172,8 +180,15 @@ %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml -/lib/systemd/system/console-kit-*.service -/lib/systemd/system/*.target.wants +%{_unitdir}/console-kit-daemon.service +%{_unitdir}/console-kit-log-system-restart.service +%{_unitdir}/console-kit-log-system-start.service +%{_unitdir}/console-kit-log-system-stop.service +%{_unitdir}/basic.target.wants/console-kit-log-system-start.service +%{_unitdir}/halt.target.wants/console-kit-log-system-stop.service +%{_unitdir}/kexec.target.wants/console-kit-log-system-restart.service +%{_unitdir}/poweroff.target.wants/console-kit-log-system-stop.service +%{_unitdir}/reboot.target.wants/console-kit-log-system-restart.service %files -n ConsoleKit-devel %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 NetworkManager for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2012-03-01 07:25:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2012-01-06 11:46:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2012-03-01 07:25:03.000000000 +0100 @@ -1,0 +2,46 @@ +Thu Feb 23 12:44:10 UTC 2012 - vuntz(a)opensuse.org + +- Get ready for full-switch to systemd: + + Add a with_systemd macro, currently set to 0 as the systemd + support implies no support for ConsoleKit, which we want to + keep until sysvinit is not supported anymore. + + Add pkgconfig(libsystemd-login) BuildRequires and pass + --with-session-tracking=systemd to configure if we build + systemd support. +- Move to libnl3: + + Remove pkgconfig(libnl-1) BuildRequires. + + Add pkgconfig() BuildRequires: libnl-3.0, libnl-genl-3.0, + libnl-route-3.0. +- Remove libiw-devel BuildRequires: it's not needed anymore. +- Stop changing libexecdir to %{_prefix}/lib/NetworkManager: there + is no need for this. + +------------------------------------------------------------------- +Sat Feb 18 16:10:10 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.9.3.990: + + Better handling of WiFi devices via nl80211 when available + (instead of WEXT) + + IP configuration is now non-blocking; waiting for IPv6 RA no + longer blocks the device from activating if IPv4 is ready and + vice versa + + Addded support for firewall "zones" via FirewallD + + Added basic support for bonded interfaces + + WiFi connections are no longer locked to a specific MAC address + if they are "locally administered" addresses (ie, 02:::::) + + New state change reasons have been added for mobile broadband + PIN errors + + Agent-owned secrets are now sent to agents for newly created + connections + + Support for non-UTF8-encoded 802.1x passwords has been added + + libnm-glib now fetches some properties more aggressively (like + active connections, access points, etc) + + Added basic support for IP-over-Infiniband interfaces + + Added support for device plugins and converted WiMAX support to + a plugin for easier packaging and simpler dependencies + + Added support for VLAN interfaces + + Added support for 802.1x EAP-FAST authentication + + Added non-blocking mode and API to libnm-glib +- Rebased systemd-network-config.patch. + +------------------------------------------------------------------- Old: ---- NetworkManager-0.9.2.0.tar.bz2 New: ---- NetworkManager-0.9.3.990.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.X5toze/_old 2012-03-01 07:25:07.000000000 +0100 +++ /var/tmp/diff_new_pack.X5toze/_new 2012-03-01 07:25:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package NetworkManager # -# 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,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +# We cannot enable systemd support right now, as it is exclusive and means we +# lose ConsoleKit support (bad for sysvinit) +%define with_systemd 0 + Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ -Version: 0.9.2.0 +Version: 0.9.3.990 Release: 0 Summary: Network Link Manager and User Applications License: GPL-2.0+ Group: Productivity/Networking/System -Source0: http://download.gnome.org/sources/NetworkManager/0.9/%{name}-%{version}.tar… +Source0: http://download.gnome.org/sources/NetworkManager/0.9/%{name}-%{version}.tar… Source1: nfs Source2: NetworkManager.conf Source3: baselibs.conf @@ -40,7 +45,6 @@ BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: iptables -BuildRequires: libiw-devel BuildRequires: libtool BuildRequires: ppp-devel BuildRequires: translation-update-upstream @@ -52,7 +56,12 @@ # We should get lib Intel Wimax in here! Remove --disable-wimax # from configure when we have it. #BuildRequires: pkgconfig(libiWmxSdk-0) -BuildRequires: pkgconfig(libnl-1) +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-genl-3.0) +BuildRequires: pkgconfig(libnl-route-3.0) +%if %{with_systemd} +BuildRequires: pkgconfig(libsystemd-login) +%endif BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(systemd) @@ -86,11 +95,11 @@ Summary: Libraries and headers for adding NetworkManager support to applications Group: Development/Libraries/Other Requires: %{name} = %{version} -Requires: libnm-util2 = %{version} -Requires: libnm-glib4 = %{version} Requires: libnm-glib-vpn1 = %{version} -Requires: typelib-1_0-NetworkManager-1_0 = %{version} +Requires: libnm-glib4 = %{version} +Requires: libnm-util2 = %{version} Requires: typelib-1_0-NMClient-1_0 = %{version} +Requires: typelib-1_0-NetworkManager-1_0 = %{version} Provides: %{name}-doc = %{version} Obsoletes: %{name}-doc < %{version} @@ -160,7 +169,6 @@ test -n "$pppddir" || exit 1 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ - --libexecdir=%{_prefix}/lib/NetworkManager\ --disable-static\ --with-crypto=nss \ --with-distro=suse\ @@ -168,6 +176,9 @@ --enable-more-warnings=no \ --with-pppd-plugin-dir=$pppddir \ --with-dhclient=/sbin/dhclient \ +%if %{with_systemd} + --with-session-tracking=systemd \ +%endif --disable-wimax %__make %{?_smp_mflags} @@ -230,17 +241,14 @@ %doc %{_mandir}/man5/NetworkManager.conf.5* %doc %{_mandir}/man5/nm-system-settings.conf.5* %doc %{_mandir}/man8/NetworkManager.* -# On 64-bit biarch systems, the libraries go to /usr/lib64/NetworkManager, -# and libexec-y things remain in /usr/lib/NetworkManager. -# Whereas on single-arch or 32-bit biarch, everything goes into -# /usr/lib/NetworkManager. -%ifarch x86_64 ppc64 s390x sparc64 %{_libdir}/NetworkManager/ -%endif %dir %{_libdir}/pppd/2.4.5 %{_libdir}/pppd/2.4.5/nm-pppd-plugin.* -%{_libexecdir}/NetworkManager/ -%{_sysconfdir}/dbus-1/system.d/NetworkManager.conf +%{_libexecdir}/nm-avahi-autoipd.action +%{_libexecdir}/nm-crash-logger +%{_libexecdir}/nm-dhcp-client.action +%{_libexecdir}/nm-dispatcher.action +%{_sysconfdir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf @@ -250,8 +258,8 @@ %dir %{_sysconfdir}/NetworkManager/system-connections %config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf %attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/nfs -/lib/systemd/system/NetworkManager.service -/lib/systemd/system/NetworkManager-wait-online.service +%{_unitdir}/NetworkManager.service +%{_unitdir}/NetworkManager-wait-online.service %dir /lib/udev %dir /lib/udev/rules.d /lib/udev/rules.d/77-nm-olpc-mesh.rules ++++++ systemd-network-config.patch ++++++ --- /var/tmp/diff_new_pack.X5toze/_old 2012-03-01 07:25:07.000000000 +0100 +++ /var/tmp/diff_new_pack.X5toze/_new 2012-03-01 07:25:07.000000000 +0100 @@ -1,8 +1,8 @@ -Index: NetworkManager-0.9.1.90/data/NetworkManager.service.in +Index: NetworkManager-0.9.3.990/data/NetworkManager.service.in =================================================================== ---- NetworkManager-0.9.1.90.orig/data/NetworkManager.service.in -+++ NetworkManager-0.9.1.90/data/NetworkManager.service.in -@@ -1,14 +1,15 @@ +--- NetworkManager-0.9.3.990.orig/data/NetworkManager.service.in ++++ NetworkManager-0.9.3.990/data/NetworkManager.service.in +@@ -1,13 +1,14 @@ [Unit] Description=Network Manager After=syslog.target @@ -16,15 +16,19 @@ ExecStart=@sbindir@/NetworkManager --no-daemon +EnvironmentFile=/etc/sysconfig/network/config +ExecStartPre=/usr/bin/test "x${NETWORKMANAGER}" = xyes + # Suppress stderr to eliminate duplicated messages in syslog. NM calls openlog() + # with LOG_PERROR when run in foreground. But systemd redirects stderr to + # syslog by default, which results in logging each message twice. +@@ -15,4 +16,4 @@ StandardError=null [Install] WantedBy=multi-user.target -Alias=dbus-org.freedesktop.NetworkManager.service +Also=NetworkManager-wait-online.service -Index: NetworkManager-0.9.1.90/data/NetworkManager-wait-online.service.in +Index: NetworkManager-0.9.3.990/data/NetworkManager-wait-online.service.in =================================================================== ---- NetworkManager-0.9.1.90.orig/data/NetworkManager-wait-online.service.in -+++ NetworkManager-0.9.1.90/data/NetworkManager-wait-online.service.in +--- NetworkManager-0.9.3.990.orig/data/NetworkManager-wait-online.service.in ++++ NetworkManager-0.9.3.990/data/NetworkManager-wait-online.service.in @@ -7,7 +7,9 @@ Before=network.target [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 colord for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package colord for openSUSE:Factory checked in at 2012-03-01 07:24:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colord (Old) and /work/SRC/openSUSE:Factory/.colord.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "colord", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/colord/colord.changes 2012-01-25 11:07:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.colord.new/colord.changes 2012-03-01 07:24:59.000000000 +0100 @@ -1,0 +2,29 @@ +Mon Feb 27 13:24:10 UTC 2012 - vuntz(a)opensuse.org + +- Fix systemd-related packaging: + + Use %{?systemd_requires}. + + Call %service_{add,del}_* macros in scriptlets for + colord.service. + +------------------------------------------------------------------- +Thu Feb 23 07:51:54 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.1.17: + + New Features: + - Add an LED sample type + - Add a metadata key to store the calibration brightness + - Show the profile title when using colormgr get-profiles + + Bugfixes: + - Add PrivateNetwork and PrivateTmp to the systemd service file + - Don't leak a GVariantIter when setting the device metadata + - Fix a critical warning if a client tries to get the profile + metadata + - Fix InstallSystemWide() when running as the colord user + - Increase the colorhug sample timeout to 5 seconds + - Make underscores into spaces for the profile title + - Return from cd_profile_has_access() with TRUE for virtual + profiles +- Remove xz BuildRequires now that it comes for free in the build + system. + +------------------------------------------------------------------- Old: ---- colord-0.1.16.tar.xz New: ---- colord-0.1.17.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colord.spec ++++++ --- /var/tmp/diff_new_pack.iw8Cim/_old 2012-03-01 07:25:00.000000000 +0100 +++ /var/tmp/diff_new_pack.iw8Cim/_new 2012-03-01 07:25:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: colord -Version: 0.1.16 +Version: 0.1.17 Release: 0 Summary: System Daemon for Managing Color Devices License: GPL-2.0+ @@ -29,8 +29,6 @@ BuildRequires: intltool BuildRequires: sane-backends-devel BuildRequires: vala -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) @@ -47,6 +45,7 @@ Requires: shared-color-profiles Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %description colord is a system activated daemon that maps devices to color profiles. @@ -112,12 +111,23 @@ %find_lang %{name} %pre +%service_add_pre colord.service +# Create colord user getent group colord >/dev/null || groupadd -r colord getent passwd colord >/dev/null || useradd -r -g colord -d %{_localstatedir}/lib/colord -s /sbin/nologin -c "user for colord" colord # Fix ownership of /var/lib/colord from first packages (in 12.1) test ! -d %{_localstatedir}/lib/colord || chown -R colord:colord %{_localstatedir}/lib/colord exit 0 +%post +%service_add_post colord.service + +%preun +%service_del_preun colord.service + +%postun +%service_del_postun colord.service + %post -n libcolord1 -p /sbin/ldconfig %postun -n libcolord1 -p /sbin/ldconfig @@ -125,7 +135,7 @@ %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -/lib/systemd/system/colord.service +%{_unitdir}/colord.service /lib/udev/rules.d/*.rules %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord %config(noreplace) %{_sysconfdir}/%{name}.conf -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit avahi for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package avahi for openSUSE:Factory checked in at 2012-03-01 07:24:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avahi (Old) and /work/SRC/openSUSE:Factory/.avahi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "avahi", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- avahi-mono.changes: same change avahi-qt4.changes: same change --- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2012-02-17 12:00:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi.changes 2012-03-01 07:24:55.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 27 13:34:33 UTC 2012 - vuntz(a)opensuse.org + +- Stop passing --with-systemdsystemunitdir to configure: we'll just + use the right default value, which should be %{_unitdir}. +- Change systemd BuildRequires to systemd-devel since this is + needed to get that default value in configure. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.2c1Q8l/_old 2012-03-01 07:24:57.000000000 +0100 +++ /var/tmp/diff_new_pack.2c1Q8l/_new 2012-03-01 07:24:57.000000000 +0100 @@ -106,7 +106,7 @@ BuildRequires: python-gdbm BuildRequires: zlib-devel %if %suse_version >= 1210 -BuildRequires: systemd +BuildRequires: systemd-devel %endif # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -125,17 +125,17 @@ BuildRequires: gobject-introspection-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel +BuildRequires: libavahi-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files -BuildRequires: libavahi-devel %endif %if %build_qt3 -BuildRequires: qt3-devel BuildRequires: libavahi-devel +BuildRequires: qt3-devel %endif %if %build_qt4 -BuildRequires: libqt4-devel BuildRequires: libavahi-devel +BuildRequires: libqt4-devel %endif %if %build_mono BuildRequires: gtk-sharp2 @@ -143,7 +143,11 @@ BuildRequires: mono-devel BuildRequires: monodoc-core # Please copy this line to avahi-mono definition below for build all-in-once: -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} +Requires: gtk-sharp2 +Requires: libavahi-client3 >= %{version} +Requires: libavahi-common3 >= %{version} +Requires: libavahi-glib1 >= %{version} +Requires: libavahi-ui0 >= %{version} %endif %description @@ -275,7 +279,11 @@ Summary: A set of Avahi utilities written in Python Group: Development/Languages/Python PreReq: coreutils -Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web +Requires: %{name} = %{version} +Requires: dbus-1-python +Requires: python-gdbm +Requires: python-twisted +Requires: python-twisted-web # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -316,7 +324,12 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ # -Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Requires: %{_name} = %{version} +Requires: dbus-1-devel +Requires: glibc-devel +Requires: libavahi-client3 = %{version} +Requires: libavahi-common3 = %{version} +Requires: libavahi-core7 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} @@ -337,7 +350,8 @@ %package compat-mDNSResponder-devel Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libdns_sd = %{version} +Requires: libavahi-devel = %{version} +Requires: libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -359,7 +373,8 @@ %package compat-howl-devel Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libhowl0 = %{version} +Requires: libavahi-devel = %{version} +Requires: libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -498,7 +513,8 @@ Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python PreReq: coreutils -Requires: python-avahi = %{version} python-gtk +Requires: python-avahi = %{version} +Requires: python-gtk # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -524,8 +540,8 @@ Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} -Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} +Requires: libavahi-ui0 = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -548,7 +564,10 @@ %package -n libavahi-gobject-devel Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons -Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel +Requires: glib2-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-glib-devel +Requires: libavahi-gobject0 = %{version} %description -n libavahi-gobject-devel Avahi is an implementation of the DNS Service Discovery and Multicast @@ -593,7 +612,9 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-qt3-1 = %{version} +Requires: qt3-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt3.so @@ -640,7 +661,9 @@ %package -n libavahi-qt4-devel Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-qt4-1 = %{version} +Requires: libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -666,7 +689,11 @@ %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: Development/Languages/Mono -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} +Requires: gtk-sharp2 +Requires: libavahi-client3 >= %{version} +Requires: libavahi-common3 >= %{version} +Requires: libavahi-glib1 >= %{version} +Requires: libavahi-ui0 >= %{version} %description -n avahi-mono This package provides Mono bindings for avahi. Avahi is an @@ -717,7 +744,6 @@ --libexecdir=%{_prefix}/lib\ --disable-static\ --with-distro=suse\ - --with-systemdsystemunitdir=/lib/systemd/system\ %if %build_core --enable-compat-libdns_sd\ --enable-compat-howl\ @@ -1024,9 +1050,9 @@ %{_sysconfdir}/init.d/avahi-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service -/lib/systemd/system/avahi-daemon.service -/lib/systemd/system/avahi-daemon.socket -/lib/systemd/system/avahi-dnsconfd.service +%{_unitdir}/avahi-daemon.service +%{_unitdir}/avahi-daemon.socket +%{_unitdir}/avahi-dnsconfd.service # Common file for avahi-utils-gtk and python-avahi-gtk: %dir %{_datadir}/avahi/ %{_datadir}/avahi/interfaces ++++++ avahi-mono.spec ++++++ --- /var/tmp/diff_new_pack.2c1Q8l/_old 2012-03-01 07:24:57.000000000 +0100 +++ /var/tmp/diff_new_pack.2c1Q8l/_new 2012-03-01 07:24:57.000000000 +0100 @@ -106,7 +106,7 @@ BuildRequires: python-gdbm BuildRequires: zlib-devel %if %suse_version >= 1210 -BuildRequires: systemd +BuildRequires: systemd-devel %endif # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -125,17 +125,17 @@ BuildRequires: gobject-introspection-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel +BuildRequires: libavahi-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files -BuildRequires: libavahi-devel %endif %if %build_qt3 -BuildRequires: qt3-devel BuildRequires: libavahi-devel +BuildRequires: qt3-devel %endif %if %build_qt4 -BuildRequires: libqt4-devel BuildRequires: libavahi-devel +BuildRequires: libqt4-devel %endif %if %build_mono BuildRequires: gtk-sharp2 @@ -143,7 +143,11 @@ BuildRequires: mono-devel BuildRequires: monodoc-core # Please copy this line to avahi-mono definition below for build all-in-once: -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} +Requires: gtk-sharp2 +Requires: libavahi-client3 >= %{version} +Requires: libavahi-common3 >= %{version} +Requires: libavahi-glib1 >= %{version} +Requires: libavahi-ui0 >= %{version} %endif %description @@ -274,7 +278,11 @@ Summary: A set of Avahi utilities written in Python Group: Development/Languages/Python PreReq: coreutils -Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web +Requires: %{name} = %{version} +Requires: dbus-1-python +Requires: python-gdbm +Requires: python-twisted +Requires: python-twisted-web # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -315,7 +323,12 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ # -Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Requires: %{_name} = %{version} +Requires: dbus-1-devel +Requires: glibc-devel +Requires: libavahi-client3 = %{version} +Requires: libavahi-common3 = %{version} +Requires: libavahi-core7 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} @@ -336,7 +349,8 @@ %package compat-mDNSResponder-devel Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libdns_sd = %{version} +Requires: libavahi-devel = %{version} +Requires: libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -358,7 +372,8 @@ %package compat-howl-devel Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libhowl0 = %{version} +Requires: libavahi-devel = %{version} +Requires: libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -497,7 +512,8 @@ Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python PreReq: coreutils -Requires: python-avahi = %{version} python-gtk +Requires: python-avahi = %{version} +Requires: python-gtk # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -523,8 +539,8 @@ Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} -Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} +Requires: libavahi-ui0 = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -547,7 +563,10 @@ %package -n libavahi-gobject-devel Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons -Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel +Requires: glib2-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-glib-devel +Requires: libavahi-gobject0 = %{version} %description -n libavahi-gobject-devel Avahi is an implementation of the DNS Service Discovery and Multicast @@ -592,7 +611,9 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-qt3-1 = %{version} +Requires: qt3-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt3.so @@ -639,7 +660,9 @@ %package -n libavahi-qt4-devel Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-qt4-1 = %{version} +Requires: libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -665,7 +688,11 @@ %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: Development/Languages/Mono -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} +Requires: gtk-sharp2 +Requires: libavahi-client3 >= %{version} +Requires: libavahi-common3 >= %{version} +Requires: libavahi-glib1 >= %{version} +Requires: libavahi-ui0 >= %{version} %description -n avahi-mono This package provides Mono bindings for avahi. Avahi is an @@ -716,7 +743,6 @@ --libexecdir=%{_prefix}/lib\ --disable-static\ --with-distro=suse\ - --with-systemdsystemunitdir=/lib/systemd/system\ %if %build_core --enable-compat-libdns_sd\ --enable-compat-howl\ @@ -1023,9 +1049,9 @@ %{_sysconfdir}/init.d/avahi-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service -/lib/systemd/system/avahi-daemon.service -/lib/systemd/system/avahi-daemon.socket -/lib/systemd/system/avahi-dnsconfd.service +%{_unitdir}/avahi-daemon.service +%{_unitdir}/avahi-daemon.socket +%{_unitdir}/avahi-dnsconfd.service # Common file for avahi-utils-gtk and python-avahi-gtk: %dir %{_datadir}/avahi/ %{_datadir}/avahi/interfaces ++++++ avahi-qt4.spec ++++++ --- /var/tmp/diff_new_pack.2c1Q8l/_old 2012-03-01 07:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.2c1Q8l/_new 2012-03-01 07:24:58.000000000 +0100 @@ -106,7 +106,7 @@ BuildRequires: python-gdbm BuildRequires: zlib-devel %if %suse_version >= 1210 -BuildRequires: systemd +BuildRequires: systemd-devel %endif # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -125,17 +125,17 @@ BuildRequires: gobject-introspection-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel +BuildRequires: libavahi-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files -BuildRequires: libavahi-devel %endif %if %build_qt3 -BuildRequires: qt3-devel BuildRequires: libavahi-devel +BuildRequires: qt3-devel %endif %if %build_qt4 -BuildRequires: libqt4-devel BuildRequires: libavahi-devel +BuildRequires: libqt4-devel %endif %if %build_mono BuildRequires: gtk-sharp2 @@ -143,7 +143,11 @@ BuildRequires: mono-devel BuildRequires: monodoc-core # Please copy this line to avahi-mono definition below for build all-in-once: -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} +Requires: gtk-sharp2 +Requires: libavahi-client3 >= %{version} +Requires: libavahi-common3 >= %{version} +Requires: libavahi-glib1 >= %{version} +Requires: libavahi-ui0 >= %{version} %endif %description @@ -277,7 +281,11 @@ Summary: A set of Avahi utilities written in Python Group: Development/Languages/Python PreReq: coreutils -Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web +Requires: %{name} = %{version} +Requires: dbus-1-python +Requires: python-gdbm +Requires: python-twisted +Requires: python-twisted-web # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -318,7 +326,12 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ # -Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Requires: %{_name} = %{version} +Requires: dbus-1-devel +Requires: glibc-devel +Requires: libavahi-client3 = %{version} +Requires: libavahi-common3 = %{version} +Requires: libavahi-core7 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} @@ -339,7 +352,8 @@ %package compat-mDNSResponder-devel Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libdns_sd = %{version} +Requires: libavahi-devel = %{version} +Requires: libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -361,7 +375,8 @@ %package compat-howl-devel Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libhowl0 = %{version} +Requires: libavahi-devel = %{version} +Requires: libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -500,7 +515,8 @@ Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python PreReq: coreutils -Requires: python-avahi = %{version} python-gtk +Requires: python-avahi = %{version} +Requires: python-gtk # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -526,8 +542,8 @@ Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} -Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} +Requires: libavahi-ui0 = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -550,7 +566,10 @@ %package -n libavahi-gobject-devel Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons -Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel +Requires: glib2-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-glib-devel +Requires: libavahi-gobject0 = %{version} %description -n libavahi-gobject-devel Avahi is an implementation of the DNS Service Discovery and Multicast @@ -595,7 +614,9 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-qt3-1 = %{version} +Requires: qt3-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt3.so @@ -642,7 +663,9 @@ %package -n libavahi-qt4-devel Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-qt4-1 = %{version} +Requires: libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -668,7 +691,11 @@ %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: Development/Languages/Mono -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} +Requires: gtk-sharp2 +Requires: libavahi-client3 >= %{version} +Requires: libavahi-common3 >= %{version} +Requires: libavahi-glib1 >= %{version} +Requires: libavahi-ui0 >= %{version} %description -n avahi-mono This package provides Mono bindings for avahi. Avahi is an @@ -719,7 +746,6 @@ --libexecdir=%{_prefix}/lib\ --disable-static\ --with-distro=suse\ - --with-systemdsystemunitdir=/lib/systemd/system\ %if %build_core --enable-compat-libdns_sd\ --enable-compat-howl\ @@ -1026,9 +1052,9 @@ %{_sysconfdir}/init.d/avahi-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service -/lib/systemd/system/avahi-daemon.service -/lib/systemd/system/avahi-daemon.socket -/lib/systemd/system/avahi-dnsconfd.service +%{_unitdir}/avahi-daemon.service +%{_unitdir}/avahi-daemon.socket +%{_unitdir}/avahi-dnsconfd.service # Common file for avahi-utils-gtk and python-avahi-gtk: %dir %{_datadir}/avahi/ %{_datadir}/avahi/interfaces ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.2c1Q8l/_old 2012-03-01 07:24:58.000000000 +0100 +++ /var/tmp/diff_new_pack.2c1Q8l/_new 2012-03-01 07:24:58.000000000 +0100 @@ -108,7 +108,7 @@ BuildRequires: python-gdbm BuildRequires: zlib-devel %if %suse_version >= 1210 -BuildRequires: systemd +BuildRequires: systemd-devel %endif # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -127,17 +127,17 @@ BuildRequires: gobject-introspection-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel +BuildRequires: libavahi-devel BuildRequires: python-gtk-devel BuildRequires: update-desktop-files -BuildRequires: libavahi-devel %endif %if %build_qt3 -BuildRequires: qt3-devel BuildRequires: libavahi-devel +BuildRequires: qt3-devel %endif %if %build_qt4 -BuildRequires: libqt4-devel BuildRequires: libavahi-devel +BuildRequires: libqt4-devel %endif %if %build_mono BuildRequires: gtk-sharp2 @@ -145,7 +145,11 @@ BuildRequires: mono-devel BuildRequires: monodoc-core # Please copy this line to avahi-mono definition below for build all-in-once: -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} +Requires: gtk-sharp2 +Requires: libavahi-client3 >= %{version} +Requires: libavahi-common3 >= %{version} +Requires: libavahi-glib1 >= %{version} +Requires: libavahi-ui0 >= %{version} %endif %description @@ -277,7 +281,11 @@ Summary: A set of Avahi utilities written in Python Group: Development/Languages/Python PreReq: coreutils -Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web +Requires: %{name} = %{version} +Requires: dbus-1-python +Requires: python-gdbm +Requires: python-twisted +Requires: python-twisted-web # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -318,7 +326,12 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ # -Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel +Requires: %{_name} = %{version} +Requires: dbus-1-devel +Requires: glibc-devel +Requires: libavahi-client3 = %{version} +Requires: libavahi-common3 = %{version} +Requires: libavahi-core7 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} @@ -339,7 +352,8 @@ %package compat-mDNSResponder-devel Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libdns_sd = %{version} +Requires: libavahi-devel = %{version} +Requires: libdns_sd = %{version} Provides: mDNSResponder-devel = 107.5 Obsoletes: mDNSResponder-devel < 107.5 @@ -361,7 +375,8 @@ %package compat-howl-devel Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libhowl0 = %{version} +Requires: libavahi-devel = %{version} +Requires: libhowl0 = %{version} %description compat-howl-devel Howl compatibility layer for avahi. @@ -500,7 +515,8 @@ Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python PreReq: coreutils -Requires: python-avahi = %{version} python-gtk +Requires: python-avahi = %{version} +Requires: python-gtk # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -526,8 +542,8 @@ Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} -Requires: libavahi-ui0 = %{version} Requires: libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version} +Requires: libavahi-ui0 = %{version} Requires: typelib-1_0-Avahi-0_6 = %{version} # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-glib.so @@ -550,7 +566,10 @@ %package -n libavahi-gobject-devel Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons -Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel +Requires: glib2-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-glib-devel +Requires: libavahi-gobject0 = %{version} %description -n libavahi-gobject-devel Avahi is an implementation of the DNS Service Discovery and Multicast @@ -595,7 +614,9 @@ Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-qt3-1 = %{version} +Requires: qt3-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt3.so @@ -642,7 +663,9 @@ %package -n libavahi-qt4-devel Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel +Requires: libavahi-devel = %{version} +Requires: libavahi-qt4-1 = %{version} +Requires: libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: avahi-devel:%{_libdir}/libavahi-qt4.so @@ -668,7 +691,11 @@ %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: Development/Languages/Mono -Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} +Requires: gtk-sharp2 +Requires: libavahi-client3 >= %{version} +Requires: libavahi-common3 >= %{version} +Requires: libavahi-glib1 >= %{version} +Requires: libavahi-ui0 >= %{version} %description -n avahi-mono This package provides Mono bindings for avahi. Avahi is an @@ -719,7 +746,6 @@ --libexecdir=%{_prefix}/lib\ --disable-static\ --with-distro=suse\ - --with-systemdsystemunitdir=/lib/systemd/system\ %if %build_core --enable-compat-libdns_sd\ --enable-compat-howl\ @@ -1026,9 +1052,9 @@ %{_sysconfdir}/init.d/avahi-daemon %{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service -/lib/systemd/system/avahi-daemon.service -/lib/systemd/system/avahi-daemon.socket -/lib/systemd/system/avahi-dnsconfd.service +%{_unitdir}/avahi-daemon.service +%{_unitdir}/avahi-daemon.socket +%{_unitdir}/avahi-dnsconfd.service # Common file for avahi-utils-gtk and python-avahi-gtk: %dir %{_datadir}/avahi/ %{_datadir}/avahi/interfaces -- 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 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package gconf2 for openSUSE:Factory checked in at 2012-03-01 07:24:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gconf2 (Old) and /work/SRC/openSUSE:Factory/.gconf2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gconf2", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gconf2/gconf2.changes 2012-02-16 16:13:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gconf2.new/gconf2.changes 2012-03-01 07:24:48.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 27 15:55:27 UTC 2012 - fcrozat(a)suse.com + +- Add gconf2-fix-crash-sync-shutdown.patch: fix crash during + syncing is done if gconfd is shutting down (bgo#670033). + +------------------------------------------------------------------- New: ---- gconf2-fix-crash-sync-shutdown.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2.spec ++++++ --- /var/tmp/diff_new_pack.CFOjgD/_old 2012-03-01 07:24:50.000000000 +0100 +++ /var/tmp/diff_new_pack.CFOjgD/_new 2012-03-01 07:24:50.000000000 +0100 @@ -47,6 +47,8 @@ Patch4: gconf2-sabayon.patch # PATCH-FIX-OPENSUSE gconf2-pk-default-path.patch vuntz(a)novell.com -- Use the right gconf path for the defaults in the pk helper Patch5: gconf2-pk-default-path.patch +# PATCH-FIX-UPSTREAM gconf2-fix-crash-sync-dbus.patch bgo#670033 fcrozat(a)suse.com -- Fix crash during sync if gconfd is shutting down +Patch6: gconf2-fix-crash-sync-shutdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang = %{version} @@ -109,6 +111,7 @@ %patch3 %patch4 %patch5 -p1 +%patch6 -p1 cp -a %{S:1} %{S:2} . %build ++++++ gconf2-fix-crash-sync-shutdown.patch ++++++ >From 6f3e127330cb0820a373be77be3cb2cacd0b352e Mon Sep 17 00:00:00 2001 From: Ray Strode <rstrode(a)redhat.com> Date: Mon, 13 Feb 2012 23:35:06 -0500 Subject: [PATCH] gconf-dbus: don't crash during sync if gconfd shutting down The gconfd shuts down after a bit of inactivity. When that happens there's a window where it refuses requests from the client library with an error. The library is resposible for gracefully handling this condition and reacting appropriately. There are many places in the code where the client library has this idiom: db = gconf_engine_get_database (conf, TRUE, err); if (db == NULL) { g_return_if_fail(err == NULL || *err != NULL); return; } In the event gconfd is shutting down, db will be NULL, and the code will return early from whatever (non-critical) operation it was doing. gconf_engine_suggest_sync has a similiar chunk of code, but it neglected the "return;" and then promptly crashed since it wasn't expecting db to be NULL. This commit adds the return; https://bugzilla.gnome.org/show_bug.cgi?id=670033 --- gconf/gconf-dbus.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c index 9f92125..442a94b 100644 --- a/gconf/gconf-dbus.c +++ b/gconf/gconf-dbus.c @@ -2029,6 +2029,7 @@ gconf_engine_suggest_sync(GConfEngine* conf, GError** err) if (db == NULL) { g_return_if_fail (err == NULL || *err != NULL); + return; } message = dbus_message_new_method_call (GCONF_DBUS_SERVICE, -- 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 stgit for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package stgit for openSUSE:Factory checked in at 2012-03-01 07:22:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stgit (Old) and /work/SRC/openSUSE:Factory/.stgit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stgit", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/stgit/stgit.changes 2011-09-23 12:46:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.stgit.new/stgit.changes 2012-03-01 07:22:03.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Feb 28 12:58:45 CET 2012 - tiwai(a)suse.de + +- updated to version 0.16: + * Several improvements to the Emacs mode (stgit.el). + * UI adjustments to better match the Git commands. + * "stg status" is an alias for "git status". + * "stg reset --hard" behaves similarly to the corresponding git + command and option. + * "stg branch --cleanup" option to remove the StGit metadata for + a given branch. + * "stg mail" can use "git send-email" directly. + * Vim syntax highlighting for StGit commit messages. + * Many bug-fixes. + +------------------------------------------------------------------- Old: ---- stgit-0.14.3.tar.bz2 stgit-doc-install-fix.diff New: ---- stgit-0.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stgit.spec ++++++ --- /var/tmp/diff_new_pack.FXmjJF/_old 2012-03-01 07:22:04.000000000 +0100 +++ /var/tmp/diff_new_pack.FXmjJF/_new 2012-03-01 07:22:04.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package stgit (Version 0.14.3) +# spec file for package stgit # -# Copyright (c) 2009 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,21 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: stgit -BuildRequires: asciidoc git-core python-devel xmlto +BuildRequires: asciidoc +BuildRequires: git-core +BuildRequires: python-devel +BuildRequires: xmlto Summary: Stacked GIT - Source Code Management Tool -Version: 0.14.3 -Release: 72 License: GPL-2.0+ Group: Development/Tools/Version Control +Version: 0.16 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.procode.org/stgit -Source: %{name}-%{version}.tar.bz2 -Patch: stgit-doc-install-fix.diff -Requires: git-core python +Source: %{name}-%{version}.tar.gz +Requires: git-core +Requires: python %py_requires %if %suse_version > 1110 BuildArch: noarch @@ -44,22 +45,21 @@ %prep %setup -q -%patch %build -make -make doc +make prefix=%{_prefix} +make doc prefix=%{_prefix} %install -make PREFIX=%{_prefix} DESTDIR="$RPM_BUILD_ROOT" install -make -C Documentation PREFIX=%{_prefix} mandir=%{_mandir} DESTDIR="$RPM_BUILD_ROOT" install +make prefix=%{_prefix} DESTDIR="$RPM_BUILD_ROOT" install +make -C Documentation prefix=%{_prefix} mandir=%{_mandir} DESTDIR="$RPM_BUILD_ROOT" install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING README TODO +%doc %attr(644,root,root) AUTHORS ChangeLog COPYING README TODO %doc %{_mandir}/man?/* %{_bindir}/* %if %suse_version > 1110 -- 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_Text_Flowed for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Text_Flowed for openSUSE:Factory checked in at 2012-03-01 07:21:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Text_Flowed (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Text_Flowed.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Text_Flowed", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Text_Flowed/php5-pear-Horde_Text_Flowed.changes 2011-09-23 12:40:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Text_Flowed.new/php5-pear-Horde_Text_Flowed.changes 2012-03-01 07:21:54.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 14 19:24:38 UTC 2011 - coolo(a)suse.com + +- the files only reference latest lgpl, so assume v3+ + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Text_Flowed.spec ++++++ --- /var/tmp/diff_new_pack.XFr4zN/_old 2012-03-01 07:21:55.000000000 +0100 +++ /var/tmp/diff_new_pack.XFr4zN/_new 2012-03-01 07:21:55.000000000 +0100 @@ -20,12 +20,12 @@ %define xmldir /var/lib/pear Summary: PEAR: Horde API for flowed text as per RFC 3676 +License: LGPL-3.0+ +Group: Development/Libraries/PHP Name: php5-pear-Horde_Text_Flowed Version: 1.0.0 -Release: 1 -License: LGPL -Group: Development/Libraries/PHP +Release: 0 Source0: http://pear.horde.org/get/Horde_Text_Flowed-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Text_Flowed -- 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_Text_Diff for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Text_Diff for openSUSE:Factory checked in at 2012-03-01 07:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Text_Diff (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Text_Diff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Text_Diff", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Text_Diff/php5-pear-Horde_Text_Diff.changes 2011-09-23 12:40:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Text_Diff.new/php5-pear-Horde_Text_Diff.changes 2012-03-01 07:21:51.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 17 14:51:39 UTC 2012 - lang(a)b1-systems.de + +- now ships license file +- version 1.0.2 +- [jan] Fix class names in Horde_Text_Diff_ThreeWay merger (Bug #10548). + +------------------------------------------------------------------- Old: ---- Horde_Text_Diff-1.0.1.tgz New: ---- Horde_Text_Diff-1.0.2.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Text_Diff.spec ++++++ --- /var/tmp/diff_new_pack.8gInId/_old 2012-03-01 07:21:52.000000000 +0100 +++ /var/tmp/diff_new_pack.8gInId/_new 2012-03-01 07:21:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Horde_Text_Diff # -# 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,12 +20,12 @@ %define xmldir /var/lib/pear Summary: PEAR: Engine for performing and rendering text diffs +License: LGPL-2.1 +Group: Development/Libraries/PHP Name: php5-pear-Horde_Text_Diff -Version: 1.0.1 -Release: 1 -License: LGPL-3.0+ -Group: Development/Libraries/PHP +Version: 1.0.2 +Release: 0 Source0: http://pear.horde.org/get/Horde_Text_Diff-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Text_Diff ++++++ Horde_Text_Diff-1.0.1.tgz -> Horde_Text_Diff-1.0.2.tgz ++++++ ++++ 6468 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_Template for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Template for openSUSE:Factory checked in at 2012-03-01 07:21:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Template (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Template.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Template", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Template/php5-pear-Horde_Template.changes 2011-09-23 12:40:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Template.new/php5-pear-Horde_Template.changes 2012-03-01 07:21:46.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 17 14:33:46 UTC 2012 - lang(a)b1-systems.de + +- version 1.0.1 +- added license +- [mms] Need to cache gettext-enabled templates with language information in the cache ID (Bug #10872). + +------------------------------------------------------------------- Old: ---- Horde_Template-1.0.0.tgz New: ---- Horde_Template-1.0.1.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Template.spec ++++++ --- /var/tmp/diff_new_pack.nE6KiW/_old 2012-03-01 07:21:47.000000000 +0100 +++ /var/tmp/diff_new_pack.nE6KiW/_new 2012-03-01 07:21:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Horde_Template # -# 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,12 +20,12 @@ %define xmldir /var/lib/pear Summary: PEAR: Horde Template System +License: LGPL-2.1 +Group: Development/Libraries/PHP Name: php5-pear-Horde_Template -Version: 1.0.0 -Release: 1 -License: LGPL -Group: Development/Libraries/PHP +Version: 1.0.1 +Release: 0 Source0: http://pear.horde.org/get/Horde_Template-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Template @@ -93,5 +93,6 @@ %{peardir}/* %{xmldir}/Horde_Template.xml +%doc %{_docdir}/%{name} %changelog ++++++ Horde_Template-1.0.0.tgz -> Horde_Template-1.0.1.tgz ++++++ ++++ 2037 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_Serialize for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Serialize for openSUSE:Factory checked in at 2012-03-01 07:21:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Serialize (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Serialize.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Serialize", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Serialize/php5-pear-Horde_Serialize.changes 2011-09-23 12:40:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Serialize.new/php5-pear-Horde_Serialize.changes 2012-03-01 07:21:44.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 17 13:41:13 UTC 2012 - lang(a)b1-systems.de + +- version 1.0.2 +- added license file +- [jan] Fix unit tests. + +------------------------------------------------------------------- Old: ---- Horde_Serialize-1.0.1.tgz New: ---- Horde_Serialize-1.0.2.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Serialize.spec ++++++ --- /var/tmp/diff_new_pack.gAxM6P/_old 2012-03-01 07:21:45.000000000 +0100 +++ /var/tmp/diff_new_pack.gAxM6P/_new 2012-03-01 07:21:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Horde_Serialize # -# 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,17 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear) %define xmldir /var/lib/pear Summary: PEAR: Data Encapulation API +License: LGPL-2.1 +Group: Development/Libraries/PHP Name: php5-pear-Horde_Serialize -Version: 1.0.1 -Release: 1 -License: LGPL -Group: Development/Libraries/PHP +Version: 1.0.2 +Release: 0 Source0: http://pear.horde.org/get/Horde_Serialize-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Serialize ++++++ Horde_Serialize-1.0.1.tgz -> Horde_Serialize-1.0.2.tgz ++++++ ++++ 2846 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 libquicktime for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package libquicktime for openSUSE:Factory checked in at 2012-03-01 07:21:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libquicktime (Old) and /work/SRC/openSUSE:Factory/.libquicktime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libquicktime", Maintainer is "PUzel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libquicktime/libquicktime.changes 2011-09-23 02:09:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libquicktime.new/libquicktime.changes 2012-03-01 07:21:33.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 11:54:28 UTC 2012 - puzel(a)suse.com + +- BuildRequire xorg-x11-devel to build lqtplay + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libquicktime.spec ++++++ --- /var/tmp/diff_new_pack.YzB6Ev/_old 2012-03-01 07:21:35.000000000 +0100 +++ /var/tmp/diff_new_pack.YzB6Ev/_new 2012-03-01 07:21:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libquicktime # -# 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,12 +20,12 @@ Name: libquicktime Version: 1.2.3 -Release: 1 +Release: 0 #to_be_filled_by_service -License: GPL-2.0+ Summary: Library for Reading and Writing Quicktime Movie Files -Url: http://libquicktime.sf.net +License: GPL-2.0+ Group: System/Libraries +Url: http://libquicktime.sf.net # http://prdownloads.sourceforge.net/libquicktime/libquicktime-%%{version}.ta… Source0: http://prdownloads.sourceforge.net/libquicktime/libquicktime-%{version}.tar… Source1: COPYING @@ -39,6 +39,7 @@ BuildRequires: libvorbis-devel BuildRequires: pkg-config BuildRequires: schroedinger-devel +BuildRequires: xorg-x11-devel %if 0%{?BUILD_ORIG} BuildRequires: libfaac-devel BuildRequires: libfaad2-devel @@ -54,7 +55,6 @@ %package -n %{name}%{soname} - Summary: Library for Reading and Writing Quicktime Movie Files Group: System/Libraries # Last version with this name was openSUSE 11.4 @@ -67,7 +67,6 @@ %package -n libquicktime-devel - Summary: Library for reading/writing quicktime movie files Group: Development/Libraries/C and C++ Requires: %{name}%{soname} = %{version} @@ -78,7 +77,6 @@ %package -n libquicktime-tools - Summary: Libquicktime Tools Group: Productivity/Multimedia/Video/Editors and Convertors Requires: %{name}%{soname} = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0