Drop legacy subpackage even on F30
There are dependencies that were dropped. The package is not installable anymore.
This commit is contained in:
parent
3c0fd4abf0
commit
2a3674a45e
65
pungi.spec
65
pungi.spec
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: pungi
|
Name: pungi
|
||||||
Version: 4.1.39
|
Version: 4.1.39
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Distribution compose tool
|
Summary: Distribution compose tool
|
||||||
|
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
@ -11,9 +11,6 @@ Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
|
|||||||
|
|
||||||
BuildRequires: python3-nose
|
BuildRequires: python3-nose
|
||||||
BuildRequires: python3-mock
|
BuildRequires: python3-mock
|
||||||
%if 0%{?fedora} < 31
|
|
||||||
BuildRequires: python2-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
BuildRequires: python3-productmd >= 1.17
|
BuildRequires: python3-productmd >= 1.17
|
||||||
@ -85,39 +82,6 @@ These utilities work with finished composes produced by Pungi. They can be used
|
|||||||
for creating unified ISO images, validating config file or sending progress
|
for creating unified ISO images, validating config file or sending progress
|
||||||
notification to Fedora Message Bus.
|
notification to Fedora Message Bus.
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?fedora} < 31
|
|
||||||
%package legacy
|
|
||||||
Summary: Legacy pungi executable
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
Requires: python2-%{name} = %{version}-%{release}
|
|
||||||
Requires: createrepo
|
|
||||||
Requires: isomd5sum
|
|
||||||
Requires: lorax
|
|
||||||
Requires: python2-functools32
|
|
||||||
Requires: python2-kickstart
|
|
||||||
Requires: python2-kobo
|
|
||||||
Requires: python2-libselinux
|
|
||||||
Requires: python2-lockfile
|
|
||||||
Requires: python2-productmd >= 1.17
|
|
||||||
Requires: python2-six
|
|
||||||
Requires: repoview
|
|
||||||
Requires: xorriso
|
|
||||||
Requires: yum
|
|
||||||
Requires: yum-utils
|
|
||||||
|
|
||||||
%description legacy
|
|
||||||
Legacy pungi executable. This package depends on Python 2.
|
|
||||||
|
|
||||||
|
|
||||||
%package -n python2-%{name}
|
|
||||||
Summary: Python 2 libraries for pungi
|
|
||||||
|
|
||||||
%description -n python2-%{name}
|
|
||||||
Python library with code for Pungi. This is not a public library and there are
|
|
||||||
no guarantees about API stability.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%package -n python3-%{name}
|
%package -n python3-%{name}
|
||||||
Summary: Python 3 libraries for pungi
|
Summary: Python 3 libraries for pungi
|
||||||
|
|
||||||
@ -130,9 +94,6 @@ no guarantees about API stability.
|
|||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?fedora} < 31
|
|
||||||
%py2_build
|
|
||||||
%endif
|
|
||||||
%py3_build
|
%py3_build
|
||||||
cd doc
|
cd doc
|
||||||
make latexpdf SPHINXBUILD=/usr/bin/sphinx-build-3
|
make latexpdf SPHINXBUILD=/usr/bin/sphinx-build-3
|
||||||
@ -142,24 +103,12 @@ make man SPHINXBUILD=/usr/bin/sphinx-build-3
|
|||||||
gzip _build/man/pungi.1
|
gzip _build/man/pungi.1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if 0%{?fedora} < 31
|
|
||||||
%py2_install
|
|
||||||
mv %{buildroot}%{_bindir}/pungi %{buildroot}%{_bindir}/pungi-2
|
|
||||||
%endif
|
|
||||||
%py3_install
|
%py3_install
|
||||||
%if 0%{?fedora} < 31
|
|
||||||
mv %{buildroot}%{_bindir}/pungi-2 %{buildroot}%{_bindir}/pungi
|
|
||||||
%endif
|
|
||||||
%{__install} -d %{buildroot}/var/cache/pungi
|
%{__install} -d %{buildroot}/var/cache/pungi
|
||||||
%{__install} -d %{buildroot}%{_mandir}/man1
|
%{__install} -d %{buildroot}%{_mandir}/man1
|
||||||
%{__install} -m 0644 doc/_build/man/pungi.1.gz %{buildroot}%{_mandir}/man1
|
%{__install} -m 0644 doc/_build/man/pungi.1.gz %{buildroot}%{_mandir}/man1
|
||||||
|
|
||||||
# No utils package for Python 2. On Py 3 this is not installed at all
|
|
||||||
rm -rf %{buildroot}%{python2_sitelib}/%{name}_utils
|
|
||||||
|
|
||||||
%if 0%{?fedora} > 30
|
|
||||||
rm %{buildroot}%{_bindir}/pungi
|
rm %{buildroot}%{_bindir}/pungi
|
||||||
%endif
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
nosetests-3 --exe
|
nosetests-3 --exe
|
||||||
@ -176,15 +125,6 @@ nosetests-3 --exe
|
|||||||
%{_datadir}/pungi
|
%{_datadir}/pungi
|
||||||
/var/cache/pungi
|
/var/cache/pungi
|
||||||
|
|
||||||
%if 0%{?fedora} < 31
|
|
||||||
%files legacy
|
|
||||||
%{_bindir}/%{name}
|
|
||||||
|
|
||||||
%files -n python2-%{name}
|
|
||||||
%{python2_sitelib}/%{name}
|
|
||||||
%{python2_sitelib}/%{name}-%{version}-py?.?.egg-info
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -n python3-%{name}
|
%files -n python3-%{name}
|
||||||
%{python3_sitelib}/%{name}
|
%{python3_sitelib}/%{name}
|
||||||
%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
|
%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
|
||||||
@ -202,6 +142,9 @@ nosetests-3 --exe
|
|||||||
%{_bindir}/%{name}-wait-for-signed-ostree-handler
|
%{_bindir}/%{name}-wait-for-signed-ostree-handler
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 09 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.39-2
|
||||||
|
- Drop pungi-legacy subpackage due to broken dependencies
|
||||||
|
|
||||||
* Mon Sep 09 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.39-1
|
* Mon Sep 09 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.39-1
|
||||||
- Fix getting platforms from lookaside (lsedlar)
|
- Fix getting platforms from lookaside (lsedlar)
|
||||||
- extra-files: Simplify iterating over variants (lsedlar)
|
- extra-files: Simplify iterating over variants (lsedlar)
|
||||||
|
Loading…
Reference in New Issue
Block a user