0.17.0 is releases, minor cleanups, Conditionalise py3 support as really too late for f30 with other infra work needed to support it in koji

This commit is contained in:
Peter Robinson 2019-03-26 10:47:56 +00:00
parent 54c03cefa4
commit 94f530c115
1 changed files with 41 additions and 11 deletions

52
oz.spec
View File

@ -1,6 +1,6 @@
Name: oz
Version: 0.17.0
Release: 0.3%{?dist}
Release: 1%{?dist}
Summary: Library and utilities for automated guest OS installs
License: LGPLv2
URL: http://github.com/clalancette/oz
@ -22,10 +22,30 @@ Patch12: 12-fix-f29-config.patch
Patch13: 13-add-f30-support.patch
BuildArch: noarch
%if 0%{?fedora} > 30
BuildRequires: python3
BuildRequires: python3-devel
BuildRequires: python3-setuptools
Requires: python3
Requires: python3-libguestfs >= 1.18
Requires: python3-lxml
Requires: python3-libguestfs >= 1.18
Requires: python3-libvirt
Requires: python3-m2crypto
Requires: python3-monotonic
Requires: python3-requests
%else
BuildRequires: python2
BuildRequires: python2-devel
BuildRequires: python3-setuptools
Requires: python2
Requires: python2-lxml
Requires: python2-libguestfs >= 1.18
Requires: python2-libvirt
Requires: python2-m2crypto
Requires: python2-monotonic
Requires: python2-requests
%endif
# in theory, oz doesn't really require libvirtd to be local to operate
# properly. However, because of the libguestfs manipulations, in practice
# it really does. Make it depend on libvirt (so we get libvirtd) for now,
@ -33,16 +53,9 @@ Requires: python3-libvirt
Requires: libvirt-daemon-kvm
Requires: libvirt-daemon-qemu
Requires: libvirt-daemon-config-network
Requires: python3-requests
Requires: genisoimage
Requires: mtools
Requires: openssh-clients
Requires: python3-m2crypto
Requires: python3-monotonic
BuildRequires: python3
BuildRequires: python3-devel
BuildRequires: python3-setuptools
%description
Oz is a set of libraries and utilities for doing automated guest OS
@ -52,10 +65,18 @@ installations, with minimal input from the user.
%autosetup -p1
%build
%if 0%{?fedora} > 30
%py3_build
%else
%py2_build
%endif
%install
%if 0%{?fedora} > 30
%py3_install
%else
%py2_install
%endif
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/oz/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/oz/isocontent/
@ -89,15 +110,24 @@ fi
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/jeos/
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/kernels/
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/screenshots/
%{python3_sitelib}/oz
%{_bindir}/oz-install
%{_bindir}/oz-generate-icicle
%{_bindir}/oz-customize
%{_bindir}/oz-cleanup-cache
%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
%{_mandir}/man1/*
%if 0%{?fedora} > 30
%{python3_sitelib}/oz
%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
%else
%{python2_sitelib}/oz
%{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info
%endif
%changelog
* Tue Mar 26 2019 Peter Robinson <pbrobinson@fedoraproject.org> 0.17.0-1
- Conditionalise py3 support
- 0.17.0 is releases, minor cleanups
* Sat Mar 16 2019 Chris Lalancette <clalancette@gmail.com> - 0.17.0-0.3
- Update to latest upstream changes for Python 3