SHA256
1
0
forked from pool/ceph-iscsi

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
This commit is contained in:
Nathan Cutler 2019-06-10 15:31:54 +00:00 committed by Git OBS Bridge
parent d0cbd50119
commit 09b6fdca95
4 changed files with 9 additions and 15 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77472deeb9b3cd112cae9fecf267c9230d0279273e7fa902ed3030228cc0715b
size 128344

View File

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

View File

@ -1,9 +1,9 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 10 10:10:27 UTC 2019 - Nathan Cutler <ncutler@suse.com> Mon Jun 10 10:10:27 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 3.0+1560161410.g38e3c92: - Update to 3.0+1560180583.g6a2109b:
+ Remove config hash check validation + 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 <ncutler@suse.com> Thu Jun 6 16:25:29 UTC 2019 - Nathan Cutler <ncutler@suse.com>

View File

@ -20,7 +20,7 @@
Name: ceph-iscsi Name: ceph-iscsi
Version: 3.0+1560161410.g38e3c92 Version: 3.0+1560180583.g6a2109b
Release: 1%{?dist} Release: 1%{?dist}
Group: System/Filesystems Group: System/Filesystems
Summary: Python modules for Ceph iSCSI gateway configuration management Summary: Python modules for Ceph iSCSI gateway configuration management
@ -72,7 +72,7 @@ Requires: python3-configshell >= 1.1.fb23
%endif %endif
%endif %endif
%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{?rhel} == 7
BuildRequires: systemd BuildRequires: systemd
%else %else
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
@ -144,8 +144,7 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api
%endif %endif
%post %post
%if 0%{?fedora} || 0%{?rhel} %if 0%{?rhel} == 7
%if 0%{?rhel} < 8
/bin/systemctl --system daemon-reload &> /dev/null || : /bin/systemctl --system daemon-reload &> /dev/null || :
/bin/systemctl --system enable rbd-target-gw &> /dev/null || : /bin/systemctl --system enable rbd-target-gw &> /dev/null || :
/bin/systemctl --system enable rbd-target-api &> /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-gw.service
%systemd_post rbd-target-api.service %systemd_post rbd-target-api.service
%endif %endif
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%service_add_post rbd-target-gw.service rbd-target-api.service %service_add_post rbd-target-gw.service rbd-target-api.service
%endif %endif
%preun %preun
%if 0%{?fedora} || 0%{?rhel}
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 8
%systemd_preun rbd-target-gw.service %systemd_preun rbd-target-gw.service
%systemd_preun rbd-target-api.service %systemd_preun rbd-target-api.service
%endif %endif
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%service_del_preun rbd-target-gw.service rbd-target-api.service %service_del_preun rbd-target-gw.service rbd-target-api.service
%endif %endif
%postun %postun
%if 0%{?fedora} || 0%{?rhel} %if 0%{?rhel} == 7
%if 0%{?rhel} < 8
/bin/systemctl --system daemon-reload &> /dev/null || : /bin/systemctl --system daemon-reload &> /dev/null || :
%endif %endif
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 8
%systemd_postun rbd-target-gw.service %systemd_postun rbd-target-gw.service
%systemd_postun rbd-target-api.service %systemd_postun rbd-target-api.service
%endif %endif
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%service_del_postun rbd-target-gw.service rbd-target-api.service %service_del_postun rbd-target-gw.service rbd-target-api.service
%endif %endif