more debug macro tweaks

This commit is contained in:
Tim Powers 2002-12-14 20:37:32 +00:00
parent 28188548fc
commit 1640cd5cac
2 changed files with 8 additions and 7 deletions

9
macros
View File

@ -92,6 +92,7 @@
%{__os_install_post}\ %{__os_install_post}\
%{nil} %{nil}
# Template for debug information sub-package. # Template for debug information sub-package.
# NOTE: This is a copy from rpm to get the ifnarch noarch fix, it can be removed later # NOTE: This is a copy from rpm to get the ifnarch noarch fix, it can be removed later
%debug_package \ %debug_package \
@ -111,7 +112,6 @@ package or when debugging this package.\
# Bad hack to set $LANG to C during all RPM builds # Bad hack to set $LANG to C during all RPM builds
%prep \ %prep \
%{?_enable_debug_packages:%{debug_package}}\
%%prep\ %%prep\
LANG=C\ LANG=C\
export LANG\ export LANG\
@ -122,7 +122,8 @@ LANG=C\
export LANG\ export LANG\
%{nil} %{nil}
%install %%install\ %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
%%install\
LANG=C\ LANG=C\
export LANG\ export LANG\
%{nil} %{nil}
@ -141,9 +142,5 @@ export LANG\
# Should unpackaged files in a build root terminate a build? # Should unpackaged files in a build root terminate a build?
%_unpackaged_files_terminate_build 1 %_unpackaged_files_terminate_build 1
#
# Use rpm's built in dependency generator?
%_use_internal_dependency_generator 1
%__find_provides /usr/lib/rpm/redhat/find-provides %__find_provides /usr/lib/rpm/redhat/find-provides
%__find_requires /usr/lib/rpm/redhat/find-requires %__find_requires /usr/lib/rpm/redhat/find-requires

View File

@ -1,6 +1,6 @@
Summary: Red Hat specific rpm configuration files. Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 8.0.13 Version: 8.0.14
Release: 1 Release: 1
License: GPL License: GPL
Group: Development/System Group: Development/System
@ -27,6 +27,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat %{_prefix}/lib/rpm/redhat
%changelog %changelog
* Sat Dec 14 2002 Tim Powers <timp@redhat.com> 8.0.14-1
- tweak debug package stuff so that we are overloading %%install
instead of %%post
* Sat Dec 14 2002 Tim Powers <timp@redhat.com> 8.0.13-1 * Sat Dec 14 2002 Tim Powers <timp@redhat.com> 8.0.13-1
- turn on internal rpm dep generation by default - turn on internal rpm dep generation by default