Rebase to 0.80.9

Fix several issues with spec file
- Perform a hardened build - Use git-formatted patches - Do not remove conf files on uninstall - Remove the cleanup post-script function
2015-03-11 17:17:27 +01:00 · 2015-03-04 19:42:21 +01:00 · 2015-02-23 19:21:51 +01:00 · 2014-11-11 13:11:09 +01:00 · 2014-11-11 13:11:09 +01:00 · 2014-09-09 10:15:31 +02:00
2 changed files with 9 additions and 18 deletions
@@ -11,7 +11,7 @@
 # common
 #################################################################################
 Name:		ceph
-Version:	0.80.10
+Version:	0.80.9
 Release:	1%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
@@ -21,6 +21,7 @@ URL:		http://ceph.com/
 Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
 Patch1:		0001-gperftools-deprecated-google-includes.patch
 Patch2:		0002-Wno-format-causes-compiler-options-collision.patch
+Patch3:		0003-Backport-pull-request-2937-to-firefly.patch
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
@@ -391,6 +392,7 @@ python-cephfs instead.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1

 %build
 # Find jni.h
@@ -603,7 +605,6 @@ fi
 %config %{_sysconfdir}/bash_completion.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw
-%{_mandir}/man8/ceph-disk.8*
 %{_mandir}/man8/ceph-mon.8*
 %{_mandir}/man8/ceph-mds.8*
 %{_mandir}/man8/ceph-osd.8*
@@ -844,7 +845,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_bindir}/ceph_smalliobenchdumb
 %{_bindir}/ceph_smalliobenchfs
 %{_bindir}/ceph_smalliobenchrbd
-%{_bindir}/ceph-objectstore-tool
+%{_bindir}/ceph_filestore_dump
+%{_bindir}/ceph_filestore_tool
 %{_bindir}/ceph_streamtest
 %{_bindir}/ceph_test_*
 %{_bindir}/ceph_tpbench
@@ -873,10 +875,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %files -n python-ceph-compat

 %changelog
-* Wed Jul 22 2015 Boris Ranto <branto@redhat.com> - 1:0.80.10-1
- Rebase to 0.80.10
- Remove hacky 3rd patch, it was back-ported properly to .10
-
 * Wed Mar 11 2015 Boris Ranto <branto@redhat.com> - 1:0.80.9-1
 - Rebase to 0.80.9, .8 contained a regression

@@ -887,17 +885,10 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 - Remove the cleanup post-script function

 * Mon Feb 23 2015 Boris Ranto <branto@redhat.com> - 1:0.80.8-1
- Rebase to 0.80.8 release
- Require yasm, the yasm-related selinux issue was fixed in .8 release
- Patch 3 and 4 are now part of the release
+- Rebase to latest upstream firefly version
+- Require yasm, the SELinux yasm issue was fixed in .8 release

-* Wed Jan 14 2015 Boris Ranto <branto@redhat.com> - 1:0.80.7-3
- Fix rhbz#1155335 -- /usr/bin/ceph hangs indefinitely
-
-* Mon Dec 8 2014 Boris Ranto <branto@redhat.com> - 1:0.80.7-2
- Fix rhbz#1144794
-
-* Thu Oct 16 2014 Boris Ranto <branto@redhat.com> - 1:0.80.7-1
+* Thu Oct 16 2014 Boris Ranto <branto@redhat.com - 1:0.80.7-1
 - Rebase to latest upstream version

 * Sat Oct 11 2014 Boris Ranto <branto@redhat.com> - 1:0.80.6-3
@@ -1 +1 @@
-0bb1d511f39d648035c412c41fd5b8a5  ceph-0.80.10.tar.bz2
+cdb6309db1e923ab291bee908cd33f16  ceph-0.80.9.tar.bz2
Author	SHA1	Message	Date
Boris Ranto	bfa0c90c28	Rebase to 0.80.9	2015-03-11 17:17:27 +01:00
Boris Ranto	512f758b63	Fix several issues with spec file - Perform a hardened build - Use git-formatted patches - Do not remove conf files on uninstall - Remove the cleanup post-script function	2015-03-04 19:42:21 +01:00
Boris Ranto	40c0183c51	Rebase to 0.80.8	2015-02-23 19:21:51 +01:00
Boris Ranto	edc2f5729d	Rebase to latest upstream version	2014-11-11 13:11:09 +01:00
Boris Ranto	b8c05a8d14	Rebase and split ceph-devel, python-ceph packages. provide empty file list for python-ceph-compat and ceph-devel-compat, fix the librados-devel vs librados2-devel problem	2014-11-11 13:11:09 +01:00
Dan Horák	fee6eea17b	- update Requires for s390(x)	2014-09-09 10:15:31 +02:00
Boris Ranto	fec89844e3	Fix bz 1136811 (incorrect symlink on fedora)	2014-09-03 15:31:05 +02:00
Boris Ranto	b24854c0a7	Second attempt to fix selinux issue (bz 1118504)	2014-08-22 02:03:45 +02:00
Kalev Lember	25b47f32a9	Obsolete ceph-libcephfs Correct the name of the obsoleted package. It used to be called "ceph-libcephfs" and not "libcephfs". Transaction check error: file /usr/lib64/libcephfs.so.1.0.0 from install of libcephfs1-1:0.80.5-5.fc21.x86_64 conflicts with file from package ceph-libcephfs-0.81.0-6.fc21.x86_64	2014-08-16 23:38:39 +02:00
Boris Ranto	e44806fede	Various fixes: - Do not require xfsprogs/xfsprogs-devel for el6 - Require gperftools-devel for non-ppc/s390 architectures only - Do not require junit -- no need to build libcephfs-test.jar - Build without libxfs for el6 - Build without tcmalloc for ppc/s390 architectures - Location of mkcephfs must depend on a rhel release - Use epoch in the Requires fields [1130700]	2014-08-16 16:00:20 +02:00
Boris Ranto	830e99f484	Use the proper version name in Obsoletes, the previous one did not obsolete all the packages that it should	2014-08-16 10:32:16 +02:00
Boris Ranto	a236dbbbe2	Fix the date in changelog	2014-08-16 03:50:05 +02:00
Peter Robinson	c81d313d7c	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2014-08-15 23:54:45 +00:00
Boris Ranto	5311ad2942	Add the arm pthread hack	2014-08-16 01:11:30 +02:00
Boris Ranto	08b7207d61	Bump the Epoch, we need to keep the latest stable, not development, ceph version in fedora - Use the upstream spec file with the ceph-libs split - Add libs-compat subpackage - Use fedora in rhel 7 checks - Obsolete libcephfs - Depend on redhat-lsb-core for the initscript	2014-08-15 23:07:34 +02:00