From 4447516fea6b9e5fded942bb923548de2ada157c Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 13 Apr 2016 21:17:35 +0200 Subject: [PATCH] - updated to 0.94.6 - updated logrotate patch - removed obsolete link,ac patches --- ceph-ac.patch | 20 -------------------- ceph-link.patch | 11 ----------- ceph.logrotate.patch | 10 +++++----- ceph.spec | 35 ++++++++++++++++++++++++++--------- 4 files changed, 31 insertions(+), 45 deletions(-) delete mode 100644 ceph-ac.patch delete mode 100644 ceph-link.patch diff --git a/ceph-ac.patch b/ceph-ac.patch deleted file mode 100644 index 01a3d60..0000000 --- a/ceph-ac.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ceph-0.94.1/configure.ac.orig 2015-04-10 21:09:16.000000000 +0200 -+++ ceph-0.94.1/configure.ac 2015-04-23 17:09:49.415097906 +0200 -@@ -967,7 +967,7 @@ - ]) - - AC_MSG_CHECKING([for sched.h]) --+AC_LANG_PUSH([C++]) -+AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define _GNU_SOURCE - #include -@@ -984,7 +984,7 @@ - ], [ - AC_MSG_RESULT([no]) - ]) --+AC_LANG_POP([C++]) -+AC_LANG_POP([C++]) - - - # diff --git a/ceph-link.patch b/ceph-link.patch deleted file mode 100644 index 948fb63..0000000 --- a/ceph-link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ceph-0.92/src/libradosstriper/Makefile.am.orig 2015-02-02 22:32:32.000000000 +0100 -+++ ceph-0.92/src/libradosstriper/Makefile.am 2015-02-07 18:25:15.007810402 +0100 -@@ -6,7 +6,7 @@ - # We need this to avoid basename conflicts with the libradosstriper build tests in test/Makefile.am - libradosstriper_la_CXXFLAGS = ${AM_CXXFLAGS} - --LIBRADOSSTRIPER_DEPS = $(LIBRADOS_DEPS) -+LIBRADOSSTRIPER_DEPS = $(top_builddir)/src/librados.la $(LIBRADOS_DEPS) - libradosstriper_la_LIBADD = $(LIBRADOSSTRIPER_DEPS) - libradosstriper_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 - if LINUX diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch index 6da864c..53b79a5 100644 --- a/ceph.logrotate.patch +++ b/ceph.logrotate.patch @@ -1,13 +1,13 @@ ---- ceph-0.84/src/logrotate.conf.orig 2014-08-22 19:12:40.945575009 +0200 -+++ ceph-0.84/src/logrotate.conf 2014-08-22 19:14:59.222235873 +0200 +--- ceph-0.94.6/src/logrotate.conf.orig 2016-04-12 20:38:42.246628426 +0200 ++++ ceph-0.94.6/src/logrotate.conf 2016-04-12 20:44:06.806614808 +0200 @@ -4,25 +4,7 @@ compress sharedscripts postrotate -- if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then -- invoke-rc.d ceph reload >/dev/null -- elif which service > /dev/null 2>&1 && [ -x `which service` ]; then +- if which service > /dev/null 2>&1 && [ -x `which service` ]; then - service ceph reload >/dev/null +- elif which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then +- invoke-rc.d ceph reload >/dev/null - fi - # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op - if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then diff --git a/ceph.spec b/ceph.spec index ca65696..86f3aeb 100644 --- a/ceph.spec +++ b/ceph.spec @@ -3,7 +3,6 @@ # (upstream scripts seem overcomplicated and hardly useful) # - run as non-root user # -# # Conditional build: %bcond_without java # Java binding %bcond_with accelio # Accelio transport support @@ -21,12 +20,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.94.3 -Release: 3 +Version: 0.94.6 +Release: 1 License: LGPL v2.1 (libraries), GPL v2 (some programs) Group: Base -Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 -# Source0-md5: ccbaba6cad56cf71719661a0cdcc6ad6 +Source0: http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz +# Source0-md5: 566cdeae80ee639dcb265ac284a59b48 Source1: ceph.sysconfig # based on files from https://github.com/ceph/ceph/tree/master/systemd Source10: cephctl @@ -37,8 +36,6 @@ Source14: ceph.target Source15: ceph.tmpfiles Patch0: %{name}-init-fix.patch Patch1: %{name}.logrotate.patch -Patch2: %{name}-link.patch -Patch3: %{name}-ac.patch URL: http://ceph.com/ %{?with_accelio:BuildRequires: accelio-devel} BuildRequires: autoconf >= 2.59 @@ -214,8 +211,6 @@ Agenci OCF do monitorowania procesów Cepha. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{__libtoolize} @@ -223,6 +218,8 @@ Agenci OCF do monitorowania procesów Cepha. %{__autoconf} %{__autoheader} %{__automake} +# required by xfs headers (for off64_t) +CPPFLAGS="%{rpmcppflags} -D_LARGEFILE64_SOURCE" # 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 \ @@ -449,23 +446,39 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcephfs.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libcephfs.so.1 +%attr(755,root,root) %{_libdir}/libos_tp.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libos_tp.so.1 +%attr(755,root,root) %{_libdir}/libosd_tp.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libosd_tp.so.1 %attr(755,root,root) %{_libdir}/librados.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/librados.so.2 +%attr(755,root,root) %{_libdir}/librados_tp.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/librados_tp.so.2 %attr(755,root,root) %{_libdir}/libradosstriper.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libradosstriper.so.1 %attr(755,root,root) %{_libdir}/librbd.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/librbd.so.1 +%attr(755,root,root) %{_libdir}/librbd_tp.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/librbd_tp.so.1 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcephfs.so +%attr(755,root,root) %{_libdir}/libos_tp.so +%attr(755,root,root) %{_libdir}/libosd_tp.so %attr(755,root,root) %{_libdir}/librados.so +%attr(755,root,root) %{_libdir}/librados_tp.so %attr(755,root,root) %{_libdir}/libradosstriper.so %attr(755,root,root) %{_libdir}/librbd.so +%attr(755,root,root) %{_libdir}/librbd_tp.so %{_libdir}/libcephfs.la +%{_libdir}/libos_tp.la +%{_libdir}/libosd_tp.la %{_libdir}/librados.la +%{_libdir}/librados_tp.la %{_libdir}/libradosstriper.la %{_libdir}/librbd.la +%{_libdir}/librbd_tp.la %{_includedir}/cephfs %{_includedir}/rados %{_includedir}/radosstriper @@ -474,9 +487,13 @@ fi %files static %defattr(644,root,root,755) %{_libdir}/libcephfs.a +%{_libdir}/libos_tp.a +%{_libdir}/libosd_tp.a %{_libdir}/librados.a +%{_libdir}/librados_tp.a %{_libdir}/libradosstriper.a %{_libdir}/librbd.a +%{_libdir}/librbd_tp.a %files -n python-ceph %defattr(644,root,root,755) -- 2.43.0