From 006006434ef31c2e1e8e332f83e2f474c3074385363fda89154c7ce2e080ce5c Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 1 Aug 2016 15:03:37 +0000 Subject: [PATCH] Accepting request 416439 from filesystems:ceph:jewel - Update to version 10.2.2+git.1470063368.e6786e8: + rpm: simplify openSUSE conditional - Update to version 10.2.2+git.1470061991.d6904b4: + rpm: build with --disable-static on openSUSE (encloses --disable-static in appropriate distro conditional) OBS-URL: https://build.opensuse.org/request/show/416439 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=51 --- _servicedata | 2 +- ceph-10.2.2+git.1469189740.b62fb63.tar.bz2 | 3 --- ceph-10.2.2+git.1470063368.e6786e8.tar.bz2 | 3 +++ ceph-test.changes | 13 +++++++++++++ ceph-test.spec | 6 ++++-- ceph.changes | 13 +++++++++++++ ceph.spec | 6 ++++-- 7 files changed, 38 insertions(+), 8 deletions(-) delete mode 100644 ceph-10.2.2+git.1469189740.b62fb63.tar.bz2 create mode 100644 ceph-10.2.2+git.1470063368.e6786e8.tar.bz2 diff --git a/_servicedata b/_servicedata index 4657b66..7dfda69 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git://github.com/SUSE/ceph.git - b62fb63235d9c3a17e8d92df97c9d7d0bf1b2c13 + e6786e8e3706d908502a3f3d8b33c425336d844a \ No newline at end of file diff --git a/ceph-10.2.2+git.1469189740.b62fb63.tar.bz2 b/ceph-10.2.2+git.1469189740.b62fb63.tar.bz2 deleted file mode 100644 index d726510..0000000 --- a/ceph-10.2.2+git.1469189740.b62fb63.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fda98dfd0dcaf396ae66f21049e7d6f89846f52bc66da2696c2ee3049e32b766 -size 17485311 diff --git a/ceph-10.2.2+git.1470063368.e6786e8.tar.bz2 b/ceph-10.2.2+git.1470063368.e6786e8.tar.bz2 new file mode 100644 index 0000000..9c2246d --- /dev/null +++ b/ceph-10.2.2+git.1470063368.e6786e8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:655426e4ab48f68c2e3060e1997f2cfe6228fe629bb205c36ae2a71b96c45878 +size 16498816 diff --git a/ceph-test.changes b/ceph-test.changes index 391bb03..1c1ce26 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Aug 01 14:59:35 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1470063368.e6786e8: + + rpm: simplify openSUSE conditional + +------------------------------------------------------------------- +Mon Aug 01 14:39:49 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1470061991.d6904b4: + + rpm: build with --disable-static on openSUSE + (encloses --disable-static in appropriate distro conditional) + ------------------------------------------------------------------- Wed Jul 27 19:34:06 UTC 2016 - dimstar@opensuse.org diff --git a/ceph-test.spec b/ceph-test.spec index cddaa75..afa4b0c 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -58,7 +58,7 @@ # common ################################################################################# Name: ceph-test -Version: 10.2.2+git.1469189740.b62fb63 +Version: 10.2.2+git.1470063368.e6786e8 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 @@ -257,7 +257,9 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` --libexecdir=%{_libexecdir} \ --localstatedir=%{_localstatedir} \ --sysconfdir=%{_sysconfdir} \ - --disable-static \ +%if 0%{?is_opensuse} + --disable-static +%endif %if 0%{?rhel} && ! 0%{?centos} --enable-subman \ %endif diff --git a/ceph.changes b/ceph.changes index 391bb03..1c1ce26 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Aug 01 14:59:35 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1470063368.e6786e8: + + rpm: simplify openSUSE conditional + +------------------------------------------------------------------- +Mon Aug 01 14:39:49 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1470061991.d6904b4: + + rpm: build with --disable-static on openSUSE + (encloses --disable-static in appropriate distro conditional) + ------------------------------------------------------------------- Wed Jul 27 19:34:06 UTC 2016 - dimstar@opensuse.org diff --git a/ceph.spec b/ceph.spec index 711dd9a..b138bd3 100644 --- a/ceph.spec +++ b/ceph.spec @@ -58,7 +58,7 @@ # common ################################################################################# Name: ceph -Version: 10.2.2+git.1469189740.b62fb63 +Version: 10.2.2+git.1470063368.e6786e8 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 @@ -608,7 +608,9 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` --libexecdir=%{_libexecdir} \ --localstatedir=%{_localstatedir} \ --sysconfdir=%{_sysconfdir} \ - --disable-static \ +%if 0%{?is_opensuse} + --disable-static +%endif %if 0%{?rhel} && ! 0%{?centos} --enable-subman \ %endif