X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython3-markupsafe.git;a=blobdiff_plain;f=python-markupsafe.spec;h=d2b52fde3d8112da1963776023c5a9a8fc71512a;hp=1c93ff260a6c98e09107f68d6f55a30a3bb2bec4;hb=c7cf0f6;hpb=8034e6e36bdcee13f5cf8336bdfa09e5f7eebcdb

diff --git a/python-markupsafe.spec b/python-markupsafe.spec
index 1c93ff2..d2b52fd 100644
--- a/python-markupsafe.spec
+++ b/python-markupsafe.spec
@@ -8,23 +8,24 @@
 Summary:	MarkupSafe - a XML/HTML/XHTML Markup safe string for Python 2
 Summary(pl.UTF-8):	MarkupSafe - łańcuch dla Pythona 2 bezpieczny pod kątem znaczników XML/HTML/XHTML
 Name:		python-%{module}
-Version:	0.18
-Release:	2
+Version:	0.23
+Release:	6
 License:	BSD
 Group:		Development/Languages/Python
+#Source0Download: https://pypi.python.org/pypi/MarkupSafe
 Source0:	https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz
-# Source0-md5:	f8d252fd05371e51dec2fe9a36890687
+# Source0-md5:	f5ab3deee4c37cd6a922fb81e730da6e
 URL:		http://www.pocoo.org/
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	rpmbuild(macros) >= 1.710
 %if %{with python2}
 BuildRequires:	python-devel
-BuildRequires:	python-distribute
+BuildRequires:	python-setuptools
 %endif
 %if %{with python3}
 BuildRequires:	python-2to3
 BuildRequires:	python3-devel
-BuildRequires:	python3-distribute
+BuildRequires:	python3-setuptools
 %endif
 Requires:	python-modules
 Provides:	python-MarkupSafe = %{version}-%{release}
@@ -66,18 +67,14 @@ cp -a py2 py3
 %if %{with python2}
 cd py3
 # CFLAGS is only for arch packages - remove on noarch packages
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags}" \
-%{__python} setup.py build
+%py_build
 %{?with_tests:%{__python} setup.py test}
 cd ..
 %endif
 
 %if %{with python3}
 cd py3
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags}" \
-%{__python3} setup.py build
+%py3_build
 %{?with_tests:%{__python3} setup.py test}
 cd ..
 %endif
@@ -86,9 +83,7 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 cd py2
-%{__python} setup.py install \
-	--optimize=2 \
-	--root=$RPM_BUILD_ROOT
+%py_install
 
 # C code errantly gets installed
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/markupsafe/_speedups.c
@@ -100,9 +95,7 @@ cd ..
 
 %if %{with python3}
 cd py3
-%{__python3} setup.py install \
-	--optimize=2 \
-	--root=$RPM_BUILD_ROOT
+%py3_install
 
 
 # C code errantly gets installed