- debug_packages "works", but non-noarch w/o %setup has empty payload.

- make dependency generation "opt-in" in order to build in distro.
- rebuild rpm with internal dependency generation enabled.

CVS patchset: 5940
CVS date: 2002/12/13 23:34:40

diff --git a/CHANGES b/CHANGES
index 883fd85..841b1b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -45,6 +45,8 @@
        - enable internal automagic dependency generation as default.
        - fix: add rpmlib(VersionedDependencies) if versioned Provides: found.
        - fix: add %%ifnarch noarch to debug_package macro.
+       - debug_packages "works", but non-noarch w/o %setup has empty payload.
+       - make dependency generation "opt-in" in order to build in distro.
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/macros.in b/macros.in
index 862d608..2c2d4c4 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.130 2002/12/12 19:21:50 jbj Exp $
+# $Id: macros.in,v 1.131 2002/12/13 23:34:40 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
@@ -111,7 +111,7 @@
 #      Path to script that creates debug symbols in a /usr/lib/debug
 #      shadow tree.
 %__debug_install_post   \
-   @RPMCONFIGDIR@/find-debuginfo.sh %{_builddir}/%{buildsubdir} \
+   @RPMCONFIGDIR@/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
 %{nil}
 
 #      Template for debug information sub-package.
@@ -132,30 +132,6 @@ package or when debugging this package.\
 
 %_defaultdocdir                %{_usr}/doc
 
-# Use internal dependency generator rather than external
-# find-provides/find-requires)?
-%_use_internal_dependency_generator    1
-
-#      Path to scripts to autogenerate package dependencies.
-%__find_provides       @RPMCONFIGDIR@/rpmdeps --provides
-%__find_requires       @RPMCONFIGDIR@/rpmdeps --requires
-#%__find_conflicts     ???
-#%__find_obsoletes     ???
-
-%__perl_provides       @RPMCONFIGDIR@/perl.prov
-%__perl_requires       @RPMCONFIGDIR@/perl.req
-
-# fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
-# These macros are necessary only for legacy compatibility, and have moved
-# to per-platform macro configuration (i.e. @RPMCONFIGDIR@/<arch>-<os>/macros)
-#%__id_u               @__ID_U@
-#%__chown_Rhf          @__CHOWN_RHF@
-#%__chgrp_Rhf          @__CHGRP_RHF@
-#%_fixowner            [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
-#%_fixgroup            [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
-#%_fixperms            %{__chmod} -Rf @FIXPERMS@
-#
-
 #      The path to the gzip executable (legacy, use %{__gzip} instead).
 %_gzipbin              %{__gzip}
 
@@ -342,6 +318,43 @@ package or when debugging this package.\
 # Note: The default value should be 0 for legacy compatibility.
 %_missing_doc_files_terminate_build    1
 
+#
+# Use internal dependency generator rather than external helpers.
+%_use_internal_dependency_generator    0
+
+#
+# Path to scripts to autogenerate package dependencies,
+#
+# Note: Used iff _use_internal_dependency_generator is zero.
+#%__find_provides      @RPMCONFIGDIR@/rpmdeps --provides
+#%__find_requires      @RPMCONFIGDIR@/rpmdeps --requires
+%__find_provides       @RPMCONFIGDIR@/find-provides
+%__find_requires       @RPMCONFIGDIR@/find-requires
+#%__find_conflicts     ???
+#%__find_obsoletes     ???
+
+#
+# Path to scripts to autogenerate per-interpreter package dependencies,
+#
+# Note: Used iff _use_internal_dependency_generator is non-zero. The
+# helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires).
+%__perl_provides       @RPMCONFIGDIR@/perl.prov
+%__perl_requires       @RPMCONFIGDIR@/perl.req
+
+#
+# fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
+# These macros are necessary only for legacy compatibility, and have moved
+# to per-platform macro configuration (i.e. @RPMCONFIGDIR@/<arch>-<os>/macros)
+#
+# Note: These are no longer enabled by default.
+#%__id_u               @__ID_U@
+#%__chown_Rhf          @__CHOWN_RHF@
+#%__chgrp_Rhf          @__CHGRP_RHF@
+#%_fixowner            [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
+#%_fixgroup            [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
+#%_fixperms            %{__chmod} -Rf @FIXPERMS@
+#
+
 #==============================================================================
 # ---- Database configuration macros.
 #      Macros used to configure Berkley db parameters.

diff --git a/po/cs.po b/po/cs.po
index 73b9348..8d21e0a 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"

diff --git a/po/da.po b/po/da.po
index 577dc19..e1c8131 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"

diff --git a/po/de.po b/po/de.po
index 3ad1ed9..5d2aec7 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"

diff --git a/po/fi.po b/po/fi.po
index 23a0f84..4634363 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"

diff --git a/po/fr.po b/po/fr.po
index 6909402..031a035 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-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"

diff --git a/po/gl.po b/po/gl.po
index 8a51c0c..2090c7d 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"

diff --git a/po/is.po b/po/is.po
index efa93f4..6df37a3 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"

diff --git a/po/ja.po b/po/ja.po
index f389b2b..6981453 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"

diff --git a/po/ko.po b/po/ko.po
index bceadb8..e64a419 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"

diff --git a/po/no.po b/po/no.po
index 310cff5..fc5fae6 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"

diff --git a/po/pl.po b/po/pl.po
index c191daa..d0c651b 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"

diff --git a/po/pt.po b/po/pt.po
index 51ac8e3..917d999 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index ea633af..9db0474 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"

diff --git a/po/ro.po b/po/ro.po
index cef8311..01dad9e 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"

diff --git a/po/rpm.pot b/po/rpm.pot
index 3bb5c7b..ad2a852 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: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-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"

diff --git a/po/ru.po b/po/ru.po
index 03d5f0e..3c5eb48 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"

diff --git a/po/sk.po b/po/sk.po
index 665dcc9..413473c 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"

diff --git a/po/sl.po b/po/sl.po
index 2ef82f7..c473d6e 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.334 2002/12/12 19:17:21 jbj Exp $
+# $Id: sl.po,v 1.335 2002/12/13 23:35:14 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"

diff --git a/po/sr.po b/po/sr.po
index 06717a7..7ec78eb 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/po/sv.po b/po/sv.po
index f50ff73..aa79e28 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2002-08-19 22:26+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"

diff --git a/po/tr.po b/po/tr.po
index 9c7b11a..91c4280 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-12 13:12-0500\n"
+"POT-Creation-Date: 2002-12-13 17:05-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"

diff --git a/rpm.spec.in b/rpm.spec.in
index f1495b6..ba92cd5 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -6,6 +6,7 @@
 
 # XXX legacy requires './' payload prefix to be omitted from rpm packages.
 %define        _noPayloadPrefix        1
+%define _use_internal_dependency_generator 1
 
 %define        __prefix        /usr
 %{?!_lib: %define _lib lib}
@@ -16,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.23
+Release: 0.25
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -459,6 +460,11 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Fri Dec 13 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.25
+- debug_packages "works", but non-noarch w/o %setup has empty payload.
+- make dependency generation "opt-in" in order to build in distro.
+- rebuild rpm with internal dependency generation enabled.
+
 * Thu Dec 12 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.23
 - fix: add rpmlib(VersionedDependencies) if versioned Provides: found.
 - fix: add %%ifnarch noarch to debug_package macro.