Accepting request 680123 from filesystems:ceph:nautilus

M11 candidate

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

ceph-iscsi-3.0+1551360670.gda1fd9b.tar.gz

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

ceph-iscsi-3.0+1551361389.g157b5fd.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:853ffa829283ebd0c689595008a521e98a38e0d12462df9de1c3ed1248e27638
+size 121640

ceph-iscsi.spec

@@ -14,35 +14,36 @@
 #
 # Please submit bugfixes or comments via http://tracker.ceph.com/
 #
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?rhel} == 7
-%global _remote_tarball_prefix https://github.com/ceph/ceph-iscsi/archive/%{version}/
+%global with_python2 1
 %endif
 
+
 Name:           ceph-iscsi
-Version:        3.0+1551360670.gda1fd9b
+Version:        3.0+1551361389.g157b5fd
 Release:        1%{?dist}
 Group:          System/Filesystems
 Summary:        Python modules for Ceph iSCSI gateway configuration management
-
+%if 0%{?suse_version}
 License:        GPL-3.0-or-later
+%else
+License:        GPLv3+
+%endif
 URL:            https://github.com/ceph/ceph-iscsi
 Source0:        %{name}-%{version}.tar.gz
 %if 0%{?suse_version}
 Source98:       checkin.sh
 Source99:       README-checkin.txt
 %endif
-%if 0%{?suse_version}
-Source98:       checkin.sh
-Source99:       README-checkin.txt
-%endif
-
 
 BuildArch:      noarch
 
 Obsoletes:      ceph-iscsi-config
 Obsoletes:      ceph-iscsi-cli
 
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?with_python2}
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
 Requires:       python-rados >= 10.2.2
 Requires:       python-rbd >= 10.2.2
 Requires:       python-netifaces >= 0.10.4
@@ -50,21 +51,22 @@ Requires:	python-rtslib >= 2.1.fb67
 Requires:       rpm-python >= 4.11
 Requires:       python-cryptography
 Requires:       python-flask >= 0.10.1
-BuildRequires:  python-devel
+%else
-BuildRequires:  python-setuptools
+BuildRequires:  python3-devel
-%endif
+BuildRequires:  python3-setuptools
-%if 0%{?suse_version}
 Requires:       python3-rados >= 10.2.2
 Requires:       python3-rbd >= 10.2.2
 Requires:       python3-netifaces >= 0.10.4
 Requires:       python3-rtslib >= 2.1.fb67
-Requires:       python3-rpm >= 4.11
 Requires:       python3-cryptography
-Requires:       python3-Flask >= 0.10.1
+Requires:       python3-rpm >= 4.11
+%if 0%{?suse_version}
 BuildRequires:  python-rpm-macros
 BuildRequires:  fdupes
-BuildRequires:  python3-devel
+Requires:       python3-Flask >= 0.10.1
-BuildRequires:  python3-setuptools
+%else
+Requires:       python3-flask >= 0.10.1
+%endif
 %endif
 
 BuildRequires:  systemd
@@ -86,32 +88,48 @@ performance statistics, supporting monitoring and visualisation tools like
 Grafana.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?with_python2}
 %{__python2} setup.py build
-%endif
+%else
 %if 0%{?suse_version}
 %python3_build
+%else
+%{py3_build}
+%endif
 %endif
 
 %install
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?with_python2}
 %{__python2} setup.py install -O1 --skip-build --root %{buildroot}  --install-scripts %{_bindir}
-%endif
+%else
 %if 0%{?suse_version}
 %python3_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%else
+%{py3_install}
+%endif
 %endif
 mkdir -p %{buildroot}%{_unitdir}
 install -m 0644 .%{_unitdir}/rbd-target-gw.service %{buildroot}%{_unitdir}
 install -m 0644 .%{_unitdir}/rbd-target-api.service %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_sysconfdir}/systemd/system/rbd-target-gw.service.d
-install -m 0644 .%{_sysconfdir}/systemd/system/rbd-target-gw.service.d/dependencies.conf %{buildroot}%{_sysconfdir}/systemd/system/rbd-target-gw.service.d/
 mkdir -p %{buildroot}%{_mandir}/man8
 install -m 0644 gwcli.8 %{buildroot}%{_mandir}/man8/
 gzip %{buildroot}%{_mandir}/man8/gwcli.8
+mkdir -p %{buildroot}%{_unitdir}/rbd-target-gw.service.d
+install -m 0644 .%{_sysconfdir}/systemd/system/rbd-target-gw.service.d/dependencies.conf %{buildroot}%{_unitdir}/rbd-target-gw.service.d/
+%if 0%{?suse_version}
+mkdir -p %{buildroot}%{_sbindir}
+ln -s service %{buildroot}%{_sbindir}/rcrbd-target-gw
+ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api
+%endif
+
+%pre
+%if 0%{?suse_version}
+%service_add_pre rbd-target-gw.service rbd-target-api.service
+%endif
 
 %post
 %if 0%{?fedora} || 0%{?rhel}
@@ -123,9 +141,9 @@ gzip %{buildroot}%{_mandir}/man8/gwcli.8
 %service_add_post rbd-target-gw.service rbd-target-api.service
 %endif
 
-%pre
+%preun
 %if 0%{?suse_version}
-%service_add_pre rbd-target-gw.service rbd-target-api.service
+%service_del_preun rbd-target-gw.service rbd-target-api.service
 %endif
 
 %postun
@@ -136,20 +154,15 @@ gzip %{buildroot}%{_mandir}/man8/gwcli.8
 %service_del_postun rbd-target-gw.service rbd-target-api.service
 %endif
 
-%preun
-%if 0%{?suse_version}
-%service_del_preun rbd-target-gw.service rbd-target-api.service
-%endif
 
-%files -n ceph-iscsi
+%files
 %license LICENSE
 %license COPYING
 %doc README
 %doc iscsi-gateway.cfg_sample
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?with_python2}
 %{python2_sitelib}/*
-%endif
+%else
-%if 0%{?suse_version}
 %{python3_sitelib}/*
 %endif
 %{_bindir}/gwcli
@@ -157,10 +170,15 @@ gzip %{buildroot}%{_mandir}/man8/gwcli.8
 %{_bindir}/rbd-target-api
 %{_unitdir}/rbd-target-gw.service
 %{_unitdir}/rbd-target-api.service
-%{_sysconfdir}/systemd/system/rbd-target-gw.service.d
 %{_mandir}/man8/gwcli.8.gz
 %attr(0770,root,root) %dir %{_localstatedir}/log/rbd-target-gw
 %attr(0770,root,root) %dir %{_localstatedir}/log/rbd-target-api
+%dir %{_unitdir}/rbd-target-gw.service.d
+%{_unitdir}/rbd-target-gw.service.d/dependencies.conf
+%if 0%{?suse_version}
+%{_sbindir}/rcrbd-target-gw
+%{_sbindir}/rcrbd-target-api
+%endif
 
 %changelog