Reflect file list changes in the new release

Rebase to 0.80.10
Rebase to 0.80.9
2015-07-22 16:35:10 +02:00 · 2015-07-22 15:55:12 +02:00 · 2015-03-11 17:17:02 +01:00 · 2015-03-04 19:28:00 +01:00 · 2015-03-04 19:13:34 +01:00 · 2015-03-04 19:11:17 +01:00
2 changed files with 18 additions and 9 deletions
@@ -11,7 +11,7 @@
 # common
 #################################################################################
 Name:		ceph
-Version:	0.80.9
+Version:	0.80.10
 Release:	1%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
@@ -21,7 +21,6 @@ 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}
@@ -392,7 +391,6 @@ python-cephfs instead.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1

 %build
 # Find jni.h
@@ -605,6 +603,7 @@ 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*
@@ -845,8 +844,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_bindir}/ceph_smalliobenchdumb
 %{_bindir}/ceph_smalliobenchfs
 %{_bindir}/ceph_smalliobenchrbd
-%{_bindir}/ceph_filestore_dump
-%{_bindir}/ceph_filestore_tool
+%{_bindir}/ceph-objectstore-tool
 %{_bindir}/ceph_streamtest
 %{_bindir}/ceph_test_*
 %{_bindir}/ceph_tpbench
@@ -875,6 +873,10 @@ 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

@@ -885,10 +887,17 @@ 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 latest upstream firefly version
- Require yasm, the SELinux yasm issue was fixed in .8 release
+- 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

-* Thu Oct 16 2014 Boris Ranto <branto@redhat.com - 1:0.80.7-1
+* 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
 - Rebase to latest upstream version

 * Sat Oct 11 2014 Boris Ranto <branto@redhat.com> - 1:0.80.6-3
@@ -1 +1 @@
-cdb6309db1e923ab291bee908cd33f16  ceph-0.80.9.tar.bz2
+0bb1d511f39d648035c412c41fd5b8a5  ceph-0.80.10.tar.bz2
Author	SHA1	Message	Date
Boris Ranto	af48e05750	Reflect file list changes in the new release	2015-07-22 16:35:10 +02:00
Boris Ranto	21ee093831	Rebase to 0.80.10	2015-07-22 15:55:12 +02:00
Boris Ranto	ef6cebb5fd	Rebase to 0.80.9	2015-03-11 17:17:02 +01:00
Boris Ranto	61198a290b	Fix a typo v2	2015-03-04 19:28:00 +01:00
Boris Ranto	c2f40f6bf6	Fix a typo	2015-03-04 19:13:34 +01:00
Boris Ranto	cba5e9554c	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:11:17 +01:00
Boris Ranto	c01db1f5b0	Rebase to ceph-0.80.8	2015-02-23 19:14:58 +01:00
Boris Ranto	8e6771dba7	Fix rhbz#1155335 -- /usr/bin/ceph hangs indefinitely	2015-01-14 08:35:02 +01:00
Boris Ranto	615188d81c	Can't backport the assert, depends on 'giant' codebase Just remove the pthread_rwlock_unlock call in destructor to fix the issue in rhbz#1144794.	2014-12-08 09:41:46 +01:00
Boris Ranto	651026bc41	Fix rhbz#1144794	2014-12-08 08:40:03 +01:00
Boris Ranto	26ff0145e7	Rebase to latest upstream version	2014-10-21 21:24:57 +02:00
Boris Ranto	fa0655c5ea	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-10-13 19:54:42 +02:00
Dan Horák	85761f4d79	- update Requires for s390(x)	2014-09-09 10:15:01 +02:00
Boris Ranto	a497e4464b	Fix bz 1136811 (incorrect symlink on fedora)	2014-09-03 15:32:06 +02:00
Boris Ranto	de771f742d	Second attempt to fix selinux issue (bz 1118504)	2014-08-22 01:59:32 +02:00
Boris Ranto	95fe85df9e	Revert "Modify configure flags to get rid of selinux-related permission denied when loading libraries (bz 1118504)" This reverts commit `c90c05b686`. The patch did not fix the issue.	2014-08-22 01:58:56 +02:00
Boris Ranto	c90c05b686	Modify configure flags to get rid of selinux-related permission denied when loading libraries (bz 1118504)	2014-08-21 17:45:41 +02:00
Kalev Lember	711bd40c4e	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:40:12 +02:00
Boris Ranto	a5375edeaf	Sync up the spec file with master	2014-08-16 16:07:45 +02:00
Boris Ranto	9db102749d	Use the proper version name in Obsoletes, the previous one did not obsolete all the packages that it should	2014-08-16 10:24:11 +02:00
Boris Ranto	7ba3ecfe8f	Fix bogus date	2014-08-16 03:53:54 +02:00
Boris Ranto	bb93fe97da	Fix the dates in changelog	2014-08-16 03:52:03 +02:00
Boris Ranto	b833068178	Merge the changes made by rel-eng and fix the dates in changelog	2014-08-16 03:47:54 +02:00
Boris Ranto	d5a5e9b77d	Add the arm pthread hack	2014-08-16 03:43:51 +02:00
Peter Robinson	1b9a141a37	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2014-08-15 23:54:53 +00:00
Boris Ranto	47fe109fff	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:22:02 +02:00