one hack to rule them all and rescue rm2-ix86-debian3.1: remove the nonessential and incomplete test for a C++ preprocessor

distcache/distcache.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        Cryptography
 License:      LGPL
 Version:      1.5.1
-Release:      20041020
+Release:      20050610
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/distcache/distcache-%{version}.tar.bz2
@@ -66,6 +66,9 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch -p0
+    %{l_shtool} subst \
+        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+        configure ssl/configure
 
 %build
     CC="%{l_cc}" \

dsh/dsh.spec

@@ -37,7 +37,7 @@ Class:        PLUS
 Group:        Shell
 License:      GPL
 Version:      %{V_dsh}
-Release:      20050408
+Release:      20050610
 
 #   list of sources
 Source0:      http://www.netfort.gr.jp/~dancer/software/downloads/dsh-%{V_dsh}.tar.gz
@@ -73,6 +73,9 @@ AutoReqProv:  no
     %setup -q
     %setup -q -T -D -a 1
     %patch -p0
+    %{l_shtool} subst \
+        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+        configure
 
 %build
     #   build libdshconfig

ex/ex.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        System
 License:      MIT/X11-style
 Version:      1.0.4
-Release:      20040405
+Release:      20050610
 
 #   list of sources
 Source0:      ftp://ftp.ossp.org/pkg/lib/ex/ex-%{version}.tar.gz
@@ -68,6 +68,9 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %{l_shtool} subst \
+        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+        configure
 
 %build
     CC="%{l_cc}" \

libdnet/libdnet.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        Network
 License:      MIT-style
 Version:      1.10
-Release:      20050226
+Release:      20050610
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/libdnet/libdnet-%{version}.tar.gz
@@ -63,7 +63,9 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    touch configure
+    %{l_shtool} subst \
+        -e '/ error: C[+]* preprocessor/{N;N;s/.*/:/;}' \
+        configure
 
 %build
     case "%{l_platform -t}" in

libwmf/libwmf.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        Graphics
 License:      LGPL
 Version:      0.2.8.3
-Release:      20040920
+Release:      20050610
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/wvware/libwmf-%{version}.tar.gz
@@ -64,7 +64,8 @@ AutoReqProv:  no
     %setup -q
     %{l_shtool} subst \
         -e 's;-lfreetype;-lfreetype -lz;' \
-        ./configure
+        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+        configure
 
 %build
     CC="%{l_cc}" \

pkgconfig/pkgconfig.spec

@@ -33,7 +33,7 @@ Class:        BASE
 Group:        Converter
 License:      GPL
 Version:      0.17.2
-Release:      20050606
+Release:      20050610
 
 #   list of sources
 Source0:      http://pkgconfig.freedesktop.org/releases/pkgconfig-%{version}.tar.gz
@@ -62,6 +62,9 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch -p0
+    %{l_shtool} subst \
+        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+        configure glib-*/configure
 
 %build
     case "%{l_platform -t}" in

proftpd/proftpd.spec

@@ -33,7 +33,7 @@ Class:        BASE
 Group:        FTP
 License:      GPL
 Version:      1.3.0rc1
-Release:      20050411
+Release:      20050610
 
 #   package options
 %option       with_ifsession  no
@@ -106,6 +106,9 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %{l_shtool} subst \
+        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+        configure
 
     #   utils also require link with getopt
     %{l_shtool} subst \

sio/sio.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        System
 License:      MIT/X11-style
 Version:      0.9.2
-Release:      20040207
+Release:      20050610
 
 #   package options
 %option       with_ex    no
@@ -84,6 +84,9 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %{l_shtool} subst \
+        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+        configure lib_*/configure
 
 %build
     CC="%{l_cc}" \

val/val.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        System
 License:      MIT/X11-style
 Version:      0.9.3
-Release:      20040913
+Release:      20050610
 
 #   package options
 %option       with_ex  no
@@ -74,6 +74,9 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %{l_shtool} subst \
+        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+        configure
 
 %build
     CC="%{l_cc}" \