- cleanup

diff --git a/python-hunspell.spec b/python-hunspell.spec
index 335288c6bf57c364fe72c19a65384cfa998b12ab..de8a67ed5a887328a18271f1224ea11f04401cd3 100644 (file)
--- a/python-hunspell.spec
+++ b/python-hunspell.spec
@@ -1,20 +1,16 @@
 #
 # Conditional build:
-%bcond_with    doc             # don't build doc
-%bcond_with    tests   # do not perform "make test"
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
 %define        module  hunspell
-Summary:       Pyhunspell is a set of Python bindings for the Hunspell spellchecker engine
-Summary(pl.UTF-8):     Moduł interfejsu do słownika Hunspell
-# Name must match the python module/package name (as in 'import' statement)
+Summary:       Pyhunspell - Python 2.x bindings for the Hunspell spellchecker engine
+Summary(pl.UTF-8):     Pyhunspell - wiązania Pythona 2.x do silnika sprawdzania pisowni Hunspell
 Name:          python-%{module}
 Version:       0.3.1
 Release:       1
-License:       GPL
+License:       LGPL v3+
 Group:         Libraries/Python
-# https://pypi.python.org/packages/source/h/hunspell/hunspell-0.2.1.tar.gz#md5=a228fbbedad209fb7691abe6d46add53
 Source0:       https://pypi.python.org/packages/source/h/hunspell/hunspell-%{version}.tar.gz
 # Source0-md5: 85d57a3bc056e3b302141c37378bfdf1
 Patch0:                %{name}-lib_fix.patch
@@ -23,32 +19,34 @@ BuildRequires:      hunspell-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
 %if %{with python2}
-BuildRequires: python-devel
+BuildRequires: python-devel >= 2
 BuildRequires: python-distribute
 %endif
 %if %{with python3}
-BuildRequires: python3-devel
+BuildRequires: python3-devel >= 1:3.2
 BuildRequires: python3-distribute
-BuildRequires: python3-modules
+BuildRequires: python3-modules >= 1:3.2
 %endif
-Requires:      python-modules
+Requires:      python-modules >= 2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Pyhunspell is a set of Python bindings for the Hunspell spellchecker
 engine. It lets developers load Hunspell dictionaries, check words,
 get suggestions, add new words, etc. It also provides some basic
-morphological analysis related methods
+morphological analysis related methods.
 
 %description -l pl.UTF-8
-Moduł interfejsu do słownika Hunspell. Pozwala załadować słowniki,
-sprawdzać pisownie, uzyskać sugestie, dodawać słowa itp. Daje dostęp
-do podstawowywch metod analizy morfologicznej.
+Pyhunspell to zbiór wiązań Pythona do silnika sprawdzania pisowni
+Hunspell. Pozwala załadować słowniki, sprawdzać pisownię słów, uzyskać
+sugestie, dodawać nowe słowa itp. Daje dostęp do podstawowywch metod
+analizy morfologicznej.
 
 %package -n python3-%{module}
-Summary:       Pyhunspell is a set of Python bindings for the Hunspell spellchecker engine
-Summary(pl.UTF-8):     Moduł interfejsu do słownika Hunspell
+Summary:       Pyhunspell - Python 3.x bindings for the Hunspell spellchecker engine
+Summary(pl.UTF-8):     Pyhunspell - wiązania Pythona 3.x do silnika sprawdzania pisowni Hunspell
 Group:         Libraries/Python
+Requires:      python3-modules >= 1:3.2
 
 %description -n python3-%{module}
 Pyhunspell is a set of Python bindings for the Hunspell spellchecker
@@ -61,44 +59,25 @@ Moduł interfejsu do słownika Hunspell. Pozwala załadować słowniki,
 sprawdzać pisownie, uzyskać sugestie, dodawać słowa itp. Daje dostęp
 do podstawowywch metod analizy morfologicznej.
 
-%package apidocs
-Summary:       %{module} API documentation
-Summary(pl.UTF-8):     Dokumentacja API %{module}
-Group:         Documentation
-
-%description apidocs
-API documentation for %{module}.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API %{module}.
-
 %prep
 %setup -q -n %{module}-%{version}
 %patch0 -p1
-# fix #!%{_bindir}/env python -> #!%{__python}:
-#%{__sed} -i -e '1s,^#!.*python,#!%{__python},' %{name}.py
 
 %build
 %if %{with python2}
-# CC/CFLAGS is only for arch packages - remove on noarch packages
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags}" \
-%{__python} setup.py build --build-base build-2 %{?with_tests:test}
+%{__python} setup.py build \
+       --build-base build-2
 %endif
 
 %if %{with python3}
-# CC/CFLAGS is only for arch packages - remove on noarch packages
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags}" \
-%{__python3} setup.py build --build-base build-3 %{?with_tests:test}
+%{__python3} setup.py build \
+       --build-base build-3
 %endif
 
-# %if %{with doc}
-# cd docs
-# %{__make} -j1 html
-# rm -rf _build/html/_sources
-# %endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -120,25 +99,6 @@ rm -rf $RPM_BUILD_ROOT
        --root=$RPM_BUILD_ROOT
 %endif
 
-# in case there are examples provided
-#%if %{with python2}
-#install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-#cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-#%endif
-#%if %{with python3}
-#install -d $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version}
-#cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version}
-#find $RPM_BUILD_ROOT%{_examplesdir}/python3-%{module}-%{version} -name '*.py' \
-#      | xargs sed -i '1s|^#!.*python\b|#!%{__python3}|'
-#%endif
-
-# when files are installed in other way that standard 'setup.py
-# they need to be (re-)compiled
-## change %{py_sitedir} to %{py_sitescriptdir} for 'noarch' packages!
-#%%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-#%%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-#%%py_postclean
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -146,24 +106,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{py_sitedir}/*.so
+%attr(755,root,root) %{py_sitedir}/hunspell.so
 %if "%{py_ver}" > "2.4"
-%{py_sitedir}/%{module}-*.egg-info
+%{py_sitedir}/hunspell-%{version}-py*.egg-info
 %endif
-# %{_examplesdir}/%{name}-%{version}
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-#%%doc AUTHORS CHANGES LICENSE
-%attr(755,root,root) %{py3_sitedir}/*.so
-%{py3_sitedir}/%{module}-%{version}-py*.egg-info
-# %{_examplesdir}/python3-%{module}-%{version}
-%endif
-
-%if %{with doc}
-%files apidocs
-%defattr(644,root,root,755)
-# %doc docs/_build/html/*
+%doc README
+%attr(755,root,root) %{py3_sitedir}/hunspell.cpython-*.so
+%{py3_sitedir}/hunspell-%{version}-py*.egg-info
 %endif