autoReq/autoProv now per-package.

CVS patchset: 2915
CVS date: 1999/03/26 20:07:34

diff --git a/CHANGES b/CHANGES
index 32a1b52..8463311 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@
        - fix: don't add header if signature generation failed (Carlo Wood).
        - more DU 4.0D fiddles (Shing-Gene Yung).
        - fix: segfault from unknown uid/gid -- use builder's uid/gid instead.
+       - autoReq/autoProv now per-package.
 
 2.91 -> 2.92
        - update with libtool-2.4f.

diff --git a/aclocal.m4 b/aclocal.m4
index f49e4bb..01910dc 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -285,7 +285,12 @@ AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 
 # Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
+#
+# the following will cause an existing older ltconfig to fail, so
+# we ignore this at the expense of the cache file... Checking this 
+# will just take longer ... bummer!
+#libtool_flags="--cache-file=$cache_file"
+#
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"

diff --git a/build/files.c b/build/files.c
index 5c6af63..b21e821 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -1517,7 +1517,7 @@ static int generateAutoReqProv(Spec spec, Package pkg,
        return 0;
     }
 
-    if (! (spec->autoReq || spec->autoProv)) {
+    if (! (pkg->autoReq || pkg->autoProv)) {
        return 0;
     }
     
@@ -1531,7 +1531,7 @@ static int generateAutoReqProv(Spec spec, Package pkg,
 
     /*** Do Provides ***/
 
-    if (spec->autoProv) {
+    if (pkg->autoProv) {
        rpmMessage(RPMMESS_NORMAL, _("Finding provides...\n"));
     
        argv[0] = FINDPROVIDES;
@@ -1557,7 +1557,7 @@ static int generateAutoReqProv(Spec spec, Package pkg,
 
     /*** Do Requires ***/
 
-    if (spec->autoReq) {
+    if (pkg->autoReq) {
        rpmMessage(RPMMESS_NORMAL, _("Finding requires...\n"));
 
        argv[0] = FINDREQUIRES;

diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 28a4472..e8e0d6d 100644 (file)
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -472,14 +472,14 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, char *macro,
        headerAddEntry(pkg->header, tag, RPM_INT32_TYPE, &num, 1);
        break;
       case RPMTAG_AUTOREQPROV:
-       spec->autoReq = parseYesNo(field);
-       spec->autoProv = spec->autoReq;
+       pkg->autoReq = parseYesNo(field);
+       pkg->autoProv = pkg->autoReq;
        break;
       case RPMTAG_AUTOREQ:
-       spec->autoReq = parseYesNo(field);
+       pkg->autoReq = parseYesNo(field);
        break;
       case RPMTAG_AUTOPROV:
-       spec->autoProv = parseYesNo(field);
+       pkg->autoProv = parseYesNo(field);
        break;
       case RPMTAG_SOURCE:
       case RPMTAG_PATCH:

diff --git a/build/rpmspec.h b/build/rpmspec.h
index e88d4ee..cde09eb 100644 (file)
--- a/build/rpmspec.h
+++ b/build/rpmspec.h
@@ -112,9 +112,6 @@ struct SpecStruct {
 
     /*@dependent@*/ struct MacroContext *macros;
 
-    int autoReq;
-    int autoProv;
-
     /*@only@*/ StringBuf prep;
     /*@only@*/ StringBuf build;
     /*@only@*/ StringBuf install;
@@ -131,7 +128,8 @@ struct PackageStruct {
 
     /*@owned@*/ struct Source *icon;
 
-    int autoReqProv;
+    int autoReq;
+    int autoProv;
 
     char *preInFile;
     char *postInFile;

diff --git a/build/spec.c b/build/spec.c
index 7afe0d4..fb81bfa 100644 (file)
--- a/build/spec.c
+++ b/build/spec.c
@@ -96,7 +96,9 @@ Package newPackage(Spec spec)
 
     p->header = headerNew();
     p->icon = NULL;
-    p->autoReqProv = 1;
+
+    p->autoProv = 1;
+    p->autoReq = 1;
     
 #if 0    
     p->reqProv = NULL;
@@ -436,9 +438,6 @@ Spec newSpec(void)
 
     spec->macros = &globalMacroContext;
     
-    spec->autoReq = 1;
-    spec->autoProv = 1;
-
     return spec;
 }
 

diff --git a/po/rpm.pot b/po/rpm.pot
index 4bb94a2..62ef224 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-24 07:35-0500\n"
+"POT-Creation-Date: 1999-03-26 20:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2194,17 +2194,17 @@ msgstr ""
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: ../build/spec.c:230
+#: ../build/spec.c:232
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: ../build/spec.c:236
+#: ../build/spec.c:238
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: ../build/spec.c:292
+#: ../build/spec.c:294
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""

diff --git a/popt/aclocal.m4 b/popt/aclocal.m4
index 2650a11..6b45541 100644 (file)
--- a/popt/aclocal.m4
+++ b/popt/aclocal.m4
@@ -285,7 +285,12 @@ AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 
 # Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
+#
+# the following will cause an existing older ltconfig to fail, so
+# we ignore this at the expense of the cache file... Checking this 
+# will just take longer ... bummer!
+#libtool_flags="--cache-file=$cache_file"
+#
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"

diff --git a/rpm.spec b/rpm.spec
index f31ca24..a197053 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 2.93
 Version: %{version}
-Release: 3
+Release: 4
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/rpm-%{version}.tar.gz
 Copyright: GPL