| |
@@ -1,26 +1,29 @@
|
| |
Name: diskimage-builder
|
| |
Summary: Image building tools for OpenStack
|
| |
Version: 1.26.1
|
| |
- Release: 7%{?dist}
|
| |
+ Release: 8%{?dist}
|
| |
License: ASL 2.0
|
| |
URL: https://launchpad.net/diskimage-builder
|
| |
Source0: http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.gz
|
| |
|
| |
BuildArch: noarch
|
| |
- BuildRequires: python2-devel
|
| |
- BuildRequires: python2-setuptools
|
| |
- BuildRequires: python2-d2to1
|
| |
- BuildRequires: python2-pbr
|
| |
+ BuildRequires: python3-devel
|
| |
+ BuildRequires: python3-setuptools
|
| |
+ BuildRequires: python3-d2to1
|
| |
+ BuildRequires: python3-pbr
|
| |
+ BuildRequires: /usr/bin/pathfix.py
|
| |
|
| |
Requires: kpartx
|
| |
Requires: qemu-img
|
| |
Requires: curl
|
| |
- Requires: python2-babel
|
| |
+ Requires: python3-babel
|
| |
Requires: sudo
|
| |
Requires: tar
|
| |
Requires: yum-utils
|
| |
Requires: dib-utils
|
| |
|
| |
+ Obsoletes: diskimage-builder < %{version}-%{release}
|
| |
+
|
| |
# Exclude all elements, as they are only run within diskimage-builder
|
| |
%global __requires_exclude_from %{_datadir}/%{name}/elements
|
| |
|
| |
@@ -28,10 +31,10 @@
|
| |
%autosetup -n %{name}-%{version}
|
| |
|
| |
%build
|
| |
- %py2_build
|
| |
+ %py3_build
|
| |
|
| |
%install
|
| |
- %py2_install
|
| |
+ %py3_install
|
| |
|
| |
mkdir -p %{buildroot}%{_datadir}/%{name}/lib
|
| |
mkdir -p %{buildroot}%{_datadir}/%{name}/elements
|
| |
@@ -39,6 +42,17 @@
|
| |
install -p -D -m 644 lib/* %{buildroot}%{_datadir}/%{name}/lib
|
| |
cp -vr elements/ %{buildroot}%{_datadir}/%{name}
|
| |
|
| |
+ # Fix shebangs for Python 3
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/pypi/pre-install.d/00-configure-pypi-mirror
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/package-installs/bin/package-installs-squash
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/svc-map/extra-data.d/10-merge-svc-map-files
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/svc-map/bin/svc-map
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/zypper/bin/map-packages
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/zypper/bin/map-services
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/rhel/bin/map-packages
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/redhat-common/bin/map-services
|
| |
+
|
| |
%description
|
| |
Components of TripleO that are responsible for building disk images.
|
| |
|
| |
@@ -46,11 +60,14 @@
|
| |
%doc LICENSE
|
| |
%doc doc/source/ci.md
|
| |
%{_bindir}/*
|
| |
- %{python2_sitelib}/diskimage_builder*
|
| |
+ %{python3_sitelib}/diskimage_builder*
|
| |
%{_datadir}/%{name}/lib
|
| |
%{_datadir}/%{name}/elements
|
| |
|
| |
%changelog
|
| |
+ * Wed Feb 27 2019 Yatin Karel <ykarel@redhat.com> - 1.26.1-8
|
| |
+ - Build python3 instead of python2 as python2 is being removed
|
| |
+
|
| |
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.1-7
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
| |
|
| |
