The package rpms/python-shapely.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/python-shapely.git/commit/?id=173dc7....
Change: +%ifarch s390x
Thanks.
Full change: ============
commit aa1633d13348d79e48a65af1f789e39f723b2903 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Thu Mar 11 07:15:06 2021 -0500
Improve rpmlintrc
diff --git a/python-shapely.rpmlintrc b/python-shapely.rpmlintrc index c7f27b8..1d84705 100644 --- a/python-shapely.rpmlintrc +++ b/python-shapely.rpmlintrc @@ -1,2 +1,4 @@ # These are not real spelling errors... -addFilter(r'spelling-error .*((en_US)| en_US) (matplotlib|numpy) ') +addFilter(r'spelling-error .*((en_US)| en_US) (matplotlib|numpy|[Mm]etapackage|vectorized) ') +# The documentation is in the -doc subpackage +addFilter(r' no-documentation')
commit dcd9a3a5c5e7b6b4bd37e87eab70b5cd94aa74f0 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 16:02:58 2021 -0500
Remove vendored python-packaging
diff --git a/python-shapely.spec b/python-shapely.spec index b12e7b2..ce71241 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -25,6 +25,8 @@ BuildRequires: geos-devel BuildRequires: python3-devel BuildRequires: python3-Cython BuildRequires: python3-setuptools +# Vendored upstream, but we remove the vendored copy: +BuildRequires: python3-packaging
# Vectorize extra (and tests) BuildRequires: python3-numpy @@ -73,6 +75,10 @@ BuildArch: noarch %prep %autosetup -p1 -n Shapely-%{version}%{?prerel}
+# Remove vendored python-packaging +rm -rf _vendor +sed -r -i 's/_vendor.//g' setup.py + # Currently, the GitHub tarball does not ship with pre-generated Cython C # sources. We preventively check for them anyway, as they must be removed if # they do appear.
commit 173dc7d89863296c7395347c18bf0a0f7435297e Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 15:58:15 2021 -0500
Work around s390x test failures; RHBZ to be filed
diff --git a/python-shapely.spec b/python-shapely.spec index f18ba02..b12e7b2 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -1,3 +1,5 @@ +%bcond_with failing_s390x_tests + Name: python-shapely Version: 1.7.1 Release: 4%{?dist} @@ -85,7 +87,14 @@ rm -vf docs/_build/html/.buildinfo
%check -%pytest +%if %{without failing_s390x_tests} +%ifarch s390x +k="not test_dumps_srid and not test_dumps_endianness and not test_dumps_hex \ +and not test_loads_srid and not test_point_empty and not test_point_z_empty" +%global pytest_skips -k "${k}" +%endif +%endif +%pytest %{?pytest_skips}
%install @@ -136,6 +145,7 @@ find %{buildroot}%{python3_sitearch}/shapely \ - Add metapackage for “vectorized” extra - Install LICENSE.txt - Add a -doc subpackage and build the HTML documentation +- Work around s390x test failures; RHBZ to be filed
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit cb77399ff1daa01b057a0a302495d3e81d27a783 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 15:51:39 2021 -0500
Add rpmlintrc file
diff --git a/python-shapely.rpmlintrc b/python-shapely.rpmlintrc new file mode 100644 index 0000000..c7f27b8 --- /dev/null +++ b/python-shapely.rpmlintrc @@ -0,0 +1,2 @@ +# These are not real spelling errors... +addFilter(r'spelling-error .*((en_US)| en_US) (matplotlib|numpy) ')
commit 7fd19e413c4c2f3cb7c0ae128c64b97f8cf85078 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 15:47:15 2021 -0500
Add a -doc subpackage and build the HTML documentation
diff --git a/python-shapely.spec b/python-shapely.spec index 4caaa9d..f18ba02 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -23,11 +23,20 @@ BuildRequires: geos-devel BuildRequires: python3-devel BuildRequires: python3-Cython BuildRequires: python3-setuptools -# Tests + +# Vectorize extra (and tests) BuildRequires: python3-numpy + +# Tests BuildRequires: python3-pytest BuildRequires: python3-matplotlib
+# Documentation +BuildRequires: make +BuildRequires: python3-sphinx +BuildRequires: python3-matplotlib +BuildRequires: python3-descartes >= 1.0.1 + %global _description %{expand: Shapely is a package for creation, manipulation, and analysis of planar geometry objects – designed especially for developers of cutting edge @@ -52,6 +61,13 @@ Summary: Manipulation and analysis of geometric objects in the Cartesian %description -n python3-shapely %_description
+%package doc +Summary: Documentation for %{name} +BuildArch: noarch + +%description doc %_description + + %prep %autosetup -p1 -n Shapely-%{version}%{?prerel}
@@ -64,6 +80,9 @@ find . -type f -name '*.c' -print -delete %build %py3_build
+%make_build -C docs html SPHINXOPTS='%{?_smp_mflags}' +rm -vf docs/_build/html/.buildinfo +
%check %pytest @@ -79,14 +98,29 @@ find %{buildroot}%{python3_sitearch}/shapely \
%files -n python3-shapely %license LICENSE.txt -%doc CHANGES.txt README.rst CREDITS.txt LICENSE.txt -%doc docs -%doc %{python3_sitearch}/shapely/examples/ %exclude %{python3_sitearch}/shapely/examples/ %{python3_sitearch}/shapely/ %{python3_sitearch}/Shapely-%{version}%{?prerel}-py*.egg-info/
+%files doc +%license LICENSE.txt + +%doc CHANGES.txt +%doc CITATION.txt +%doc CODE_OF_CONDUCT.md +%doc CREDITS.txt +%doc FAQ.rst +%doc GEOS-C-API.txt +%doc README.rst + +%doc docs/design.rst + +%doc docs/_build/html + +%doc shapely/examples/ + + %changelog * Wed Mar 10 2021 Benjamin A. Beasley code@musicinmybrain.net - 1.7.1-4 - Use %%url macro to shorten Source0 URL @@ -101,6 +135,7 @@ find %{buildroot}%{python3_sitearch}/shapely \ %%check - Add metapackage for “vectorized” extra - Install LICENSE.txt +- Add a -doc subpackage and build the HTML documentation
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit f6c26be4dff819b9ca2f29bf54811c37c5ac05bb Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 15:13:59 2021 -0500
Install LICENSE.txt
diff --git a/python-shapely.spec b/python-shapely.spec index 13ea1a1..4caaa9d 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -78,6 +78,7 @@ find %{buildroot}%{python3_sitearch}/shapely \
%files -n python3-shapely +%license LICENSE.txt %doc CHANGES.txt README.rst CREDITS.txt LICENSE.txt %doc docs %doc %{python3_sitearch}/shapely/examples/ @@ -99,6 +100,7 @@ find %{buildroot}%{python3_sitearch}/shapely \ also ensures we test the built package rather than re-compiling extensions in %%check - Add metapackage for “vectorized” extra +- Install LICENSE.txt
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit 8c8d24793fc8df8b9cf172ab93e8fcfed861632a Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 14:45:41 2021 -0500
Add metapackage for “vectorized” extra
diff --git a/python-shapely.spec b/python-shapely.spec index 0e6a026..13ea1a1 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -40,6 +40,9 @@ more information!} %description %_description
+%{?python_extras_subpkg:%python_extras_subpkg -n python3-shapely -i %{python3_sitearch}/*.egg-info vectorized} + + %package -n python3-shapely Summary: Manipulation and analysis of geometric objects in the Cartesian plane %if 0%{?fedora} == 32 @@ -95,6 +98,7 @@ find %{buildroot}%{python3_sitearch}/shapely \ - Use the %%pytest macro instead of deprecated “python3 setup.py test”; this also ensures we test the built package rather than re-compiling extensions in %%check +- Add metapackage for “vectorized” extra
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit e46b5baeed19190381964fbda8d0f415489032b9 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 12:44:40 2021 -0500
Use the %pytest macro instead of deprecated “python3 setup.py test”; this also ensures we test the built package rather than re-compiling extensions in %check
diff --git a/python-shapely.spec b/python-shapely.spec index e426462..0e6a026 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -63,7 +63,7 @@ find . -type f -name '*.c' -print -delete
%check -%{python3} setup.py test +%pytest
%install @@ -92,6 +92,9 @@ find %{buildroot}%{python3_sitearch}/shapely \ - Fix SvgTestCase.test_collection failing with geos 3.9.0 (https://github.com/Toblerity/Shapely/issues/1079, RHBZ #1907955) - Improve handling of Cython and Cython-generated C source files +- Use the %%pytest macro instead of deprecated “python3 setup.py test”; this + also ensures we test the built package rather than re-compiling extensions in + %%check
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit 9ddf9b9bea81269d53009cc4b52ff159735029eb Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 12:33:12 2021 -0500
Improve handling of Cython and Cython-generated C source files
diff --git a/python-shapely.spec b/python-shapely.spec index 01f4349..e426462 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -52,9 +52,10 @@ Summary: Manipulation and analysis of geometric objects in the Cartesian %prep %autosetup -p1 -n Shapely-%{version}%{?prerel}
-# Remove pre-generated sources -rm -f shapely/speedups/_speedups.c -rm -f shapely/vectorized/_vectorized.c +# Currently, the GitHub tarball does not ship with pre-generated Cython C +# sources. We preventively check for them anyway, as they must be removed if +# they do appear. +find . -type f -name '*.c' -print -delete
%build @@ -67,8 +68,10 @@ rm -f shapely/vectorized/_vectorized.c
%install %py3_install - -rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c +# Ensure that neither Cython source files nor Cython-generated C source files +# are installed; they are not useful. +find %{buildroot}%{python3_sitearch}/shapely \ + -type f ( -name '*.pyx' -o -name '*.c' ) -print -delete
%files -n python3-shapely @@ -88,6 +91,7 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c - Drop python_provide macro, which is obsolete in Fedora - Fix SvgTestCase.test_collection failing with geos 3.9.0 (https://github.com/Toblerity/Shapely/issues/1079, RHBZ #1907955) +- Improve handling of Cython and Cython-generated C source files
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit 7d881ac37cdec7a3072ad6862ccfa82df3070e99 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 08:50:05 2021 -0500
Fix SvgTestCase.test_collection failing with geos 3.9.0 (https://github.com/Toblerity/Shapely/issues/1079, RHBZ #1907955)
diff --git a/python-shapely.spec b/python-shapely.spec index 8ab28ec..01f4349 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -7,6 +7,16 @@ License: BSD URL: https://github.com/Toblerity/Shapely Source0: %{url}/archive/%{version}%{?prerel}.tar.gz
+# Backport a relevant subset of commit +# 611a0b3b2047bf8a49db32dc4b30684a10f5b6eb, which fixes +# https://github.com/Toblerity/Shapely/issues/1079 (Test failure with geos +# 3.9.0) and corresponds to https://github.com/Toblerity/Shapely/pull/1042/ +# (Expand CI and tests to support GEOS 3.9.0beta2). The particular test vectors +# must be adjusted in the backport because +# https://github.com/Toblerity/Shapely/pull/1031 is not in 1.7.1; +# in particular, “WKTWriter.defaults = {}” is still in tests/__init__.py. +Patch1: shapely-1.7.1-611a0b3b-subset.patch + BuildRequires: gcc BuildRequires: geos-devel
@@ -76,6 +86,8 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c - Use expand: to clean up description macro - Improve whitespace consistency - Drop python_provide macro, which is obsolete in Fedora +- Fix SvgTestCase.test_collection failing with geos 3.9.0 + (https://github.com/Toblerity/Shapely/issues/1079, RHBZ #1907955)
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos) diff --git a/shapely-1.7.1-611a0b3b-subset.patch b/shapely-1.7.1-611a0b3b-subset.patch new file mode 100644 index 0000000..604d10a --- /dev/null +++ b/shapely-1.7.1-611a0b3b-subset.patch @@ -0,0 +1,83 @@ +diff -Naur Shapely-1.7.1-original/shapely/geos.py Shapely-1.7.1/shapely/geos.py +--- Shapely-1.7.1-original/shapely/geos.py 2020-08-20 16:02:11.000000000 -0400 ++++ Shapely-1.7.1/shapely/geos.py 2021-03-10 12:54:49.075728259 -0500 +@@ -84,7 +84,7 @@ + 'libgeos_c.so.1', + 'libgeos_c.so', + ] +- _lgeos = load_dll('geos_c', fallbacks=alt_paths) ++ _lgeos = load_dll('libgeos_c', fallbacks=alt_paths) + # Necessary for environments with only libc.musl + c_alt_paths = [ + 'libc.musl-x86_64.so.1' +diff -Naur Shapely-1.7.1-original/tests/test_create_inconsistent_dimensionality.py Shapely-1.7.1/tests/test_create_inconsistent_dimensionality.py +--- Shapely-1.7.1-original/tests/test_create_inconsistent_dimensionality.py 2020-08-20 16:02:11.000000000 -0400 ++++ Shapely-1.7.1/tests/test_create_inconsistent_dimensionality.py 2021-03-10 14:35:22.383306748 -0500 +@@ -29,8 +29,15 @@ + + + wkt_cases = [ ++ # for Shapely 1.7.1, does not preserve 3rd dimension by default: ++ ('MULTIPOINT (1 1 1, 2 2)', 'MULTIPOINT (1.0000000000000000 1.0000000000000000, 2.0000000000000000 2.0000000000000000)'), ++ ('MULTIPOINT (1 1, 2 2 2)', 'MULTIPOINT (1.0000000000000000 1.0000000000000000, 2.0000000000000000 2.0000000000000000)'), + ('LINESTRING (1 1 1, 2 2)', 'LINESTRING (1.0000000000000000 1.0000000000000000, 2.0000000000000000 2.0000000000000000)'), +- ('POLYGON ((0 0 0, 1 0 0, 1 1, 0 1 0, 0 0 0))', 'POLYGON ((0.0000000000000000 0.0000000000000000, 1.0000000000000000 0.0000000000000000, 1.0000000000000000 1.0000000000000000, 0.0000000000000000 1.0000000000000000, 0.0000000000000000 0.0000000000000000))') ++ ('POLYGON ((0 0 0, 1 0 0, 1 1, 0 1 0, 0 0 0))', 'POLYGON ((0.0000000000000000 0.0000000000000000, 1.0000000000000000 0.0000000000000000, 1.0000000000000000 1.0000000000000000, 0.0000000000000000 1.0000000000000000, 0.0000000000000000 0.0000000000000000))'), ++ # drop 3rd dimension ++ ('LINESTRING (1 1, 2 2 2)', 'LINESTRING (1.0000000000000000 1.0000000000000000, 2.0000000000000000 2.0000000000000000)'), ++ ('POLYGON ((0 0, 1 0 1, 1 1, 0 1, 0 0))', ++ 'POLYGON ((0.0000000000000000 0.0000000000000000, 1.0000000000000000 0.0000000000000000, 1.0000000000000000 1.0000000000000000, 0.0000000000000000 1.0000000000000000, 0.0000000000000000 0.0000000000000000))'), + ] + + +diff -Naur Shapely-1.7.1-original/tests/test_svg.py Shapely-1.7.1/tests/test_svg.py +--- Shapely-1.7.1-original/tests/test_svg.py 2020-08-20 16:02:11.000000000 -0400 ++++ Shapely-1.7.1/tests/test_svg.py 2021-03-10 12:54:49.076728265 -0500 +@@ -174,7 +174,8 @@ + self.assertSVG(GeometryCollection(), '<g />') + # Valid + self.assertSVG( +- Point(7, 3).union(LineString([(4, 2), (8, 4)])), ++ GeometryCollection( ++ [Point(7, 3), LineString([(4, 2), (8, 4)])]), + '<g><circle cx="7.0" cy="3.0" r="3.0" stroke="#555555" ' + 'stroke-width="1.0" fill="#66cc99" opacity="0.6" />' + '<polyline fill="none" stroke="#66cc99" stroke-width="2.0" ' +diff -Naur Shapely-1.7.1-original/tests/test_wkb.py Shapely-1.7.1/tests/test_wkb.py +--- Shapely-1.7.1-original/tests/test_wkb.py 2020-08-20 16:02:11.000000000 -0400 ++++ Shapely-1.7.1/tests/test_wkb.py 2021-03-10 12:54:49.076728265 -0500 +@@ -1,6 +1,12 @@ ++import binascii ++ ++import pytest ++ ++from shapely import wkt + from shapely.wkb import dumps, loads + from shapely.geometry import Point +-import binascii ++from shapely.geos import geos_version ++ + + + def bin2hex(value): +@@ -49,3 +55,20 @@ + # replace geometry srid with another + result = dumps(geom, srid=27700) + assert bin2hex(result) == "0101000020346C0000333333333333F33F3333333333330B40" ++ ++ ++requires_geos_39 = pytest.mark.xfail( ++ geos_version < (3, 9, 0), reason="GEOS >= 3.9.0 is required", strict=True) ++ ++ ++@requires_geos_39 ++def test_point_empty(): ++ g = wkt.loads("POINT EMPTY") ++ assert g.wkb_hex == "0101000000000000000000F87F000000000000F87F" ++ ++ ++@requires_geos_39 ++def test_point_z_empty(): ++ g = wkt.loads("POINT Z EMPTY") ++ assert g.wkb_hex == \ ++ "0101000080000000000000F87F000000000000F87F000000000000F87F"
commit ea1125dce7f824e604de866d2b21061f754e867b Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 08:29:30 2021 -0500
Drop python_provide macro, which is obsolete in Fedora
diff --git a/python-shapely.spec b/python-shapely.spec index 7e8b54d..8ab28ec 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -32,7 +32,9 @@ more information!}
%package -n python3-shapely Summary: Manipulation and analysis of geometric objects in the Cartesian plane -%{?python_provide:%python_provide python3-shapely} +%if 0%{?fedora} == 32 +%py_provides python3-shapely +%endif
%description -n python3-shapely %_description
@@ -73,6 +75,7 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c - Use %%url macro to shorten Source0 URL - Use expand: to clean up description macro - Improve whitespace consistency +- Drop python_provide macro, which is obsolete in Fedora
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit c1f43706844ca71ad0ba9648538c6270c783a436 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 08:26:46 2021 -0500
Improve whitespace consistency
diff --git a/python-shapely.spec b/python-shapely.spec index aaa22b2..7e8b54d 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -6,6 +6,7 @@ Summary: Manipulation and analysis of geometric objects in the Cartesian License: BSD URL: https://github.com/Toblerity/Shapely Source0: %{url}/archive/%{version}%{?prerel}.tar.gz + BuildRequires: gcc BuildRequires: geos-devel
@@ -28,6 +29,7 @@ more information!}
%description %_description
+ %package -n python3-shapely Summary: Manipulation and analysis of geometric objects in the Cartesian plane %{?python_provide:%python_provide python3-shapely} @@ -65,10 +67,12 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c %{python3_sitearch}/shapely/ %{python3_sitearch}/Shapely-%{version}%{?prerel}-py*.egg-info/
+ %changelog * Wed Mar 10 2021 Benjamin A. Beasley code@musicinmybrain.net - 1.7.1-4 - Use %%url macro to shorten Source0 URL - Use expand: to clean up description macro +- Improve whitespace consistency
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos) @@ -122,7 +126,7 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jul 05 2018 Volker Fröhlich volker27@gmx.at - 1.6.4-2.post1 -- Merge Miro's pull request removing filter_provides and +- Merge Miro's pull request removing filter_provides and correcting the python_provide macro; Also adding it to the Python 3 sub-package
@@ -285,7 +289,7 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c - BR geos-devel to actually build arch specific bits - Drop unneeded geos dep
-* Fri Aug 12 2011 Volker Fröhlich volker27@gmx.at - 1.2.11-1 +* Fri Aug 12 2011 Volker Fröhlich volker27@gmx.at - 1.2.11-1 - Updated for 1.2.11 - Switch away from noarch - Remove useless clean section and rm in install @@ -293,19 +297,19 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c - Avoid private provides for .so - Extend package description
-* Fri Apr 01 2011 Volker Fröhlich volker27@gmx.at - 1.2.9-1 +* Fri Apr 01 2011 Volker Fröhlich volker27@gmx.at - 1.2.9-1 - Updated for 1.2.9 - Added tests again, but ignore the results
-* Fri Feb 25 2011 Volker Fröhlich volker27@gmx.at - 1.2.8-1 +* Fri Feb 25 2011 Volker Fröhlich volker27@gmx.at - 1.2.8-1 - Updated for 1.2.8 - Disable tests
* Wed Feb 09 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-* Sat Nov 27 2010 Volker Fröhlich volker27@gmx.at - 1.2.7-2 +* Sat Nov 27 2010 Volker Fröhlich volker27@gmx.at - 1.2.7-2 - Explained excluded files; added check section
-* Wed Nov 24 2010 Volker Fröhlich volker27@gmx.at - 1.2.7-1 +* Wed Nov 24 2010 Volker Fröhlich volker27@gmx.at - 1.2.7-1 - Initial package for Fedora
commit b1f5208d6f829152e8c46614eb5ddb2d84cf6199 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 08:25:30 2021 -0500
Use expand: to clean up description macro
diff --git a/python-shapely.spec b/python-shapely.spec index 8b6094b..aaa22b2 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -17,16 +17,14 @@ BuildRequires: python3-numpy BuildRequires: python3-pytest BuildRequires: python3-matplotlib
+%global _description %{expand: +Shapely is a package for creation, manipulation, and analysis of planar +geometry objects – designed especially for developers of cutting edge +geographic information systems. In a nutshell: Shapely lets you do PostGIS-ish +stuff outside the context of a database using idiomatic Python.
-%global _description\ -Shapely is a package for creation, manipulation, and analysis\ -of planar geometry objects – designed especially for developers\ -of cutting edge geographic information systems. In a nutshell:\ -Shapely lets you do PostGIS-ish stuff outside the context of a\ -database using idiomatic Python.\ -\ -You can use this package with python-matplotlib and numpy.\ -See README.rst for more information! +You can use this package with python-matplotlib and numpy. See README.rst for +more information!}
%description %_description
@@ -70,6 +68,7 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c %changelog * Wed Mar 10 2021 Benjamin A. Beasley code@musicinmybrain.net - 1.7.1-4 - Use %%url macro to shorten Source0 URL +- Use expand: to clean up description macro
* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit 0d2f141be4aba29af7803d21ae20d5a0079c573f Author: Benjamin A. Beasley code@musicinmybrain.net Date: Wed Mar 10 08:24:57 2021 -0500
Use %%url macro to shorten Source0 URL
diff --git a/python-shapely.spec b/python-shapely.spec index 9a8ebab..8b6094b 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -1,11 +1,11 @@ Name: python-shapely Version: 1.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manipulation and analysis of geometric objects in the Cartesian plane
License: BSD URL: https://github.com/Toblerity/Shapely -Source0: https://github.com/Toblerity/Shapely/archive/%%7Bversion%7D%%7B?prerel%7D.ta... +Source0: %{url}/archive/%{version}%{?prerel}.tar.gz BuildRequires: gcc BuildRequires: geos-devel
@@ -68,6 +68,9 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c %{python3_sitearch}/Shapely-%{version}%{?prerel}-py*.egg-info/
%changelog +* Wed Mar 10 2021 Benjamin A. Beasley code@musicinmybrain.net - 1.7.1-4 +- Use %%url macro to shorten Source0 URL + * Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 - Rebuild (geos)
commit 3a92ed65b3395f056bdf78c3f3f8561b455a14bb Author: Sandro Mani manisandro@gmail.com Date: Sat Feb 13 18:27:51 2021 +0100
Rebuild (geos)
diff --git a/python-shapely.spec b/python-shapely.spec index e2a6032..9a8ebab 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -1,6 +1,6 @@ Name: python-shapely Version: 1.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manipulation and analysis of geometric objects in the Cartesian plane
License: BSD @@ -68,6 +68,9 @@ rm %{buildroot}%{python3_sitearch}/shapely/speedups/_speedups.c %{python3_sitearch}/Shapely-%{version}%{?prerel}-py*.egg-info/
%changelog +* Sat Feb 13 2021 Sandro Mani manisandro@gmail.com - 1.7.1-3 +- Rebuild (geos) + * Wed Jan 27 2021 Fedora Release Engineering releng@fedoraproject.org - 1.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild