- rebuild against glibc with fcntl fixed in libpthread.

- re-enable CDB locking, removing "private" from %%__dbi_cdb macro.

CVS patchset: 5944
CVS date: 2002/12/17 19:22:15

4 files changed, 22 insertions, 14 deletions

diff --git a/CHANGES b/CHANGES
index 7daa88aea..d4aee7f91 100644
--- a/CHANGES
+++ b/CHANGES
@@ -53,6 +53,8 @@
 	- make cdb locks "private" for pthreads compatibility w/o NPTL.
 	- add --enable-posixmutexes to use NPTL.
 	- make dependency generation "opt-out" everywhere.
+	- rebuild against glibc with fcntl fixed in libpthread.
+	- re-enable CDB locking, removing "private" from %%__dbi_cdb macro.
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
diff --git a/macros.in b/macros.in
index 7f16bd83b..d1298a293 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.132 2002/12/15 18:30:45 jbj Exp $
+# $Id: macros.in,v 1.133 2002/12/17 19:22:15 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -445,8 +445,8 @@ package or when debugging this package.\
 #				mp_mmapsize=8Mb mp_size=512Kb
 
 # Use a CDB database model for concurrent access.
-# XXX "private" cdb locks for legacy interoperation transiting to glibc+nptl
-%__dbi_cdb			create private cdb mpool mp_mmapsize=16Mb mp_size=1Mb
+# XXX Add "private" here for legacy interoperation transiting to glibc+nptl.
+%__dbi_cdb			create cdb mpool mp_mmapsize=16Mb mp_size=1Mb
 
 %__dbi_other			%{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_cdb}
 
@@ -491,9 +491,7 @@ package or when debugging this package.\
 %_dbi_tags	Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys
 
 # "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
-# XXX disable legacy fcntl lock until glibc+nptl fixes fcntl
-#%_dbi_config_Packages		%{_dbi_htconfig} lockdbfd
-%_dbi_config_Packages		%{_dbi_htconfig}
+%_dbi_config_Packages		%{_dbi_htconfig} lockdbfd
 
 # "Depends" is a per-transaction cache of known dependency resolutions.
 %_dbi_config_Depends		%{_dbi_htconfig} temporary private
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 1a2483141..cdc8e9b01 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -515,6 +515,7 @@ void initrpm(void)
     REGISTER_ENUM(RPMTRANS_FLAG_NOMD5);
     REGISTER_ENUM(RPMTRANS_FLAG_NOSUGGEST);
     REGISTER_ENUM(RPMTRANS_FLAG_ADDINDEPS);
+    REGISTER_ENUM(RPMTRANS_FLAG_REVERSE);
 
     REGISTER_ENUM(RPMPROB_FILTER_IGNOREOS);
     REGISTER_ENUM(RPMPROB_FILTER_IGNOREARCH);
diff --git a/rpm.spec.in b/rpm.spec.in
index a26d05bf5..08513b837 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.26+nptl
+Release: 0.28nptl
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -33,15 +33,16 @@ BuildRequires: elfutils-devel >= 0.63
 
 %if !%{with_internal_db}
 BuildRequires: db3-devel
-
-# XXX glibc-2.1.92 has incompatible locale changes that affect statically
-# XXX linked binaries like /bin/rpm.
-%ifnarch ia64
-Requires: glibc >= 2.1.92
-%endif
 %endif
 
+# XXX /dev/futex support needed:
+Requires: kernel >= 2.4.20-0.pp.9
+
+# XXX NPTL support needed.
+Requires: glibc >= 2.3.1-16nptl
+
 BuildRequires: zlib-devel
+
 # XXX Red Hat 5.2 has not bzip2 or python
 %if %{with_bzip2}
 BuildRequires: bzip2 >= 0.9.0c-2
@@ -460,7 +461,13 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
-* Sun Dec 15 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.26
+* Tue Dec 17 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.28nptl
+- re-enable CDB locking, removing "private" from %%__dbi_cdb macro.
+
+* Mon Dec 16 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.27+nptl
+- rebuild against glibc with fcntl fixed in libpthread.
+
+* Sun Dec 15 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.26+nptl
 - disable fcntl(2) lock on Packages until glibc+nptl is fixed.
 - make cdb locks "private" for pthreads compatibility w/o NPTL.
 - add --enable-posixmutexes to use NPTL.