aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-09-28 12:06:29 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-09-28 12:06:29 +0000
commit4b4abfbc72058dafba6ae1f0d4462403706c1cb4 (patch)
treef8121e7b4af1c71b8d254a7f3673099ae7e882c7
parent17b600293482c5414fc3b2663129021646799cd6 (diff)
downloadrpmtools-4b4abfbc72058dafba6ae1f0d4462403706c1cb4.tar
rpmtools-4b4abfbc72058dafba6ae1f0d4462403706c1cb4.tar.gz
rpmtools-4b4abfbc72058dafba6ae1f0d4462403706c1cb4.tar.bz2
rpmtools-4b4abfbc72058dafba6ae1f0d4462403706c1cb4.tar.xz
rpmtools-4b4abfbc72058dafba6ae1f0d4462403706c1cb4.zip
Use Pod::Usage for gendistrib
-rw-r--r--Makefile.PL8
-rwxr-xr-xgendistrib48
-rw-r--r--rpmtools.spec5
3 files changed, 21 insertions, 40 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 8e7cb7f..e556c5a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -59,15 +59,15 @@ WriteMakefile(
'Distribconf.pm' => '$(INST_LIBDIR)/Distribconf.pm',
'Distribconf/Build.pm' => '$(INST_LIBDIR)/Distribconf/Build.pm',
},
- 'EXE_FILES' => [ qw(gendistrib genhdlist packdrake rpm2header parsehdlist rpm2cpio.pl dumpdistribconf) ],
- C => [],
- 'OBJECT' => '',
+ EXE_FILES => [ qw(gendistrib genhdlist packdrake rpm2header parsehdlist rpm2cpio.pl dumpdistribconf) ],
+ C => [],
+ OBJECT => '',
CCFLAGS => '-Wall',
OPTIMIZE => '-O3 -fomit-frame-pointer -fno-exceptions -pipe -s -ffast-math -fexpensive-optimizations',
INC => '',
LIBS => [ '' ],
INSTALLDIRS => 'vendor',
- dist => {
+ dist => {
COMPRESS => 'bzip2 --best',
SUFFIX => '.bz2',
},
diff --git a/gendistrib b/gendistrib
index cfa70b5..5e3f854 100755
--- a/gendistrib
+++ b/gendistrib
@@ -25,38 +25,14 @@ use URPM::Build;
use Getopt::Long;
use Distribconf::Build;
use Packdrakeng;
+use Pod::Usage;
my $urpm = new URPM;
my $tempdir = -d $ENV{TMPDIR} ? $ENV{TMPDIR} : -d "$ENV{HOME}/tmp" ? "$ENV{HOME}/tmp" : "/tmp";
my $headers_dir = $tempdir . "/.build_hdlist";
sub usage () {
- print STDERR <<EOF;
-Usage: $0 [options] dir
-dir should be the top level of distro
-Options:
- --help print this message and exit
- --compss file path of compss file (default media/media_info/compss)
- --depslist file path of depslist file
- (default media/media_info/depslist.ordered)
- --provides file path of provides file (default media/media_info/provides)
- --mediacfg file use this media.cfg file
- (default media/media_info/media.cfg)
- --hdlists file path of hdlists file (default media/media_info/hdlists)
- --destdir dir create all new files in the dir, all subdirectory should
- exists this is usefull for testing, or while using
- read-only repository
- --headersdir dir put temporary files in this dir (default \$TMPDIR)
- --nobadrpm don't stop on bad rpms
- --skipmissingdir if a media dir is missing, ignore instead stoping
- --noemptymedia stop if an media is found
- --nochkdep don't search for missing dependencies
- --blind allways rebuild index, don't check if build is need
- --noclean keep cache files
- --nomediainfo don't create per-media media_info subdirectories
- --nomd5sum don't generate MD5SUM files
- -s silent mode
-EOF
+ pod2usage({ -verbose => 1 });
}
my %urpmfiles;
@@ -449,31 +425,33 @@ gendistrib - generates a mirror tree for a distribution
=over 4
-=item --compss I<file>
+=item --compss file
-Path of compss file (defaults to F<media/media_info/compss>).
+Path of F<compss> file (defaults to F<media/media_info/compss>).
-=item --depslist I<file>
+=item --depslist file
-Path of depslist file (defaults to F<media/media_info/depslist.ordered>).
+Path of F<depslist> file (defaults to F<media/media_info/depslist.ordered>).
-=item --provides I<file> Path of provides file (defaults to F<media/media_info/provides>)
+=item --provides file
-=item --mediacfg I<file>
+Path of F<provides> file (defaults to F<media/media_info/provides>)
+
+=item --mediacfg file
Use the specified F<media.cfg> file (defaults to F<media/media_info/media.cfg>).
-=item --hdlists I<file>
+=item --hdlists file
Path of the F<hdlists> file (defaults to F<media/media_info/hdlists>)
-=item --destdir I<dir>
+=item --destdir dir
Create all new files in the specified directory. All subdirectories should
exist. This option is mostly useful for testing, or while using a read-only
repository.
-=item --headersdir I<dir>
+=item --headersdir dir
Put temporary files in this directory (defaults to TMPDIR).
diff --git a/rpmtools.spec b/rpmtools.spec
index 780c721..f447463 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -19,7 +19,10 @@ BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: rpm-devel >= 4.0.3 bzip2-devel
BuildRequires: perl-devel
BuildRequires: perl-Compress-Zlib
-Requires: rpm >= %{rpm_version} bzip2 >= 1.0 perl-URPM >= 0.94
+Requires: rpm >= %{rpm_version}
+Requires: bzip2 >= 1.0
+Requires: perl-URPM >= 0.94
+Requires: perl
Conflicts: rpmtools-compat <= 2.0 rpmtools-devel <= 2.0
Conflicts: packdrake < 5.0.10