From 64ab6adb904719965d096fddf614af0cbd98dbd0dcb27bd305ea350f69eef52d Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sun, 12 Jun 2016 20:57:57 +0000 Subject: [PATCH] Update link from rev 16 to rev 20 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=33 --- _servicedata | 2 +- ceph-10.2.1+git.1464774627.abc3d6b.tar.bz2 | 3 -- ceph-10.2.1+git.1465763247.b9decd3.tar.bz2 | 3 ++ ceph.changes | 55 ++++++++++++++++++++++ ceph.spec | 14 +++--- 5 files changed, 67 insertions(+), 10 deletions(-) delete mode 100644 ceph-10.2.1+git.1464774627.abc3d6b.tar.bz2 create mode 100644 ceph-10.2.1+git.1465763247.b9decd3.tar.bz2 diff --git a/_servicedata b/_servicedata index c2db4f0..fb8ad05 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git://github.com/SUSE/ceph.git - abc3d6b01a526ad42fcfd32d4d6358059a942449 + b9decd3bcb1cb21f61955c0666d963908fa70e97 \ No newline at end of file diff --git a/ceph-10.2.1+git.1464774627.abc3d6b.tar.bz2 b/ceph-10.2.1+git.1464774627.abc3d6b.tar.bz2 deleted file mode 100644 index 3835cda..0000000 --- a/ceph-10.2.1+git.1464774627.abc3d6b.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99c575a0a582b41d550d4c30ff7dd8968cacf854e9fd55c2d681d043450b0b0e -size 16510687 diff --git a/ceph-10.2.1+git.1465763247.b9decd3.tar.bz2 b/ceph-10.2.1+git.1465763247.b9decd3.tar.bz2 new file mode 100644 index 0000000..b43b23a --- /dev/null +++ b/ceph-10.2.1+git.1465763247.b9decd3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2aeb52e4533931a3451dbf8d2438a3d21cd0d5ccbc4486a447e8b3ba5a7bd51 +size 16459056 diff --git a/ceph.changes b/ceph.changes index ad21c47..3aea9ab 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Sun Jun 12 20:46:50 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.1+git.1465763247.b9decd3: + + rpm: be careful about build parallelism + +------------------------------------------------------------------- +Fri Jun 10 04:50:54 UTC 2016 - ncutler@suse.com + +- rpm: drop support for RHEL<7 and SUSE<1210 in jewel and above (pr#8938, + issue#15739, issue#15742, issue#15744, issue#15825, issue#15894, issue#16008) + + test/ec: build the libs only when 'make check' + + rpm: refrain from installing systemd unit files twice + + udev: remove 60-ceph-partuuid-workaround-rules + + rpm: drop python_sitelib/sitearch conditional + + rpm: drop _with_systemd + + rpm: drop python-argparse dependency + + rpm: drop dead conditionals + + rpm: drop init-ceph.in-fedora.patch + + rpm: move unified python-sphinx build dependency + + rpm: move boost-random dependency to appropriate section + + rpm: drop sysvinit-specific dependencies + + rpm: put dependencies in alphabetical order + + rpm: global replace $RPM_BUILD_ROOT with %{buildroot} + + rpm: drop udev/95-ceph-osd-alt.rules + + rpm: replace literal paths with RPM macros + + rpm: drop sysvinit bits from relabel_files function + + rpm: do a full make check when --with-tests is given + + Test-enable XIO messenger and IB/RDMA support + + rpm: Fix SELinux relabel on fedora + + rpm: Drop SELinux priority setting + + install-deps.sh: systemd-rpm-macros must be installed on SUSE + + rpm: Mute semodule in postun script + + rpm: Restore /var/run/ceph context manually + +------------------------------------------------------------------- +Mon Jun 06 11:32:20 UTC 2016 - ncutler@suse.com + +Update to version 10.2.1+git.1465212620.28ea4f6: + +- Upstream fixes merged since last update: + + rbd-mirror: replicate cloned images (pr#9423, issue#16101) + + backports needed for Manila (pr#9430, issue#16065, issue#15855, + issue#15854) + +- Replace blanket ExclusiveArch with narrower ExcludeArch + + Revert "ceph.spec.in: add ExclusiveArch: x86_64 aarch64" + + ceph.spec.in: add ExcludeArch: i586 + +------------------------------------------------------------------- +Mon Jun 6 09:06:03 UTC 2016 - ncutler@suse.com + +- Regenerate tarball from same SHA1 after deleting downstream tags + + Fixes bsc#982755 + ------------------------------------------------------------------- Wed Jun 01 10:05:59 UTC 2016 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 8759f1b..06cd296 100644 --- a/ceph.spec +++ b/ceph.spec @@ -49,8 +49,8 @@ # common ################################################################################# Name: ceph -Version: 10.2.1+git.1464774627.abc3d6b -Release: 0 +Version: 10.2.1+git.1465763247.b9decd3 +Release: 0%{?dist} 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 %if 0%{?suse_version} @@ -59,7 +59,7 @@ Group: System/Filesystems URL: http://ceph.com/ Source0: %{name}-%{version}.tar.bz2 Source99: ceph-rpmlintrc -ExclusiveArch: x86_64 aarch64 +ExcludeArch: i586 ################################################################################# # dependencies that apply across all distro families ################################################################################# @@ -671,7 +671,6 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` # Parallel build settings ... PARALLEL_BUILD=%{?_smp_mflags} -%if %{with lowmem_builder} lo_jobs="%{?jobs:%{jobs}}" %ifarch %arm %if ! 0%{?qemu_user_space_build:1} @@ -696,7 +695,6 @@ fi if test -n "$lo_jobs" ; then PARALLEL_BUILD="-j$lo_jobs" fi -%endif make "$PARALLEL_BUILD" @@ -1481,6 +1479,8 @@ fi # Now, relabel the files /usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null rm -f ${FILE_CONTEXT}.pre +# The fixfiles command won't fix label for /var/run/ceph +/usr/sbin/restorecon -R /var/run/ceph > /dev/null 2>&1 # Start the daemons iff they were running before if test $STATUS -eq 0; then @@ -1496,7 +1496,7 @@ if [ $1 -eq 0 ]; then cp ${FILE_CONTEXT} ${FILE_CONTEXT}.pre # Remove the module - /usr/sbin/semodule -n -r ceph + /usr/sbin/semodule -n -r ceph > /dev/null 2>&1 # Reload the policy if SELinux is enabled if ! /usr/sbin/selinuxenabled ; then @@ -1515,6 +1515,8 @@ if [ $1 -eq 0 ]; then /usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null rm -f ${FILE_CONTEXT}.pre + # The fixfiles command won't fix label for /var/run/ceph + /usr/sbin/restorecon -R /var/run/ceph > /dev/null 2>&1 # Start the daemons if they were running before if test $STATUS -eq 0; then