diff --git a/.gitignore b/.gitignore index dabcc92..6530429 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ html2text-2.38.py +/python-html2text-3.02.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index 93ff7b4..8ff5a15 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,20 +1,23 @@ # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%global tardirname aaronsw-html2text-d9bf7d6 + Name: python-html2text -Version: 2.38 +Version: 3.02 Release: 3.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-%{version}.py +Source0: https://github.com/aaronsw/html2text/tarball/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python +BuildRequires: python-setuptools-devel %description html2text is a Python script that convers a page of HTML into clean, @@ -24,9 +27,7 @@ be valid Markdown (a text-to-HTML format). Also known as: THE ASCIINATOR, html to text, htm to txt, htm2txt, ... %prep -%setup -q -c -T -install -p %{SOURCE0} ./html2text.py -sed -i -e 's/\r//' html2text.py +%setup -q -n %{tardirname} %build @@ -35,8 +36,7 @@ echo Nothing to build %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{python_sitelib}/ -install -p -m 0644 html2text.py $RPM_BUILD_ROOT/%{python_sitelib}/ +%{__python} setup.py install --root $RPM_BUILD_ROOT %clean @@ -49,6 +49,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 11 2011 Thorsten Leemhuis - 3.02-1 +- update to 3.02 +- download tarball from github +- use setuptools + * Tue Feb 08 2011 Fedora Release Engineering - 2.38-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 052c248..76b2c6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11ca33eabefb6a951ff7ae667f441f19 html2text-2.38.py +916b36bb84b88b1d96584b84db872efc python-html2text-3.02.tar.gz