Hello community,
here is the log from the commit of package perl-Image-Sane for openSUSE:Factory
checked in at 2019-09-16 10:52:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Image-Sane (Old)
and /work/SRC/openSUSE:Factory/.perl-Image-Sane.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Image-Sane"
Mon Sep 16 10:52:29 2019 rev:2 rq:730865 version:4
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Image-Sane/perl-Image-Sane.changes
2017-12-02 13:11:56.283602653 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Image-Sane.new.7948/perl-Image-Sane.changes
2019-09-16 10:52:33.363155495 +0200
@@ -1,0 +2,11 @@
+Fri Sep 13 09:03:41 UTC 2019 - Tina Mueller <[email protected]>
+
+- Add BuildRequires: pkgconfig(sane-backends)
+
+-------------------------------------------------------------------
+Fri Sep 13 08:59:30 UTC 2019 - <[email protected]>
+
+- updated to 4
+ see /usr/share/doc/packages/perl-Image-Sane/Changes
+
+-------------------------------------------------------------------
Old:
----
Image-Sane-0.14.tar.gz
New:
----
Image-Sane-4.tar.gz
cpanspec.yml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Image-Sane.spec ++++++
--- /var/tmp/diff_new_pack.yNvdmo/_old 2019-09-16 10:52:33.755155444 +0200
+++ /var/tmp/diff_new_pack.yNvdmo/_new 2019-09-16 10:52:33.755155444 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Image-Sane
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,43 +12,54 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define cpan_name Image-Sane
Name: perl-Image-Sane
-Version: 0.14
+Version: 4
Release: 0
-Summary: Perl extension for the SANE (Scanner Access Now Easy) Project
-License: Artistic-1.0 or GPL-2.0+
+%define cpan_name Image-Sane
+Summary: Perl extension for the SANE (Scanner Access Now Easy)
+License: Artistic-1.0 OR GPL-1.0-or-later
Group: Development/Libraries/Perl
-Url: http://search.cpan.org/dist/Image-Sane/
-Source:
http://www.cpan.org/authors/id/R/RA/RATCLIFFE/%{cpan_name}-%{version}.tar.gz
+Url: https://metacpan.org/release/%{cpan_name}
+Source0:
https://cpan.metacpan.org/authors/id/R/RA/RATCLIFFE/%{cpan_name}-%{version}.tar.gz
+Source1: cpanspec.yml
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: perl
+BuildRequires: perl-macros
BuildRequires: perl(Exception::Class)
BuildRequires: perl(ExtUtils::Depends)
BuildRequires: perl(ExtUtils::PkgConfig)
BuildRequires: perl(Readonly)
BuildRequires: perl(Test::Requires)
BuildRequires: perl(Try::Tiny)
-BuildRequires: pkgconfig(sane-backends)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: perl(Exception::Class)
+Requires: perl(Readonly)
%{perl_requires}
+# MANUAL BEGIN
+BuildRequires: pkgconfig(sane-backends)
+# MANUAL END
%description
-This module allows you to access SANE-compatible scanners in a Perlish and
-object-oriented way, freeing you from the casting and memory management in C,
-yet remaining very close in spirit to original API.
+These Perl bindings for the SANE (Scanner Access Now Easy) Project allow
+you to access SANE-compatible scanners in a Perlish and object-oriented
+way, freeing you from the casting and memory management in C, yet remaining
+very close in spirit to original API.
+
+Find out more about SANE at http://www.sane-project.org.
%prep
%setup -q -n %{cpan_name}-%{version}
+find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644
%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}
%check
-make %{?_smp_mflags} test
+make test
%install
%perl_make_install
@@ -57,6 +68,6 @@
%files -f %{name}.files
%defattr(-,root,root,755)
-%doc Changes README
+%doc Changes examples README
%changelog
++++++ Image-Sane-0.14.tar.gz -> Image-Sane-4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/Changes new/Image-Sane-4/Changes
--- old/Image-Sane-0.14/Changes 2017-07-08 19:33:45.000000000 +0200
+++ new/Image-Sane-4/Changes 2019-09-12 09:53:06.000000000 +0200
@@ -1,6 +1,23 @@
Revision history for Perl extension Image::Sane.
-0.14 Thu, 08 Jul 2017 19:30 +0200
+4 Thu, 12 Sep 2019 00:00 +0000
+ - Use Config
+ Thanks to Petr Pisar for the patch.
+
+3 Wed, 11 Sep 2019 00:00 +0000
+ - Respect Perl CCFLAGS.
+ Closes RT 130477 (Makefile.PL ignores Perl CCFLAGS)
+ Thanks to Petr Pisar for the patch.
+
+2 Sat, 17 Aug 2019 19:30 +0200
+ - correctly set version number.
+ - correct MANIFEST.
+
+1 Sat, 17 Aug 2019 19:30 +0200
+ - initialise info flags as some backends, e.g. imagescan
+ (utsushi) don't.
+
+0.14 Sat, 08 Jul 2017 19:30 +0200
- correct escaping in 81_scanimage-perl.t to fix RT 122380.
- add Try::Tiny to TEST_REQUIRES fix RT 122382.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/MANIFEST new/Image-Sane-4/MANIFEST
--- old/Image-Sane-0.14/MANIFEST 2017-07-08 19:36:21.000000000 +0200
+++ new/Image-Sane-4/MANIFEST 2019-09-12 10:00:22.000000000 +0200
@@ -9,6 +9,7 @@
lib/Image/Sane/Device.pm
saneperl.h
t/1_init.t
+t/2_exit.t
t/81_scanimage-perl.t
t/90_MANIFEST.t
t/91_critic.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/META.json new/Image-Sane-4/META.json
--- old/Image-Sane-0.14/META.json 2017-07-08 19:36:21.000000000 +0200
+++ new/Image-Sane-4/META.json 2019-09-12 10:00:22.000000000 +0200
@@ -4,7 +4,7 @@
"Jeffrey Ratcliffe"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.1002, CPAN::Meta::Converter
version 2.150010",
+ "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter
version 2.150010",
"license" : [
"unknown"
],
@@ -22,14 +22,12 @@
"prereqs" : {
"build" : {
"requires" : {
- "ExtUtils::MakeMaker" : "0",
- "Test::More" : "0",
- "Test::Requires" : "0",
- "Try::Tiny" : "0"
+ "ExtUtils::MakeMaker" : "0"
}
},
"configure" : {
"requires" : {
+ "Config" : "0",
"ExtUtils::Depends" : "0",
"ExtUtils::PkgConfig" : "0"
}
@@ -39,9 +37,16 @@
"Exception::Class" : "0",
"Readonly" : "0"
}
+ },
+ "test" : {
+ "requires" : {
+ "Test::More" : "0",
+ "Test::Requires" : "0",
+ "Try::Tiny" : "0"
+ }
}
},
"release_status" : "stable",
- "version" : "0.14",
- "x_serialization_backend" : "JSON::PP version 2.27300_01"
+ "version" : "4",
+ "x_serialization_backend" : "JSON::PP version 2.27400_02"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/META.yml new/Image-Sane-4/META.yml
--- old/Image-Sane-0.14/META.yml 2017-07-08 19:36:21.000000000 +0200
+++ new/Image-Sane-4/META.yml 2019-09-12 10:00:22.000000000 +0200
@@ -8,10 +8,11 @@
Test::Requires: '0'
Try::Tiny: '0'
configure_requires:
+ Config: '0'
ExtUtils::Depends: '0'
ExtUtils::PkgConfig: '0'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.1002, CPAN::Meta::Converter
version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version
2.150010'
license: unknown
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,5 +25,5 @@
requires:
Exception::Class: '0'
Readonly: '0'
-version: '0.14'
+version: '4'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/Makefile.PL
new/Image-Sane-4/Makefile.PL
--- old/Image-Sane-0.14/Makefile.PL 2017-07-08 19:16:50.000000000 +0200
+++ new/Image-Sane-4/Makefile.PL 2019-09-12 09:58:53.000000000 +0200
@@ -3,6 +3,7 @@
use ExtUtils::Depends;
use ExtUtils::PkgConfig;
use English;
+use Config;
# minimum required version of dependancies we need to build
our %build_reqs = ( 'libsane' => '1.0.19', );
@@ -33,6 +34,7 @@
VERSION_FROM => 'lib/Image/Sane.pm', # finds
$VERSION
PREREQ_PM => { Readonly => 0, Exception::Class => 0 },
CONFIGURE_REQUIRES => {
+ Config => 0,
ExtUtils::Depends => 0,
ExtUtils::PkgConfig => 0
},
@@ -55,9 +57,10 @@
)
: ()
),
- LIBS => [$lib], # e.g., '-lm'
- DEFINE => '', # e.g., '-DHAVE_SOMETHING'
- INC => $inc, # e.g., '-I. -I/usr/include/other'
+ LIBS => [$lib], # e.g., '-lm'
+ CCFLAGS => "$Config{ccflags} -Wall",
+ DEFINE => '', # e.g., '-DHAVE_SOMETHING'
+ INC => $inc, # e.g., '-I. -I/usr/include/other'
# Un-comment this if you add C files to link with
later:
# OBJECT => '$(O_FILES)', # link all the C files too
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/README new/Image-Sane-4/README
--- old/Image-Sane-0.14/README 2017-05-23 21:47:25.000000000 +0200
+++ new/Image-Sane-4/README 2019-09-12 09:56:29.000000000 +0200
@@ -22,7 +22,7 @@
COPYRIGHT AND LICENCE
-Copyright (C) 2008-2017 by Jeffrey Ratcliffe
+Copyright (C) 2008-2019 by Jeffrey Ratcliffe
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself, either Perl version 5.8.5 or,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/Sane.xs new/Image-Sane-4/Sane.xs
--- old/Image-Sane-0.14/Sane.xs 2017-05-25 11:53:59.000000000 +0200
+++ new/Image-Sane-4/Sane.xs 2019-08-13 13:34:38.000000000 +0200
@@ -162,7 +162,7 @@
SANE_Int n
INIT:
SANE_Status status;
- SANE_Int info;
+ SANE_Int info = 0;
PPCODE:
SV* sv = get_sv("Image::Sane::DEBUG", FALSE);
if (SvTRUE(sv)) printf("Setting option %d to automatic
on SANE_Handle %p\n", n, (void *) h);
@@ -179,8 +179,8 @@
SV* value
INIT:
SANE_Status status;
- SANE_Int info;
- void * valuep;
+ SANE_Int info = 0;
+ void * valuep = &info; /* dummy assignment to avoid
warning */
const SANE_Option_Descriptor * opt;
SANE_Bool b;
SANE_Fixed fixed;
@@ -252,8 +252,6 @@
SANE_Status
sane__start (handle)
SANE_Handle handle
- INIT:
- SANE_Status status;
CODE:
SV* sv = get_sv("Image::Sane::DEBUG", FALSE);
if (SvTRUE(sv)) printf("Running sane_start for
SANE_Handle %p\n", (void *) handle);
@@ -299,7 +297,7 @@
PUSHMARK(sp);
XPUSHs(sv_2mortal(newSViv(status)));
if (!status) {
- XPUSHs(sv_2mortal(newSVpvn(data, length)));
+ XPUSHs(sv_2mortal(newSVpvn((const char *) data,
length)));
XPUSHs(sv_2mortal(newSViv(length)));
}
PUTBACK;
@@ -542,10 +540,8 @@
SANE_Bool local
INIT:
SANE_Status status;
- AV * array;
int i;
const SANE_Device ** device_list;
- array = (AV *)sv_2mortal((SV *)newAV());
PPCODE:
SV* sv = get_sv("Image::Sane::DEBUG", FALSE);
if (SvTRUE(sv)) printf("Running sane_get_devices\n");
@@ -571,9 +567,9 @@
void
sane__exit ()
CODE:
- SV* sv = get_sv("Image::Sane::_vc", FALSE);
+ SV* sv = get_sv("Image::Sane::vc", FALSE);
if (SvTRUE(sv)) {
sv = get_sv("Image::Sane::DEBUG", FALSE);
if (SvTRUE(sv)) printf("Exiting via sane_exit\n");
- sane_exit;
+ sane_exit();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/lib/Image/Sane.pm
new/Image-Sane-4/lib/Image/Sane.pm
--- old/Image-Sane-0.14/lib/Image/Sane.pm 2017-07-08 19:35:21.000000000
+0200
+++ new/Image-Sane-4/lib/Image/Sane.pm 2019-09-12 09:56:40.000000000 +0200
@@ -136,9 +136,9 @@
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-our $VERSION = '0.14';
+our $VERSION = '4';
our $DEBUG = 0;
-my $vc;
+our $vc;
use XSLoader;
XSLoader::load( 'Image::Sane', $VERSION );
@@ -200,7 +200,7 @@
=head1 VERSION
-0.14
+4
=head1 SYNOPSIS
@@ -532,7 +532,7 @@
=head1 LICENSE AND COPYRIGHT
-Copyright (C) 2008--2017 by Jeffrey Ratcliffe
+Copyright (C) 2008--2019 by Jeffrey Ratcliffe
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself, either Perl version 5.8.5 or,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/saneperl.h
new/Image-Sane-4/saneperl.h
--- old/Image-Sane-0.14/saneperl.h 2017-07-06 17:54:06.000000000 +0200
+++ new/Image-Sane-4/saneperl.h 2019-09-12 09:57:02.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008--2017 by Jeffrey Ratcliffe <[email protected]>
+ * Copyright (c) 2008--2019 by Jeffrey Ratcliffe <[email protected]>
*
* This library is free software; you can redistribute it and/or modify
* it under the same terms as Perl itself, either Perl version 5.8.5 or,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/t/2_exit.t
new/Image-Sane-4/t/2_exit.t
--- old/Image-Sane-0.14/t/2_exit.t 1970-01-01 01:00:00.000000000 +0100
+++ new/Image-Sane-4/t/2_exit.t 2019-08-13 13:34:38.000000000 +0200
@@ -0,0 +1,24 @@
+use warnings;
+use strict;
+use English;
+use Test::Requires qw( v5.10 );
+use Test::More tests => 1;
+
+#########################
+
+my $pl = <<'END';
+use strict;
+use warnings;
+use Image::Sane ':all';
+$Image::Sane::DEBUG = 1;
+Image::Sane->get_version_scalar;
+END
+
+my $fname = 'examples/exit.pl';
+open my $fh, '>', $fname;
+print $fh $pl;
+close $fh;
+my $exe = "PERL5LIB=\"blib:blib/arch:lib:\$PERL5LIB\" $EXECUTABLE_NAME $fname";
+my $output = `$exe`;
+like $output, qr/Exiting via sane_exit/, 'sane_exit() reached';
+unlink $fname;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/t/90_MANIFEST.t
new/Image-Sane-4/t/90_MANIFEST.t
--- old/Image-Sane-0.14/t/90_MANIFEST.t 2017-05-29 22:13:38.000000000 +0200
+++ new/Image-Sane-4/t/90_MANIFEST.t 2019-09-10 09:24:27.000000000 +0200
@@ -26,7 +26,7 @@
my $text = <$fh>;
close $fh or die "Error: cannot close $file\n";
-if ( $text =~ /=head1\s+VERSION\s+([0-9][.][0-9]+)/xsm ) {
+if ( $text =~ /=head1\s+VERSION\s+([0-9]+([.][0-9]+)?)/xsm ) {
my $version = $1;
is( $version, $Image::Sane::VERSION,
'version number correctly documented' );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Image-Sane-0.14/t/err.t new/Image-Sane-4/t/err.t
--- old/Image-Sane-0.14/t/err.t 2017-05-02 22:54:47.000000000 +0200
+++ new/Image-Sane-4/t/err.t 2019-08-13 08:51:03.000000000 +0200
@@ -1,12 +1,12 @@
use Image::Sane ':all';
use Try::Tiny;
-use Test::More tests => 39;
+use Test::More tests => 40;
BEGIN { use_ok('Image::Sane') }
#########################
SKIP: {
- skip "libsane 1.0.19 or better required", 39
+ skip "libsane 1.0.19 or better required", 40
unless Image::Sane->get_version_scalar > 1.000018;
try {
@@ -78,4 +78,7 @@
};
$test->cancel;
}
+
+ is( Image::Sane::strstatus(SANE_STATUS_INVAL),
+ 'Invalid argument', 'strstatus' );
}
++++++ cpanspec.yml ++++++
---
#description_paragraphs: 3
#description: |-
# override description from CPAN
#summary: override summary from CPAN
#no_testing: broken upstream
#sources:
# - source1
# - source2
#patches:
# foo.patch: -p1
# bar.patch:
preamble: |-
BuildRequires: pkgconfig(sane-backends)
#post_prep: |-
# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'`
# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL
#post_build: |-
# rm unused.files
#post_install: |-
# sed on %{name}.files
#license: SUSE-NonFree
#skip_noarch: 1
#custom_build: |-
#./Build build flags=%{?_smp_mflags} --myflag
#custom_test: |-
#startserver && make test
#ignore_requires: Bizarre::Module
