folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- use package version 3 if --nodirtokens is specified. 

CVS patchset: 4317
CVS date: 2000/12/04 02:13:11
This commit is contained in:
jbj 2000-12-04 02:13:11 +00:00
parent 0d5ea21985
commit 2e9d261696
9 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -50,6 +50,7 @@
- autoconfigure building python bindings. - autoconfigure building python bindings.
- autoconfigure generating rpm API doco. - autoconfigure generating rpm API doco.
- fix: don't fdFree in rpmVerifyScript, rpmtransFree does already. - fix: don't fdFree in rpmVerifyScript, rpmtransFree does already.
- use package version 3 if --nodirtokens is specified.
3.0.6 -> 4.0 3.0.6 -> 4.0
- use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.

1
Doxyfile.in
View File

@ -325,7 +325,6 @@ INPUT = \
./rpmio/base64.h \ ./rpmio/base64.h \
./rpmio/digest.c \ ./rpmio/digest.c \
./rpmio/macro.c \ ./rpmio/macro.c \
./rpmio/md5.c \
./rpmio/rpmlog.c \ ./rpmio/rpmlog.c \
./rpmio/rpmerr.h \ ./rpmio/rpmerr.h \
./rpmio/rpmio.c \ ./rpmio/rpmio.c \

5
Makefile.am
View File

