Hello community, here is the log from the commit of package cpanspec for openSUSE:Factory checked in at Mon Sep 26 10:29:57 CEST 2011.
-------- --- cpanspec/cpanspec.changes 2011-08-02 10:32:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/cpanspec/cpanspec.changes 2011-09-26 09:47:30.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Sep 26 07:37:58 UTC 2011 - [email protected] + +- Stephan Kulow (3): + ignore duplicates + run prepare_spec + new version + +------------------------------------------------------------------- +Mon Sep 19 07:57:52 UTC 2011 - [email protected] + +- Stephan Kulow (1): + only add scanned deps as comment + +------------------------------------------------------------------- +Sat Sep 17 23:55:01 UTC 2011 - [email protected] + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cpanspec-1.78.05.tar.gz New: ---- cpanspec-1.78.06.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpanspec.spec ++++++ --- /var/tmp/diff_new_pack.AYBhaK/_old 2011-09-26 10:29:52.000000000 +0200 +++ /var/tmp/diff_new_pack.AYBhaK/_new 2011-09-26 10:29:52.000000000 +0200 @@ -18,14 +18,14 @@ Name: cpanspec -Version: 1.78.05 -Release: 31 +Version: 1.78.06 +Release: 1 %define cpan_name cpanspec Summary: Generate a SUSE spec file for a CPAN module License: GPL+ or Artistic Group: Development/Languages/Perl Url: http://sourceforge.net/projects/cpanspec/ -Source0: cpanspec-1.78.05.tar.gz +Source0: cpanspec-%{version}.tar.gz Source99: updaterpm.sh BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -71,9 +71,6 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) %doc Artistic BUGS Changes COPYING TODO ++++++ cpanspec-1.78.05.tar.gz -> cpanspec-1.78.06.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpanspec-1.78.05/META.yml new/cpanspec-1.78.06/META.yml --- old/cpanspec-1.78.05/META.yml 2011-08-02 10:31:22.000000000 +0200 +++ new/cpanspec-1.78.06/META.yml 2011-09-26 09:38:04.000000000 +0200 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: cpanspec -version: 1.78.05 +version: 1.78.06 abstract: ~ author: [] license: unknown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpanspec-1.78.05/cpanspec new/cpanspec-1.78.06/cpanspec --- old/cpanspec-1.78.05/cpanspec 2011-08-02 10:31:20.000000000 +0200 +++ new/cpanspec-1.78.06/cpanspec 2011-09-26 09:37:57.000000000 +0200 @@ -190,7 +190,7 @@ use warnings; our $NAME="cpanspec"; -our $VERSION='1.78.05'; +our $VERSION='1.78.06'; use Cwd; BEGIN { @@ -934,7 +934,7 @@ $license=undef; my $scripts=0; - my (%build_requires,%requires,%recommends); + my (%build_requires,%requires,%recommends,%possible_build_requires); my ($yml,$meta); if (grep /^META\.yml$/, @files and $yml=readfile("$path/META.yml")) { @@ -1052,6 +1052,8 @@ foreach my $test (grep /\.(pm|t|PL|pl)/, @files) { my $doc = PPI::Document->new($basedir . $path . "/" . $test); + next unless ($doc); + # Get the name of the main package my $pkg = $doc->find_first('PPI::Statement::Package'); if ($pkg) { @@ -1062,7 +1064,7 @@ foreach my $dep (keys(%scanneddeps)) { my $ndep = $scanneddeps{$dep}; unless ($build_requires{$dep} && $build_requires{$dep} > $ndep) { - $build_requires{$dep}=$scanneddeps{$dep}; + $possible_build_requires{$dep} = $scanneddeps{$dep}; } } } @@ -1138,11 +1140,16 @@ $build_requires{$dep}=$build_requires{$dep} || $requires{$dep}; } - for my $dep (sort(keys(%build_requires))) { - next if (is_in_core($dep, $build_requires{$dep})); + my @treqs = sort(keys(%build_requires)); + foreach my $dep (sort(keys(%possible_build_requires))) { + push(@treqs, $dep) if (!defined $build_requires{$dep}); + } + for my $dep (@treqs) { + my $iscore = 0; + eval { $iscore = is_in_core($dep, $build_requires{$dep}); }; + next if $iscore; if ($follow) { if ($dep ne $module and !(grep { $_ eq $dep } @processed, @args)) { - print "dep: $dep\n"; if (check_dep($dep)) { verbose("$dep is available, skipping."); } else { @@ -1151,9 +1158,15 @@ } } } - printf $spec "%-16s%s", "BuildRequires:", "perl($dep)"; - print $spec (" >= " . $build_requires{$dep}) - if ($build_requires{$dep}); + if (defined $build_requires{$dep}) { + printf $spec "%-16s%s", "BuildRequires:", "perl($dep)"; + print $spec (" >= " . $build_requires{$dep}) + if ($build_requires{$dep}); + } else { + printf $spec "#%-15s%s", "BuildRequires:", "perl($dep)"; + print $spec (" >= " . $possible_build_requires{$dep}) + if ($possible_build_requires{$dep}); + } print $spec "\n"; } @@ -1308,15 +1321,18 @@ $hdoc{"Artistic"} = 1; } - print $spec <<END; - + if (@filter_requires || @filter_provides) { + print $spec <<END; \%clean \%{__rm} -rf $macro{buildroot}@{[ (@filter_requires ? ' %{__perl_requires}' : '') . (@filter_provides ? ' %{__perl_provides}' : '')]} - -\%files -f \%{name}.files END + } else { + print $spec "\n"; + } + + print $spec "\%files -f \%{name}.files\n"; print $spec "\%defattr(-,root,root,755)\n"; if (%hdoc) { @@ -1334,6 +1350,15 @@ END $spec->close(); + my ($fh, $filename) = File::Temp::tempfile; + if (-x "/usr/lib/obs/service/format_spec_file.files/prepare_spec") { + if (!system("/usr/lib/obs/service/format_spec_file.files/prepare_spec '$specfile' > '$filename'")) { + # don't want to reimplement cross-device rename + system("mv '$filename' '$specfile'"); + } + } else { + print STDERR "please install obs-service-format_spec_file\n"; + } build_rpm($specfile) if ($buildsrpm or $buildrpm); ++++++ updaterpm.sh ++++++ --- /var/tmp/diff_new_pack.AYBhaK/_old 2011-09-26 10:29:52.000000000 +0200 +++ /var/tmp/diff_new_pack.AYBhaK/_new 2011-09-26 10:29:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh -rev=8ffa1e88a8b05c300274b844fde2700ca4768e14 +rev=3579abfacd75530f5baf5f020645ca905531affe 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` ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
