diff --git a/ceph-iscsi-3.0+1560249372.g70ec7a9.tar.gz b/ceph-iscsi-3.0+1560249372.g70ec7a9.tar.gz deleted file mode 100644 index a519215..0000000 --- a/ceph-iscsi-3.0+1560249372.g70ec7a9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9f140c339238b57b6a3f6307fd19462e3cf31eda6a4224da39e8821bf60023d -size 128571 diff --git a/ceph-iscsi-3.2+1568099844.g09c5205.tar.gz b/ceph-iscsi-3.2+1568099844.g09c5205.tar.gz new file mode 100644 index 0000000..56ce78e --- /dev/null +++ b/ceph-iscsi-3.2+1568099844.g09c5205.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afb40d1514b63cba468a4ff15c555a68a35d1055589264a6d8d54b677d4ba5ad +size 128785 diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index 430605d..472e707 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Sep 10 06:54:56 UTC 2019 - Nathan Cutler + +- Update to 3.2+1568098374.g09c5205: + + upstream 3.2 release + * Always use host FQDN instead of shortname + * Validate target controls min/max value + * Validate rbd:user/tcmu-runner image controls min/max value + + checkin.sh: + * add "sed" statements to reproduce Dominique Leuenberger's + downstream-only mod from July 29, 2019 (see previous entry), so it + doesn't get clobbered every time we run the script + * add "sed" statement to collapse multiple newlines down to one + ------------------------------------------------------------------- Mon Jul 29 15:08:16 UTC 2019 - Dominique Leuenberger diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec index 89a96ba..3ae3d50 100644 --- a/ceph-iscsi.spec +++ b/ceph-iscsi.spec @@ -18,9 +18,8 @@ %global with_python2 1 %endif - Name: ceph-iscsi -Version: 3.0+1560249372.g70ec7a9 +Version: 3.2+1568099844.g09c5205 Release: 1%{?dist} Group: System/Filesystems Summary: Python modules for Ceph iSCSI gateway configuration management @@ -34,32 +33,37 @@ Source0: %{name}-%{version}.tar.gz %if 0%{?suse_version} Source98: checkin.sh Source99: README-checkin.txt -%endif ExclusiveArch: x86_64 aarch64 ppc64le s390x +%endif Obsoletes: ceph-iscsi-config Obsoletes: ceph-iscsi-cli +Requires: tcmu-runner >= 1.4.0 %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 -Requires: python-rtslib >= 2.1.fb67 -Requires: rpm-python >= 4.11 +Requires: python-rtslib >= 2.1.fb68 Requires: python-cryptography Requires: python-flask >= 0.10.1 Requires: python-configshell +%if 0%{?rhel} == 7 +Requires: pyOpenSSL +%else +Requires: python-pyOpenSSL +%endif %else BuildRequires: python3-devel BuildRequires: python3-setuptools 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-rtslib >= 2.1.fb68 Requires: python3-cryptography -Requires: python3-rpm >= 4.11 +Requires: python3-pyOpenSSL %if 0%{?suse_version} BuildRequires: python-rpm-macros BuildRequires: fdupes @@ -71,7 +75,7 @@ Requires: python3-configshell %endif %endif -%if 0%{?rhel} == 7 +%if 0%{?rhel} BuildRequires: systemd %else BuildRequires: systemd-rpm-macros @@ -130,7 +134,6 @@ 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 @@ -177,7 +180,6 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %service_del_postun rbd-target-gw.service rbd-target-api.service %endif - %files %license LICENSE %license COPYING @@ -197,7 +199,6 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %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 diff --git a/checkin.sh b/checkin.sh index d450fa7..462557a 100644 --- a/checkin.sh +++ b/checkin.sh @@ -98,7 +98,9 @@ VERSION=$(grep ^Version *spec | sed -r "s/^Version:\s+//") VERSION="${VERSION}+$(date +%s).${GIT_SHA1}" sed -i -e 's/^Version:.*/Version: '$VERSION'/' $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\nExclusiveArch: x86_64 aarch64 ppc64le s390x\n%endif' $PROJECT.spec +sed -i -e '/BuildArch:\s\+noarch/d' $PROJECT.spec +sed -i -e 'N;/^\n$/D;P;D;' $PROJECT.spec # collapse multiple adjacent newlines down to a single newline cp $PROJECT.spec $THIS_DIR echo "Version number is ->$VERSION<-" cd ..