Accepting request 412242 from filesystems:ceph

1

OBS-URL: https://build.opensuse.org/request/show/412242
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=3

_servicedata

@@ -1,5 +1,5 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/SUSE/ceph.git</param>
-          <param name="changesrevision">b5a7c563cc3561d25db573bd85e20fb255715896</param></service>
+          <param name="changesrevision">7232e187533f205bcc5a5f0dbaec8f9830531601</param></service>
 </servicedata>

ceph-10.2.2+git.1466113786.b5a7c56.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4d68e347c165173604a97766b76efc19d70edcdaa6f5952fc9ff7690d7fcf69
-size 16499656

ceph-10.2.2+git.1468935528.7232e18.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a92aa23729386bcf71dd1e96b65a8f7cc84a06f4f5159e99acc907233604c59
+size 16500665

ceph.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Tue Jul 19 13:57:43 UTC 2016 - ncutler@suse.com
+
+- Update to version 10.2.2+git.1468935528.7232e18:
+  + rpm: Fix creation of mount.ceph symbolic link for SUSE distros (bsc#987594)
+
+-------------------------------------------------------------------
+Tue Jul 19 10:24:43 UTC 2016 - ncutler@suse.com
+
+- Update to version 10.2.2+git.1468923564.55149c4:
+  + fix bsc#989512
+    - Revert "ceph.spec.in: add ExcludeArch: i586"
+    - Revert "Revert "ceph.spec.in: add ExclusiveArch: x86_64 aarch64""
+
+-------------------------------------------------------------------
+Tue Jul 19 08:01:54 UTC 2016 - ncutler@suse.com
+
+- Update to version 10.2.2+git.1468914912.5a3ea0a:
+  + makefile: install mount.fuse.ceph,mount.ceph into /usr/sbin
+
+-------------------------------------------------------------------
+Mon Jul 18 16:11:19 UTC 2016 - ncutler@suse.com
+
+- Update to version 10.2.2+git.1468852657.c7d4fc3:
+  + rpm: create mount.ceph symlink in /sbin
+
+-------------------------------------------------------------------
+Mon Jul 18 09:13:15 UTC 2016 - ncutler@suse.com
+
+- Update to version 10.2.2+git.1468832924.19e510c:
+  + ceph.spec.in: move ceph-dencoder to ceph-base
+  + ceph.spec.in: drop ceph-brag and ceph-post-file
+  + ceph.spec.in: move cephfs-* fsck tools to ceph-base
+
+-------------------------------------------------------------------
+Thu Jul 14 09:24:10 UTC 2016 - ncutler@suse.com
+
+- Update to version 10.2.2+git.1468439993.fb857f2:
+  + rpm: provide -devel library packages that are being obsoleted
+
 -------------------------------------------------------------------
 Tue Jul 12 14:01:20 UTC 2016 - ncutler@suse.com
 

ceph.spec

@@ -53,7 +53,7 @@
 # common
 #################################################################################
 Name:		ceph
-Version:	10.2.2+git.1466113786.b5a7c56
+Version:	10.2.2+git.1468935528.7232e18
 Release:	0
 Summary:	User space components of the Ceph file system
 License:	LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@@ -63,7 +63,7 @@ Group:         System/Filesystems
 URL:		http://ceph.com/
 Source0:	%{name}-%{version}.tar.bz2
 Source99:       ceph-rpmlintrc
-ExcludeArch:    i586
+ExclusiveArch:  x86_64 aarch64
 #################################################################################
 # dependencies that apply across all distro families
 #################################################################################
@@ -373,7 +373,8 @@ Group:		Development/Libraries
 License:	LGPL-2.0
 Requires:	librados2 = %{version}-%{release}
 Obsoletes:	ceph-devel < %{version}-%{release}
-Obsoletes:	librados2-devel
+Provides:	librados2-devel = %{version}-%{release}
+Obsoletes:	librados2-devel < %{version}-%{release}
 %description -n librados-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS object store.
@@ -393,7 +394,8 @@ Group:		Development/Libraries
 License:	LGPL-2.0
 Requires:	librados-devel = %{version}-%{release}
 Requires:	librgw2 = %{version}-%{release}
-Obsoletes:	librgw2-devel
+Provides:	librgw2-devel = %{version}-%{release}
+Obsoletes:	librgw2-devel < %{version}-%{release}
 %description -n librgw-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS gateway client library.
@@ -425,7 +427,8 @@ License:	LGPL-2.0
 Requires:	libradosstriper1 = %{version}-%{release}
 Requires:	librados-devel = %{version}-%{release}
 Obsoletes:	ceph-devel < %{version}-%{release}
-Obsoletes:	libradosstriper1-devel
+Provides:	libradosstriper1-devel = %{version}-%{release}
+Obsoletes:	libradosstriper1-devel < %{version}-%{release}
 %description -n libradosstriper-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS striping interface.
@@ -451,7 +454,8 @@ License:	LGPL-2.0
 Requires:	librbd1 = %{version}-%{release}
 Requires:	librados-devel = %{version}-%{release}
 Obsoletes:	ceph-devel < %{version}-%{release}
-Obsoletes:	librbd1-devel
+Provides:	librbd1-devel = %{version}-%{release}
+Obsoletes:	librbd1-devel < %{version}-%{release}
 %description -n librbd-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS block device.
@@ -488,7 +492,8 @@ License:	LGPL-2.0
 Requires:	libcephfs1 = %{version}-%{release}
 Requires:	librados-devel = %{version}-%{release}
 Obsoletes:	ceph-devel < %{version}-%{release}
-Obsoletes:	libcephfs1-devel
+Provides:	libcephfs1-devel = %{version}-%{release}
+Obsoletes:	libcephfs1-devel < %{version}-%{release}
 %description -n libcephfs-devel
 This package contains libraries and headers needed to develop programs
 that use Cephs distributed file system.
@@ -532,7 +537,8 @@ License:	LGPL-2.0
 Requires:	java
 Requires:	libcephfs_jni1 = %{version}-%{release}
 Obsoletes:	ceph-devel < %{version}-%{release}
-Obsoletes:	libcephfs_jni1-devel
+Provides:	libcephfs_jni1-devel = %{version}-%{release}
+Obsoletes:	libcephfs_jni1-devel < %{version}-%{release}
 %description -n libcephfs_jni-devel
 This package contains the development files for CephFS Java Native Interface
 library.
@@ -679,17 +685,17 @@ install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/cep
 chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
 chmod 0644 %{buildroot}%{_docdir}/ceph/sample.fetch_config
 
-# firewall templates
+# firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version}
 install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
 install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
+mkdir -p %{buildroot}/sbin
+ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
 %endif
 
 # udev rules
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
 install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules
-mv %{buildroot}/sbin/mount.ceph %{buildroot}/usr/sbin/mount.ceph
-mv %{buildroot}/sbin/mount.fuse.ceph %{buildroot}/usr/sbin/mount.fuse.ceph
 
 #set up placeholder directories
 mkdir -p %{buildroot}%{_sysconfdir}/ceph
@@ -722,13 +728,20 @@ rm -rf %{buildroot}
 %{_bindir}/monmaptool
 %{_bindir}/osdmaptool
 %{_bindir}/ceph-run
+%{_bindir}/ceph-dencoder
 %{_bindir}/ceph-detect-init
 %{_bindir}/ceph-client-debug
 %{_bindir}/cephfs
+%{_bindir}/cephfs-data-scan
+%{_bindir}/cephfs-journal-tool
+%{_bindir}/cephfs-table-tool
 %{_libexecdir}/systemd/system-preset/50-ceph.preset
 %{_sbindir}/ceph-create-keys
 %{_sbindir}/rcceph
 %{_sbindir}/mount.ceph
+%if 0%{?suse_version}
+/sbin/mount.ceph
+%endif
 %dir %{_libexecdir}/ceph
 %{_libexecdir}/ceph/ceph_common.sh
 %dir %{_libdir}/rados-classes
@@ -807,13 +820,9 @@ DISABLE_RESTART_ON_UPDATE="yes"
 %{_bindir}/ceph
 %{_bindir}/ceph-authtool
 %{_bindir}/ceph-conf
-%{_bindir}/ceph-dencoder
 %{_bindir}/ceph-rbdnamer
 %{_bindir}/ceph-syn
 %{_bindir}/ceph-crush-location
-%{_bindir}/cephfs-data-scan
-%{_bindir}/cephfs-journal-tool
-%{_bindir}/cephfs-table-tool
 %{_bindir}/rados
 %{_bindir}/rbd
 %{_bindir}/rbd-replay
@@ -822,8 +831,8 @@ DISABLE_RESTART_ON_UPDATE="yes"
 %if %{with lttng}
 %{_bindir}/rbd-replay-prep
 %endif
-%{_bindir}/ceph-post-file
+%exclude %{_bindir}/ceph-post-file
-%{_bindir}/ceph-brag
+%exclude %{_bindir}/ceph-brag
 %{_tmpfilesdir}/ceph-common.conf
 %{_mandir}/man8/ceph-authtool.8*
 %{_mandir}/man8/ceph-conf.8*