OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 06-Aug-2003 20:33:01
Branch: HEAD Handle: 2003080619325802
Modified files:
openpkg-re/vcheck vc.gcrypt
openpkg-src/gcrypt gcrypt.spec
openpkg-web news.txt
Log:
upgrade 1.1.12 -> 1.1.42, include separated gpg-error library, play
libtool games
Summary:
Revision Changes Path
1.10 +7 -3 openpkg-re/vcheck/vc.gcrypt
1.19 +42 -16 openpkg-src/gcrypt/gcrypt.spec
1.6061 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.gcrypt
============================================================================
$ cvs diff -u -r1.9 -r1.10 vc.gcrypt
--- openpkg-re/vcheck/vc.gcrypt 1 Aug 2003 06:58:12 -0000 1.9
+++ openpkg-re/vcheck/vc.gcrypt 6 Aug 2003 18:32:58 -0000 1.10
@@ -1,10 +1,14 @@
config = {
}
-prog gcrypt = {
- comment = "rse: 1.1.42 fails to build -- needs reinvestigation, perhaps easy to
fix"
- version = 1.1.12
+prog gcrypt:libgcrypt = {
+ version = 1.1.42
url = ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/
regex = libgcrypt-(__VER__)\.tar\.gz
+}
+prog gcrypt:libgpg-error = {
+ version = 0.3
+ url = ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/
+ regex = libgpg-error-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcrypt/gcrypt.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 gcrypt.spec
--- openpkg-src/gcrypt/gcrypt.spec 23 Jul 2003 07:06:02 -0000 1.18
+++ openpkg-src/gcrypt/gcrypt.spec 6 Aug 2003 18:33:00 -0000 1.19
@@ -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 @@
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 @@
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'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6060 -r1.6061 news.txt
--- openpkg-web/news.txt 6 Aug 2003 16:05:15 -0000 1.6060
+++ openpkg-web/news.txt 6 Aug 2003 18:32:59 -0000 1.6061
@@ -1,3 +1,4 @@
+06-Aug-2003: Upgraded package: P<gcrypt-1.1.42-20030806>
06-Aug-2003: Upgraded package: P<imapd-2.1.14-20030806>
06-Aug-2003: Upgraded package: P<openpkg-20030806-20030806>
06-Aug-2003: Upgraded package: P<perl-www-1.2.1-1.2.1>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
