From 7c97cf8935c7ec39e25a5bc8aa2f9a8631ded1a3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 29 Oct 2020 11:33:34 +0800 Subject: [PATCH] remove python2 --- marisa.spec | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/marisa.spec b/marisa.spec index 5842a13..f992f31 100644 --- a/marisa.spec +++ b/marisa.spec @@ -1,13 +1,13 @@ Name: marisa Version: 0.2.4 -Release: 37 +Release: 38 Summary: Matching Algorithm with Recursively Implemented StorAge License: BSD or LGPLv2+ URL: https://code.google.com/p/marisa-trie Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/marisa-trie/%{name}-%{version}.tar.gz -BuildRequires: swig perl-devel perl-generators python3-devel ruby-devel python2-devel +BuildRequires: swig perl-devel perl-generators python3-devel ruby-devel %description MARISA is a static and space-efficient trie data structure. And libmarisa is a C++ @@ -24,16 +24,6 @@ Obsoletes: %{name}-tools < %{version}-%{release} The marisa-devel package contains libraries and header files for developing applications that use marisa. -%package -n python2-marisa -Summary: Python2 bindings for marisa -Requires: %{name} = %{version}-%{release} -Provides: %{name}-python = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -%{?python_provide:%python_provide python2-marisa} - -%description -n python2-marisa -Python2 bindings for marisa. - %package -n python3-marisa Summary: Python3 bindings for marisa Requires: %{name} = %{version}-%{release} @@ -76,10 +66,6 @@ cd - %make_build --directory=bindings swig-python cd bindings/python -%{__python2} setup.py build_ext --include-dirs="%{_builddir}/marisa-%{version}/lib" \ ---library-dirs="%{_builddir}/marisa-%{version}/lib/.libs" -%py2_build - %{__python3} setup.py build_ext --include-dirs="%{_builddir}/marisa-%{version}/lib" \ --library-dirs="%{_builddir}/marisa-%{version}/lib/.libs" %py3_build @@ -104,7 +90,6 @@ cd bindings/perl cd - cd bindings/python -%py2_install %py3_install cd - @@ -131,10 +116,6 @@ find $RPM_BUILD_ROOT -name 'perllocal.pod' -delete %{_libdir}/{*.so,pkgconfig/*.pc} %{_bindir}/* -%files -n python2-marisa -%{python2_sitearch}/{_marisa.so,marisa.py*} -%{python2_sitearch}/marisa-0.0.0-py2.?.egg-info - %files -n python3-marisa %{python3_sitearch}/__pycache__/marisa* %{python3_sitearch}/{_marisa*.so,marisa.py} @@ -149,6 +130,9 @@ find $RPM_BUILD_ROOT -name 'perllocal.pod' -delete %{ruby_vendorarchdir}/marisa.so %changelog +* Wed Oct 21 2020 Ge Wang - 0.2.4-38 +- remove python2 + * Thu Dec 12 2019 daiqianwen - 0.2.4-37 - Package init