Bump version to 4.1.

Invert logic for db1, don't build by default.

CVS patchset: 4629
CVS date: 2001/03/15 17:54:55

CHANGES

@@ -1,4 +1,4 @@
-4.0.2 -> 4.0.3
+4.0.3 -> 4.1
 	- cpio mappings carry dirname/basename, not absolute path.
 	- fix: check waitpid return code.
 	- remove support for v1 src rpm's.
@@ -8,6 +8,8 @@
 	- update per-interpreter dependency scripts, add sql/tcl (#20295).
 	- fix: rpmvercmp("1.a", "1.") returned -1, not +1 (#21392).
 
+4.0.2 -> 4.0.3
+
 4.0 -> 4.0.[12]
 	- add doxygen and lclint annotations most everywhere.
 	- rip out rpm{get,put}text, use getpo.sh and specspo instead.

configure.in

@@ -7,7 +7,7 @@ dnl it, why check it?
 AC_INIT(rpm.c)
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(rpm, 4.0.3)
+AM_INIT_AUTOMAKE(rpm, 4.1)
 AM_CONFIG_HEADER(config.h)
 
 AC_PREREQ(2.12)         dnl Minimum Autoconf version required.
@@ -344,18 +344,18 @@ dnl )
 AC_MSG_CHECKING(whether to enable DB1 support)
 
 AC_ARG_ENABLE(db1,
-[  --disable-db1           Disable DB1 support ],
+[  --enable-db1            Enable DB1 support ],
 [
-if test "$enableval" = "yes"; then
-   AC_MSG_RESULT(yes)
-   usedb1=yes
-else
+if test "$enableval" = "no"; then
    AC_MSG_RESULT(no)
    usedb1=no
+else
+   AC_MSG_RESULT(yes)
+   usedb1=yes
 fi
 ],[
-AC_MSG_RESULT(yes)
-usedb1=yes
+AC_MSG_RESULT(no)
+usedb1=no
 ])
 
 if test "$usedb1" = "yes"; then
@@ -368,7 +368,7 @@ if test "$usedb1" = "yes"; then
 fi
 
 if test X"$DBLIBSRCS" = X; then
-    AC_MSG_ERROR([sorry rpm requires libdb-3.x.a or libdb1.a (from the Berkeley db package)]) 
+    AC_MSG_ERROR([sorry rpm requires libdb-3.x.a (from the Berkeley db package)]) 
 fi
 
 if test -n "$libdb3" -a -n "$libthread" ; then

lib/fsm.c

@@ -538,7 +538,6 @@ fprintf(stderr, "*** %s:%s %s\n", fiTypeString(fi), fileActionString(fsm->action
 	    break;
 
 	case FA_BACKUP:
-fprintf(stderr, "*** %s:%s %s\n", fiTypeString(fi), fileActionString(fsm->action), (fsm->path ? fsm->path : ""));
 	    switch (fi->type) {
 	    case TR_ADDED:
 		fsm->osuffix = SUFFIX_RPMORIG;

po/rpm.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-15 09:21-0500\n"
+"POT-Creation-Date: 2001-03-15 12:09-0500\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"
@@ -2521,32 +2521,32 @@ msgstr ""
 msgid "%9d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1042
+#: lib/fsm.c:1041
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1344 lib/fsm.c:1461
+#: lib/fsm.c:1343 lib/fsm.c:1460
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1486
+#: lib/fsm.c:1485
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1491
+#: lib/fsm.c:1490
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1500
+#: lib/fsm.c:1499
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1517
+#: lib/fsm.c:1516
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""

popt/configure.in

@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(popt, 1.6.2)
+AM_INIT_AUTOMAKE(popt, 1.7)
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX

popt/popt.spec

@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.6.2
+Version: 1.7
 Release: 0.1
 Copyright: X Consortium
 Group: System Environment/Libraries

rpm.spec

@@ -11,7 +11,7 @@
 
 Summary: The Red Hat package management system.
 Name: rpm
-%define version 4.0.3
+%define version 4.1
 Version: %{version}
 Release: 0.1
 Group: System Environment/Base
@@ -96,7 +96,7 @@ programs that will manipulate RPM packages and databases.
 %package -n popt
 Summary: A C library for parsing command line parameters.
 Group: Development/Libraries
-Version: 1.6.2
+Version: 1.7
 
 %description -n popt
 Popt is a C library for parsing command line parameters.  Popt was

rpm.spec.in

@@ -96,7 +96,7 @@ programs that will manipulate RPM packages and databases.
 %package -n popt
 Summary: A C library for parsing command line parameters.
 Group: Development/Libraries
-Version: 1.6.2
+Version: 1.7
 
 %description -n popt
 Popt is a C library for parsing command line parameters.  Popt was