- reworked find-*-wrappers, userpmdepswrappers patch, macros and platform macros

  to use --with-perl/--with-php options and pass _noauto{req,dep}* through args
- merged spec-prep-pre patch into macros
- release .20.1 (for heavy testing)
- NOTE: _noauto with "" quotes won't work now... use '' or no quotes

Changed files:
    rpm.macros -> 1.121

diff --git a/rpm.macros b/rpm.macros
index 244fbd1675579db653adda4aba61ef57f577a104..1317809565236ad304d89290cba7b842cd1763e6 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -329,11 +329,6 @@ echo "Compress kernel modules if any."; \
 # exceptions system by Jacek Konieczny <jajcus@pld.org.pl>
 %__spec_prep_pre \
 _autoreqprov=n \
-%{?_noautoreqfiles:_autoreqprov=y}\
-%{?_noautoreq:_autoreqprov=y}\
-%{?_noautoreqdep:_autoreqprov=y}\
-%{?_noautoprovfiles:_autoreqprov=y}\
-%{?_noautoprov:_autoreqprov=y}\
 %{?_noautocompressdoc:_autoreqprov=y}\
 if [ "$_autoreqprov" = "y" ] ; then \
     if [ -f %{_builddir}/__rpm_lock ] ; then \
@@ -346,17 +341,12 @@ if [ "$_autoreqprov" = "y" ] ; then \
     fi \
 fi \
 %{?_noautocompressdoc:echo '%{_noautocompressdoc}' > %{_builddir}/__rpm_noautocompressdoc}\
+%{___build_pre}\
 %{nil}
 
 
 %__spec_clean_pre      %{___build_pre}\
 _autoreqprov=n \
-%{?_noautoreqfiles:_autoreqprov=y}\
-%{?_noautoreq:_autoreqprov=y}\
-%{?_noautoreqdep:_autoreqprov=y}\
-%{?_noautoprovfiles:_autoreqprov=y}\
-%{?_noautoprov:_autoreqprov=y}\
-%{?_noautoreqfiles:_autoreqprov=y}\
 %{?_noautocompressdoc:_autoreqprov=y}\
 if [ "$_autoreqprov" = "y" ] ; then \
        rm -f %{_builddir}/__rpm_* \