dropped Python 2 subpackage; enabled YAML support

This commit is contained in:
Martin Gieseking 2018-10-13 09:44:35 +02:00
parent bc0063f9d6
commit 4bef6a37f1

View File

@ -1,11 +1,9 @@
%if !( 0%{?rhel} > 0 && 0%{?rhel} <= 7)
# Turn off the brp-python-bytecompile script # Turn off the brp-python-bytecompile script
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
%endif
Name: liblouis Name: liblouis
Version: 3.7.0 Version: 3.7.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Braille translation and back-translation library Summary: Braille translation and back-translation library
Group: System Environment/Libraries Group: System Environment/Libraries
@ -16,11 +14,11 @@ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: gcc BuildRequires: gcc
BuildRequires: help2man BuildRequires: help2man
BuildRequires: libyaml-devel
BuildRequires: texinfo BuildRequires: texinfo
BuildRequires: texinfo-tex BuildRequires: texinfo-tex
BuildRequires: texlive-eurosym BuildRequires: texlive-eurosym
BuildRequires: texlive-xetex BuildRequires: texlive-xetex
BuildRequires: python2-devel
BuildRequires: python3-devel BuildRequires: python3-devel
# gnulib is a copylib that has been granted an exception from the no-bundled-libraries policy # gnulib is a copylib that has been granted an exception from the no-bundled-libraries policy
@ -57,7 +55,6 @@ developing applications that use %{name}.
Summary: Command-line utilities to test %{name} Summary: Command-line utilities to test %{name}
Group: Applications/Text Group: Applications/Text
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: python2-louis = %{version}-%{release}
License: GPLv3+ License: GPLv3+
%description utils %description utils
@ -65,18 +62,6 @@ Six test programs are provided as part of the liblouis package. They
are intended for testing liblouis and for debugging tables. None of are intended for testing liblouis and for debugging tables. None of
them is suitable for braille transcription. them is suitable for braille transcription.
%package -n python2-louis
Summary: Python 2 language bindings for %{name}
Group: Development/Languages
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Obsoletes: %{name}-python < 2.6.2-3
Provides: %{name}-python = %{version}-%{release}
%{?python_provide:%python_provide python2-louis}
%description -n python2-louis
This package provides Python 2 language bindings for %{name}.
%package -n python3-louis %package -n python3-louis
Summary: Python 3 language bindings for %{name} Summary: Python 3 language bindings for %{name}
@ -123,16 +108,9 @@ rm -rf %{buildroot}/%{_bindir}/lou_maketable*
rm -rf %{buildroot}/%{_defaultdocdir}/%{name}/ rm -rf %{buildroot}/%{_defaultdocdir}/%{name}/
cd python/louis cd python/louis
install -d %{buildroot}%{python2_sitelib}/louis
install -pm 0644 __init__.py %{buildroot}%{python2_sitelib}/louis/
%if !( 0%{?rhel} > 0 && 0%{?rhel} <= 7)
%py_byte_compile %{__python2} %{buildroot}%{python2_sitelib}/louis/
install -d %{buildroot}%{python3_sitelib}/louis install -d %{buildroot}%{python3_sitelib}/louis
install -pm 0644 __init__.py %{buildroot}%{python3_sitelib}/louis/ install -pm 0644 __init__.py %{buildroot}%{python3_sitelib}/louis/
%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/louis/ %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/louis/
%endif
# Remove Rpaths from the executables. We must do that in the %%install section # Remove Rpaths from the executables. We must do that in the %%install section
# because, otherwise, the test suite wouldn't build. # because, otherwise, the test suite wouldn't build.
@ -161,20 +139,20 @@ done
%{_bindir}/lou_* %{_bindir}/lou_*
%{_mandir}/man1/lou_*.1* %{_mandir}/man1/lou_*.1*
%files -n python2-louis
%doc python/README
%{python2_sitelib}/louis/
%if !( 0%{?rhel} > 0 && 0%{?rhel} <= 7)
%files -n python3-louis %files -n python3-louis
%{python3_sitelib}/louis/ %{python3_sitelib}/louis/
%endif
%files doc %files doc
%doc doc/%{name}.{html,txt,pdf} %doc doc/%{name}.{html,txt,pdf}
%changelog %changelog
* Sat Oct 13 2018 Martin Gieseking <martin.gieseking@uos.de> - 3.7.0-2
- Dropped Python 2 language bindings according to
https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
- Dropped Python dependency from utils package because it doesn't contain Python scripts any longer
- Added BR:libyaml-devel to enable YAML support
* Wed Sep 26 2018 Martin Gieseking <martin.gieseking@uos.de> - 3.7.0-1 * Wed Sep 26 2018 Martin Gieseking <martin.gieseking@uos.de> - 3.7.0-1
- Updated to 3.7.0, fixes CVE-2018-17294 (BZ #1632834). - Updated to 3.7.0, fixes CVE-2018-17294 (BZ #1632834).