Accepting request 545581 from filesystems:ceph:mimic

boo#1069468

OBS-URL: https://build.opensuse.org/request/show/545581
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=150

ceph-13.0.0-3531-g3692e00bab.tar.bz2

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

ceph-13.0.0-3534-g92e556138e.tar.bz2

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

ceph-test.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 25 21:33:23 UTC 2017 - ncutler@suse.com
+
+- Replace references to /var/adm/fillup-templates with new %_fillupdir macro
+  (boo#1069468) 
+
 -------------------------------------------------------------------
 Sat Nov 25 14:31:00 UTC 2017 - ncutler@suse.com
 

ceph-test.spec

@@ -32,6 +32,10 @@
 %bcond_without ceph_test_package
 %bcond_with cephfs_java
 %bcond_without lowmem_builder
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+%define _fillupdir /var/adm/fillup-templates
+%endif
 %if 0%{?is_opensuse}
 %bcond_without lttng
 %else
@@ -63,7 +67,7 @@
 #################################################################################
 Name: ceph-test
 Version: 13.0.0
-Release: 3531.g3692e00bab%{?dist}
+Release: 3534.g92e556138e%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
 %endif
@@ -79,10 +83,10 @@ Group: System/Filesystems
 %endif
 URL: http://ceph.com/
 %if 0%{?fedora} || 0%{?rhel}
-Source0: https://download.ceph.com/tarballs/ceph-13.0.0-3531-g3692e00bab.tar.bz2
+Source0: https://download.ceph.com/tarballs/ceph-13.0.0-3534-g92e556138e.tar.bz2
 %endif
 %if 0%{?suse_version}
-Source0: ceph-13.0.0-3531-g3692e00bab.tar.bz2
+Source0: ceph-13.0.0-3534-g92e556138e.tar.bz2
 Source96: checkin.sh
 Source97: README-checkin.txt
 Source98: README-ceph-test.txt
@@ -362,7 +366,7 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{?suse_version}
 %endif
 %prep
-%autosetup -p1 -n ceph-13.0.0-3531-g3692e00bab
+%autosetup -p1 -n ceph-13.0.0-3534-g92e556138e
 
 %build
 %if 0%{with cephfs_java}
@@ -487,7 +491,7 @@ install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
 install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
 %endif
 %if 0%{?suse_version}
-install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name}
 %endif
 install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
 install -m 0755 -D systemd/ceph %{buildroot}%{_sbindir}/rcceph
@@ -557,7 +561,7 @@ rm -rf %{buildroot}%{_libdir}/libos_tp.so*
 rm -rf %{buildroot}%{_libdir}/libosd_tp.so*
 rm -rf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
 rm -rf %{buildroot}%{_sysconfdir}/sysconfig/ceph
-rm -rf %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.*
+rm -rf %{buildroot}%{_fillupdir}/sysconfig.*
 rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
 rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service

ceph.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 25 21:33:23 UTC 2017 - ncutler@suse.com
+
+- Replace references to /var/adm/fillup-templates with new %_fillupdir macro
+  (boo#1069468) 
+
 -------------------------------------------------------------------
 Sat Nov 25 14:31:00 UTC 2017 - ncutler@suse.com
 

ceph.spec

@@ -32,6 +32,10 @@
 %bcond_with ceph_test_package
 %bcond_with cephfs_java
 %bcond_without lowmem_builder
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
 %if 0%{?is_opensuse}
 %bcond_without lttng
 %else
@@ -63,7 +67,7 @@
 #################################################################################
 Name:		ceph
 Version:	13.0.0
-Release:	3531.g3692e00bab%{?dist}
+Release:	3534.g92e556138e%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -79,10 +83,10 @@ Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
 %if 0%{?fedora} || 0%{?rhel}
-Source0:	https://download.ceph.com/tarballs/ceph-13.0.0-3531-g3692e00bab.tar.bz2
+Source0:	https://download.ceph.com/tarballs/ceph-13.0.0-3534-g92e556138e.tar.bz2
 %endif
 %if 0%{?suse_version}
-Source0:	ceph-13.0.0-3531-g3692e00bab.tar.bz2
+Source0:	ceph-13.0.0-3534-g92e556138e.tar.bz2
 # _insert_obs_source_lines_here
 %if 0%{?is_opensuse}
 ExclusiveArch:  x86_64 aarch64 ppc64 ppc64le
@@ -790,7 +794,7 @@ python-rbd, python-rgw or python-cephfs instead.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-13.0.0-3531-g3692e00bab
+%autosetup -p1 -n ceph-13.0.0-3534-g92e556138e
 
 %build
 %if 0%{with cephfs_java}
@@ -915,7 +919,7 @@ install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
 install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
 %endif
 %if 0%{?suse_version}
-install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name}
 %endif
 install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
 install -m 0755 -D systemd/ceph %{buildroot}%{_sbindir}/rcceph
@@ -1007,7 +1011,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/sysconfig/ceph
 %endif
 %if 0%{?suse_version}
-%{_localstatedir}/adm/fillup-templates/sysconfig.*
+%{_fillupdir}/sysconfig.*
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 %endif