commit ceph-iscsi for openSUSE:Factory

28 Feb 2019

Hello community,

here is the log from the commit of package ceph-iscsi for openSUSE:Factory checked in at 2019-02-28 21:44:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ceph-iscsi (Old)
 and      /work/SRC/openSUSE:Factory/.ceph-iscsi.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ceph-iscsi"

Thu Feb 28 21:44:56 2019 rev:4 rq:680124 version:3.0+1551361389.g157b5fd

Changes:
--------

--- /work/SRC/openSUSE:Factory/ceph-iscsi/ceph-iscsi.changes	2019-02-04 14:26:19.149027965 +0100
+++ /work/SRC/openSUSE:Factory/.ceph-iscsi.new.28833/ceph-iscsi.changes	2019-02-28 21:44:59.653484338 +0100
@@ -1,0 +2,21 @@
+Thu Feb 28 10:45:20 UTC 2019 - ncutler@suse.com
+
+- Update to 3.0+1551350485.g157b5fd: 
+  + refactor spec file for better Fedora/RHEL and Python 3 support (Ricardo Dias)
+  + rados pool for storing configuration is now configurable (Ricardo Marques)
+  + support for specifying the cluster client name (Ricardo Dias)
+
+-------------------------------------------------------------------
+Tue Feb 19 16:04:43 UTC 2019 - ncutler@suse.com
+
+- Update to 3.0+1550592273.gda1fd9b:
+  + Support for kernel LIO backstore (which is the default backstore on SES6)
+    (Ricardo Marques)
+  + Disable OS, and package version checks (Ricardo Marques)
+
+-------------------------------------------------------------------
+Thu Feb  7 17:00:40 UTC 2019 - ncutler@suse.com
+
+- checkin.sh: append git SHA1 to version number 
+
+-------------------------------------------------------------------

Old:
----
  ceph-iscsi-3.0+1549277704.tar.gz

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

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ceph-iscsi.spec ++++++
--- /var/tmp/diff_new_pack.w5PWOi/_old	2019-02-28 21:45:00.109484144 +0100
+++ /var/tmp/diff_new_pack.w5PWOi/_new	2019-02-28 21:45:00.113484142 +0100
@@ -14,31 +14,36 @@
 #
 # Please submit bugfixes or comments via http://tracker.ceph.com/
 #
-%if 0%{?fedora} || 0%{?rhel}
-%global _remote_tarball_prefix https://github.com/ceph/ceph-iscsi/archive/%{version}/
+%if 0%{?rhel} == 7
+%global with_python2 1
 %endif
 
+
 Name:           ceph-iscsi
-Version:        3.0+1549277704
+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:        %{?_remote_tarball_prefix}%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 %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
@@ -46,21 +51,22 @@
 Requires:	rpm-python >= 4.11
 Requires:	python-cryptography
 Requires:	python-flask >= 0.10.1
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-%endif
-%if 0%{?suse_version}
+%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-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
-BuildRequires:  python3-setuptools
+Requires:       python3-Flask >= 0.10.1
+%else
+Requires:       python3-flask >= 0.10.1
+%endif
 %endif
 
 BuildRequires:  systemd
@@ -82,32 +88,48 @@
 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}
@@ -119,9 +141,9 @@
 %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
@@ -132,20 +154,15 @@
 %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
-%if 0%{?suse_version}
+%else
 %{python3_sitelib}/*
 %endif
 %{_bindir}/gwcli
@@ -153,9 +170,14 @@
 %{_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

++++++ checkin.sh ++++++
--- /var/tmp/diff_new_pack.w5PWOi/_old	2019-02-28 21:45:00.177484115 +0100
+++ /var/tmp/diff_new_pack.w5PWOi/_new	2019-02-28 21:45:00.177484115 +0100
@@ -92,10 +92,13 @@
     echo "no .git present.  run this from the base dir of the git checkout."
     exit 1
 fi
+GIT_SHA1=$(git describe --long --tags | cut -d"-" -f3)
 echo "Extracting spec file"
 VERSION=$(grep ^Version *spec | sed -r "s/^Version:\s+//")
-VERSION="${VERSION}+$(date +%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
 cp $PROJECT.spec $THIS_DIR
 echo "Version number is ->$VERSION<-"
 cd ..

    

root

tags

participants (1)