- updated to 0.66

- updated link patch
- force using javac (build failed with gcj)

diff --git a/ceph-link.patch b/ceph-link.patch
index ae244f8287947296b092a7e9e837048ee4c7b8ea..c3da3a772790d47e47dbcfa010022fe1c7b79ccc 100644 (file)
--- a/ceph-link.patch
+++ b/ceph-link.patch
@@ -9,15 +9,6 @@
  
  LIBOS_LDA = libos.a
  
-@@ -146,7 +146,7 @@
- bin_PROGRAMS += cephfs
- 
- librados_config_SOURCES = librados-config.cc
--librados_config_LDADD = libglobal.la librados.la $(PTHREAD_LIBS) $(EXTRALIBS) $(CRYPTO_LIBS)
-+librados_config_LDADD = librados.la $(LIBGLOBAL_LDA) $(PTHREAD_LIBS) $(EXTRALIBS) $(CRYPTO_LIBS)
- bin_PROGRAMS += librados-config
- 
- # synthetic client
 @@ -313,7 +313,7 @@
  libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
  libcephfs_la_CXXFLAGS= ${AM_CXXFLAGS}

diff --git a/ceph.spec b/ceph.spec
index 095ceeebd777402401eb624cb5b014dbc90cc677..6f72fa70ea948ca5c031f5011d5941f8952c35e4 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -6,12 +6,12 @@
 Summary:       User space components of the Ceph file system
 Summary(pl.UTF-8):     Działające w przestrzeni użytkownika elementy systemu plików Ceph
 Name:          ceph
-Version:       0.65
+Version:       0.66
 Release:       1
 License:       LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:         Base
 Source0:       http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 5fb7283f302838ea94d02fa0fc28fd45
+# Source0-md5: dee4cf21cfb1aedebc29a0a52921c235
 Patch0:                %{name}-init-fix.patch
 Patch1:                %{name}.logrotate.patch
 Patch2:                %{name}-link.patch
@@ -198,6 +198,7 @@ Klient Hadoopa dla systemu plików Ceph.
 # ac_cv_prog_uudecode_base64=no is a hack to compile Test.class instead of
 # using included one which fails with Sun/Oracle JDK 1.6
 %configure \
+       %{?with_java:JAVAC=/usr/bin/javac} \
        ac_cv_prog_uudecode_base64=no \
        --sbindir=/sbin \
        --with-cryptopp \