pool/ceph-iscsi
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 680121 from filesystems:ceph:nautilus

Browse Source 
M11 candidate

OBS-URL: https://build.opensuse.org/request/show/680121
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=16
This commit is contained in:
Nathan Cutler 2019-02-28 13:32:18 +00:00 committed by Git OBS Bridge
parent 3bc6c44aeb
commit c27ab9f847
4 changed files with 51 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-iscsi-3.0+1551350485.g157b5fd.tar.gz
View File

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

3
ceph-iscsi-3.0+1551360670.gda1fd9b.tar.gz Normal file
View File

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

112
ceph-iscsi.spec
View File

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

2
checkin.sh
View File

@ -97,7 +97,7 @@ echo "Extracting spec file"
VERSION=$(grep ^Version *spec | sed -r "s/^Version:\s+//") VERSION=$(grep ^Version *spec | sed -r "s/^Version:\s+//")
VERSION="${VERSION}+$(date +%s).${GIT_SHA1}" VERSION="${VERSION}+$(date +%s).${GIT_SHA1}"
sed -i -e 's/^Version:.*/Version: '$VERSION'/' $PROJECT.spec sed -i -e 's/^Version:.*/Version: '$VERSION'/' $PROJECT.spec
sed -i -e 's#^Source0:.*#Source0: %{version}/%{name}-%{version}.tar.gz#' $PROJECT.spec sed -i -e 's#^Source0:.*#Source0: %{name}-%{version}.tar.gz#' $PROJECT.spec
sed -i -e '/Source0/a %if 0%{?suse_version}\nSource98: checkin.sh\nSource99: README-checkin.txt\n%endif' $PROJECT.spec sed -i -e '/Source0/a %if 0%{?suse_version}\nSource98: checkin.sh\nSource99: README-checkin.txt\n%endif' $PROJECT.spec
cp $PROJECT.spec $THIS_DIR cp $PROJECT.spec $THIS_DIR
echo "Version number is ->$VERSION<-" echo "Version number is ->$VERSION<-"