- Version 1.3.1-1.

diff --git a/python-shapely.spec b/python-shapely.spec
index 329f0ed1c0862770e5334cc009f5af1e2bd36d94..80479597c7314737fd57f392c909232593cc088b 100644 (file)
--- a/python-shapely.spec
+++ b/python-shapely.spec
@@ -1,31 +1,37 @@
+# TODO: Package examples to _examplesdir ?
 %define        module  shapely
 Summary:       Geospatial geometries, predicates, and operations for Python
 Name:          python-%{module}
-Version:       1.0.12
-Release:       0.1
+Version:       1.3.1
+Release:       1
 License:       BSD
 Group:         Development/Languages/Python
 Source0:       http://pypi.python.org/packages/source/S/Shapely/Shapely-%{version}.tar.gz
-# Source0-md5: 0122c53ec3ba1c4b805afce43d0aa039
+# Source0-md5: 5ac028637fbd52b9752994bdbfd9446c
 URL:           http://pypi.python.org/pypi/Shapely
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
+Requires:      geos >= 3.1
 Requires:      python-modules
-Requires:      geos >= 3.0.0
-BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Shapely is a Python package for manipulation and analysis of 2D geospatial
-geometries. It is based on GEOS. Shapely 1.0 is
-not concerned with data formats or coordinate reference systems.
+Shapely is a Python package for manipulation and analysis of 2D
+geospatial geometries. It is based on GEOS. Shapely is not concerned
+with data formats or coordinate reference systems.
+
+%description -l pl.UTF-8
+Pakiet do manipulacji i anlizy duwymiarowych geoptrzestrzennych
+geometrii. Bazuje na GEOS, nie zajmuje się formatami danych czy
+układami odniesnienia danych.
 
 %prep
 %setup -q -n Shapely-%{version}
 
 %build
-export CFLAGS="%{rpmcflags}"
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags}" \
 %{__python} setup.py build
 
 %install
@@ -34,22 +40,36 @@ rm -rf $RPM_BUILD_ROOT
        --optimize=2 \
        --root=$RPM_BUILD_ROOT
 
-%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
-find $RPM_BUILD_ROOT%{py_sitescriptdir} -name '*.py' \
-       | grep -v ctypes_declarations | xargs rm
+# install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+# cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.txt CREDITS.txt HISTORY.txt README.txt
-%dir %{py_sitescriptdir}/%{module}
-%{py_sitescriptdir}/%{module}/ctypes_declarations.py
-%{py_sitescriptdir}/%{module}/*.py[co]
-%dir %{py_sitescriptdir}/%{module}/geometry
-%{py_sitescriptdir}/%{module}/geometry/*.py[co]
+# %doc CHANGES.txt CREDITS.txt HISTORY.txt README.txt
+%dir %{py_sitedir}/%{module}
+# %{py_sitescriptdir}/%{module}/ctypes_declarations.py
+%{py_sitedir}/%{module}/*.py[co]
+%dir %{py_sitedir}/%{module}/geometry
+%{py_sitedir}/%{module}/geometry/*.py[co]
+%dir %{py_sitedir}/%{module}/algorithms
+%{py_sitedir}/%{module}/algorithms/*.py[co]
+
+%dir %{py_sitedir}/%{module}/speedups
+%attr(755,root,root) %{py_sitedir}/%{module}/speedups/*.so
+%{py_sitedir}/%{module}/speedups/*.py[co]
+
+%dir %{py_sitedir}/%{module}/tests
+%{py_sitedir}/%{module}/tests/*.py[co]
+%dir %{py_sitedir}/%{module}/examples
+%{py_sitedir}/%{module}/examples/*.py[co]
+
 %if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/Shapely-*.egg-info
+%{py_sitedir}/Shapely-*.egg-info
 %endif