date:20140814

[CVS] RPM: rpm-5_4: rpm/ configure.ac

2014-08-14 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   15-Aug-2014 03:22:36
  Branch: rpm-5_4  Handle: 2014081501223500

  Modified files:   (Branch: rpm-5_4)
rpm configure.ac

  Log:
- java: fix: switch to AutoFu plan B (BuildRequires: gcj).

  Summary:
RevisionChanges Path
2.472.2.107 +19 -19 rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.106 -r2.472.2.107 configure.ac
  --- rpm/configure.ac  15 Aug 2014 01:00:45 -  2.472.2.106
  +++ rpm/configure.ac  15 Aug 2014 01:22:35 -  2.472.2.107
  @@ -1765,28 +1765,28 @@
   AC_SUBST(WITH_RUBY_VENDORARCHDIR)
   
   dnl # Java prerequisites (swiped from db-6.1.19/dist/aclocal_java et al)
  -### AC_CHECK_CLASSPATH
  -### AC_JAVA_OPTIONS
  -### AC_PROG_JAVAC
  -### AC_PROG_JAVAH
  +AC_CHECK_CLASSPATH
  +AC_JAVA_OPTIONS
  +AC_PROG_JAVAC
  +AC_PROG_JAVAH
   ### AC_PROG_JAR
  -### AC_PROG_JAVA
  +AC_PROG_JAVA
   
   AC_JNI_INCLUDE_DIR
  -### AC_MSG_CHECKING(java version)
  -### case "$JAVA" in
  -### *kaffe* )
  -### JAVA_VERSION=`$JAVA -version 2>&1 |
  -### sed -e '/Java Version:/!d' -e 's/.*Java Version: 
\([[^  ]]*\)[[ ]]*/\1/'` ;;
  -### * ) JAVA_VERSION=`$JAVA -version 2>&1 |
  -### sed -e '/ version /!d' -e 's/.*"\(.*\)".*/\1/'` ;;
  -### esac
  -### AC_MSG_RESULT($JAVA_VERSION)
  -### case "$JAVA_VERSION" in
  -### 1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;;
  -### * )
  -### AC_MSG_ERROR([Java version 1.3 or higher required, got 
$JAVA_VERSION]) ;;
  -### esac
  +AC_MSG_CHECKING(java version)
  +case "$JAVA" in
  +*kaffe* )
  +JAVA_VERSION=`$JAVA -version 2>&1 |
  +sed -e '/Java Version:/!d' -e 's/.*Java Version: 
\([[^  ]]*\)[[ ]]*/\1/'` ;;
  +* ) JAVA_VERSION=`$JAVA -version 2>&1 |
  +sed -e '/ version /!d' -e 's/.*"\(.*\)".*/\1/'` ;;
  +esac
  +AC_MSG_RESULT($JAVA_VERSION)
  +case "$JAVA_VERSION" in
  +1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;;
  +* )
  +AC_MSG_ERROR([Java version 1.3 or higher required, got 
$JAVA_VERSION]) ;;
  +esac
   
   for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
   do
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ configure.ac

2014-08-14 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   15-Aug-2014 03:00:45
  Branch: rpm-5_4  Handle: 2014081501004500

  Modified files:   (Branch: rpm-5_4)
rpm configure.ac

  Log:
- java: fix: lose the unneeded java AutoFu baggage.

  Summary:
RevisionChanges Path
2.472.2.106 +19 -19 rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.105 -r2.472.2.106 configure.ac
  --- rpm/configure.ac  15 Aug 2014 00:56:53 -  2.472.2.105
  +++ rpm/configure.ac  15 Aug 2014 01:00:45 -  2.472.2.106
  @@ -1765,28 +1765,28 @@
   AC_SUBST(WITH_RUBY_VENDORARCHDIR)
   
   dnl # Java prerequisites (swiped from db-6.1.19/dist/aclocal_java et al)
  - AC_CHECK_CLASSPATH
  - AC_JAVA_OPTIONS
  -AC_PROG_JAVAC
  -AC_PROG_JAVAH
  +### AC_CHECK_CLASSPATH
  +### AC_JAVA_OPTIONS
  +### AC_PROG_JAVAC
  +### AC_PROG_JAVAH
   ### AC_PROG_JAR
  -AC_PROG_JAVA
  +### AC_PROG_JAVA
   
   AC_JNI_INCLUDE_DIR
  -AC_MSG_CHECKING(java version)
  -case "$JAVA" in
  -*kaffe* )
  -JAVA_VERSION=`$JAVA -version 2>&1 |
  -sed -e '/Java Version:/!d' -e 's/.*Java Version: 
\([[^  ]]*\)[[ ]]*/\1/'` ;;
  -* ) JAVA_VERSION=`$JAVA -version 2>&1 |
  -sed -e '/ version /!d' -e 's/.*"\(.*\)".*/\1/'` ;;
  -esac
  -AC_MSG_RESULT($JAVA_VERSION)
  -case "$JAVA_VERSION" in
  -1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;;
  -* )
  -AC_MSG_ERROR([Java version 1.3 or higher required, got 
$JAVA_VERSION]) ;;
  -esac
  +### AC_MSG_CHECKING(java version)
  +### case "$JAVA" in
  +### *kaffe* )
  +### JAVA_VERSION=`$JAVA -version 2>&1 |
  +### sed -e '/Java Version:/!d' -e 's/.*Java Version: 
