diff --git a/_servicedata b/_servicedata index d8583a9..64679a8 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - d86680e01d962df5e9313dad20fcb0f2613da04f \ No newline at end of file + 4daa41614aac71abfc43cc15fd8ce0a626da6968 \ No newline at end of file diff --git a/ceph-11.1.0+git.1483528076.d86680e.tar.bz2 b/ceph-11.1.0+git.1483528076.d86680e.tar.bz2 deleted file mode 100644 index ca8a3e8..0000000 --- a/ceph-11.1.0+git.1483528076.d86680e.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:417bd05885a14d07231bc5fdfca976ba2a5b54287acd88a251908775aaee0035 -size 102821189 diff --git a/ceph-11.1.0+git.1484905510.4daa416.tar.bz2 b/ceph-11.1.0+git.1484905510.4daa416.tar.bz2 new file mode 100644 index 0000000..1ef1b7a --- /dev/null +++ b/ceph-11.1.0+git.1484905510.4daa416.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afed1030759f2c66313cdb1b2264fb24e1687c1fcb657150c1cee6c6280cc279 +size 102879829 diff --git a/ceph-test.changes b/ceph-test.changes index b08d22d..88de245 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Jan 20 10:18:44 UTC 2017 - ncutler@suse.com + +- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch + line in ceph-test.spec (rationale: ceph-test is not shipped for s390x) + +------------------------------------------------------------------- +Fri Jan 20 10:06:54 UTC 2017 - ncutler@suse.com + +- Update to version 11.1.0+git.1484745543.7b08de5: + + Update to latest upstream master (36874c8) - significant changes: + * cmake: Turn libcommon into a shared library (PR#12840) + * cmake: fix rpath on shared libraries and executables (PR#12927) + + Fix build failure in ppc64le and s390x, caused by missing + "-momit-leaf-frame-pointer" gcc option in these architectures: + + rocksdb: build with ppc64 (PR#12908) + +------------------------------------------------------------------- +Tue Jan 17 14:14:45 UTC 2017 - ncutler@suse.com + +- Update to version 11.1.0+git.1484659687.3472421: + + rpm: tell openSUSE to never clean the spec file + + Enable ppc64le and s390x builds in SLE + + rpm: lttng only on x86_64 and aarch64 + ------------------------------------------------------------------- Thu Jan 05 10:43:34 UTC 2017 - jfajerski@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 320173d..5a76e6d 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -13,7 +13,7 @@ # # Please submit bugfixes or comments via http://tracker.ceph.com/ # -%bcond_without cephfs_java +%bcond_with cephfs_java %if 0%{?suse_version} %bcond_without ceph_test_package %else @@ -27,7 +27,7 @@ # no gperftools/tcmalloc on s390(x) %bcond_with tcmalloc %endif -%bcond_with lowmem_builder +%bcond_without lowmem_builder %bcond_with minimal_debugging_information %if 0%{?fedora} || 0%{?rhel} %bcond_with ocf @@ -44,9 +44,11 @@ # LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE) %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} %if ! 0%{?is_opensuse} +%ifarch x86_64 aarch64 %bcond_without lttng %endif %endif +%endif %if %{with selinux} # get selinux policy version @@ -65,7 +67,7 @@ # common ################################################################################# Name: ceph-test -Version: 11.1.0+git.1483528076.d86680e +Version: 11.1.0+git.1484905510.4daa416 Release: 0 Summary: Ceph benchmarks and test tools 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 @@ -86,7 +88,7 @@ Source99: ceph-rpmlintrc %if 0%{?is_opensuse} ExclusiveArch: x86_64 aarch64 ppc64 ppc64le %else -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: x86_64 aarch64 ppc64le %endif %endif ################################################################################# @@ -556,6 +558,7 @@ rm -rf %{buildroot}%{_unitdir}/ceph-osd.target rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd rm -rf %{buildroot}%{_libdir}/librados.so.* +rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so rm -rf %{buildroot}%{_libdir}/librados_tp.so.* rm -rf %{buildroot}%{_includedir}/rados/librados.h rm -rf %{buildroot}%{_includedir}/rados/librados.hpp @@ -790,3 +793,4 @@ rm -rf %{buildroot} %if 0%{with selinux} %endif # with selinux %changelog +# nospeccleaner diff --git a/ceph.changes b/ceph.changes index b08d22d..88de245 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Jan 20 10:18:44 UTC 2017 - ncutler@suse.com + +- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch + line in ceph-test.spec (rationale: ceph-test is not shipped for s390x) + +------------------------------------------------------------------- +Fri Jan 20 10:06:54 UTC 2017 - ncutler@suse.com + +- Update to version 11.1.0+git.1484745543.7b08de5: + + Update to latest upstream master (36874c8) - significant changes: + * cmake: Turn libcommon into a shared library (PR#12840) + * cmake: fix rpath on shared libraries and executables (PR#12927) + + Fix build failure in ppc64le and s390x, caused by missing + "-momit-leaf-frame-pointer" gcc option in these architectures: + + rocksdb: build with ppc64 (PR#12908) + +------------------------------------------------------------------- +Tue Jan 17 14:14:45 UTC 2017 - ncutler@suse.com + +- Update to version 11.1.0+git.1484659687.3472421: + + rpm: tell openSUSE to never clean the spec file + + Enable ppc64le and s390x builds in SLE + + rpm: lttng only on x86_64 and aarch64 + ------------------------------------------------------------------- Thu Jan 05 10:43:34 UTC 2017 - jfajerski@suse.com diff --git a/ceph.spec b/ceph.spec index d414c6a..e30fd08 100644 --- a/ceph.spec +++ b/ceph.spec @@ -13,7 +13,7 @@ # # Please submit bugfixes or comments via http://tracker.ceph.com/ # -%bcond_without cephfs_java +%bcond_with cephfs_java %if 0%{?suse_version} %bcond_with ceph_test_package %else @@ -27,7 +27,7 @@ # no gperftools/tcmalloc on s390(x) %bcond_with tcmalloc %endif -%bcond_with lowmem_builder +%bcond_without lowmem_builder %bcond_with minimal_debugging_information %if 0%{?fedora} || 0%{?rhel} %bcond_with ocf @@ -44,9 +44,11 @@ # LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE) %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} %if ! 0%{?is_opensuse} +%ifarch x86_64 aarch64 %bcond_without lttng %endif %endif +%endif %if %{with selinux} # get selinux policy version @@ -65,7 +67,7 @@ # common ################################################################################# Name: ceph -Version: 11.1.0+git.1483528076.d86680e +Version: 11.1.0+git.1484905510.4daa416 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 @@ -84,7 +86,7 @@ Source0: %{name}-%{version}.tar.bz2 %if 0%{?is_opensuse} ExclusiveArch: x86_64 aarch64 ppc64 ppc64le %else -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: x86_64 aarch64 ppc64le s390x %endif %endif ################################################################################# @@ -1393,6 +1395,8 @@ fi %files -n librados2 %defattr(-,root,root,-) %{_libdir}/librados.so.* +%dir %{_libdir}/ceph +%{_libdir}/ceph/libceph-common.so %if %{with lttng} %{_libdir}/librados_tp.so.* %endif @@ -1691,3 +1695,4 @@ exit 0 %changelog +# nospeccleaner diff --git a/pre_checkin.sh b/pre_checkin.sh index 7b4ad6e..e4a2111 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -169,6 +169,9 @@ function transform_spec_file { "Source0:"*) line=`echo $line | sed 's/%{name}/ceph/g'` ;; + "ExclusiveArch:"*) + line=`echo $line | sed 's/s390\S*//g'` + ;; "%autosetup -p1") line="%autosetup -p1 -n ceph-%version" ;;