@ -7,11 +7,10 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
gendiff installplatform platform* \ gendiff installplatform platform* \
po/*.in po/*.po po/rpm.pot \ po/*.in po/*.po po/rpm.pot \
python/*.am python/*.in python/*.c python/*.h python/testit \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.magic rpmpopt-$(VERSION) rpmqv.c
# XXX TODO: python perl # XXX TODO: perl
SUBDIRS = intl po popt rpmio lib build misc tools scripts tests doc . 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 \ INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/rpmio \
-I$(top_srcdir)/popt @INCPATH@ -I$(top_srcdir)/popt @INCPATH@

5
build/pack.c
View File

@ -13,8 +13,6 @@
#include "signature.h" #include "signature.h"
#include "rpmlead.h" #include "rpmlead.h"
#define RPM_MAJOR_NUMBER 4
extern int _noDirTokens; extern int _noDirTokens;
static inline int genSourceRpmName(Spec spec) static inline int genSourceRpmName(Spec spec)
@ -438,7 +436,8 @@ int writeRPM(Header *hdrp, const char *fileName, int type,
} }
memset(&lead, 0, sizeof(lead)); 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.minor = 0;
lead.type = type; lead.type = type;
lead.archnum = archnum; lead.archnum = archnum;

56
po/rpm.pot
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1495,7 +1495,7 @@ msgstr ""
msgid "no tar files given for build" msgid "no tar files given for build"
msgstr "" msgstr ""
#: build/build.c:111 build/pack.c:356 #: build/build.c:111 build/pack.c:354
msgid "Unable to open temp file." msgid "Unable to open temp file."
msgstr "" msgstr ""
@ -1685,7 +1685,7 @@ msgstr ""
msgid "Could not open %%files file %s: %s" msgid "Could not open %%files file %s: %s"
msgstr "" msgstr ""
#: build/files.c:1244 build/pack.c:101 #: build/files.c:1244 build/pack.c:99
#, c-format #, c-format
msgid "line: %s" msgid "line: %s"
msgstr "" msgstr ""
@ -1757,126 +1757,126 @@ msgstr ""
msgid "Could not canonicalize hostname: %s\n" msgid "Could not canonicalize hostname: %s\n"
msgstr "" msgstr ""
#: build/pack.c:49 #: build/pack.c:47
#, c-format #, c-format
msgid "create archive failed on file %s: %s" msgid "create archive failed on file %s: %s"
msgstr "" msgstr ""
#: build/pack.c:69 #: build/pack.c:67
#, c-format #, c-format
msgid "cpio_copy write failed: %s" msgid "cpio_copy write failed: %s"
msgstr "" msgstr ""
#: build/pack.c:76 #: build/pack.c:74
#, c-format #, c-format
msgid "cpio_copy read failed: %s" msgid "cpio_copy read failed: %s"
msgstr "" msgstr ""
#: build/pack.c:152 #: build/pack.c:150
#, c-format #, c-format
msgid "Could not open PreIn file: %s" msgid "Could not open PreIn file: %s"
msgstr "" msgstr ""
#: build/pack.c:159 #: build/pack.c:157
#, c-format #, c-format
msgid "Could not open PreUn file: %s" msgid "Could not open PreUn file: %s"
msgstr "" msgstr ""
#: build/pack.c:166 #: build/pack.c:164
#, c-format #, c-format
msgid "Could not open PostIn file: %s" msgid "Could not open PostIn file: %s"
msgstr "" msgstr ""
#: build/pack.c:173 #: build/pack.c:171
#, c-format #, c-format
msgid "Could not open PostUn file: %s" msgid "Could not open PostUn file: %s"
msgstr "" msgstr ""
#: build/pack.c:181 #: build/pack.c:179
#, c-format #, c-format
msgid "Could not open VerifyScript file: %s" msgid "Could not open VerifyScript file: %s"
msgstr "" msgstr ""
#: build/pack.c:196 #: build/pack.c:194
#, c-format #, c-format
msgid "Could not open Trigger script file: %s" msgid "Could not open Trigger script file: %s"
msgstr "" msgstr ""
#: build/pack.c:222 #: build/pack.c:220
#, c-format #, c-format
msgid "readRPM: open %s: %s\n" msgid "readRPM: open %s: %s\n"
msgstr "" msgstr ""
#: build/pack.c:232 #: build/pack.c:230
#, c-format #, c-format
msgid "readRPM: read %s: %s\n" msgid "readRPM: read %s: %s\n"
msgstr "" msgstr ""
#: build/pack.c:253 #: build/pack.c:251
#, c-format #, c-format
msgid "readRPM: %s is not an RPM package\n" msgid "readRPM: %s is not an RPM package\n"
msgstr "" msgstr ""
#: build/pack.c:259 #: build/pack.c:257
#, c-format #, c-format
msgid "readRPM: reading header from %s\n" msgid "readRPM: reading header from %s\n"
msgstr "" msgstr ""
#: build/pack.c:368 #: build/pack.c:366
msgid "Bad CSA data" msgid "Bad CSA data"
msgstr "" msgstr ""
#: build/pack.c:409 #: build/pack.c:407
#, c-format #, c-format
msgid "Generating signature: %d\n" msgid "Generating signature: %d\n"
msgstr "" msgstr ""
#: build/pack.c:419 #: build/pack.c:417
#, c-format #, c-format
msgid "Could not open %s: %s\n" msgid "Could not open %s: %s\n"
msgstr "" msgstr ""
#: build/pack.c:455 #: build/pack.c:454
#, c-format #, c-format
msgid "Unable to write package: %s" msgid "Unable to write package: %s"
msgstr "" msgstr ""
#: build/pack.c:470 #: build/pack.c:469
#, c-format #, c-format
msgid "Unable to open sigtarget %s: %s" msgid "Unable to open sigtarget %s: %s"
msgstr "" msgstr ""
#: build/pack.c:480 #: build/pack.c:479
#, c-format #, c-format
msgid "Unable to read header from %s: %s" msgid "Unable to read header from %s: %s"
msgstr "" msgstr ""
#: build/pack.c:494 #: build/pack.c:493
#, c-format #, c-format
msgid "Unable to write header to %s: %s" msgid "Unable to write header to %s: %s"
msgstr "" msgstr ""
#: build/pack.c:504 #: build/pack.c:503
#, c-format #, c-format
msgid "Unable to read payload from %s: %s" msgid "Unable to read payload from %s: %s"
msgstr "" msgstr ""
#: build/pack.c:510 #: build/pack.c:509
#, c-format #, c-format
msgid "Unable to write payload to %s: %s" msgid "Unable to write payload to %s: %s"
msgstr "" msgstr ""
#: build/pack.c:537 #: build/pack.c:536
#, c-format #, c-format
msgid "Wrote: %s\n" msgid "Wrote: %s\n"
msgstr "" msgstr ""
#: build/pack.c:602 #: build/pack.c:601
#, c-format #, c-format
msgid "Could not generate output filename for package %s: %s\n" msgid "Could not generate output filename for package %s: %s\n"
msgstr "" msgstr ""
#: build/pack.c:619 #: build/pack.c:618
#, c-format #, c-format
msgid "cannot create %s: %s\n" msgid "cannot create %s: %s\n"
msgstr "" msgstr ""

3
rpm.spec.in
View File

@ -308,6 +308,9 @@ fi
- autoconfigure building python bindings. - autoconfigure building python bindings.
- autoconfigure generating rpm API doco rpm-devel package. - autoconfigure generating rpm API doco rpm-devel package.
- fix: don't fdFree in rpmVerifyScript, rpmtransFree does already. - 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 <jbj@redhat.com> * Thu Nov 30 2000 Jeff Johnson <jbj@redhat.com>
- add missing headerFree for legacy signature header. - add missing headerFree for legacy signature header.

2
rpmio/rpmlog.c
View File

@ -152,6 +152,8 @@ static void vrpmlog (unsigned code, const char *fmt, va_list ap)
fputs(_(rpmlogMsgPrefix[pri]), msgout); fputs(_(rpmlogMsgPrefix[pri]), msgout);
fputs(msg, msgout); fputs(msg, msgout);
if (pri == RPMLOG_ERR) /* XXX Legacy rpmError behavior appends newline. */
fputs("\n", msgout);
fflush(msgout); fflush(msgout);
if (pri <= RPMLOG_CRIT) if (pri <= RPMLOG_CRIT)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

1
scripts/.cvsignore
View File

@ -1,2 +1,3 @@
Makefile Makefile
Makefile.in
brp-redhat brp-redhat

12
tools/Makefile.am
View File

@ -24,12 +24,14 @@ LIBS =
LDADD = $(myLDADD) LDADD = $(myLDADD)
noinst_PROGRAMS = \ noinst_PROGRAMS = \
dump dumpdb javadeps rpmarchive rpmheader rpmlead rpmsignature rpmsort dump dumpdb rpmarchive rpmheader rpmlead rpmsignature rpmsort
rpmsort_SOURCES = rpmsort.c
rpmsort_LDFLAGS = @LDFLAGS_STATIC@
pkgbindir = @RPMCONFIGDIR@ pkgbindir = @RPMCONFIGDIR@
pkgbin_PROGRAMS = @BUILD_RPMNLSTOOLS@ pkgbin_PROGRAMS = javadeps
rpmsort_SOURCES = rpmsort.c
rpmsort_LDFLAGS =
javadeps_SOURCES = javadeps.c
$(PROGRAMS): $(myLDADD) $(PROGRAMS): $(myLDADD)