- Some clean up
This commit is contained in:
Terje Røsten 2015-11-17 19:35:06 +01:00
parent ca75ec0399
commit a3002fe52e
3 changed files with 28 additions and 45 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
clog
/pyparsing-2.0.3.tar.gz
/pyparsing-2.0.6.tar.gz

View File

@ -2,35 +2,34 @@
%global with_python3 1
%endif
Name: pyparsing
Version: 2.0.3
Release: 3%{?dist}
Summary: An object-oriented approach to text processing
Name: pyparsing
Version: 2.0.6
Release: 1%{?dist}
Group: Development/Libraries
License: MIT
URL: http://pyparsing.wikispaces.com/
Source0: http://downloads.sourceforge.net/pyparsing/pyparsing-%{version}.tar.gz
BuildArch: noarch
BuildRequires: python-devel
BuildRequires: dos2unix
BuildRequires: glibc-common
BuildRequires: python2-devel
%if 0%{?with_python3}
BuildRequires: python3-devel
%endif # if with_python3
BuildRequires: python3-devel
%endif
%description
pyparsing is a module that can be used to easily and directly configure syntax
definitions for any number of text parsing applications.
%package doc
%package doc
Summary: Documentation for pyparsing
Group: Development/Libraries
%description doc
%description doc
The package contains documentation for pyparsing.
%if 0%{?with_python3}
%package -n python3-pyparsing
%package -n python3-pyparsing
Summary: An object-oriented approach to text processing (Python 3 version)
Group: Development/Libraries
@ -39,51 +38,30 @@ pyparsing is a module that can be used to easily and directly configure syntax
definitions for any number of text parsing applications.
This is the Python 3 version.
%endif # if with_python3
%endif
%prep
%setup -q
mv docs/pyparsingClassDiagram.PNG docs/pyparsingClassDiagram.png
rm docs/pyparsingClassDiagram.JPG
dos2unix -k CHANGES LICENSE README
for f in CHANGES ; do
mv $f $f.iso88591
iconv -f ISO-8859-1 -t UTF-8 -o $f $f.iso88591
touch -r $f.iso88591 $f
rm -f $f.iso88591
done
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
%endif # with_python3
%build
%{__python2} setup.py build
%{py2_build}
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py build
popd
%endif # with_python3
%{py3_build}
%endif
%install
rm -rf %{buildroot}
# Install python 3 first, so that python 2 gets precedence:
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
popd
%endif # with_python3
%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
%clean
rm -rf %{buildroot}
%{py3_install}
%endif
%{py2_install}
%files
%doc CHANGES README LICENSE
%license LICENSE
%doc CHANGES README
%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
%{python_sitelib}/pyparsing*egg-info
%endif
@ -91,18 +69,22 @@ rm -rf %{buildroot}
%if 0%{?with_python3}
%files -n python3-pyparsing
%license LICENSE
%doc CHANGES README LICENSE
%{python3_sitelib}/pyparsing*egg-info
%{python3_sitelib}/pyparsing.py*
%endif # with_python3
%if 0%{?with_python3}
%{python3_sitelib}/__pycache__/pyparsing*
%endif # pycache
%endif
%files doc
%doc CHANGES README LICENSE HowToUsePyparsing.html docs examples htmldoc
%license LICENSE
%doc CHANGES README HowToUsePyparsing.html docs examples htmldoc
%changelog
* Tue Nov 17 2015 Terje Rosten <terje.rosten@ntnu.no> - 2.0.6-1
- 2.0.6
- Some clean up
* Wed Sep 23 2015 Robert Kuska <rkuska@redhat.com> - 2.0.3-3
- Rebuilt for Python3.5 rebuild

View File

@ -1 +1 @@
0fe479be09fc2cf005f753d3acc35939 pyparsing-2.0.3.tar.gz
a2d85979e33a6600148c6383d3d8de67 pyparsing-2.0.6.tar.gz