do not test the nonexistant HAVE_*_PROTOTYPE variables (never set), and correct strlcpy(3) and vsnprintf(3) conditional definition logic

imagemagick/imagemagick.spec

@@ -41,7 +41,7 @@ Class:        BASE
 Group:        Graphics
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20040530
+Release:      20040602
 
 #   package options
 %option       with_perl   no
@@ -96,6 +96,12 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e 's;\(-L@MAGICKLIBDIR@\);-L../magick/.libs \1;g' \
         PerlMagick/Makefile.PL.in
+    %{l_shtool} subst \
+        -e 's; && !defined(HAVE_STRLCPY_PROTOTYPE);;g' \
+        -e 's; && !defined(HAVE_VSNPRINTF_PROTOTYPE);;g' \
+        -e 's;^#if \(defined(HAVE_STRLCPY)\);#if !\1;g' \
+        -e 's;^#if \(defined(HAVE_VSNPRINTF)\);#if !\1;g' \
+        magick/studio.h
 
 %build
     CC="%{l_cc}" \