diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-01-15 17:08:59 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-01-15 17:08:59 +0000 |
| commit | 16c28ac373777313a4360cfcde0078d424e6701e (patch) | |
| tree | 82f276ea7c7f6306a4323ff0ffc8666fb182e758 | |
| parent | 5724efe345ece2d55ec6e5439382b6f77d615408 (diff) | |
| download | rpmtools-16c28ac373777313a4360cfcde0078d424e6701e.tar rpmtools-16c28ac373777313a4360cfcde0078d424e6701e.tar.gz rpmtools-16c28ac373777313a4360cfcde0078d424e6701e.tar.bz2 rpmtools-16c28ac373777313a4360cfcde0078d424e6701e.tar.xz rpmtools-16c28ac373777313a4360cfcde0078d424e6701e.zip | |
4.0-4mdk4.0.4
| -rw-r--r-- | parsehdlist.c | 8 | ||||
| -rw-r--r-- | rpmtools.pm | 2 | ||||
| -rw-r--r-- | rpmtools.spec | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/parsehdlist.c b/parsehdlist.c index 7976434..16137eb 100644 --- a/parsehdlist.c +++ b/parsehdlist.c @@ -205,6 +205,7 @@ void print_help(void) { " line, incompatible with interactive mode).\n" " --compact - print compact provides, requires, conflicts, obsoletes flags.\n" " --all - print all tags (incompatible with interactive mode).\n" + " --synthesis - print synthesis tags (incompatible with interactive mode).\n" " --name - print tag name and rpm filename if needed.\n" " --info - print tag name, serial and rpm filename if needed\n" " --group - print tag group: group.\n" @@ -294,6 +295,13 @@ int main(int argc, char **argv) print_conflicts = 1; print_obsoletes = 1; print_prereqs = 1; + } else if (strcmp(argv[i], "--synthesis") == 0) { + print_sep = '@'; + print_info = 1; + print_provides = 1; + print_requires = 1; + print_conflicts = 1; + print_obsoletes = 1; } else { fprintf(stderr, "parsehdlist: unknown option %s\n", argv[i]); } diff --git a/rpmtools.pm b/rpmtools.pm index 0358273..3695d73 100644 --- a/rpmtools.pm +++ b/rpmtools.pm @@ -602,7 +602,7 @@ sub compat_arch { better_arch(arch(), $_[0]) } #- compare a version string, make sure no deadlock can occur. #- try to return always a numerical value. sub version_compare { - return rpmvercmp(@_); + goto &rpmvercmp; } #- historical perl version (still breaks on "4m" with "4.1m"... #- my ($a, $b) = @_; diff --git a/rpmtools.spec b/rpmtools.spec index 4b2626e..0d00958 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 3mdk +%define release 4mdk # do not modify here, see Makefile in the CVS %define version 4.0 @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/perl5/man/*/* %changelog +* Tue Jan 15 2002 François Pons <fpons@mandrakesoft.com> 4.0-4mdk +- added --synthesis flag to parsehdlist. + * Thu Jan 10 2002 François Pons <fpons@mandrakesoft.com> 4.0-3mdk - fixed stupid bug when parsing hdlist. |