- apply patches 7 and 8 to db-4.1.24.

- upgrade to elfutils-0.59.
- add -g to all platforms optflags.

CVS patchset: 5899
CVS date: 2002/11/27 01:28:55

4 files changed, 58 insertions, 55 deletions

diff --git a/CHANGES b/CHANGES
index dbce7c309..bd10443a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,9 @@
 	- statically link rpmdeps against (internal) libfmagic.
 	- use rpmdeps rather than find-{requires,provides}.
 	- bundle libfmagic into librpmbuild for now.
+	- apply patches 7 and 8 to db-4.1.24.
+	- upgrade to elfutils-0.59.
+	- add -g to all platforms optflags.
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
diff --git a/elfutils/libelf/elf32_getehdr.c b/elfutils/libelf/elf32_getehdr.c
index 4c0de7e0a..23f6c8a5d 100644
--- a/elfutils/libelf/elf32_getehdr.c
+++ b/elfutils/libelf/elf32_getehdr.c
@@ -27,7 +27,7 @@
 
 
 ElfW2(LIBELFBITS,Ehdr) *
-elfw2(LIBELFBITS,getehdr) (ELf *elf)
+elfw2(LIBELFBITS,getehdr) (Elf *elf)
 {
   ElfW2(LIBELFBITS,Ehdr) *result;
 
diff --git a/rpm.spec.in b/rpm.spec.in
index 8f4516ce2..588dd3859 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -16,7 +16,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.12
+Release: 0.13
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -495,6 +495,9 @@ exit 0
 %changelog
 * Tue Nov 26 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.13
 - bundle libfmagic into librpmbuild for now.
+- apply patches 7 and 8 to db-4.1.24.
+- upgrade to elfutils-0.59.
+- add -g to all platforms optflags.
 
 * Wed Nov 20 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.12
 - use rpmdeps rather than find-{requires,provides}.
diff --git a/rpmrc.in b/rpmrc.in
index 2b20ba02b..5e167d3ef 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,7 +1,7 @@
 #/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
 # \verbatim
 #
-# $Id: rpmrc.in,v 2.52 2002/10/09 19:07:44 jbj Exp $
+# $Id: rpmrc.in,v 2.53 2002/11/27 01:28:55 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
@@ -11,58 +11,55 @@
 #############################################################
 # Values for RPM_OPT_FLAGS for various platforms
 
-# XXX this is the i386 optflags that rpm has traditionally used in the past.
-#optflags: i386 -O2 -m486 -fno-strength-reduce
-optflags: i386 -O2 -march=i386 -mcpu=i686
-optflags: i486 -O2 -march=i486
-optflags: i586 -O2 -march=i586
-optflags: i686 -O2 -march=i686
-optflags: athlon -O2 -march=athlon
-optflags: ia64 -O2
-optflags: x86_64 -O2
-
-# XXX Please note that -mieee has been added in rpm-3.0.5.
-optflags: alpha -O2 -mieee
-optflags: alphaev5 -O2 -mieee -mcpu=ev5
-optflags: alphaev56 -O2 -mieee -mcpu=ev56
-optflags: alphapca56 -O2 -mieee -mcpu=pca56
-optflags: alphaev6 -O2 -mieee -mcpu=ev6
-optflags: alphaev67 -O2 -mieee -mcpu=ev67
-
-optflags: sparc -O2 -m32 -mtune=ultrasparc
-optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc
-optflags: sparc64 -O2 -m64 -mcpu=ultrasparc
-
-optflags: m68k -O2 -fomit-frame-pointer
-
-optflags: ppc -O2 -fsigned-char
-optflags: ppciseries -O2 -fsigned-char
-optflags: ppcpseries -O2 -fsigned-char
-optflags: ppc64 -O2 -fsigned-char
-
-optflags: parisc -O2 -mpa-risc-1-0
-optflags: hppa1.0 -O2 -mpa-risc-1-0
-optflags: hppa1.1 -O2 -mpa-risc-1-0
-optflags: hppa1.2 -O2 -mpa-risc-1-0
-optflags: hppa2.0 -O2 -mpa-risc-1-0
-
-optflags: mips -O2
-optflags: mipsel -O2
-
-optflags: armv3l -O2 -fsigned-char -fomit-frame-pointer -march=armv3
-optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -march=armv4
-optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -march=armv4
-
-optflags: atarist -O2 -fomit-frame-pointer
-optflags: atariste -O2 -fomit-frame-pointer
-optflags: ataritt -O2 -fomit-frame-pointer
-optflags: falcon -O2 -fomit-frame-pointer
-optflags: atariclone -O2 -fomit-frame-pointer
-optflags: milan -O2 -fomit-frame-pointer
-optflags: hades -O2 -fomit-frame-pointer
-
-optflags: s390 -O2
-optflags: s390x -O2 
+optflags: i386 -O2 -g -march=i386 -mcpu=i686
+optflags: i486 -O2 -g -march=i486
+optflags: i586 -O2 -g -march=i586
+optflags: i686 -O2 -g -march=i686
+optflags: athlon -O2 -g -march=athlon
+optflags: ia64 -O2 -g
+optflags: x86_64 -O2 -g
+
+optflags: alpha -O2 -g -mieee
+optflags: alphaev5 -O2 -g -mieee -mcpu=ev5
+optflags: alphaev56 -O2 -g -mieee -mcpu=ev56
+optflags: alphapca56 -O2 -g -mieee -mcpu=pca56
+optflags: alphaev6 -O2 -g -mieee -mcpu=ev6
+optflags: alphaev67 -O2 -g -mieee -mcpu=ev67
+
+optflags: sparc -O2 -g -m32 -mtune=ultrasparc
+optflags: sparcv9 -O2 -g -m32 -mcpu=ultrasparc
+optflags: sparc64 -O2 -g -m64 -mcpu=ultrasparc
+
+optflags: m68k -O2 -g -fomit-frame-pointer
+
+optflags: ppc -O2 -g -fsigned-char
+optflags: ppciseries -O2 -g -fsigned-char
+optflags: ppcpseries -O2 -g -fsigned-char
+optflags: ppc64 -O2 -g -fsigned-char
+
+optflags: parisc -O2 -g -mpa-risc-1-0
+optflags: hppa1.0 -O2 -g -mpa-risc-1-0
+optflags: hppa1.1 -O2 -g -mpa-risc-1-0
+optflags: hppa1.2 -O2 -g -mpa-risc-1-0
+optflags: hppa2.0 -O2 -g -mpa-risc-1-0
+
+optflags: mips -O2 -g
+optflags: mipsel -O2 -g
+
+optflags: armv3l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv3
+optflags: armv4b -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4
+optflags: armv4l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4
+
+optflags: atarist -O2 -g -fomit-frame-pointer
+optflags: atariste -O2 -g -fomit-frame-pointer
+optflags: ataritt -O2 -g -fomit-frame-pointer
+optflags: falcon -O2 -g -fomit-frame-pointer
+optflags: atariclone -O2 -g -fomit-frame-pointer
+optflags: milan -O2 -g -fomit-frame-pointer
+optflags: hades -O2 -g -fomit-frame-pointer
+
+optflags: s390 -O2 -g
+optflags: s390x -O2 -g
 
 #############################################################
 # Canonical arch names and numbers