Created
October 29, 2011 15:12
-
-
Save mizzy/1324569 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- cpanflute2.org 2008-02-26 12:20:28.000000000 +0900 | |
| +++ cpanflute2 2008-02-26 12:21:15.000000000 +0900 | |
| @@ -159,10 +159,12 @@ | |
| my $yaml = Load($contents); | |
| while (my ($mod, $ver) = each %{$yaml->{build_requires}}) { | |
| - push @build_requires, [ "perl($mod)", $ver ]; | |
| + $mod = "perl($mod)" if $mod ne 'perl'; | |
| + push @build_requires, [ "$mod", $ver ]; | |
| } | |
| while (my ($mod, $ver) = each %{$yaml->{requires}}) { | |
| - push @requires, [ "perl($mod)", $ver ]; | |
| + $mod = "perl($mod)" if $mod ne 'perl'; | |
| + push @requires, [ "$mod", $ver ]; | |
| } | |
| } | |
| @@ -289,12 +291,7 @@ | |
| my $makefile_pl = qq{CFLAGS="\$RPM_OPT_FLAGS" %{__perl} Makefile.PL < /dev/null}; | |
| my $make_install = qq{make pure_install PERL_INSTALL_ROOT=\$RPM_BUILD_ROOT}; | |
| -if ($use_module_build) { | |
| - $makefile_pl = qq{CFLAGS="\$RPM_OPT_FLAGS" %{__perl} Makefile.PL destdir=\$RPM_BUILD_ROOT $installdirs < /dev/null}; | |
| -} | |
| -else { | |
| - $makefile_pl = qq{CFLAGS="\$RPM_OPT_FLAGS" %{__perl} Makefile.PL $installdirs}; | |
| -} | |
| +$makefile_pl = qq{CFLAGS="\$RPM_OPT_FLAGS" %{__perl} Makefile.PL $installdirs}; | |
| $spec->build(<<EOB); | |
| $makefile_pl |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment