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: 07-Aug-2003 16:26:45
Branch: HEAD Handle: 2003080715264302
Modified files:
openpkg-re/vcheck vc.gcrypt
openpkg-src/gcrypt gcrypt.spec
openpkg-web news.txt
Log:
downgrade to previous vendor version, waiting for the rest of the
world to catch up with the API changes
Summary:
Revision Changes Path
1.11 +2 -0 openpkg-re/vcheck/vc.gcrypt
1.21 +16 -46 openpkg-src/gcrypt/gcrypt.spec
1.6075 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.gcrypt
============================================================================
$ cvs diff -u -r1.10 -r1.11 vc.gcrypt
--- openpkg-re/vcheck/vc.gcrypt 6 Aug 2003 18:32:58 -0000 1.10
+++ openpkg-re/vcheck/vc.gcrypt 7 Aug 2003 14:26:43 -0000 1.11
@@ -2,11 +2,13 @@
}
prog gcrypt:libgcrypt = {
+ comment = "mlelstv - version 1.1.42 has incompatible API changes, wait until
fixed or rest of the world (e.g. gnutls) catches up"
version = 1.1.42
url = ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/
regex = libgcrypt-(__VER__)\.tar\.gz
}
prog gcrypt:libgpg-error = {
+ comment = "mlelstv - only used for gcrypt >= 1.1.42"
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.20 -r1.21 gcrypt.spec
--- openpkg-src/gcrypt/gcrypt.spec 6 Aug 2003 20:27:05 -0000 1.20
+++ openpkg-src/gcrypt/gcrypt.spec 7 Aug 2003 14:26:45 -0000 1.21
@@ -23,7 +23,9 @@
## SUCH DAMAGE.
##
-%define V_gcrypt 1.1.42
+## FIXME: mlelstv - version 1.1.42 has API change that break other packages
+
+%define V_gcrypt 1.1.12
%define V_gpg_error 0.3
# package information
@@ -36,19 +38,16 @@
Group: Cryptography
License: LGPL
Version: %{V_gcrypt}
-Release: 20030806
+Release: 20030807
# list of sources
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}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206, make, gcc
PreReq: OpenPKG, openpkg >= 20020206
-BuildPreReq: libiconv, gettext
-PreReq: libiconv, gettext
AutoReq: no
AutoReqProv: no
@@ -56,52 +55,23 @@
GCrypt is the split-out cryptography library from GnuPG.
%prep
- %setup -q -c
- %setup -q -T -D -a 1
- %{l_shtool} subst \
- -e 's;/usr/local;%{prefix};g' \
- */configure
+ %setup -q -n libgcrypt-%{version}
%build
- ( 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 $?
+ ( 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} \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
%install
rm -rf $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 $?
-
- # fixup gcrypt config script for compatibility
- %{l_shtool} subst \
- -e 's;^libs=.*;libs="-lgcrypt -lgpg-error -lintl -liconv";' \
- $RPM_BUILD_ROOT%{l_prefix}/bin/libgcrypt-config
-
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6074 -r1.6075 news.txt
--- openpkg-web/news.txt 7 Aug 2003 14:11:12 -0000 1.6074
+++ openpkg-web/news.txt 7 Aug 2003 14:26:43 -0000 1.6075
@@ -1,3 +1,4 @@
+07-Aug-2003: Upgraded package: P<gcrypt-1.1.12-20030807>
07-Aug-2003: Upgraded package: P<libtasn1-0.2.5-20030807>
07-Aug-2003: Upgraded package: P<xaw3d-1.5-20030807>
07-Aug-2003: Upgraded package: P<bind-9.2.2-20030807>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
