From 3d9806c238419d38a7c9193f397523fdb2eb97e9 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 23 Jun 2003 21:38:56 +0000 Subject: [PATCH] - one more specflags patch update: undefined macros by default to avoid some autoconf issues with extra spaces at the end of *FLAGS - added new find-{provides,requires}-wrapper scripts, which can be used as external dependency generators to wrap around rpmdeps bringing back _noauto* and package name deps features back (and should be faster then old versions) (not enabled by default yet) - release .11 Changed files: rpm.spec -> 1.441 --- rpm.spec | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/rpm.spec b/rpm.spec index 33990f8..8548de4 100644 --- a/rpm.spec +++ b/rpm.spec @@ -26,7 +26,7 @@ Summary(uk): Name: rpm %define ver 4.3 Version: %{ver} -%define rel 0.%{snap}.10 +%define rel 0.%{snap}.11 Release: %{rel} License: GPL Group: Base @@ -47,6 +47,8 @@ Source11: %{name}-check-files Source12: %{name}-php-provides Source13: %{name}-php-requires Source14: %{name}.macros +Source15: %{name}-find-provides-wrapper +Source16: %{name}-find-requires-wrapper Source30: builder Source31: adapter.awk Source32: pldnotify.awk @@ -612,10 +614,14 @@ install %{SOURCE1} doc/manual/groups install %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree install %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/find-rpm-provides install %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond +# 2 following files - to be removed or changed to find-elf-* +# (to generate only ELF dependencies using objdump)??? install %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/compress-doc install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/check-files +install %{SOURCE15} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides-wrapper +install %{SOURCE16} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires-wrapper install scripts/find-php* $RPM_BUILD_ROOT%{_libdir}/rpm install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_libdir}/rpm @@ -633,6 +639,32 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep <