diff --git a/geos.spec b/geos.spec index 39e30de336dd16606a5ff9a5467ad9ef071ecba5..19957a6f0d157a625b3139e8e7ec9d18c2e02099 100644 --- a/geos.spec +++ b/geos.spec @@ -1,6 +1,6 @@ Name: geos Version: 3.6.1 -Release: 12 +Release: 13 Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 URL: http://trac.osgeo.org/geos/ @@ -8,9 +8,7 @@ Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2 #To add stdlib.h Patch0000: geos-gcc43.patch -BuildRequires: gcc gcc-c++ doxygen libtool python2-devel - -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: gcc gcc-c++ doxygen libtool %description GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). @@ -33,17 +31,6 @@ many other projects and products. This package contains the development files to build applications that use GEOS. -%package -n python2-geos -%{?python_provide:%python_provide python2-geos} -Provides: %{name}-python = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: Python modules for GEOS -Requires: %{name} = %{version}-%{release} -BuildRequires: swig - -%description -n python2-geos -Python module to build applications using GEOS and python - %prep %autosetup -p1 @@ -58,7 +45,7 @@ for makefile in `find . -type f -name 'Makefile.in'`; do sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile done -%configure --disable-static --disable-dependency-tracking --enable-python +%configure --disable-static --disable-dependency-tracking --disable-python touch swig/python/geos_wrap.cxx %make_build @@ -90,16 +77,10 @@ make check || exit 0 %exclude %{_libdir}/*.la %exclude %{_libdir}/*.a -%files -n python2-geos -%dir %{python2_sitearch}/%{name} -%exclude %{python2_sitearch}/%{name}/_%{name}.a -%exclude %{python2_sitearch}/%{name}/_%{name}.la -%{python2_sitearch}/%{name}.pth -%{python2_sitearch}/%{name}/*.py -%{python2_sitearch}/%{name}/*.py? -%{python2_sitearch}/%{name}/_%{name}.so - %changelog +* Wed Nov 11 2020 leiju - 3.6.1-13 +- Remove python2 subpackage + * Mon Mar 09 2020 yangjian - 3.6.1-12 - Fix patch problem