packages: pldcpan/pldcpan.pl - version 1.59: BR: perl-Module-Build automati...

radek radek at pld-linux.org
Mon Feb 15 14:13:59 CET 2010


Author: radek                        Date: Mon Feb 15 13:13:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- version 1.59: BR: perl-Module-Build automatically
- minor tweaks

---- Files affected:
packages/pldcpan:
   pldcpan.pl (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: packages/pldcpan/pldcpan.pl
diff -u packages/pldcpan/pldcpan.pl:1.58 packages/pldcpan/pldcpan.pl:1.59
--- packages/pldcpan/pldcpan.pl:1.58	Fri Jan 30 16:29:37 2009
+++ packages/pldcpan/pldcpan.pl	Mon Feb 15 14:13:54 2010
@@ -651,7 +651,7 @@
 		## TODO: %pdir / %pnam in %URL
 	}
 	elsif (my ($tarname) =
-		$arg =~ m#^(?:https?|ftp)://[^/]+/(?:[^/]+/)*([^/]+)$#)
+		$arg =~ m# ^ (?:https?|ftp):// [^/]+/ (?:[^/]+/)* ([^/]+) $ #x)
 	{
 		$info->{url} = $arg;
 		warn " -- fetching '$tarname'\n";
@@ -730,7 +730,7 @@
 
 	my $basedir = getcwd;
 
-	$info->{dir} =~ s#/*$##;
+	$info->{dir} =~ s{/*$}{};
 	die " !! not a directory: $info->{dir}" unless -d $info->{dir};
 	warn " .. processing $info->{dir}\n";
 	chdir $info->{dir};
@@ -799,7 +799,7 @@
 [% IF pnam -%]
 %define	pnam	[% pnam %]
 [% END -%]
-Summary:	[% summary.replace('[\r\n]+', ' ') %]
+Summary:	[% summary.replace('[\r\n\t ]+', ' ') |trim %]
 #Summary(pl.UTF-8):	
 Name:		perl-[% pdir %][% IF pnam %]-[% pnam %][% END %]
 Version:	[% version %]
@@ -831,6 +831,11 @@
 #URL:		http://search.cpan.org/dist/[% pdir %]-[% pnam %]/
 [% ELSE -%]
 #URL:		http://search.cpan.org/dist/[% pdir %]/
+[% END -%]
+[% IF uses_module_build -%]
+[% req = 'perl-Module-Build' -%]
+BuildRequires:	perl-Module-Build[% ' >= ' _ build_requires.$req IF build_requires.$req %]
+[% build_requires.delete('perl-Module-Build') -%]
 [% END -%]
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pldcpan/pldcpan.pl?r1=1.58&r2=1.59&f=u



More information about the pld-cvs-commit mailing list