\([[^  ]]*\)[[ ]]*/\1/'` ;;
  +### * ) JAVA_VERSION=`$JAVA -version 2>&1 |
  +### sed -e '/ version /!d' -e 's/.*"\(.*\)".*/\1/'` ;;
  +### esac
  +### AC_MSG_RESULT($JAVA_VERSION)
  +### case "$JAVA_VERSION" in
  +### 1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;;
  +### * )
  +### AC_MSG_ERROR([Java version 1.3 or higher required, got 
$JAVA_VERSION]) ;;
  +### esac
   
   for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
   do
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ configure.ac

2014-08-14 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   15-Aug-2014 02:56:54
  Branch: rpm-5_4  Handle: 2014081500565300

  Modified files:   (Branch: rpm-5_4)
rpm configure.ac

  Log:
- autofu: update timestamp.

  Summary:
RevisionChanges Path
2.472.2.105 +1  -1  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.104 -r2.472.2.105 configure.ac
  --- rpm/configure.ac  14 Aug 2014 18:13:20 -  2.472.2.104
  +++ rpm/configure.ac  15 Aug 2014 00:56:53 -  2.472.2.105
  @@ -9,7 +9,7 @@
   AC_PREREQ([2.63])
   m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
   AC_INIT([rpm],[5.4.15],[PACKAGE_BUGREPORT_DEFAULT])
  -PACKAGE_TIMESTAMP="2014-05-03" dnl # [-MM[-DD[ HH[:MM
  +PACKAGE_TIMESTAMP="2014-08-13" dnl # [-MM[-DD[ HH[:MM
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
   
   AC_MSG_HEADER([INITIALIZATION])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ devtool.conf

2014-08-14 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   14-Aug-2014 20:15:06
  Branch: rpm-5_4  Handle: 2014081418150500

  Modified files:   (Branch: rpm-5_4)
rpm devtool.conf

  Log:
- gcrypt: libgcrypt: gcry_sexp_extract_param() not in CentOS6
libgcrypt-1.4.5.

  Summary:
RevisionChanges Path
2.365.2.90  +1  -1  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.89 -r2.365.2.90 devtool.conf
  --- rpm/devtool.conf  12 Aug 2014 16:28:53 -  2.365.2.89
  +++ rpm/devtool.conf  14 Aug 2014 18:15:05 -  2.365.2.90
  @@ -151,7 +151,7 @@
   --without-java \
   --with-openssl \
   --with-nss \
  ---with-gcrypt \
  +--without-gcrypt \
   --with-tomcrypt \
   --without-libtpm \
   --without-libtasn1 \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ configure.ac

2014-08-14 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   14-Aug-2014 20:13:21
  Branch: rpm-5_4  Handle: 2014081418132000

  Modified files:   (Branch: rpm-5_4)
rpm configure.ac

  Log:
- java: fix: AC_PROG_JAR is full stop failure without jar. Don't test.

  Summary:
RevisionChanges Path
2.472.2.104 +1  -1  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.103 -r2.472.2.104 configure.ac
  --- rpm/configure.ac  8 Aug 2014 22:40:39 -   2.472.2.103
  +++ rpm/configure.ac  14 Aug 2014 18:13:20 -  2.472.2.104
  @@ -1769,7 +1769,7 @@
AC_JAVA_OPTIONS
   AC_PROG_JAVAC
   AC_PROG_JAVAH
  -AC_PROG_JAR
  +### AC_PROG_JAR
   AC_PROG_JAVA
   
   AC_JNI_INCLUDE_DIR
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ INSTALL

2014-08-14 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   14-Aug-2014 19:47:21
  Branch: rpm-5_4  Handle: 2014081417472100

  Modified files:   (Branch: rpm-5_4)
rpm INSTALL

  Log:
- gcrypt: libcrypt-1.6.0 is necessary.

  Summary:
RevisionChanges Path
2.134.2.9   +4  -1  rpm/INSTALL
  

  patch -p0 <<'@@ .'
  Index: rpm/INSTALL
  
  $ cvs diff -u -r2.134.2.8 -r2.134.2.9 INSTALL
  --- rpm/INSTALL   1 Aug 2014 17:52:58 -   2.134.2.8
  +++ rpm/INSTALL   14 Aug 2014 17:47:21 -  2.134.2.9
  @@ -39,7 +39,7 @@
   Mozilla NSS optional  3.113.16.2  
http://www.mozilla.org/projects/security/pki/nss/
   OpenSSL optional  0.9.8   1.0.0e  http://www.openssl.org/
   LibTomCrypt optional  1.171.17http://www.libtom.org/
  -LibGcrypt   optional  1.5.3   1.6.1   http://www.gnupg.org/
  +LibGcrypt   [6] optional  1.6.0   1.6.1   http://www.gnupg.org/
   SQLite  [1] optional  3.3 3.7.0.1 http://www.sqlite.org/
   Lua [2] optional  5.2 5.2.2   http://www.lua.org/
   ZLiboptional  1.2 1.2.8   http://www.zlib.net/
  @@ -81,6 +81,9 @@
  Building RPM against stock external XAR currently still not 
recommended.
  The 1.5 and 1.5.1 releases of XAR needs some patching, before 
they work.
   
  +[6] libgcrypt: gcry_sexp_extract_param() is available only in 
libgcrypt-1.6.0.
  +   gcry_sexp_sprint() could be used instead to extract MPI's.
  +
   Run-Time
   
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ configure.ac

[CVS] RPM: rpm-5_4: rpm/ configure.ac

[CVS] RPM: rpm-5_4: rpm/ configure.ac

[CVS] RPM: rpm-5_4: rpm/ devtool.conf

[CVS] RPM: rpm-5_4: rpm/ configure.ac

[CVS] RPM: rpm-5_4: rpm/ INSTALL

6 matches

Site Navigation

Mail list logo

Footer information