Accepting request 708176 from filesystems:ceph

M17 candidate (forwarded request 708175 from smithfarm)

OBS-URL: https://build.opensuse.org/request/show/708176
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph-iscsi?expand=0&rev=14

ceph-iscsi-3.0+1559815396.g7aa8f7f.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bffcc8ba1ff8399dfdcce8b065ef8a1cc928503323a2a8f8485e76489c09411
-size 128634

ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94c9f95a54539284db25ceeee766df1a8bd1adf5412c3e08e4c7d6c7e004b3b7
+size 128686

ceph-iscsi.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun  6 16:25:29 UTC 2019 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 3.0+1559837868.g8be74cf:
+  + spec: conflict only with lrbd <= 3.0 to ensure lrbd is not installed
+    simultaneously with ceph-iscsi
+
 -------------------------------------------------------------------
 Thu Jun  6 10:04:00 UTC 2019 - Nathan Cutler <ncutler@suse.com>
 

ceph-iscsi.spec

@@ -20,7 +20,7 @@
 
 
 Name:           ceph-iscsi
-Version:        3.0+1559815396.g7aa8f7f
+Version:        3.0+1559837868.g8be74cf
 Release:        1%{?dist}
 Group:          System/Filesystems
 Summary:        Python modules for Ceph iSCSI gateway configuration management
@@ -72,12 +72,16 @@ Requires:       python3-configshell >= 1.1.fb23
 %endif
 %endif
 
-%if 0%{?suse_version}
+%if 0%{?rhel} < 8
-Conflicts: lrbd
+BuildRequires: systemd
-%endif
+%else
-
 BuildRequires: systemd-rpm-macros
 %{?systemd_requires}
+%endif
+
+%if 0%{?suse_version}
+Conflicts: lrbd < 3.0
+%endif
 
 %description
 Python package providing the modules used to handle the configuration of an
@@ -140,7 +144,12 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api
 %endif
 
 %post
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?rhel} < 8
+/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 || :
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 8
 %systemd_post rbd-target-gw.service
 %systemd_post rbd-target-api.service
 %endif
@@ -149,7 +158,7 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api
 %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
@@ -158,7 +167,10 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api
 %endif
 
 %postun
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?rhel} < 8
+/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