diff --git a/_constraints b/_constraints index 6737679..d070032 100644 --- a/_constraints +++ b/_constraints @@ -9,10 +9,10 @@ - 24 + 19990 - 8 + 7240 diff --git a/_servicedata b/_servicedata index 139da2f..00f6f64 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git://github.com/SUSE/ceph.git - 38cd6cbb8b5b8bffb6097fc2f46a55cc5b0ee96a + b446b700df1cbdc2bddd72ae37f3e89fb84a262f \ No newline at end of file diff --git a/ceph-10.2.2+git.1470776886.38cd6cb.tar.bz2 b/ceph-10.2.2+git.1470776886.38cd6cb.tar.bz2 deleted file mode 100644 index a0abdfa..0000000 --- a/ceph-10.2.2+git.1470776886.38cd6cb.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0febc008e18c60a321c44ab826809108bbeb1433548e752dbae31067987b9586 -size 16510494 diff --git a/ceph-10.2.2+git.1471622341.b446b70.tar.bz2 b/ceph-10.2.2+git.1471622341.b446b70.tar.bz2 new file mode 100644 index 0000000..d151166 --- /dev/null +++ b/ceph-10.2.2+git.1471622341.b446b70.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a862e279cb3c732dfff44bc5872949705df35acd725a1962e771ac88de20167e +size 16513713 diff --git a/ceph-test.changes b/ceph-test.changes index 3de54a7..da50e07 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Aug 19 16:02:46 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1471622341.b446b70: + + LTTng-UST disabled for openSUSE + +------------------------------------------------------------------- +Fri Aug 19 13:25:43 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1471612825.45407b0: + + ceph.spec.in: be less naive when removing sources + +------------------------------------------------------------------- +Fri Aug 19 12:11:58 UTC 2016 - ncutler@suse.com + +- _constraints: tweak ceph constraints to pick up more build workers + +------------------------------------------------------------------- +Fri Aug 19 11:07:21 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1471601351.ddee097: + + ceph.spec.in: jewel is x86_64+aarch64 only + + ceph.spec.in: nuke sources at end of %install phase + ------------------------------------------------------------------- Wed Aug 10 08:56:43 UTC 2016 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index f82fd20..cd63889 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -37,10 +37,12 @@ %bcond_with selinux %endif -# LTTng-UST enabled on Fedora, RHEL 6+, and SLES 12 -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} == 1315 +# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE) +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if ! 0%{?is_opensuse} %bcond_without lttng %endif +%endif %if %{with selinux} # get selinux policy version @@ -58,7 +60,7 @@ # common ################################################################################# Name: ceph-test -Version: 10.2.2+git.1470776886.38cd6cb +Version: 10.2.2+git.1471622341.b446b70 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 @@ -70,12 +72,8 @@ Source0: ceph-%{version}.tar.bz2 Source98: README-ceph-test.txt Source99: ceph-rpmlintrc %if 0%{?suse_version} -%if 0%{?is_opensuse} -ExclusiveArch: x86_64 aarch64 ppc64 ppc64le -%else ExclusiveArch: x86_64 aarch64 %endif -%endif ################################################################################# # dependencies that apply across all distro families ################################################################################# @@ -378,6 +376,11 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw +# hack to reduce disk space usage in OBS +%if 0%{?is_opensuse} +rm -rf .* * 2>/dev/null | : +%endif + rm -rf %{buildroot}/usr/share/doc/packages/ceph/sample.ceph.conf rm -rf %{buildroot}/usr/share/doc/packages/ceph/sample.fetch_config rm -rf %{buildroot}/usr/bin/crushtool diff --git a/ceph.changes b/ceph.changes index 3de54a7..da50e07 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Aug 19 16:02:46 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1471622341.b446b70: + + LTTng-UST disabled for openSUSE + +------------------------------------------------------------------- +Fri Aug 19 13:25:43 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1471612825.45407b0: + + ceph.spec.in: be less naive when removing sources + +------------------------------------------------------------------- +Fri Aug 19 12:11:58 UTC 2016 - ncutler@suse.com + +- _constraints: tweak ceph constraints to pick up more build workers + +------------------------------------------------------------------- +Fri Aug 19 11:07:21 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1471601351.ddee097: + + ceph.spec.in: jewel is x86_64+aarch64 only + + ceph.spec.in: nuke sources at end of %install phase + ------------------------------------------------------------------- Wed Aug 10 08:56:43 UTC 2016 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index b93785e..46b66e3 100644 --- a/ceph.spec +++ b/ceph.spec @@ -37,10 +37,12 @@ %bcond_with selinux %endif -# LTTng-UST enabled on Fedora, RHEL 6+, and SLES 12 -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} == 1315 +# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE) +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if ! 0%{?is_opensuse} %bcond_without lttng %endif +%endif %if %{with selinux} # get selinux policy version @@ -58,7 +60,7 @@ # common ################################################################################# Name: ceph -Version: 10.2.2+git.1470776886.38cd6cb +Version: 10.2.2+git.1471622341.b446b70 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 @@ -69,12 +71,8 @@ URL: http://ceph.com/ Source0: %{name}-%{version}.tar.bz2 Source99: ceph-rpmlintrc %if 0%{?suse_version} -%if 0%{?is_opensuse} -ExclusiveArch: x86_64 aarch64 ppc64 ppc64le -%else ExclusiveArch: x86_64 aarch64 %endif -%endif ################################################################################# # dependencies that apply across all distro families ################################################################################# @@ -728,6 +726,11 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw +# hack to reduce disk space usage in OBS +%if 0%{?is_opensuse} +rm -rf .* * 2>/dev/null | : +%endif + %clean rm -rf %{buildroot}