dinislage/cpanspec
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the path to rpm.

Browse Source
This commit is contained in:
stevenpritchard committed 2006-05-16 00:12:02 +00:00
1 parent 2ccb07fad3
commit cf1a9dd0d7
3 files changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Changes
+1
View File
@@ -3,6 +3,7 @@
* Fix $summary modification. * Fix $summary modification.
* Strip leading [Vv]\.? from spec Version. * Strip leading [Vv]\.? from spec Version.
* Add --epoch option. * Add --epoch option.
* rpm is in /bin, not /usr/bin.
1.65 2006-04-26 1.65 2006-04-26
TODO
+3
View File
@@ -22,3 +22,6 @@
from the module itself. from the module itself.
* Do a better job of detecting scripts in the package. * Do a better job of detecting scripts in the package.
* Check the search path for rpm, rpmbuild, etc. instead of hard-coding
paths.
cpanspec
+2 -2
View File
@@ -10,7 +10,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# $Id: cpanspec,v 1.25 2006/05/15 23:32:46 stevenpritchard Exp $ # $Id: cpanspec,v 1.26 2006/05/16 00:12:03 stevenpritchard Exp $
our $NAME="cpanspec"; our $NAME="cpanspec";
our $VERSION='1.66'; our $VERSION='1.66';
@@ -311,7 +311,7 @@ sub build_rpm($) {
my $spec=shift; my $spec=shift;
my $dir=getcwd(); my $dir=getcwd();
my $rpm=(-x "/usr/bin/rpmbuild" ? "/usr/bin/rpmbuild" : "/usr/bin/rpm"); my $rpm=(-x "/usr/bin/rpmbuild" ? "/usr/bin/rpmbuild" : "/bin/rpm");
verbose("Building " . ($buildrpm ? "rpms" : "source rpm") . " from $spec"); verbose("Building " . ($buildrpm ? "rpms" : "source rpm") . " from $spec");