From 2e9d2616969433851a1c883c900d6ea5acde67b7 Mon Sep 17 00:00:00 2001 From: jbj Date: Mon, 4 Dec 2000 02:13:11 +0000 Subject: [PATCH] - use package version 3 if --nodirtokens is specified. CVS patchset: 4317 CVS date: 2000/12/04 02:13:11 --- CHANGES | 1 + Doxyfile.in | 1 - Makefile.am | 5 ++--- build/pack.c | 5 ++--- po/rpm.pot | 56 +++++++++++++++++++++++----------------------- rpm.spec.in | 3 +++ rpmio/rpmlog.c | 2 ++ scripts/.cvsignore | 1 + tools/Makefile.am | 12 +++++----- 9 files changed, 46 insertions(+), 40 deletions(-) diff --git a/CHANGES b/CHANGES index b66d7752f..acb5dcaba 100644 --- a/CHANGES +++ b/CHANGES @@ -50,6 +50,7 @@ - autoconfigure building python bindings. - autoconfigure generating rpm API doco. - fix: don't fdFree in rpmVerifyScript, rpmtransFree does already. + - use package version 3 if --nodirtokens is specified. 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/Doxyfile.in b/Doxyfile.in index ef39676a7..2e845a126 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -325,7 +325,6 @@ INPUT = \ ./rpmio/base64.h \ ./rpmio/digest.c \ ./rpmio/macro.c \ - ./rpmio/md5.c \ ./rpmio/rpmlog.c \ ./rpmio/rpmerr.h \ ./rpmio/rpmio.c \ diff --git a/Makefile.am b/Makefile.am index ddd35449c..3a4a9f8e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,11 +7,10 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ gendiff installplatform platform* \ po/*.in po/*.po po/rpm.pot \ - python/*.am python/*.in python/*.c python/*.h python/testit \ rpm.magic rpmpopt-$(VERSION) rpmqv.c -# XXX TODO: python perl -SUBDIRS = intl po popt rpmio lib build misc tools scripts tests doc . +# XXX TODO: perl +SUBDIRS = intl po popt rpmio lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/rpmio \ -I$(top_srcdir)/popt @INCPATH@ diff --git a/build/pack.c b/build/pack.c index c408b0ad2..b201ef5d8 100644 --- a/build/pack.c +++ b/build/pack.c @@ -13,8 +13,6 @@ #include "signature.h" #include "rpmlead.h" -#define RPM_MAJOR_NUMBER 4 - extern int _noDirTokens; static inline int genSourceRpmName(Spec spec) @@ -438,7 +436,8 @@ int writeRPM(Header *hdrp, const char *fileName, int type, } memset(&lead, 0, sizeof(lead)); - lead.major = RPM_MAJOR_NUMBER; + /* XXX Set package version conditioned on noDirTokens. */ + lead.major = (_noDirTokens ? 3 : 4); lead.minor = 0; lead.type = type; lead.archnum = archnum; diff --git a/po/rpm.pot b/po/rpm.pot index e0ab20f82..ccd83d365 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-12-03 19:48-0500\n" +"POT-Creation-Date: 2000-12-03 20:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1495,7 +1495,7 @@ msgstr "" msgid "no tar files given for build" msgstr "" -#: build/build.c:111 build/pack.c:356 +#: build/build.c:111 build/pack.c:354 msgid "Unable to open temp file." msgstr "" @@ -1685,7 +1685,7 @@ msgstr "" msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1244 build/pack.c:101 +#: build/files.c:1244 build/pack.c:99 #, c-format msgid "line: %s" msgstr "" @@ -1757,126 +1757,126 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:49 +#: build/pack.c:47 #, c-format msgid "create archive failed on file %s: %s" msgstr "" -#: build/pack.c:69 +#: build/pack.c:67 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:76 +#: build/pack.c:74 #, c-format msgid "cpio_copy read failed: %s" msgstr "" -#: build/pack.c:152 +#: build/pack.c:150 #, c-format msgid "Could not open PreIn file: %s" msgstr "" -#: build/pack.c:159 +#: build/pack.c:157 #, c-format msgid "Could not open PreUn file: %s" msgstr "" -#: build/pack.c:166 +#: build/pack.c:164 #, c-format msgid "Could not open PostIn file: %s" msgstr "" -#: build/pack.c:173 +#: build/pack.c:171 #, c-format msgid "Could not open PostUn file: %s" msgstr "" -#: build/pack.c:181 +#: build/pack.c:179 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:196 +#: build/pack.c:194 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" -#: build/pack.c:222 +#: build/pack.c:220 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:232 +#: build/pack.c:230 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:253 +#: build/pack.c:251 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:259 +#: build/pack.c:257 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:368 +#: build/pack.c:366 msgid "Bad CSA data" msgstr "" -#: build/pack.c:409 +#: build/pack.c:407 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:419 +#: build/pack.c:417 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:455 +#: build/pack.c:454 #, c-format msgid "Unable to write package: %s" msgstr "" -#: build/pack.c:470 +#: build/pack.c:469 #, c-format msgid "Unable to open sigtarget %s: %s" msgstr "" -#: build/pack.c:480 +#: build/pack.c:479 #, c-format msgid "Unable to read header from %s: %s" msgstr "" -#: build/pack.c:494 +#: build/pack.c:493 #, c-format msgid "Unable to write header to %s: %s" msgstr "" -#: build/pack.c:504 +#: build/pack.c:503 #, c-format msgid "Unable to read payload from %s: %s" msgstr "" -#: build/pack.c:510 +#: build/pack.c:509 #, c-format msgid "Unable to write payload to %s: %s" msgstr "" -#: build/pack.c:537 +#: build/pack.c:536 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:602 +#: build/pack.c:601 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:619 +#: build/pack.c:618 #, c-format msgid "cannot create %s: %s\n" msgstr "" diff --git a/rpm.spec.in b/rpm.spec.in index 63072f3f4..4d29b3c95 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -308,6 +308,9 @@ fi - autoconfigure building python bindings. - autoconfigure generating rpm API doco rpm-devel package. - fix: don't fdFree in rpmVerifyScript, rpmtransFree does already. +- unify rpmError and rpmMessge interfaces through rpmlog. +- collect and display rpm build error messages at end of build. +- use package version 3 if --nodirtokens is specified. * Thu Nov 30 2000 Jeff Johnson - add missing headerFree for legacy signature header. diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c index 09ec0c2cb..6f8576f19 100644 --- a/rpmio/rpmlog.c +++ b/rpmio/rpmlog.c @@ -152,6 +152,8 @@ static void vrpmlog (unsigned code, const char *fmt, va_list ap) fputs(_(rpmlogMsgPrefix[pri]), msgout); fputs(msg, msgout); + if (pri == RPMLOG_ERR) /* XXX Legacy rpmError behavior appends newline. */ + fputs("\n", msgout); fflush(msgout); if (pri <= RPMLOG_CRIT) exit(EXIT_FAILURE); diff --git a/scripts/.cvsignore b/scripts/.cvsignore index 701ba1044..586a6bc13 100644 --- a/scripts/.cvsignore +++ b/scripts/.cvsignore @@ -1,2 +1,3 @@ Makefile +Makefile.in brp-redhat diff --git a/tools/Makefile.am b/tools/Makefile.am index 32140e829..a44eac656 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,12 +24,14 @@ LIBS = LDADD = $(myLDADD) noinst_PROGRAMS = \ - dump dumpdb javadeps rpmarchive rpmheader rpmlead rpmsignature rpmsort - -rpmsort_SOURCES = rpmsort.c -rpmsort_LDFLAGS = @LDFLAGS_STATIC@ + dump dumpdb rpmarchive rpmheader rpmlead rpmsignature rpmsort pkgbindir = @RPMCONFIGDIR@ -pkgbin_PROGRAMS = @BUILD_RPMNLSTOOLS@ +pkgbin_PROGRAMS = javadeps + +rpmsort_SOURCES = rpmsort.c +rpmsort_LDFLAGS = + +javadeps_SOURCES = javadeps.c $(PROGRAMS): $(myLDADD)