Hello community, here is the log from the commit of package perl-Business-ISBN-Data for openSUSE:Factory checked in at 2015-02-24 12:59:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Business-ISBN-Data (Old) and /work/SRC/openSUSE:Factory/.perl-Business-ISBN-Data.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Business-ISBN-Data" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Business-ISBN-Data/perl-Business-ISBN-Data.changes 2014-09-25 08:42:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Business-ISBN-Data.new/perl-Business-ISBN-Data.changes 2015-02-24 12:59:04.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Feb 19 13:24:45 UTC 2015 - coolo@suse.com + +- updated to 20140910.002 + * Look in the current directory for RangeMessage.xml if it's + not in other locations. This can help with various Perl app + packagers. (But, also try ISBN_RANGE_MESSAGE env var) +- add fix-provides.diff to avoid providing ::ISBN without data + +------------------------------------------------------------------- Old: ---- Business-ISBN-Data-20140910.001.tar.gz New: ---- Business-ISBN-Data-20140910.002.tar.gz fix-provides.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Business-ISBN-Data.spec ++++++ --- /var/tmp/diff_new_pack.nIDQWZ/_old 2015-02-24 12:59:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nIDQWZ/_new 2015-02-24 12:59:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Business-ISBN-Data # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,22 +17,20 @@ Name: perl-Business-ISBN-Data -Version: 20140910.001 +Version: 20140910.002 Release: 0 %define cpan_name Business-ISBN-Data -Summary: Data pack for Business::ISBN +Summary: data pack for Business::ISBN License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Business-ISBN-Data/ Source: http://www.cpan.org/authors/id/B/BD/BDFOY/%{cpan_name}-%{version}.tar.gz +Patch0: fix-provides.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Test::More) >= 0.95 -Requires: perl(Test::More) >= 0.95 -#BuildRequires: perl(Test::Pod) -#BuildRequires: perl(Test::Pod::Coverage) %{perl_requires} %description @@ -41,9 +39,9 @@ These data are generated from the _RangeMessage.xml_ file provided by the ISBN Agency. You can retrieve this yourself at the -http://www.isbn-international.org/agency?rmxml=1 manpage. This file is -included as part of the distribution and should be installed at -_~lib/Business/ISBN/RangeMessage.xml_. +https://www.isbn-international.org/range_file_generation manpage. This file +is included as part of the distribution and should be installed at +_~lib/Business/ISBN/Data/RangeMessage.xml_. If you want to use a different _RangeMessage.xml_ file, you can set the 'ISBN_RANGE_MESSAGE' environment variable to the alternate location before @@ -53,14 +51,17 @@ If the default _RangeMessage.xml_ or your alternate one is not available, the module falls back to data included in _Data.pm_. However, that data is -likely to be older data. +likely to be older data. If it does not find that file, it looks for +_RangeMessage.xml_ in the current directory. -The data are in 'Business::ISBN::country_data' (although the "country" +The data are in '%Business::ISBN::country_data' (although the "country" part is historical). If you want to see where the data are from, check '$Business::ISBN::country_data{_source}'. %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 +# MANUAL sed -i "s|^#!/usr/local/bin/.*|%{_bindir}/perl|" make_data.pl %build ++++++ Business-ISBN-Data-20140910.001.tar.gz -> Business-ISBN-Data-20140910.002.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Business-ISBN-Data-20140910.001/Changes new/Business-ISBN-Data-20140910.002/Changes --- old/Business-ISBN-Data-20140910.001/Changes 2014-09-18 12:46:16.000000000 +0200 +++ new/Business-ISBN-Data-20140910.002/Changes 2014-09-22 20:32:13.000000000 +0200 @@ -1,4 +1,9 @@ +20140910.02 - Mon Sep 22 14:31:21 2014 + * Look in the current directory for RangeMessage.xml if it's + not in other locations. This can help with various Perl app + packagers. (But, also try ISBN_RANGE_MESSAGE env var) + 20140910.001 - Thu Sep 18 06:46:01 2014 * Update to the latest data (2014-09-10) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Business-ISBN-Data-20140910.001/META.json new/Business-ISBN-Data-20140910.002/META.json --- old/Business-ISBN-Data-20140910.001/META.json 2014-09-18 12:46:59.000000000 +0200 +++ new/Business-ISBN-Data-20140910.002/META.json 2014-09-22 20:32:15.000000000 +0200 @@ -4,7 +4,7 @@ "brian d foy " ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.140640", + "generated_by" : "ExtUtils::MakeMaker version 6.86, CPAN::Meta::Converter version 2.120921", "license" : [ "perl_5" ], @@ -50,5 +50,5 @@ "web" : "https://github.com/briandfoy/business--isbn" } }, - "version" : "20140910.001" + "version" : "20140910.002" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Business-ISBN-Data-20140910.001/META.yml new/Business-ISBN-Data-20140910.002/META.yml --- old/Business-ISBN-Data-20140910.001/META.yml 2014-09-18 12:46:58.000000000 +0200 +++ new/Business-ISBN-Data-20140910.002/META.yml 2014-09-22 20:32:15.000000000 +0200 @@ -3,25 +3,25 @@ author: - 'brian d foy ' build_requires: - ExtUtils::MakeMaker: '0' - Test::More: '0.95' + ExtUtils::MakeMaker: 0 + Test::More: 0.95 configure_requires: - ExtUtils::MakeMaker: '0' + ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.140640' +generated_by: 'ExtUtils::MakeMaker version 6.86, CPAN::Meta::Converter version 2.120921' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: '1.4' + version: 1.4 name: Business-ISBN-Data no_index: directory: - t - inc requires: - Carp: '0' - File::Basename: '0' - File::Spec::Functions: '0' + Carp: 0 + File::Basename: 0 + File::Spec::Functions: 0 resources: repository: https://github.com/briandfoy/business--isbn -version: '20140910.001' +version: 20140910.002 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Business-ISBN-Data-20140910.001/Makefile.PL new/Business-ISBN-Data-20140910.002/Makefile.PL --- old/Business-ISBN-Data-20140910.001/Makefile.PL 2014-09-18 12:46:16.000000000 +0200 +++ new/Business-ISBN-Data-20140910.002/Makefile.PL 2014-09-22 20:32:13.000000000 +0200 @@ -1,5 +1,7 @@ use ExtUtils::MakeMaker 6.65; +use 5.008; + eval "use Test::Manifest 1.21"; WriteMakefile( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Business-ISBN-Data-20140910.001/lib/Business/ISBN/Data.pm new/Business-ISBN-Data-20140910.002/lib/Business/ISBN/Data.pm --- old/Business-ISBN-Data-20140910.001/lib/Business/ISBN/Data.pm 2014-09-18 12:46:16.000000000 +0200 +++ new/Business-ISBN-Data-20140910.002/lib/Business/ISBN/Data.pm 2014-09-22 20:32:13.000000000 +0200 @@ -6,7 +6,7 @@ use File::Basename qw(dirname); use File::Spec::Functions qw(catfile); -$VERSION = '20140910.001'; +$VERSION = '20140910.002'; =head1 NAME @@ -34,7 +34,8 @@ If the default F or your alternate one is not available, the module falls back to data included in F. However, that data -is likely to be older data. +is likely to be older data. If it does not find that file, it looks +for F in the current directory. The data are in C<%Business::ISBN::country_data> (although the "country" part is historical). If you want to see where the data are from, check @@ -57,6 +58,9 @@ Daniel Jakubik updated the data in July 2012. +Markus Spann suggested looking for F in the current +directory to make it work with Perl app bundlers. + =head1 COPYRIGHT AND LICENSE Copyright (c) 2002-2014, brian d foy, All Rights Reserved. @@ -68,6 +72,7 @@ sub _default_data { ( _source => __FILE__, + _data_date => '20140910', 0 => [ 'English language' => [ '00' => '19', '200' => '699', '7000' => '8499', '85000' => '89999', '900000' => '949999', '9500000' => '9999999'] ], 1 => [ 'English language' => [ '00' => '09', '100' => '329', '330' => '399', '4000' => '5499', '55000' => '86979', '869800' => '998999', '9990000' => '9999999'] ], 2 => [ 'French language' => [ '00' => '19', '200' => '349', '35000' => '39999', '400' => '699', '7000' => '8399', '84000' => '89999', '900000' => '949999', '9500000' => '9999999'] ], @@ -300,15 +305,18 @@ # eventually fetch this from the internet # http://www.isbn-international.org/agency?rmxml=1 - my $file = do { - no warnings 'uninitialized'; - if( -e $ENV{ISBN_RANGE_MESSAGE} ) { $ENV{ISBN_RANGE_MESSAGE} } - else { - my $default = catfile( dirname( __FILE__ ), 'RangeMessage.xml' ); - } - }; + if( defined $ENV{ISBN_RANGE_MESSAGE} and ! -e $ENV{ISBN_RANGE_MESSAGE} ) { + carp "ISBN_RANGE_MESSAGE is set to [$ENV{ISBN_RANGE_MESSAGE}] but that file does not exist!\nTrying to use the default locations\n"; + } + my $file = 'RangeMessage.xml'; + no warnings 'uninitialized'; + my @candidates = grep { -e } ( + $ENV{ISBN_RANGE_MESSAGE}, # env + catfile( dirname( __FILE__ ), $file ), # next to the module + $file, # current directory + ); - my $hash = _parse_range_message( $file ); + my $hash = _parse_range_message( $candidates[0] ); if( defined $hash ) { return %$hash } else { _default_data() } @@ -318,7 +326,7 @@ my( $file ) = @_; open my $fh, '<:utf8', $file or do { - carp "Could not open $file to get ISBN range data [$!]"; + carp "Could not open $file to get ISBN range data [$!]\n"; return }; ++++++ fix-provides.diff ++++++ Index: Business-ISBN-Data-20140910.002/lib/Business/ISBN/Data.pm =================================================================== --- Business-ISBN-Data-20140910.002.orig/lib/Business/ISBN/Data.pm +++ Business-ISBN-Data-20140910.002/lib/Business/ISBN/Data.pm @@ -375,7 +375,8 @@ $Business::ISBN::MAX_COUNTRY_CODE_LENGTH ( sort { $a <=> $b } grep { ! /\A_/ } keys %Business::ISBN::country_data )[-1] ); -package Business::ISBN; +package + Business::ISBN; sub isbn_group_code_string_from_number { return if $_[0] =~ /\A_/; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org