cleanup packaging and synchronize with bootstrap package

beecrypt/beecrypt.spec

@@ -67,14 +67,17 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch -p0
-    %{l_shtool} subst -s \
-       -e 's;cppglue.lo;;g' \
-       -e 's;cppglue.cxx;;g' \
+    %{l_shtool} subst \
+       -e 's;cppglue\.lo;;g' \
+       -e 's;cppglue\.cxx;;g' \
        -e '/^CXX = /s;@CXX@;@CC@;g' \
        Makefile.in
 
 %build
-    ( echo "bc_cv_as_noexecstack=no"
+    ( echo 'ac_cv_have_dev_dsp=no'
+      echo 'ac_cv_have_dev_audio=no'
+      echo 'ac_cv_func_gettimeofday=yes'
+      echo 'bc_cv_as_noexecstack=no'
     ) >config.cache
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
@@ -86,7 +89,6 @@ AutoReqProv:  no
         --without-cplusplus \
         --without-java \
         --without-python \
-        --without-cplusplus \
         --disable-threads \
         --disable-shared
     %{l_make} %{l_mflags -O}