upgrade to 0.8.5 and replace local getopt with new getopt package

gnutls/gnutls.spec

@@ -32,18 +32,17 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Cryptography
 License:      GPL
-Version:      0.8.4
-Release:      20030312
+Version:      0.8.5
+Release:      20030322
 
 #   list of sources
 Source0:      ftp://gnutls.hellug.gr/pub/gnutls/gnutls-%{version}.tar.gz
-Source1:      getopt.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, gcrypt, libtasn1, opencdk, lzo
-PreReq:       OpenPKG, openpkg >= 20020206, gcrypt, libtasn1, opencdk, lzo
+BuildPreReq:  OpenPKG, openpkg >= 20020206, gcrypt, libtasn1, opencdk, lzo, getopt
+PreReq:       OpenPKG, openpkg >= 20020206, gcrypt, libtasn1, opencdk, lzo, getopt
 AutoReq:      no
 AutoReqProv:  no
 
@@ -54,17 +53,13 @@ AutoReqProv:  no
     group (RFC2246, TLS 1.0).
 
 %prep
-    %setup0 -q
-    %setup1 -q -T -D -a 1
+    %setup -q
 
 %build
-    ( cd getopt
-      %{l_make} %{l_mflags} \
-          CC="%{l_cc}" CFLAGS="%{l_cflags -O}" )
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O} -I`pwd`/getopt %{l_cppflags lzo}" \
-    CPPFLAGS="%{l_cppflags} -I`pwd`/getopt %{l_cppflags lzo}" \
-    LDFLAGS="%{l_ldflags} -L`pwd`/getopt" \
+    CFLAGS="%{l_cflags -O} %{l_cppflags lzo}" \
+    CPPFLAGS="%{l_cppflags} %{l_cppflags lzo}" \
+    LDFLAGS="%{l_ldflags}" \
     LIBS="-lgetopt" \
     ./configure \
         --prefix=%{l_prefix} \