upgrade 1.1.12 -> 1.1.42, include separated gpg-error library, play libtool games

gcrypt/gcrypt.spec

@@ -23,6 +23,9 @@
 ##  SUCH DAMAGE.
 ##
 
+%define       V_gcrypt      1.1.42
+%define       V_gpg_error   0.3
+
 #   package information
 Name:         gcrypt
 Summary:      Cryptography Library
@@ -32,11 +35,12 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Cryptography
 License:      LGPL
-Version:      1.1.12
-Release:      20030702
+Version:      %{V_gcrypt}
+Release:      20030806
 
 #   list of sources
-Source0:      ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/libgcrypt-%{version}.tar.gz
+Source0:      ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/libgcrypt-%{V_gcrypt}.tar.gz
+Source1:      ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-%{V_gpg_error}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -50,25 +54,47 @@ AutoReqProv:  no
     GCrypt is the split-out cryptography library from GnuPG.
 
 %prep
-    %setup -q -n libgcrypt-%{version}
+    %setup -q -c
+    %setup -q -T -D -a 1
+    %{l_shtool} subst \
+        -e 's;/usr/local;%{prefix};g' \
+        */configure
 
 %build
-    ( echo "ac_cv_lib_pthread_pthread_create=no"
-      echo "ac_cv_lib_pth_pth_version=no"
-    ) >config.cache
-    CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O}" \
-    ./configure \
-        --cache-file=./config.cache \
-        --prefix=%{l_prefix}
-    %{l_make} %{l_mflags -O}
+    ( cd libgpg-error-%{V_gpg_error}
+      CC="%{l_cc}" \
+      CFLAGS="%{l_cflags -O}" \
+      ./configure \
+          --cache-file=./config.cache \
+          --prefix=%{l_prefix} \
+          --disable-shared
+      %{l_make} %{l_mflags -O}
+    ) || exit $?
+
+    gpgerror="$RPM_BUILD_DIR/gcrypt-%{version}/libgpg-error-%{V_gpg_error}/src"
+
+    ( cd libgcrypt-%{V_gcrypt}
+      ( echo "ac_cv_lib_pthread_pthread_create=no"
+        echo "ac_cv_lib_pth_pth_version=no"
+      ) >config.cache
+      CC="%{l_cc}" \
+      CFLAGS="%{l_cflags -O} -I$gpgerror" \
+      ./configure \
+          --cache-file=./config.cache \
+          --prefix=%{l_prefix} \
+          --disable-shared
+      %{l_make} %{l_mflags -O}
+    ) || exit $?
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    ( cd libgpg-error-%{V_gpg_error}
+      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    ) || exit $?
+    ( cd libgcrypt-%{V_gcrypt}
+      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    ) || exit $?
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libgcrypt.so*
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libgcrypt.la
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%not %dir %{l_prefix}/share/aclocal'