From 09b6fdca959a42395a97bfcd4cc8ebdde27c669eb5a24ce0864822ff0997461a Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 10 Jun 2019 15:31:54 +0000 Subject: [PATCH] Accepting request 708984 from filesystems:ceph:nautilus M17 candidate OBS-URL: https://build.opensuse.org/request/show/708984 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=44 --- ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz | 3 --- ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz | 3 +++ ceph-iscsi.changes | 4 ++-- ceph-iscsi.spec | 14 ++++---------- 4 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz create mode 100644 ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz diff --git a/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz b/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz deleted file mode 100644 index af95e0f..0000000 --- a/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77472deeb9b3cd112cae9fecf267c9230d0279273e7fa902ed3030228cc0715b -size 128344 diff --git a/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz b/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz new file mode 100644 index 0000000..797c6b9 --- /dev/null +++ b/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b98192b983ac85c258a6c2a72e85aa1655031dc1a6ab7a593e70c6f6546221f +size 128313 diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index 8384a8b..d5da94f 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- Mon Jun 10 10:10:27 UTC 2019 - Nathan Cutler -- Update to 3.0+1560161410.g38e3c92: +- Update to 3.0+1560180583.g6a2109b: + Remove config hash check validation - + spec: fix fedora/rhel conditional blocks + + spec: fix rhel conditional blocks ------------------------------------------------------------------- Thu Jun 6 16:25:29 UTC 2019 - Nathan Cutler diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec index a2bb531..c8dd044 100644 --- a/ceph-iscsi.spec +++ b/ceph-iscsi.spec @@ -20,7 +20,7 @@ Name: ceph-iscsi -Version: 3.0+1560161410.g38e3c92 +Version: 3.0+1560180583.g6a2109b Release: 1%{?dist} Group: System/Filesystems Summary: Python modules for Ceph iSCSI gateway configuration management @@ -72,7 +72,7 @@ Requires: python3-configshell >= 1.1.fb23 %endif %endif -%if 0%{?rhel} && 0%{?rhel} < 8 +%if 0%{?rhel} == 7 BuildRequires: systemd %else BuildRequires: systemd-rpm-macros @@ -144,8 +144,7 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %endif %post -%if 0%{?fedora} || 0%{?rhel} -%if 0%{?rhel} < 8 +%if 0%{?rhel} == 7 /bin/systemctl --system daemon-reload &> /dev/null || : /bin/systemctl --system enable rbd-target-gw &> /dev/null || : /bin/systemctl --system enable rbd-target-api &> /dev/null || : @@ -154,32 +153,27 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %systemd_post rbd-target-gw.service %systemd_post rbd-target-api.service %endif -%endif %if 0%{?suse_version} %service_add_post rbd-target-gw.service rbd-target-api.service %endif %preun -%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel} >= 8 %systemd_preun rbd-target-gw.service %systemd_preun rbd-target-api.service %endif -%endif %if 0%{?suse_version} %service_del_preun rbd-target-gw.service rbd-target-api.service %endif %postun -%if 0%{?fedora} || 0%{?rhel} -%if 0%{?rhel} < 8 +%if 0%{?rhel} == 7 /bin/systemctl --system daemon-reload &> /dev/null || : %endif %if 0%{?fedora} || 0%{?rhel} >= 8 %systemd_postun rbd-target-gw.service %systemd_postun rbd-target-api.service %endif -%endif %if 0%{?suse_version} %service_del_postun rbd-target-gw.service rbd-target-api.service %endif