---- rpm-4.1/rpmpopt.in.wiget Thu Sep 19 00:32:02 2002
-+++ rpm-4.1/rpmpopt.in Thu Sep 19 00:44:31 2002
-@@ -93,31 +93,31 @@
+--- rpm-4.2/rpmpopt.in.wiget Thu Mar 27 19:07:35 2003
++++ rpm-4.2/rpmpopt.in Thu Mar 27 19:07:36 2003
+@@ -105,31 +105,31 @@
--POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)"
# colon separated i18n domains to use as PO catalogue lookaside for
# Choose db interface:
# 0 same as 1
# 1 native db1 interface (e.g. linux glibc libdb1 routines).
-@@ -173,44 +173,49 @@
- #rpm exec --target rpmb --target
- #rpm exec --short-circuit rpmb --short-circuit
-
--rpm exec --initdb rpmd --initdb
--rpm exec --rebuilddb rpmd --rebuilddb
--rpm exec --verifydb rpmd --verifydb
--
--rpm exec --addsign rpmk --addsign
--rpm exec -K rpmk -K
--rpm exec --checksig rpmk --checksig
--rpm exec --import rpmk --import
--rpm exec --resign rpmk --resign
--
--rpm exec -q rpmq -q
--rpm exec --query rpmq --query
--rpm exec --querytags rpmq --querytags
--rpm exec -V rpmv -V
--rpm exec -y rpmv -y
--rpm exec --verify rpmv --verify
--
--rpm alias --with --define "_with_!#:+ --with-!#:+" \
-- --POPTdesc=$"enable configure <option> for build" \
-- --POPTargs=$"<option>"
--rpm alias --without --define "_without_!#:+ --without-!#:+" \
-- --POPTdesc=$"disable configure <option> for build" \
-- --POPTargs=$"<option>"
-+#rpm exec --initdb rpmd --initdb
-+#rpm exec --rebuilddb rpmd --rebuilddb
-+#rpm exec --verifydb rpmd --verifydb
-+
-+#rpm exec --addsign rpmk --addsign
-+#rpm exec -K rpmk -K
-+#rpm exec --checksig rpmk --checksig
-+#rpm exec --import rpmk --import
-+#rpm exec --resign rpmk --resign
-+
-+#rpm exec -q rpmq -q
-+#rpm exec --query rpmq --query
-+#rpm exec --querytags rpmq --querytags
-+#rpm exec -V rpmv -V
-+#rpm exec -y rpmv -y
-+#rpm exec --verify rpmv --verify
-+
-+#rpm alias --with --define "_with_!#:+ --with-!#:+" \
-+# --POPTdesc=$"enable configure <option> for build" \
-+# --POPTargs=$"<option>"
-+#rpm alias --without --define "_without_!#:+ --without-!#:+" \
-+# --POPTdesc=$"disable configure <option> for build" \
-+# --POPTargs=$"<option>"
- #==============================================================================
--rpmb alias --dbpath --define '_dbpath !#:+' \
-- --POPTdesc=$"use database in DIRECTORY" \
-- --POPTargs=$"DIRECTORY"
--rpmb alias --ftpport --define '_ftpport !#:+'
--rpmb alias --ftpproxy --define '_ftpproxy !#:+'
--rpmb alias --httpport --define '_httpport !#:+'
--rpmb alias --httpproxy --define '_httpproxy !#:+'
--rpmb alias --timecheck --define '_timecheck !#:+'
--rpmb alias --with --define "_with_!#:+ --with-!#:+" \
-- --POPTdesc=$"enable configure <option> for build" \
-- --POPTargs=$"<option>"
--rpmb alias --without --define "_without_!#:+ --without-!#:+" \
-- --POPTdesc=$"disable configure <option> for build" \
-- --POPTargs=$"<option>"
-+#rpmb alias --dbpath --define '_dbpath !#:+' \
-+# --POPTdesc=$"use database in DIRECTORY" \
-+# --POPTargs=$"DIRECTORY"
-+#rpmb alias --ftpport --define '_ftpport !#:+'
-+#rpmb alias --ftpproxy --define '_ftpproxy !#:+'
-+#rpmb alias --httpport --define '_httpport !#:+'
-+#rpmb alias --httpproxy --define '_httpproxy !#:+'
-+#rpmb alias --timecheck --define '_timecheck !#:+'
-+#rpmb alias --with --define "_with_!#:+ --with-!#:+" \
-+# --POPTdesc=$"enable configure <option> for build" \
-+# --POPTargs=$"<option>"
-+#rpmb alias --without --define "_without_!#:+ --without-!#:+" \
-+# --POPTdesc=$"disable configure <option> for build" \
-+# --POPTargs=$"<option>"
-+# Build policies enabled from command line. Last policy applies.
-+#rpmb alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
-+# --POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
-+# --POPTargs=$"<policy>"
-+
- #==============================================================================
- rpmbuild alias --dbpath --define '_dbpath !#:+' \
- --POPTdesc=$"use database in DIRECTORY" \
-@@ -226,6 +231,11 @@
+@@ -247,6 +247,11 @@
rpmbuild alias --without --define "_without_!#:+ --without-!#:+" \
--POPTdesc=$"disable configure <option> for build" \
--POPTargs=$"<option>"
---- rpm-4.2/po/fr.po.pofix Wed Mar 12 14:47:30 2003
-+++ rpm-4.2/po/fr.po Wed Mar 12 14:49:02 2003
+--- rpm-4.2/po/fr.po.wiget Wed Mar 19 18:18:08 2003
++++ rpm-4.2/po/fr.po Thu Mar 27 19:16:47 2003
@@ -2,17 +2,16 @@
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-10-24 16:55-0400\n"
+ "POT-Creation-Date: 2003-03-14 12:49-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"
#: build.c:40
#, fuzzy
---- rpm-4.2/po/pt_BR.po.pofix Wed Mar 12 14:49:22 2003
-+++ rpm-4.2/po/pt_BR.po Wed Mar 12 14:50:30 2003
+--- rpm-4.2/po/pt_BR.po.wiget Wed Mar 19 18:18:11 2003
++++ rpm-4.2/po/pt_BR.po Thu Mar 27 19:17:20 2003
@@ -5,6 +5,9 @@
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-10-24 16:55-0400\n"
+ "POT-Creation-Date: 2003-03-14 12:49-0500\n"
+"PO-Revision-Date: 2003-03-12 14:47+0200\n"
+"Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+"Language-Team: pt <pt@li.org>\n"
-diff -Nru rpm-4.0.1/rpmrc.in rpm-4.0.1.new/rpmrc.in
---- rpm-4.0.1/rpmrc.in Wed Jan 31 13:19:02 2001
-+++ rpm-4.0.1.new/rpmrc.in Wed Jan 31 13:20:51 2001
-@@ -9,7 +9,7 @@
+--- rpm-4.2/rpmrc.in.wiget Fri Jan 10 21:34:26 2003
++++ rpm-4.2/rpmrc.in Thu Mar 27 18:56:27 2003
+@@ -11,55 +11,56 @@
+ #############################################################
# 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: 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: i386 -O2 -march=i386
+#optflags: i386 -O2 -march=i386 -mcpu=i686
- optflags: i486 -O2 -march=i486
- optflags: i586 -O2 -march=i586
++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
++
++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 -g
+-optflags: s390x -O2 -g
++optflags: s390 -O2
++optflags: s390x -O2
+
+ #############################################################
+ # Canonical arch names and numbers