upgrading package: gnutls 0.5.10 -> 0.5.11

gnutls/gnutls.spec

@@ -32,11 +32,12 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [JUNK]
 Group:        Cryptography
 License:      GPL
-Version:      0.5.10
-Release:      20021022
+Version:      0.5.11
+Release:      20021114
 
 #   list of sources
 Source0:      ftp://gnutls.hellug.gr/pub/gnutls/gnutls-%{version}.tar.gz
+Source1:      getopt.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -53,21 +54,32 @@ AutoReqProv:  no
     group (RFC2246, TLS 1.0).
 
 %prep
-    %setup -q
+    %setup0 -q -c
+    %setup1 -q -T -D -a 1
 
 %build
-    CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
-    CPPFLAGS="-I%{l_prefix}/include" \
-    ./configure \
-        --prefix=%{l_prefix} \
-        --with-libgcrypt-prefix=%{l_prefix} \
-        --disable-shared
-    %{l_make} %{l_mflags -O}
+    ( cd getopt
+      %{l_make} %{l_mflags} \
+          CC="%{l_cc}" CFLAGS="%{l_cflags -O}" \
+    )
+    ( cd gnutls-%{version}
+      CC="%{l_cc}" \
+      CFLAGS="%{l_cflags -O} -I`pwd`/../getopt -I%{l_prefix}/include" \
+      CPPFLAGS="%{l_cppflags} -I`pwd`/../getopt -I%{l_prefix}/include" \
+      LDFLAGS="%{l_ldflags} -L`pwd`/../getopt" \
+      LIBS="-lgetopt" \
+      ./configure \
+          --prefix=%{l_prefix} \
+          --with-libgcrypt-prefix=%{l_prefix} \
+          --disable-shared
+      %{l_make} %{l_mflags -O}
+    )
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    ( cd gnutls-%{version}
+      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    )
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}