diff --git a/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz b/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz deleted file mode 100644 index a4e9b7c..0000000 --- a/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94c9f95a54539284db25ceeee766df1a8bd1adf5412c3e08e4c7d6c7e004b3b7 -size 128686 diff --git a/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz b/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz new file mode 100644 index 0000000..af95e0f --- /dev/null +++ b/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77472deeb9b3cd112cae9fecf267c9230d0279273e7fa902ed3030228cc0715b +size 128344 diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index a540c86..8384a8b 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 10 10:10:27 UTC 2019 - Nathan Cutler + +- Update to 3.0+1560161410.g38e3c92: + + Remove config hash check validation + + spec: fix fedora/rhel conditional blocks + ------------------------------------------------------------------- Thu Jun 6 16:25:29 UTC 2019 - Nathan Cutler diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec index 558ce40..a2bb531 100644 --- a/ceph-iscsi.spec +++ b/ceph-iscsi.spec @@ -20,7 +20,7 @@ Name: ceph-iscsi -Version: 3.0+1559837868.g8be74cf +Version: 3.0+1560161410.g38e3c92 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} < 8 +%if 0%{?rhel} && 0%{?rhel} < 8 BuildRequires: systemd %else BuildRequires: systemd-rpm-macros @@ -144,6 +144,7 @@ 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 || : @@ -153,20 +154,24 @@ 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 /bin/systemctl --system daemon-reload &> /dev/null || : %endif @@ -174,6 +179,7 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %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