June 2006 - openSUSE Commits - openSUSE Mailing Lists

commit rpm
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package rpm checked in at Thu Jun 22 18:33:58 CEST 2006. -------- --- rpm/rpm.changes 2006-04-26 01:16:16.000000000 +0200 +++ rpm/rpm.changes 2006-06-14 15:56:33.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 14 15:55:36 CEST 2006 - mls(a)suse.de + +- make rpmlib provide rpmlib(PatchRPMs) [#184856] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.ziTgRE/_old 2006-06-22 18:33:50.000000000 +0200 +++ /var/tmp/diff_new_pack.ziTgRE/_new 2006-06-22 18:33:50.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 41 +Release: 43 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -266,7 +266,7 @@ License: LGPL, Other License(s), see package Group: System/Libraries Version: 1.7 -Release: 269 +Release: 271 # %description -n popt @@ -289,7 +289,7 @@ License: LGPL, Other License(s), see package Group: System/Libraries Version: 1.7 -Release: 269 +Release: 271 Requires: popt = 1.7 Requires: glibc-devel @@ -331,6 +331,8 @@ %{_libdir}/python* %changelog -n rpm +* Wed Jun 14 2006 - mls(a)suse.de +- make rpmlib provide rpmlib(PatchRPMs) [#184856] * Wed Apr 26 2006 - agruen(a)suse.de - rpm-suse-kernel-module-subpackage: Use a temporary file location that only root can write to (169378). ++++++ rpm-4.4.2.diff ++++++ --- /var/tmp/diff_new_pack.ziTgRE/_old 2006-06-22 18:33:50.000000000 +0200 +++ /var/tmp/diff_new_pack.ziTgRE/_new 2006-06-22 18:33:51.000000000 +0200 @@ -1994,8 +1994,18 @@ RPMSENSE_SCRIPT_BUILD | \ RPMSENSE_SCRIPT_INSTALL | \ --- ./lib/rpmlibprov.c.orig 2004-03-16 21:58:29.000000000 +0000 -+++ ./lib/rpmlibprov.c 2005-12-16 20:07:58.000000000 +0000 -@@ -51,9 +51,11 @@ static struct rpmlibProvides_s rpmlibPro ++++ ./lib/rpmlibprov.c 2006-06-14 13:52:46.000000000 +0000 +@@ -33,6 +33,9 @@ static struct rpmlibProvides_s rpmlibPro + { "rpmlib(PayloadIsBzip2)", "3.0.5-1", + (RPMSENSE_RPMLIB|RPMSENSE_EQUAL), + N_("package payload can be compressed using bzip2.") }, ++ { "rpmlib(PatchRPMs)", "3.0.6-1", ++ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL), ++ N_("understand rpms that replace a subset of files.") }, + { "rpmlib(PayloadFilesHavePrefix)", "4.0-1", + (RPMSENSE_RPMLIB|RPMSENSE_EQUAL), + N_("package payload file(s) have \"./\" prefix.") }, +@@ -51,9 +54,11 @@ static struct rpmlibProvides_s rpmlibPro { "rpmlib(ConcurrentAccess)", "4.1-1", ( RPMSENSE_EQUAL), N_("package scriptlets may access the rpm database while installing.") }, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit qt
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package qt checked in at Thu Jun 22 18:33:43 CEST 2006. -------- --- qt/qt-sql-plugins.changes 2006-06-19 12:05:29.000000000 +0200 +++ qt/qt-sql-plugins.changes 2006-06-22 09:40:26.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 22 09:40:18 CEST 2006 - dmueller(a)suse.de + +- update requires on devel package + +------------------------------------------------------------------- qt.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Kj4oQa/_old 2006-06-22 18:32:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Kj4oQa/_new 2006-06-22 18:32:45.000000000 +0200 @@ -20,7 +20,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.1.3 -Release: 7 +Release: 8 %define x11_free -x11-opensource-src- %define rversion 4.1.3 Source: qt%x11_free%rversion.tar.bz2 @@ -208,6 +208,8 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog -n qt-sql-plugins +* Thu Jun 22 2006 - dmueller(a)suse.de +- update requires on devel package * Mon Jun 19 2006 - dmueller(a)suse.de - Fix build on s390(x) * Mon May 29 2006 - schwab(a)suse.de ++++++ qt.spec ++++++ --- /var/tmp/diff_new_pack.Kj4oQa/_old 2006-06-22 18:32:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Kj4oQa/_new 2006-06-22 18:32:45.000000000 +0200 @@ -19,7 +19,7 @@ Summary: C++ Program Library, Core Components # COMMON-BEGIN Version: 4.1.3 -Release: 7 +Release: 8 %define x11_free -x11-opensource-src- %define rversion 4.1.3 Source: qt%x11_free%rversion.tar.bz2 @@ -81,6 +81,7 @@ Group: Development/Libraries/X11 Summary: Qt Development Kit Requires: xorg-x11-devel zlib-devel c++_compiler +Requires: freetype2-devel libmng-devel libpng-devel pkgconfig Requires: qt = %version %description devel @@ -310,6 +311,8 @@ %_libdir/libQtSql*.so.* %changelog -n qt +* Thu Jun 22 2006 - dmueller(a)suse.de +- update requires on devel package * Mon Jun 19 2006 - dmueller(a)suse.de - Fix build on s390(x) * Mon May 29 2006 - schwab(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit pysol
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package pysol checked in at Thu Jun 22 18:33:35 CEST 2006. -------- --- pysol/pysol.changes 2006-01-27 12:47:31.000000000 +0100 +++ pysol/pysol.changes 2006-06-22 18:16:56.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 22 18:16:50 CEST 2006 - ro(a)suse.de + +- remove selfprovides + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pysol.spec ++++++ --- /var/tmp/diff_new_pack.8bVXhV/_old 2006-06-22 18:32:47.000000000 +0200 +++ /var/tmp/diff_new_pack.8bVXhV/_new 2006-06-22 18:32:47.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,13 +14,12 @@ BuildRequires: SDL-devel python-devel python-tk update-desktop-files xorg-x11 License: GPL Group: Amusements/Games/Board/Card -Provides: pysol %define pyver %(python -c 'import sys; print sys.version[:3]') Requires: python-tk, python >= %pyver, python < %{pyver}.99 Autoreqprov: on Summary: Nice solitaire game Version: 4.82 -Release: 192 +Release: 204 %define dataversion 4.40 %define soundversion 3.00 URL: http://www.pysol.org/ @@ -119,6 +118,8 @@ %attr(644,root,root) %doc %{_mandir}/man6/pysol.6.gz %changelog -n pysol +* Thu Jun 22 2006 - ro(a)suse.de +- remove selfprovides * Fri Jan 27 2006 - jmatejek(a)suse.cz - use local copy of desktop file with a correct icon * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit perl-Image-Size
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package perl-Image-Size checked in at Thu Jun 22 18:32:41 CEST 2006. -------- --- perl-Image-Size/perl-Image-Size.changes 2006-01-25 21:39:47.000000000 +0100 +++ perl-Image-Size/perl-Image-Size.changes 2006-06-22 10:14:32.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jun 22 10:14:05 CEST 2006 - kssingvo(a)suse.de + +- upgrade to version 3.0. New features: +- delay of Image::Magick loading until it is needed +- additional installation tests +- FlashMX (Shockwave Flash Ver. 6) support +- image size of gif is now controlled by additional flag + +------------------------------------------------------------------- Old: ---- Image-Size-2.992.tar.bz2 New: ---- Image-Size-3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Image-Size.spec ++++++ --- /var/tmp/diff_new_pack.UPgeMB/_old 2006-06-22 18:32:35.000000000 +0200 +++ /var/tmp/diff_new_pack.UPgeMB/_new 2006-06-22 18:32:35.000000000 +0200 @@ -1,23 +1,24 @@ # -# spec file for package perl-Image-Size (Version 2.992) +# spec file for package perl-Image-Size (Version 3.0) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: perl-Image-Size License: Artistic License +BuildRequires: perl-Compress-Zlib Group: Development/Libraries/Perl Requires: perl = %{perl_version} Autoreqprov: on Summary: A Perl Module to deal with Dimensions of an Image in Several Popular Formats -Version: 2.992 -Release: 124 +Version: 3.0 +Release: 1 Source: Image-Size-%{version}.tar.bz2 URL: http://www.cpan.org/authors/id/R/RJ/RJRAY BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,6 +71,12 @@ %doc README README.Win32 %changelog -n perl-Image-Size +* Thu Jun 22 2006 - kssingvo(a)suse.de +- upgrade to version 3.0. New features: +- delay of Image::Magick loading until it is needed +- additional installation tests +- FlashMX (Shockwave Flash Ver. 6) support +- image size of gif is now controlled by additional flag * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Sep 28 2005 - dmueller(a)suse.de ++++++ Image-Size-2.992.tar.bz2 -> Image-Size-3.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/ChangeLog new/Image-Size-3.0/ChangeLog --- old/Image-Size-2.992/ChangeLog 2003-07-21 08:36:42.000000000 +0200 +++ new/Image-Size-3.0/ChangeLog 2006-06-10 08:40:01.000000000 +0200 @@ -1,5 +1,27 @@ CHANGE HISTORY +Changes in 3.0: + +* Added test suites for POD correctness and POD coverage. + +* Implemented and documented a flag called $Image::Size::GIF_BEHAVIOR that + controls whether the GIF code returns the screensize, the first sub-image + or the largest of the sub-images. + +* Applied a patch from mrj(a)mrj.spb.ru to fix usage of the Compress::Zlib + module in the handling of compressed flash files. Added a new SWF file to + test this, and added reference to the file in MANIFEST and t/all.t. + +* Delay Image::Magick loading until it is needed. (Mark Stosberg). + Add support for Graphics::Magick as an alternative to Image::Magick. + If either Graphics::Magick or Image::Magick is loaded into memory + that module will be used. Otherwise, they are both tried to be loaded, + with Graphics::Magick being tried first. (Mark Stosberg). This patch also + adds a new test suite, t/magick.t, to the distribution and modifies both + MANIFEST and Makefile.PL (to add a build-dependancy on Test::More). + +* With Test::More now required for building, converted t/all.t to use it. + Changes in 2.992: * Added support for FlashMX (Shockwave Flash ver. 6), as contributed by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/MANIFEST new/Image-Size-3.0/MANIFEST --- old/Image-Size-2.992/MANIFEST 2001-09-19 05:12:54.000000000 +0200 +++ new/Image-Size-3.0/MANIFEST 2006-06-10 10:53:54.000000000 +0200 @@ -6,6 +6,9 @@ Size.pm the code imgsize Utility script t/all.t test suite +t/magick.t +t/pod.t +t/pod_coverage.t t/letter_T.jpg Support files for tests t/pak38.jpg t/test.gif @@ -18,3 +21,5 @@ t/bexjdic.tif t/yasp.swf t/468x60.psd +t/8.swf +META.yml Module meta-data (added by MakeMaker) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/META.yml new/Image-Size-3.0/META.yml --- old/Image-Size-2.992/META.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/Image-Size-3.0/META.yml 2006-06-10 10:53:54.000000000 +0200 @@ -0,0 +1,12 @@ +# http://module-build.sourceforge.net/META-spec.html +#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# +name: Image-Size +version: 3.0 +version_from: Size.pm +installdirs: site +requires: + File::Spec: 0 + Test::More: 0 + +distribution_type: module +generated_by: ExtUtils::MakeMaker version 6.30 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/Makefile.PL new/Image-Size-3.0/Makefile.PL --- old/Image-Size-2.992/Makefile.PL 2001-08-11 11:03:06.000000000 +0200 +++ new/Image-Size-3.0/Makefile.PL 2006-06-10 08:01:35.000000000 +0200 @@ -8,7 +8,7 @@ (ABSTRACT => 'A library to extract height/width from images', AUTHOR => 'Randy J. Ray (rjray(a)blackperl.com)') : ()), dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz' }, - PREREQ_PM => { File::Spec => 0 }, + PREREQ_PM => { File::Spec => 0, Test::More => 0, }, EXE_FILES => ['imgsize'], clean => { FILES => 'Image-Size-* *.spec *.rpm rpmrc rpmmacro' }, @@ -20,7 +20,7 @@ my $text = shift->SUPER::tools_other(@_); - "$text\nECHO=\@echo\nRPM=rpm\n"; + "$text\nECHO=echo\nRPM=rpm\n"; } sub MY::post_constants diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/README new/Image-Size-3.0/README --- old/Image-Size-2.992/README 2003-07-21 08:38:59.000000000 +0200 +++ new/Image-Size-3.0/README 2006-06-10 08:44:33.000000000 +0200 @@ -1,6 +1,6 @@ Image::Size - Determine the size of images in several common formats -Version: 2.992 (See CHANGES below) +Version: 3.0 (See CHANGES below) WHAT IS IT @@ -74,5 +74,22 @@ CHANGES -* Added support for FlashMX (Shockwave Flash ver. 6), as contributed by - Victor L Kuriashkin <victor(a)yasp.com>. +Added test suites for POD correctness and POD coverage. + +Implemented and documented a flag called $Image::Size::GIF_BEHAVIOR that +controls whether the GIF code returns the screensize, the first sub-image +or the largest of the sub-images. + +Applied a patch from mrj(a)mrj.spb.ru to fix usage of the Compress::Zlib +module in the handling of compressed flash files. Added a new SWF file to +test this, and added reference to the file in MANIFEST and t/all.t. + +Delay Image::Magick loading until it is needed. (Mark Stosberg). +Add support for Graphics::Magick as an alternative to Image::Magick. +If either Graphics::Magick or Image::Magick is loaded into memory +that module will be used. Otherwise, they are both tried to be loaded, +with Graphics::Magick being tried first. (Mark Stosberg). This patch also +adds a new test suite, t/magick.t, to the distribution and modifies both +MANIFEST and Makefile.PL (to add a build-dependancy on Test::More). + +With Test::More now required for building, converted t/all.t to use it. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/Size.pm new/Image-Size-3.0/Size.pm --- old/Image-Size-2.992/Size.pm 2003-07-21 08:48:47.000000000 +0200 +++ new/Image-Size-3.0/Size.pm 2006-06-10 08:05:15.000000000 +0200 @@ -17,55 +17,32 @@ package Image::Size; -require 5.002; +require 5.6.0; use strict; +use bytes; use Cwd (); use File::Spec (); use Symbol (); use AutoLoader 'AUTOLOAD'; require Exporter; -use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $revision $VERSION $NO_CACHE - %PCD_MAP $PCD_SCALE $read_in $last_pos *imagemagick_size); + +our (@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $revision, $VERSION, $NO_CACHE, + $GIF_BEHAVIOR, %PCD_MAP, $PCD_SCALE, $read_in, $last_pos); BEGIN { @ISA = qw(Exporter); @EXPORT = qw(imgsize); - @EXPORT_OK = qw(imgsize html_imgsize attr_imgsize $NO_CACHE $PCD_SCALE); + @EXPORT_OK = qw(imgsize html_imgsize attr_imgsize $NO_CACHE $PCD_SCALE + $GIF_BEHAVIOR); %EXPORT_TAGS = ('all' => [ @EXPORT_OK ]); - $revision = q$Id: Size.pm,v 1.35 2003/07/21 06:48:47 rjray Exp $; - $VERSION = "2.992"; + $VERSION = "3.0"; - # Check if we have Image::Magick available - eval { - local $SIG{__DIE__}; # protect against user installed die handlers - require Image::Magick; - }; - if ($@) { - *imagemagick_size = - sub - { - (undef, undef, "Data stream is not a known image file format"); - }; - } else { - *imagemagick_size = - sub - { - my ($file_name) = @_; - my $img = Image::Magick->new(); - my $x = $img->Read($file_name); - # Image::Magick error handling is a bit weird, see - # <http://www.simplesystems.org/ImageMagick/www/perl.html#erro> - if("$x") { - return (undef, undef, "$x"); - } else { - return ($img->Get('width', 'height', 'format')); - } - }; - } + # Default behavior for GIFs is to return the "screen" size + $GIF_BEHAVIOR = 0; } @@ -260,6 +237,54 @@ return (wantarray) ? ($x, $y, $id) : (); } +sub imagemagick_size { + my $module_name; + # First see if we have already loaded Graphics::Magick or Image::Magick + # If so, just use whichever one is already loaded. + if (exists $INC{'Graphics/Magick.pm'}) { + $module_name = 'Graphics::Magick'; + } + elsif (exists $INC{'Image/Magick.pm'}) { + $module_name = 'Image::Magick'; + } + + # If neither are already loaded, try loading either one. + elsif ( _load_magick_module('Graphics::Magick') ) { + $module_name = 'Graphics::Magick'; + } + elsif ( _load_magick_module('Image::Magick') ) { + $module_name = 'Image::Magick'; + } + + if ($module_name) { + my ($file_name) = @_; + my $img = $module_name->new(); + my $x = $img->Read($file_name); + # Image::Magick error handling is a bit weird, see + # <http://www.simplesystems.org/ImageMagick/www/perl.html#erro> + if("$x") { + return (undef, undef, "$x"); + } else { + return ($img->Get('width', 'height', 'format')); + } + + } + else { + return (undef, undef, "Data stream is not a known image file format"); + } +} + +# load Graphics::Magick or Image::Magick if one is not already loaded. +sub _load_magick_module { + my $module_name = shift; + eval { + local $SIG{__DIE__}; + require $module_name; + }; + return !$@; +} + + sub html_imgsize { my @args = imgsize(@_); @@ -289,6 +314,8 @@ eof $stream; } +# Simple converter-routine used by SWF and CWS code +sub _bin2int { unpack("N", pack("B32", substr("0" x 32 . shift, -32))); } =head1 NAME @@ -423,7 +450,7 @@ =item SWF (ShockWave/Flash) -=item SWC (FlashMX, compressed SWF, Flash 6) +=item CWS (FlashMX, compressed SWF, Flash 6) =item PCD (Kodak PhotoCD, see notes below) @@ -505,6 +532,55 @@ portrait or landscape. That is in fact all that the library extracts from the image file. +=head2 Controlling Behavior with GIF Images + +GIF images present a sort of unusual situation when it comes to reading size. +Because GIFs can be a series of sub-images to be isplayed as an animated +sequence, what part does the user want to get the size for? + +When dealing with GIF files, the user may control the behavior by setting the +global value B<$Image::Size::GIF_BEHAVIOR>. Like the PCD setting, this may +be imported when loading the library. Three values are recognized by the +GIF-handling code: + +=over 4 + +=item 0 + +This is the default value. When this value is chosen, the returned dimensions +are those of the "screen". The "screen" is the display area that the GIF +declares in the first data block of the file. No sub-images will be greater +than this in size; if they are, the specification dictates that they be +cropped to fit within the box. + +This is also the fastest method for sizing the GIF, as it reads the least +amount of data from the image stream. + +=item 1 + +If this value is set, then the size of the first sub-image within the GIF is +returned. For plain (non-animated) GIF files, this would be the same as the +screen (though it doesn't have to be, strictly-speaking). + +When the first image descriptor block is read, the code immediately returns, +making this only slightly-less efficient than the previous setting. + +=item 2 + +If this value is chosen, then the code loops through all the sub-images of the +animated GIF, and returns the dimensions of the largest of them. + +This option requires that the full GIF image be read, in order to ensure that +the largest is found. + +=back + +Any value outside this range will produce an error in the GIF code before any +image data is read. + +The value of dimensions other than the view-port ("screen") is dubious. +However, some users have asked for that functionality. + =head1 DIAGNOSTICS The base routine, C<imgsize>, returns B<undef> as the first value in its list @@ -555,8 +631,7 @@ =head1 SEE ALSO -C<http://www.tardis.ed.ac.uk/~ark/wwwis/> for a description of C<wwwis> -and how to obtain it, L<Image::Magick>. +The B<Image::Magick> and B<Image::Info> Perl modules at CPAN. =head1 AUTHORS @@ -597,7 +672,7 @@ { my $stream = shift; - my ($cmapsize, $buf, $h, $w, $x, $y, $type); + my ($cmapsize, $buf, $sh, $sw, $h, $w, $x, $y, $type); my $gif_blockskip = sub { my ($skip, $type) = @_; @@ -617,12 +692,23 @@ } }; + return (undef, undef, + 'Out-of-range value for $Image::Size::GIF_BEHAVIOR: ' . + $Image::Size::GIF_BEHAVIOR) + if ($Image::Size::GIF_BEHAVIOR > 2); + + # Skip over the identifying string, since we already know this is a GIF $type = &$read_in($stream, 6); if (length($buf = &$read_in($stream, 7)) != 7 ) { return (undef, undef, "Invalid/Corrupted GIF (bad header)"); } - ($x) = unpack("x4 C", $buf); + ($sw, $sh, $x) = unpack("vv C", $buf); + if ($Image::Size::GIF_BEHAVIOR == 0) + { + return ($sw, $sh, 'GIF'); + } + if ($x & 0x80) { $cmapsize = 3 * (2**(($x & 0x07) + 1)); @@ -633,13 +719,28 @@ } } + # Before we start this loop, set $sw and $sh to 0s and use them to track + # the largest sub-image in the overall GIF. + $sw = $sh = 0; + FINDIMAGE: while (1) { if (&img_eof($stream)) { - return (undef, undef, - "Invalid/Corrupted GIF (at EOF w/o Image Descriptors)"); + # At this point, if we haven't returned then the user wants the + # largest of the sub-images. So, if $sh and $sw are still 0s, then + # we didn't see even one Image Descriptor block. Otherwise, return + # those two values. + if ($sw and $sh) + { + return ($sw, $sh, 'GIF'); + } + else + { + return (undef, undef, + "Invalid/Corrupted GIF (no Image Descriptors)"); + } } $buf = &$read_in($stream, 1); ($x) = unpack("C", $buf); @@ -651,10 +752,13 @@ return (undef, undef, "Invalid/Corrupted GIF (missing image header?)"); } - ($x, $w, $y, $h) = unpack("x4 C4", $buf); - $x += $w * 256; - $y += $h * 256; - return ($x, $y, 'GIF'); + ($x, $y) = unpack("x4 vv", $buf); + return ($x, $y, 'GIF') if ($Image::Size::GIF_BEHAVIOR == 1); + if ($x > $sw and $y > $sh) + { + $sw = $x; + $sh = $y; + } } if ($x == 0x21) { @@ -984,8 +1088,6 @@ my $image = shift; my $header = &$read_in($image, 33); - sub _bin2int { unpack("N", pack("B32", substr("0" x 32 . shift, -32))); } - my $ver = _bin2int(unpack 'B8', substr($header, 3, 1)); my $bs = unpack 'B133', substr($header, 8, 17); my $bits = _bin2int(substr($bs, 0, 5)); @@ -1023,15 +1125,15 @@ my ($image) = @_; my $header = &$read_in($image, 1058); - sub _bin2int { unpack("N", pack("B32", substr("0" x 32 . shift, -32))); } my $ver = _bin2int(unpack 'B8', substr($header, 3, 1)); - $header = substr($header, 8, 1024); - $header = Compress::Zlib::uncompress($header); + my ($d, $status) = Compress::Zlib::inflateInit(); + $header = $d->inflate(substr($header, 8, 1024)); + my $bs = unpack 'B133', substr($header, 0, 9); my $bits = _bin2int(substr($bs, 0, 5)); my $x = int(_bin2int(substr($bs, 5+$bits, $bits))/20); my $y = int(_bin2int(substr($bs, 5+$bits*3, $bits))/20); - return ($x, $y, 'SWC'); + return ($x, $y, 'CWS'); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/imgsize new/Image-Size-3.0/imgsize --- old/Image-Size-2.992/imgsize 2003-01-03 10:09:59.000000000 +0100 +++ new/Image-Size-3.0/imgsize 2006-05-25 11:07:46.000000000 +0200 @@ -42,6 +42,8 @@ other formatting directives will be lost. The numbers are passed as width first, then height. +=back + =head1 SEE ALSO L<Image::Size> Binary files old/Image-Size-2.992/t/468x60.psd and new/Image-Size-3.0/t/468x60.psd differ Binary files old/Image-Size-2.992/t/8.swf and new/Image-Size-3.0/t/8.swf differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/t/all.t new/Image-Size-3.0/t/all.t --- old/Image-Size-2.992/t/all.t 2001-09-19 05:20:29.000000000 +0200 +++ new/Image-Size-3.0/t/all.t 2006-06-10 08:35:56.000000000 +0200 @@ -1,60 +1,66 @@ -#!./perl +#!/usr/bin/perl use lib '../blib/lib'; + use IO::File; use Image::Size qw(:all); +use Test::More tests => 17; ($dir = $0) =~ s/\w+\.t$//o; -print "1..16\n"; - # -# Phase one, tests 1-10: basic types tested on files. +# Phase one: basic types tested on files. # ($x, $y) = imgsize("${dir}test.gif"); -print (($x == 60 && $y == 40) ? "ok 1\n" : "not ok 1\n"); +ok(($x == 60 && $y == 40), 'Basic GIF format test'); $html = html_imgsize("${dir}letter_T.jpg"); -print (($html =~ /width="52"\s+height="54"/oi) ? "ok 2\n" : "not ok 2\n"); +ok(($html =~ /width="52"\s+height="54"/oi), + 'Test html_imgsize and basic JPG format'); @attrs = attr_imgsize("${dir}xterm.xpm"); -print (($attrs[1] == 64 && $attrs[3] == 38) ? "ok 3\n" : "not ok 3\n"); +ok(($attrs[1] == 64 && $attrs[3] == 38), + 'Test attr_imgsize and basic XPM format'); ($x, $y) = imgsize("${dir}spacer50.xbm"); -print (($x == 50 && $y == 10) ? "ok 4\n" : "not ok 4\n"); +ok(($x == 50 && $y == 10), 'Basic XBM format test'); ($x, $y, $err) = imgsize("some non-existant file"); -print (($err =~ /can\'t open/oi) ? "ok 5\n" : "not ok 5\n"); +ok(($err =~ /can\'t open/oi), 'Test non-existent file error catching'); # The Pak-38 is actually a valid GIF, but this should work: ($x, $y) = imgsize("${dir}pak38.jpg"); -print (($x == 333 && $y == 194) ? "ok 6\n" : "not ok 6\n"); +ok(($x == 333 && $y == 194), 'Test format/file-extension mis-match'); # Test PNG image supplied by Tom Metro: ($x, $y) = imgsize("${dir}pass-1_s.png"); -print (($x == 90 && $y == 60) ? "ok 7\n" : "not ok 7\n"); +ok(($x == 90 && $y == 60), 'Basic PNG format test'); # Test PPM image code supplied by Carsten Dominik: ($x, $y, $id) = imgsize("${dir}letter_N.ppm"); -print (($x == 66 && $y == 57 && $id eq 'PPM') ? "ok 8\n" : "not ok 8\n"); +ok(($x == 66 && $y == 57 && $id eq 'PPM'), 'Basic PPM format test'); # Test TIFF image code supplied by Cloyce Spradling ($x, $y, $id) = imgsize("${dir}lexjdic.tif"); -print (($x == 35 && $y == 32 && $id eq 'TIF') ? "ok 9\n" : "not ok 9\n"); +ok(($x == 35 && $y == 32 && $id eq 'TIF'), 'Basic TIFF format test (1)'); ($x, $y, $id) = imgsize("${dir}bexjdic.tif"); -print (($x == 35 && $y == 32 && $id eq 'TIF') ? "ok 10\n" : "not ok 10\n"); +ok(($x == 35 && $y == 32 && $id eq 'TIF'), 'Basic TIFF format test (2)'); # Test BMP code from Aldo Calpini ($x, $y, $id) = imgsize("${dir}xterm.bmp"); -print (($x == 64 && $y == 38 && $id eq 'BMP') ? "ok 11\n" : "not ok 11\n"); +ok(($x == 64 && $y == 38 && $id eq 'BMP'), 'Basic BMP format test'); # Test SWF code from Dmitry Dorofeev <dima(a)yasp.com> ($x, $y, $id) = imgsize("${dir}yasp.swf"); -print (($x == 85 && $y == 36 && $id eq 'SWF') ? "ok 12\n" : "not ok 12\n"); +ok(($x == 85 && $y == 36 && $id eq 'SWF'), 'Basic SWF format test'); + +# Test CWS patch from mrj(a)mrj.spb.ru +($x, $y, $id) = imgsize("${dir}8.swf"); +ok(($x == 280 && $y == 140 && $id eq 'CWS'), 'Basic CWS format test'); # Test the PSD code (orig. contributer unknown) ($x, $y, $id) = imgsize("${dir}468x60.psd"); -print (($x == 468 && $y == 60 && $id eq 'PSD') ? "ok 13\n" : "not ok 13\n"); +ok(($x == 468 && $y == 60 && $id eq 'PSD'), 'Basic PSD format test'); # # Phase two: tests on in-memory strings. @@ -64,14 +70,14 @@ read $fh, $data, (stat "${dir}test.gif")[7]; $fh->close; ($x, $y, $id) = imgsize(\$data); -print (($x == 60 && $y == 40 && $id eq 'GIF') ? "ok 14\n" : "not ok 14\n"); +ok(($x == 60 && $y == 40 && $id eq 'GIF'), 'Test in-memory image data'); # # Phase three: tests on open IO::File objects. # $fh = new IO::File "< ${dir}test.gif"; ($x, $y, $id) = imgsize($fh); -print (($x == 60 && $y == 40 && $id eq 'GIF') ? "ok 15\n" : "not ok 15\n"); +ok(($x == 60 && $y == 40 && $id eq 'GIF'), 'Test open IO::File object'); # Reset to head $fh->seek(0, 0); @@ -79,8 +85,8 @@ $fh->seek(128, 0); # Do it again. This time when we check results, $fh->tell should be 128 ($x, $y, $id) = imgsize($fh); -print STDOUT (($x == 60 && $y == 40 && $id eq 'GIF' && ($fh->tell == 128)) ? - "ok 16\n" : "not ok 16\n"); +ok(($x == 60 && $y == 40 && $id eq 'GIF' && ($fh->tell == 128)), + 'Test that it leaves open IO::File object in the same position'); $fh->close; Binary files old/Image-Size-2.992/t/letter_N.ppm and new/Image-Size-3.0/t/letter_N.ppm differ Binary files old/Image-Size-2.992/t/letter_T.jpg and new/Image-Size-3.0/t/letter_T.jpg differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/t/magick.t new/Image-Size-3.0/t/magick.t --- old/Image-Size-2.992/t/magick.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Image-Size-3.0/t/magick.t 2006-06-10 08:11:43.000000000 +0200 @@ -0,0 +1,13 @@ +#!/usr/bin/perl + +# Tests related to Image::Magick and Graphics::Magick + +BEGIN: { + use Test::More tests => 2; + use_ok('Image::Size'); +} + +# This test should work whether or not Image::Magick is installed. +ok(!(exists $INC{'Image/Magick.pm'}), + 'Image::Magick should not be loaded until it is needed if it available') + || diag "Image::Magick loaded at: $INC{'Image/Magick.pm'}"; Binary files old/Image-Size-2.992/t/pak38.jpg and new/Image-Size-3.0/t/pak38.jpg differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/t/pod.t new/Image-Size-3.0/t/pod.t --- old/Image-Size-2.992/t/pod.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Image-Size-3.0/t/pod.t 2006-05-25 11:17:00.000000000 +0200 @@ -0,0 +1,11 @@ +#!/usr/bin/perl + +use Test::More; + +eval "use Test::Pod 1.00"; + +plan skip_all => "Test::Pod 1.00 required for testing POD" if $@; + +all_pod_files_ok(); + +exit; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Image-Size-2.992/t/pod_coverage.t new/Image-Size-3.0/t/pod_coverage.t --- old/Image-Size-2.992/t/pod_coverage.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Image-Size-3.0/t/pod_coverage.t 2006-05-25 11:16:52.000000000 +0200 @@ -0,0 +1,14 @@ +#!/usr/bin/perl + +use Test::More; + +eval "use Test::Pod::Coverage 1.00"; + +plan skip_all => + "Test::Pod::Coverage 1.00 required for testing POD coverage" if $@; +plan tests => 1; + +pod_coverage_ok(Image::Size => { also_private => [ qr/size$/, 'img_eof' ] }, + 'Image::Size'); + +exit; Binary files old/Image-Size-2.992/t/test.gif and new/Image-Size-3.0/t/test.gif differ Binary files old/Image-Size-2.992/t/yasp.swf and new/Image-Size-3.0/t/yasp.swf differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit perl-HTML-Tree
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package perl-HTML-Tree checked in at Thu Jun 22 18:32:33 CEST 2006. -------- --- perl-HTML-Tree/perl-HTML-Tree.changes 2006-01-25 21:39:45.000000000 +0100 +++ perl-HTML-Tree/perl-HTML-Tree.changes 2006-06-22 10:18:11.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jun 22 10:15:23 CEST 2006 - kssingvo(a)suse.de + +- update to version 3.20. +- bug fixes for starttag(): HTML::Element is now rendered correctly + and became a installation test case +- bug fix in restoration of declarations +- DOCTYPE now always present on top of document + +------------------------------------------------------------------- Old: ---- HTML-Tree-3.1901.tar.bz2 New: ---- HTML-Tree-3.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTML-Tree.spec ++++++ --- /var/tmp/diff_new_pack.tT52jb/_old 2006-06-22 18:32:23.000000000 +0200 +++ /var/tmp/diff_new_pack.tT52jb/_new 2006-06-22 18:32:23.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package perl-HTML-Tree (Version 3.1901) +# spec file for package perl-HTML-Tree (Version 3.20) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,7 +17,7 @@ Requires: perl = %{perl_version}, perl-HTML-Parser, perl-HTML-Tagset Autoreqprov: on Summary: Modules for representing, creating, and extracting information from HTML syntax trees -Version: 3.1901 +Version: 3.20 Release: 1 Source: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.t… URL: http://cpan.org/authors/id/S/SB/SBURKE @@ -62,6 +62,12 @@ %doc README Changes %changelog -n perl-HTML-Tree +* Thu Jun 22 2006 - kssingvo(a)suse.de +- update to version 3.20. +- bug fixes for starttag(): HTML::Element is now rendered correctly + and became a installation test case +- bug fix in restoration of declarations +- DOCTYPE now always present on top of document * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jan 12 2006 - kssingvo(a)suse.de ++++++ HTML-Tree-3.1901.tar.bz2 -> HTML-Tree-3.20.tar.bz2 ++++++ ++++ 3480 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit octave
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package octave checked in at Thu Jun 22 18:32:29 CEST 2006. -------- --- octave/octave.changes 2006-05-24 10:50:01.000000000 +0200 +++ octave/octave.changes 2006-06-22 18:16:38.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 22 18:16:32 CEST 2006 - ro(a)suse.de + +- remove selfprovides + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.x049kZ/_old 2006-06-22 18:32:14.000000000 +0200 +++ /var/tmp/diff_new_pack.x049kZ/_new 2006-06-22 18:32:14.000000000 +0200 @@ -15,12 +15,12 @@ URL: http://www.octave.org/ License: GPL Group: Productivity/Scientific/Math -Provides: matlab4 octave +Provides: matlab4 Requires: gnuplot gcc-fortran PreReq: %install_info_prereq Autoreqprov: on Version: 2.1.73 -Release: 1 +Release: 2 Summary: A High Level Programming Language Source: %{name}-%{version}.tar.bz2 Patch: octave-%{version}.diff @@ -124,6 +124,8 @@ /usr/share/octave/ %changelog -n octave +* Thu Jun 22 2006 - ro(a)suse.de +- remove selfprovides * Wed May 24 2006 - anicka(a)suse.cz - update to 2.1.73 - bugfix release ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit openldap2
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package openldap2 checked in at Thu Jun 22 18:32:04 CEST 2006. -------- --- openldap2/openldap2-client.changes 2006-05-25 00:49:57.000000000 +0200 +++ openldap2/openldap2-client.changes 2006-06-22 18:30:56.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 22 14:46:58 CEST 2006 - schwab(a)suse.de + +- Don't use automake macros without using automake. + +------------------------------------------------------------------- openldap2.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.15dDxE/_old 2006-06-22 18:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.15dDxE/_new 2006-06-22 18:31:53.000000000 +0200 @@ -28,7 +28,7 @@ %endif Autoreqprov: on Version: 2.3.23 -Release: 1 +Release: 2 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: openldap-admin-guide.tar.bz2 @@ -449,6 +449,8 @@ %endif %changelog -n openldap2-client +* Thu Jun 22 2006 - schwab(a)suse.de +- Don't use automake macros without using automake. * Wed May 24 2006 - rhafer(a)suse.de - Updated to Version 2.3.23 * obsoletes the patches: libldap_ads-sasl-gssapi.dif, openldap2.spec: same change ++++++ openldap-2.2.24.dif ++++++ --- /var/tmp/diff_new_pack.15dDxE/_old 2006-06-22 18:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.15dDxE/_new 2006-06-22 18:31:53.000000000 +0200 @@ -1,8 +1,8 @@ Index: acinclude.m4 -=================================================================== ---- acinclude.m4.orig +================================================================================ +--- acinclude.m4 +++ acinclude.m4 -@@ -14,3 +14,16 @@ dnl top-level directory of the distribut +@@ -14,3 +14,16 @@ dnl <http://www.OpenLDAP.org/license.html>. divert(-1) builtin(include, build/openldap.m4)dnl @@ -19,46 +19,9 @@ + AC_DEFINE(HAVE_PTRDIFF_T,1,[Define if system has ptrdiff_t type]) + fi +]) -Index: build/top.mk -=================================================================== ---- build/top.mk.orig -+++ build/top.mk -@@ -37,7 +37,7 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --moduledir = @libexecdir@$(ldap_subdir) -+moduledir = @libexecdir@/modules - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@$(ldap_subdir) -@@ -69,7 +69,7 @@ SHTOOL = $(top_srcdir)/build/shtool - LIBTOOL = @LIBTOOL@ - LIBRELEASE = @OPENLDAP_LIBRELEASE@ - LIBVERSION = @OPENLDAP_LIBVERSION@ --LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION) -+LTVERSION = -version-info $(LIBVERSION) - - # libtool --only flag for libraries: platform specific - NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC) -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -2133,7 +2133,7 @@ if test $ol_enable_proctitle != no ; the - [have_setproctitle=yes - LUTIL_LIBS="$LUTIL_LIBS -lutil"], - [have_setproctitle=no -- LIBOBJS="$LIBOBJS setproctitle.o" -+ AC_LIBOBJ(setproctitle) - LIBSRCS="$LIBSRCS setproctitle.c"])]) - - if test $have_setproctitle = yes ; then -Index: build/openldap.m4 -=================================================================== ---- build/openldap.m4.orig +--- build/openldap.m4 +++ build/openldap.m4 -@@ -65,7 +65,7 @@ dnl AC_VERBOSE(OpenLDAP --with-$1 $ol_wi +@@ -65,7 +65,7 @@ dnl dnl ==================================================================== dnl @@ -67,7 +30,7 @@ [changequote(<<, >>)dnl dnl The name to #define. define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl -@@ -173,7 +173,7 @@ fi +@@ -173,7 +173,7 @@ dnl dnl -------------------------------------------------------------------- dnl OpenLDAP version of STDC header check w/ EBCDIC support @@ -76,7 +39,7 @@ [AC_REQUIRE_CPP()dnl AC_REQUIRE([OL_CPP_EBCDIC])dnl AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc, -@@ -315,27 +315,7 @@ dnl Try to locate appropriate library +@@ -315,27 +315,7 @@ AC_DEFUN([OL_BERKELEY_DB_LINK], [ol_cv_lib_db=no OL_BERKELEY_DB_TRY(ol_cv_db_none) @@ -104,7 +67,7 @@ ]) dnl dnl -------------------------------------------------------------------- -@@ -1016,7 +996,7 @@ dnl ==================================== +@@ -1016,7 +996,7 @@ dnl Early MIPS compilers (used in Ultrix 4.2) don't like dnl "int x; int *volatile a = &x; *a = 0;" dnl -- borrowed from PDKSH @@ -113,7 +76,7 @@ [AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile, [AC_TRY_COMPILE([int x, y, z;], [volatile int a; int * volatile b = x ? &y : &z; -@@ -1052,7 +1032,7 @@ fi +@@ -1052,7 +1032,7 @@ dnl dnl ==================================================================== dnl Define sig_atomic_t if not defined in signal.h @@ -122,7 +85,7 @@ [AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t, [AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;], ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)]) -@@ -1064,7 +1044,7 @@ AC_DEFUN(OL_TYPE_SIG_ATOMIC_T, +@@ -1064,7 +1044,7 @@ dnl dnl ==================================================================== dnl Define socklen_t if not defined in sys/types.h or sys/socket.h @@ -131,7 +94,7 @@ [AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t, [AC_TRY_COMPILE([ #ifdef HAVE_SYS_TYPES_H -@@ -1083,7 +1063,7 @@ AC_DEFUN(OL_TYPE_SOCKLEN_T, +@@ -1083,7 +1063,7 @@ dnl dnl ==================================================================== dnl Define inet_aton is available @@ -140,7 +103,7 @@ [AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton, [AC_TRY_LINK([ #ifdef HAVE_SYS_TYPES_H -@@ -1110,7 +1090,7 @@ int rc = inet_aton( "255.255.255.255", & +@@ -1110,7 +1090,7 @@ dnl dnl ==================================================================== dnl check no of arguments for ctime_r @@ -149,7 +112,7 @@ [AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs, [AC_TRY_COMPILE([#include <time.h>], [time_t ti; char *buffer; ctime_r(&ti,buffer,32);], -@@ -1145,7 +1125,7 @@ AC_DEFUN(OL_FUNC_CTIME_R_NARGS, +@@ -1145,7 +1125,7 @@ dnl dnl -------------------------------------------------------------------- dnl check return type of ctime_r() @@ -158,7 +121,7 @@ [AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type, [AC_TRY_COMPILE([#include <time.h>], [extern int (ctime_r)();], -@@ -1157,7 +1137,7 @@ AC_DEFUN(OL_FUNC_CTIME_R_TYPE, +@@ -1157,7 +1137,7 @@ ])dnl dnl ==================================================================== dnl check no of arguments for gethostbyname_r @@ -167,7 +130,7 @@ [AC_CACHE_CHECK(number of arguments of gethostbyname_r, ol_cv_func_gethostbyname_r_nargs, [AC_TRY_COMPILE([#include <sys/types.h> -@@ -1207,7 +1187,7 @@ AC_DEFUN(OL_FUNC_GETHOSTBYNAME_R_NARGS, +@@ -1207,7 +1187,7 @@ ])dnl dnl dnl check no of arguments for gethostbyaddr_r @@ -176,7 +139,7 @@ [AC_CACHE_CHECK(number of arguments of gethostbyaddr_r, [ol_cv_func_gethostbyaddr_r_nargs], [AC_TRY_COMPILE([#include <sys/types.h> -@@ -1283,7 +1263,7 @@ AC_DEFUN([OL_SASL_COMPAT], +@@ -1283,7 +1263,7 @@ ]) dnl ==================================================================== dnl check for msg_accrights in msghdr @@ -185,11 +148,29 @@ [AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights, [AC_TRY_COMPILE([#include <sys/socket.h>], [struct msghdr m; m.msg_accrightslen=0], -Index: build/version.var -=================================================================== ---- build/version.var.orig +--- build/top.mk ++++ build/top.mk +@@ -37,7 +37,7 @@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-moduledir = @libexecdir@$(ldap_subdir) ++moduledir = @libexecdir@/modules + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@$(ldap_subdir) +@@ -69,7 +69,7 @@ + LIBTOOL = @LIBTOOL@ + LIBRELEASE = @OPENLDAP_LIBRELEASE@ + LIBVERSION = @OPENLDAP_LIBVERSION@ +-LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION) ++LTVERSION = -version-info $(LIBVERSION) + + # libtool --only flag for libraries: platform specific + NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC) +--- build/version.var +++ build/version.var -@@ -17,7 +17,7 @@ ol_major=2 +@@ -17,7 +17,7 @@ ol_minor=2 ol_patch=24 ol_api_inc=20224 @@ -200,11 +181,31 @@ +ol_api_revision=24 +ol_api_age=3 ol_release_date="2005/03/15" -Index: servers/slapd/schema_prep.c -=================================================================== ---- servers/slapd/schema_prep.c.orig +--- configure.in ++++ configure.in +@@ -84,7 +84,9 @@ + dnl we try not to use this for much + AC_CANONICAL_SYSTEM + +-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl ++AC_PROG_MAKE_SET ++PACKAGE=$OL_PACKAGE ++VERSION=$OL_VERSION + AC_SUBST(PACKAGE)dnl + AC_SUBST(VERSION)dnl + AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package) +@@ -2133,7 +2135,7 @@ + [have_setproctitle=yes + LUTIL_LIBS="$LUTIL_LIBS -lutil"], + [have_setproctitle=no +- LIBOBJS="$LIBOBJS setproctitle.o" ++ AC_LIBOBJ(setproctitle) + LIBSRCS="$LIBSRCS setproctitle.c"])]) + + if test $have_setproctitle = yes ; then +--- servers/slapd/schema_prep.c +++ servers/slapd/schema_prep.c -@@ -894,6 +894,35 @@ static struct slap_schema_ad_map { +@@ -894,6 +894,35 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_cn) }, @@ -240,7 +241,7 @@ { "userPassword", "( 2.5.4.35 NAME 'userPassword' " "DESC 'RFC2256/2307: password of user' " "EQUALITY octetStringMatch " -@@ -945,6 +974,24 @@ static struct slap_schema_ad_map { +@@ -945,6 +974,24 @@ NULL, NULL, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_krbName) }, #endif @@ -265,11 +266,9 @@ { NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 } }; -Index: servers/slapd/slap.h -=================================================================== ---- servers/slapd/slap.h.orig +--- servers/slapd/slap.h +++ servers/slapd/slap.h -@@ -825,6 +825,9 @@ struct slap_internal_schema { +@@ -825,6 +825,9 @@ AttributeDescription *si_ad_distinguishedName; AttributeDescription *si_ad_name; AttributeDescription *si_ad_cn; @@ -279,7 +278,7 @@ AttributeDescription *si_ad_userPassword; AttributeDescription *si_ad_labeledURI; #ifdef SLAPD_AUTHPASSWD -@@ -833,6 +836,8 @@ struct slap_internal_schema { +@@ -833,6 +836,8 @@ #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND AttributeDescription *si_ad_krbName; #endif ++++++ openldap-2.3.23.dif ++++++ --- /var/tmp/diff_new_pack.15dDxE/_old 2006-06-22 18:31:54.000000000 +0200 +++ /var/tmp/diff_new_pack.15dDxE/_new 2006-06-22 18:31:54.000000000 +0200 @@ -1,6 +1,6 @@ ---- build/top.mk 2003/05/20 08:15:37 1.1 -+++ build/top.mk 2003/05/20 08:16:28 -@@ -32,7 +32,7 @@ +--- build/top.mk ++++ build/top.mk +@@ -39,7 +39,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -9,8 +9,6 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@$(ldap_subdir) ---- build/top.mk 2005/06/23 11:04:12 1.1 -+++ build/top.mk 2005/06/23 11:04:47 @@ -58,7 +58,7 @@ INSTALL_DATA = $(INSTALL) -m 644 INSTALL_SCRIPT = $(INSTALL) @@ -20,8 +18,21 @@ LINT = lint 5LINT = 5lint ---- servers/slapd/aclparse.c 2006/01/09 08:48:40 1.1 -+++ servers/slapd/aclparse.c 2006/01/09 08:53:52 +--- configure.in ++++ configure.in +@@ -64,7 +64,9 @@ + dnl we try not to use this for much + AC_CANONICAL_TARGET([]) + +-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl ++AC_PROG_MAKE_SET ++PACKAGE=$OL_PACKAGE ++VERSION=$OL_VERSION + AC_SUBST(PACKAGE)dnl + AC_SUBST(VERSION)dnl + AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package) +--- servers/slapd/aclparse.c ++++ servers/slapd/aclparse.c @@ -662,7 +662,7 @@ if ( rc != LDAP_SUCCESS ) { char buf[ SLAP_TEXT_BUFLEN ]; @@ -29,5 +40,5 @@ - snprintf( buf, sizeof( buf ), "%s: line %d: " + snprintf( buf, sizeof( buf ), " attr \"%s\" normalization failed (%d: %s)", + fname, lineno, a->acl_attrs[ 0 ].an_name.bv_val, rc, text ); - Debug( LDAP_DEBUG_ANY, "%s: line %d: %s.\n", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit lineakd
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package lineakd checked in at Thu Jun 22 18:31:35 CEST 2006. -------- --- lineakd/lineakd.changes 2006-02-13 18:17:11.000000000 +0100 +++ lineakd/lineakd.changes 2006-06-22 18:15:39.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 22 18:15:33 CEST 2006 - ro(a)suse.de + +- remove selfprovides + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lineakd.spec ++++++ --- /var/tmp/diff_new_pack.pFvFVJ/_old 2006-06-22 18:30:56.000000000 +0200 +++ /var/tmp/diff_new_pack.pFvFVJ/_new 2006-06-22 18:30:56.000000000 +0200 @@ -14,10 +14,10 @@ URL: http://lineak.sourceforge.net/ License: GPL Group: Hardware/Other -Provides: lineakd liblineak.so.0 +Provides: liblineak.so.0 Summary: Linux Support for Easy Access and Internet Keyboards Version: 0.8.4 -Release: 4 +Release: 16 Source: lineakd-%{version}.tar.bz2 Source2: lineakd.rc Source3: lineakkb.def_addon @@ -122,6 +122,8 @@ %{_includedir}/lineak/* %changelog -n lineakd +* Thu Jun 22 2006 - ro(a)suse.de +- remove selfprovides * Mon Feb 13 2006 - behlert(a)suse.de - fixed makefile-patch to work on ppc/s390/ia64 (man8-dir has to be created in both branches of the IF) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit lineakconfig
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package lineakconfig checked in at Thu Jun 22 18:30:52 CEST 2006. -------- --- lineakconfig/lineakconfig.changes 2006-01-25 21:37:54.000000000 +0100 +++ lineakconfig/lineakconfig.changes 2006-06-22 18:15:10.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 22 18:15:05 CEST 2006 - ro(a)suse.de + +- remove selfprovides + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lineakconfig.spec ++++++ --- /var/tmp/diff_new_pack.2AHX1J/_old 2006-06-22 18:30:44.000000000 +0200 +++ /var/tmp/diff_new_pack.2AHX1J/_new 2006-06-22 18:30:44.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package lineakconfig (Version 0.4.1b) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,10 +15,9 @@ URL: http://lineak.sourceforge.net/ License: GPL Group: Hardware/Other -Provides: lineakconfig -Summary: Configuration tool for lineakd(Linux support for Easy Access and Internet Keyboards) +Summary: Configuration Tool for lineakd (Linux Support for Easy Access and Internet Keyboards) Version: 0.4.1b -Release: 8 +Release: 20 Source: lineakconfig-%{version}.tar.bz2 Patch: lineakconfig-%{version}.diff Patch2: malloc_fix-%{version}.diff @@ -28,9 +27,9 @@ %description LinEAK is a utility designed to enable the use and configuration of -those special keys on Internet, Easy Access and Multimedia keyboards in -Linux. It consists of three parts, two of them are included in this -package: This is the GTK+ GUI, which provides easier configuration You +those special keys on Internet, Easy Access, and Multimedia keyboards +in Linux. It consists of three parts, two of which are included in this +package: this is the GTK+ GUI, which provides easier configuration. You need the lineak_defaultplugin package, too. @@ -81,6 +80,8 @@ %doc %{_defaultdocdir}/lineakconfig/* %changelog -n lineakconfig +* Thu Jun 22 2006 - ro(a)suse.de +- remove selfprovides * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Dec 05 2005 - behlert(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit lifelines
by root＠suse.de 22 Jun '06

22 Jun '06

Hello community, here is the log from the commit of package lifelines checked in at Thu Jun 22 18:30:40 CEST 2006. -------- --- lifelines/lifelines.changes 2006-01-25 21:37:51.000000000 +0100 +++ lifelines/lifelines.changes 2006-06-22 18:14:31.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 22 18:14:26 CEST 2006 - ro(a)suse.de + +- remove selfprovides + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lifelines.spec ++++++ --- /var/tmp/diff_new_pack.PeATWa/_old 2006-06-22 18:29:59.000000000 +0200 +++ /var/tmp/diff_new_pack.PeATWa/_new 2006-06-22 18:29:59.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,19 +15,18 @@ URL: http://lifelines.sourceforge.net/ License: X11/MIT Group: Productivity/Scientific/Other -Provides: lifelines Autoreqprov: on Version: 3.0.46.1 -Release: 2 +Release: 14 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: The lifelines genealogy program +Summary: The Lifelines Genealogy Program Source: http://download.sourceforge.net/lifelines/lifelines-3.0.46.1.tar.bz2 Patch: lifelines-3.0.46.1.dif Patch1: lifelines-3.0.46.1-funcptr.dif Patch2: lifelines-3.0.46.1-array.dif %description -Lifelines is terminal based program that allows the tracking of +Lifelines is terminal-based program that allows the tracking of genealogical information. The lifelines reports are the power of the system but requires knowledge in the ll format. @@ -106,6 +105,8 @@ %{_mandir}/man1/*.gz %changelog -n lifelines +* Thu Jun 22 2006 - ro(a)suse.de +- remove selfprovides * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jan 23 2006 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0