Hello community, here is the log from the commit of package cpanspec for openSUSE:Factory checked in at 2011-12-08 11:27:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpanspec (Old) and /work/SRC/openSUSE:Factory/.cpanspec.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cpanspec", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cpanspec/cpanspec.changes 2011-09-26 10:29:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cpanspec.new/cpanspec.changes 2011-12-08 11:27:38.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Dec 5 15:20:55 UTC 2011 - [email protected] + +- fixed cpanspec to suggest "GPL-1.0+ or Artistic-1.0" if no + licence is found + +------------------------------------------------------------------- +Fri Dec 2 13:13:35 UTC 2011 - [email protected] + +- Stephan Kulow (1): + adopt license + +------------------------------------------------------------------- +Fri Dec 2 12:48:03 UTC 2011 - [email protected] + +- Add requires on Class::Accessor::Chained and Pod::POM + +------------------------------------------------------------------- New: ---- cpanspec-1.78.06-spdx.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpanspec.spec ++++++ --- /var/tmp/diff_new_pack.Uv9a2p/_old 2011-12-08 11:27:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Uv9a2p/_new 2011-12-08 11:27:40.000000000 +0100 @@ -19,32 +19,36 @@ Name: cpanspec Version: 1.78.06 -Release: 1 +Release: 0 %define cpan_name cpanspec Summary: Generate a SUSE spec file for a CPAN module -License: GPL+ or Artistic +License: Artistic-1.0 or GPL-1.0+ Group: Development/Languages/Perl Url: http://sourceforge.net/projects/cpanspec/ Source0: cpanspec-%{version}.tar.gz Source99: updaterpm.sh +# PATCH-FIX-OPENSUSE suggest licence in SPDX format +Patch0: cpanspec-1.78.06-spdx.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl -BuildRequires: perl-macros BuildRequires: perl(Archive::Tar) BuildRequires: perl(Archive::Zip) BuildRequires: perl(IO::Uncompress::Bunzip2) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Parse::CPAN::Packages) +BuildRequires: perl(Perl::PrereqScanner) BuildRequires: perl(Pod::Simple::TextContent) BuildRequires: perl(Text::Autoformat) BuildRequires: perl(YAML) -BuildRequires: perl(Perl::PrereqScanner) +BuildRequires: perl-macros Requires: perl(Archive::Tar) Requires: perl(Archive::Zip) +Requires: perl(Class::Accessor::Chained) Recommends: perl(IO::Uncompress::Bunzip2) Requires: perl(LWP::UserAgent) Requires: perl(Parse::CPAN::Packages) +Requires: perl(Pod::POM) Requires: perl(Pod::Simple::TextContent) Requires: perl(Text::Autoformat) Requires: perl(YAML) @@ -57,6 +61,7 @@ %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 find . -type f -print0 | xargs -0 chmod 644 %build ++++++ cpanspec-1.78.06-spdx.patch ++++++ Index: cpanspec-1.78.06/cpanspec =================================================================== --- cpanspec-1.78.06.orig/cpanspec 2011-12-02 14:13:34.000000000 +0100 +++ cpanspec-1.78.06/cpanspec 2011-12-05 16:18:55.010868360 +0100 @@ -1013,7 +1013,7 @@ get_license($content); if ($license && ($license =~ /under the same terms as Perl itself/ || $license =~ /under the terms of the Perl artistic license/)) { - $license = "GPL+ or Artistic"; + $license = "GPL-1.0+ or Artistic-1.0"; } } @@ -1021,7 +1021,7 @@ $summary="$module Perl module"; } - $license="CHECK(GPL+ or Artistic)" if (!$license); + $license="CHECK(GPL-1.0+ or Artistic-1.0)" if (!$license); $description=$summary if (!defined($description)); ++++++ cpanspec-1.78.06.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpanspec-1.78.06/META.yml new/cpanspec-1.78.06/META.yml --- old/cpanspec-1.78.06/META.yml 2011-09-26 09:38:04.000000000 +0200 +++ new/cpanspec-1.78.06/META.yml 2011-12-02 14:13:36.000000000 +0100 @@ -28,7 +28,7 @@ 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/cpanspec-1.78.06/cpanspec new/cpanspec-1.78.06/cpanspec --- old/cpanspec-1.78.06/cpanspec 2011-09-26 09:37:57.000000000 +0200 +++ new/cpanspec-1.78.06/cpanspec 2011-12-02 14:13:34.000000000 +0100 @@ -197,6 +197,7 @@ my ($wd) = Cwd::abs_path($0) =~ m-(.*)/- ; $wd ||= '.'; unshift @INC, "$wd"; + unshift @INC, "$wd/lib"; } use Module::CoreList; @@ -225,7 +226,7 @@ require Carp; $SIG{__DIE__} = sub { - Carp::confess("Died"); +# Carp::confess("Died"); }; our %opt; @@ -976,19 +977,19 @@ # docs, cross referenced with the list of licenses in # /usr/share/rpmlint/config. if ($meta->{license} =~ /^perl$/i) { - $license="GPL+ or Artistic"; + $license="Artistic-1.0 or GPL-1.0+"; } elsif ($meta->{license} =~ /^apache$/i) { $license="Apache Software License"; } elsif ($meta->{license} =~ /^artistic$/i) { - $license="Artistic"; + $license="Artistic-1.0"; } elsif ($meta->{license} =~ /^artistic_?2$/i) { - $license="Artistic 2.0"; + $license="Artistic-2.0"; } elsif ($meta->{license} =~ /^bsd$/i) { - $license="BSD"; + $license="BSD3c"; } elsif ($meta->{license} =~ /^gpl$/i) { - $license="GPL+"; + $license="GPL-1.0+"; } elsif ($meta->{license} =~ /^lgpl$/i) { - $license="LGPLv2+"; + $license="LGPL-2.1+"; } elsif ($meta->{license} =~ /^mit$/i) { $license="MIT"; } elsif ($meta->{license} =~ /^mozilla$/i) { ++++++ updaterpm.sh ++++++ --- /var/tmp/diff_new_pack.Uv9a2p/_old 2011-12-08 11:27:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Uv9a2p/_new 2011-12-08 11:27:40.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh -rev=3579abfacd75530f5baf5f020645ca905531affe +rev=513e85daf0caa6df5604b32b86dcb5111b6f106a git clone --depth 0 http://git.gitorious.org/opensuse/cpanspec.git cd cpanspec nrev=`git show HEAD| grep commit | head -n 1 | cut '-d ' -f2` -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
