From 5bb717be191bff766e0ce7e2f36fc7f714dedb19 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 26 Jan 1999 18:08:14 +0000 Subject: [PATCH] make '-' character illegal (again) in version/release. Use auto-standard names for auto-package components. CVS patchset: 2753 CVS date: 1999/01/26 18:08:14 --- .cvsignore | 4 ++-- CHANGES | 1 + Makefile.am | 27 +++++---------------------- build/Makefile.am | 4 ++-- build/parsePreamble.c | 10 ++++++++++ configure.in | 42 +++++++++++++++++++----------------------- lib/Makefile.am | 4 ++-- po/rpm.pot | 27 ++++++++++++++++----------- lib-rpmrc.in => rpmrc.in | 0 scripts/Makefile.in | 3 +-- tests/hello-test/.cvsignore | 1 + tools/.cvsignore | 1 + 12 files changed, 60 insertions(+), 64 deletions(-) rename lib-rpmrc.in => rpmrc.in (100%) diff --git a/.cvsignore b/.cvsignore index 613bddf..b7239b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,12 +2,12 @@ .depend .depend-done Makefile -Makefile.inc +Makefile.in rpm rpm.shared rpm2cpio rpmconvert -lib-rpmrc +rpmrc macros config.h.in config.h diff --git a/CHANGES b/CHANGES index 0861303..eb0e2bd 100644 --- a/CHANGES +++ b/CHANGES @@ -46,6 +46,7 @@ - there must be a { between two % in a query format (unless %% is used) 2.5.6 -> 2.5.7: + - make '-' character illegal (again) in version/release. - use portable #!/bin/sh (Tim Mooney). - don't erase failing build script (Tim Mooney). - use portable mkinstalldirs (Tim Mooney). diff --git a/Makefile.am b/Makefile.am index 0b02a7d..52cd5a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,9 +26,10 @@ noinst_PROGRAMS = rpmconvert man_MANS = rpm.8 rpm2cpio.8 # rpm.8ru rpm2cpio.8ru -configdir = @RPMCONFIGDIR@ -config_DATA = rpmrc rpmpopt macros -config_SCRIPTS = find-provides find-requires mkinstalldirs +pkglibdir = @RPMCONFIGDIR@ +pkglib_DATA = rpmrc rpmpopt macros +pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \ + config.guess config.sub noinst_HEADERS = \ acconfig.h build.h checksig.h ftp.h \ @@ -68,14 +69,6 @@ install-data-local: @$(mkinstalldirs) $(DESTDIR)/var/lib/rpm @$(mkinstalldirs) $(DESTDIR)/var/tmp -# FIXME: these should be generated in configure.in -find-requires: find-requires.sh - cp $< $@ -find-provides: find-provides.sh - cp $< $@ -rpmrc: lib-rpmrc - cp $< $@ - # FIXME: these should be checked .PHONY: tar tar: @@ -106,16 +99,6 @@ archive: @echo "This is version $(VERSION)." @sleep 5 @cvs -Q tag -F $(CVSTAG) . - @rm -rf /tmp/rpm-$(VERSION) /tmp/rpm - @cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) rpm || : - @mv /tmp/rpm /tmp/rpm-$(VERSION) - @rm /tmp/rpm-$(VERSION)/popt/popt.spec - @cd /tmp/rpm-$(VERSION); ./autogen.sh - @make -C /tmp/rpm-$(VERSION) distclean - @cd /tmp/rpm-$(VERSION); ./autogen.sh --noconfigure - @cd /tmp; tar czSpf rpm-$(VERSION).tar.gz rpm-$(VERSION) - @rm -rf /tmp/rpm-$(VERSION) - @cp /tmp/rpm-$(VERSION).tar.gz . - @rm -f /tmp/rpm-$(VERSION).tar.gz + @make dist @echo " " @echo "The final archive is ./rpm-$(VERSION).tar.gz." diff --git a/build/Makefile.am b/build/Makefile.am index 3029dae..3d32aef 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -4,8 +4,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib @INCPATH@ -rpmincdir = $(includedir)/rpm -rpminc_HEADERS = rpmbuild.h rpmspec.h +pkgincdir = $(pkgincludedir) +pkginc_HEADERS = rpmbuild.h rpmspec.h noinst_HEADERS = buildio.h myftw.h lib_LTLIBRARIES = librpmbuild.la diff --git a/build/parsePreamble.c b/build/parsePreamble.c index c69dedb..0d463ba 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -357,8 +357,18 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, char *macro, SINGLE_TOKEN_ONLY; /* These are for backward compatibility */ if (tag == RPMTAG_VERSION) { + if (strchr(field, '-') != NULL) { + rpmError(RPMERR_BADSPEC, _("line %d: Illegal char '-' in %s: %s"), + "version", spec->lineNum, spec->line); + return RPMERR_BADSPEC; + } addMacro(spec->macros, "PACKAGE_VERSION", NULL, field, RMIL_OLDSPEC); } else if (tag == RPMTAG_RELEASE) { + if (strchr(field, '-') != NULL) { + rpmError(RPMERR_BADSPEC, _("line %d: Illegal char '-' in %s: %s"), + "release", spec->lineNum, spec->line); + return RPMERR_BADSPEC; + } addMacro(spec->macros, "PACKAGE_RELEASE", NULL, field, RMIL_OLDSPEC-1); } /* fall through */ diff --git a/configure.in b/configure.in index a425837..16c8171 100644 --- a/configure.in +++ b/configure.in @@ -527,9 +527,6 @@ elif echo "$build_os" | grep sunos > /dev/null; then AC_DEFINE(NEED_STRINGS_H) AC_DEFINE(NEED_MYREALLOC) LIBOBJS="$LIBOBJS myrealloc.o" -elif echo "$build_os" | grep hpux > /dev/null; then - LIBDL=-ldld - echo "hacking things up for hpux" fi # @@ -545,40 +542,40 @@ build_os_major=`echo "${build_os}" | sed 's/\..*$//'` build_os_noversion=`echo "${build_os}" | sed 's/[0-9]*\..*$//'` changequote([, ]) -rm -f ./find-provides.sh +rm -f ./find-provides if test -f ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov ; then echo "using ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov for automatic provides generation" - ln -s ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov ./find-provides.sh + ln -s ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov ./find-provides elif test -f ${srcdir}/autodeps/${build_os_exact}.prov ; then echo "using ${srcdir}/autodeps/${build_os_exact}.prov for automatic provides generation" - ln -s ${srcdir}/autodeps/${build_os_exact}.prov ./find-provides.sh + ln -s ${srcdir}/autodeps/${build_os_exact}.prov ./find-provides elif test -f ${srcdir}/autodeps/${build_os_major}.prov ; then echo "using ${srcdir}/autodeps/${build_os_major}.prov for automatic provides generation" - ln -s ${srcdir}/autodeps/${build_os_major}.prov ./find-provides.sh + ln -s ${srcdir}/autodeps/${build_os_major}.prov ./find-provides elif test -f ${srcdir}/autodeps/${build_os_noversion}.prov ; then echo "using ${srcdir}/autodeps/${build_os_noversion}.prov for automatic provides generation" - ln -s ${srcdir}/autodeps/${build_os_noversion}.prov ./find-provides.sh + ln -s ${srcdir}/autodeps/${build_os_noversion}.prov ./find-provides else echo "*** no default provides information is available for ${build_os_noversion}" - ln -s ${srcdir}/autodeps/none ./find-provides.sh + ln -s ${srcdir}/autodeps/none ./find-provides fi -rm -f ./find-requires.sh +rm -f ./find-requires if test -f ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req ; then echo "using ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req for automatic requires generation" - ln -s ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req ./find-requires.sh + ln -s ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req ./find-requires elif test -f ${srcdir}/autodeps/${build_os_exact}.req ; then echo "using ${srcdir}/autodeps/${build_os_exact}.req for automatic requires generation" - ln -s ${srcdir}/autodeps/${build_os_exact}.req ./find-requires.sh + ln -s ${srcdir}/autodeps/${build_os_exact}.req ./find-requires elif test -f ${srcdir}/autodeps/${build_os_major}.req ; then echo "using ${srcdir}/autodeps/${build_os_major}.req for automatic requires generation" - ln -s ${srcdir}/autodeps/${build_os_major}.req ./find-requires.sh + ln -s ${srcdir}/autodeps/${build_os_major}.req ./find-requires elif test -f ${srcdir}/autodeps/${build_os_noversion}.req ; then echo "using ${srcdir}/autodeps/${build_os_noversion}.req for automatic requires generation" - ln -s ${srcdir}/autodeps/${build_os_noversion}.req ./find-requires.sh + ln -s ${srcdir}/autodeps/${build_os_noversion}.req ./find-requires else echo "*** no default requires information is available for ${build_os_noversion}" - ln -s ${srcdir}/autodeps/none ./find-requires.sh + ln -s ${srcdir}/autodeps/none ./find-requires fi if test -n "$LIBOBJS" ; then @@ -588,22 +585,22 @@ fi LOCALEDIR="`echo ${prefix}/share/locale`" AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") AC_SUBST(LOCALEDIR) -RPMCONFIGDIR="`echo ${prefix}/lib/rpm`" +RPMCONFIGDIR="`echo ${pkglibdir}`" AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR") AC_SUBST(RPMCONFIGDIR) -LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc" +LIBRPMRC_FILENAME="${pkglibdir}/rpmrc" AC_DEFINE_UNQUOTED(LIBRPMRC_FILENAME, "$LIBRPMRC_FILENAME") AC_SUBST(LIBRPMRC_FILENAME) -LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt" +LIBRPMALIAS_FILENAME="${pkglibdir}/rpmpopt" AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME") AC_SUBST(LIBRPMALIAS_FILENAME) -FINDREQUIRES="${RPMCONFIGDIR}/find-requires" +FINDREQUIRES="${pkglibdir}/find-requires" AC_DEFINE_UNQUOTED(FINDREQUIRES, "$FINDREQUIRES") AC_SUBST(FINDREQUIRES) -FINDPROVIDES="${RPMCONFIGDIR}/find-provides" +FINDPROVIDES="${pkglibdir}/find-provides" AC_DEFINE_UNQUOTED(FINDPROVIDES, "$FINDPROVIDES") AC_SUBST(FINDPROVIDES) -MACROFILES="${RPMCONFIGDIR}/macros" +MACROFILES="${pkglibdir}/macros" AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES") AC_SUBST(MACROFILES) @@ -618,7 +615,6 @@ AC_SUBST(varprefix) AC_SUBST(tmpdir) AC_SUBST(LIBS) -AC_SUBST(LIBDL) AC_SUBST(RPM) AC_SUBST(GZIPBIN) @@ -632,7 +628,7 @@ AC_SUBST(LDFLAGS_STATIC) export LIBS INCPATH AC_CONFIG_SUBDIRS(popt) -AC_OUTPUT([Makefile lib-rpmrc macros lib/Makefile +AC_OUTPUT([Makefile rpmrc macros lib/Makefile build/Makefile tools/Makefile scripts/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile misc/Makefile po/Makefile.in intl/Makefile], diff --git a/lib/Makefile.am b/lib/Makefile.am index 6b5866c..0809905 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,8 +4,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@ -rpmincdir = $(includedir)/rpm -rpminc_HEADERS = \ +pkgincdir = $(pkgincludedir) +pkginc_HEADERS = \ dbindex.h header.h misc.h rpmio.h rpmlib.h rpmmacro.h stringbuf.h noinst_HEADERS = \ cpio.h depends.h falloc.h fprint.h hash.h install.h \ diff --git a/po/rpm.pot b/po/rpm.pot index 4bfd095..bef4cf8 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-01-22 10:28-0500\n" +"POT-Creation-Date: 1999-01-26 12:34-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1934,52 +1934,57 @@ msgstr "" msgid "line %d: Empty tag: %s" msgstr "" -#: ../build/parsePreamble.c:389 +#: ../build/parsePreamble.c:361 ../build/parsePreamble.c:368 +#, c-format +msgid "line %d: Illegal char '-' in %s: %s" +msgstr "" + +#: ../build/parsePreamble.c:399 #, c-format msgid "line %d: BuildRoot can not be \"/\": %s" msgstr "" -#: ../build/parsePreamble.c:402 +#: ../build/parsePreamble.c:412 #, c-format msgid "line %d: Prefixes must not end with \"/\": %s" msgstr "" -#: ../build/parsePreamble.c:414 +#: ../build/parsePreamble.c:424 #, c-format msgid "line %d: Docdir must begin with '/': %s" msgstr "" -#: ../build/parsePreamble.c:425 +#: ../build/parsePreamble.c:435 #, c-format msgid "line %d: Epoch/Serial field must be a number: %s" msgstr "" -#: ../build/parsePreamble.c:489 +#: ../build/parsePreamble.c:499 #, c-format msgid "line %d: Bad BuildArchitecture format: %s" msgstr "" -#: ../build/parsePreamble.c:499 +#: ../build/parsePreamble.c:509 #, c-format msgid "Internal error: Bogus tag %d" msgstr "" -#: ../build/parsePreamble.c:643 +#: ../build/parsePreamble.c:653 #, c-format msgid "Bad package specification: %s" msgstr "" -#: ../build/parsePreamble.c:649 +#: ../build/parsePreamble.c:659 #, c-format msgid "Package already exists: %s" msgstr "" -#: ../build/parsePreamble.c:676 +#: ../build/parsePreamble.c:686 #, c-format msgid "line %d: Unknown tag: %s" msgstr "" -#: ../build/parsePreamble.c:701 +#: ../build/parsePreamble.c:711 msgid "Spec file can't use BuildRoot" msgstr "" diff --git a/lib-rpmrc.in b/rpmrc.in similarity index 100% rename from lib-rpmrc.in rename to rpmrc.in diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 3ba14a0..b8961b2 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -92,7 +92,6 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ LD = @LD@ LDFLAGS_STATIC = @LDFLAGS_STATIC@ -LIBDL = @LIBDL@ LIBMISC = @LIBMISC@ LIBOBJS = @LIBOBJS@ LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ @@ -143,7 +142,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/tests/hello-test/.cvsignore b/tests/hello-test/.cvsignore index 3cfa6e7..25a5e88 100644 --- a/tests/hello-test/.cvsignore +++ b/tests/hello-test/.cvsignore @@ -1,2 +1,3 @@ Makefile +Makefile.in *.out diff --git a/tools/.cvsignore b/tools/.cvsignore index 441682b..e1491d1 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -1,6 +1,7 @@ .deps .depend Makefile +Makefile.in rpmlead dump rpmheader -- 2.7.4