[packages/python-hunspell] - updated to 0.4.1 - lib_fix patch replaced by sed call getting ABI version from pkg-config
qboosh
qboosh at pld-linux.org
Mon May 16 20:37:25 CEST 2016
commit 59c75a236f956c1ed533eef917f888461669deb6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon May 16 20:37:35 2016 +0200
- updated to 0.4.1
- lib_fix patch replaced by sed call getting ABI version from pkg-config
python-hunspell-lib_fix.patch | 11 -----------
python-hunspell.spec | 28 +++++++++++++---------------
2 files changed, 13 insertions(+), 26 deletions(-)
---
diff --git a/python-hunspell.spec b/python-hunspell.spec
index ce094f9..5658073 100644
--- a/python-hunspell.spec
+++ b/python-hunspell.spec
@@ -7,24 +7,24 @@
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.2
-Release: 4
-License: LGPL v3+
+Version: 0.4.1
+Release: 1
+License: GPL v3+
Group: Libraries/Python
+#Source0Download: https://pypi.python.org/simple/hunspell/
Source0: https://pypi.python.org/packages/source/h/hunspell/hunspell-%{version}.tar.gz
-# Source0-md5: 39373430a1541618aea67d99d31d0ac8
-Patch0: %{name}-lib_fix.patch
+# Source0-md5: d8b69c71a1e4d9a74c00972f76ea06bc
URL: http://github.com/blatinier/pyhunspell
BuildRequires: hunspell-devel >= 1.3
+BuildRequires: pkgconfig
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.710
+BuildRequires: rpmbuild(macros) >= 1.714
+BuildRequires: sed >= 4.0
%if %{with python2}
BuildRequires: python-devel >= 2
-BuildRequires: python-distribute
%endif
%if %{with python3}
BuildRequires: python3-devel >= 1:3.2
-BuildRequires: python3-distribute
BuildRequires: python3-modules >= 1:3.2
%endif
Requires: python-modules >= 2
@@ -61,17 +61,17 @@ do podstawowywch metod analizy morfologicznej.
%prep
%setup -q -n %{module}-%{version}
-%patch0 -p1
+
+hunspell_abi="$(pkg-config --modversion hunspell | cut -d. -f1-2)"
+%{__sed} -i -e "/libraries/s/'hunspell'/'hunspell-${hunspell_abi}'/" setup.py
%build
%if %{with python2}
-%py_build \
- --build-base build-2
+%py_build
%endif
%if %{with python3}
-%py3_build \
- --build-base build-3
+%py3_build
%endif
%install
@@ -93,7 +93,6 @@ rm -rf $RPM_BUILD_ROOT
%if %{with python2}
%files
%defattr(644,root,root,755)
-%doc README
%attr(755,root,root) %{py_sitedir}/hunspell.so
%if "%{py_ver}" > "2.4"
%{py_sitedir}/hunspell-%{version}-py*.egg-info
@@ -103,7 +102,6 @@ rm -rf $RPM_BUILD_ROOT
%if %{with python3}
%files -n python3-%{module}
%defattr(644,root,root,755)
-%doc README
%attr(755,root,root) %{py3_sitedir}/hunspell.cpython-*.so
%{py3_sitedir}/hunspell-%{version}-py*.egg-info
%endif
diff --git a/python-hunspell-lib_fix.patch b/python-hunspell-lib_fix.patch
deleted file mode 100644
index 474c73c..0000000
--- a/python-hunspell-lib_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.py.lib_fix 2014-09-16 15:13:45.772469560 +0200
-+++ ./setup.py 2014-09-16 15:15:05.352623879 +0200
-@@ -22,7 +22,7 @@ from distutils.core import setup, Extens
-
- main = Extension('hunspell',
- define_macros=[('_LINUX', None)],
-- libraries=['hunspell'],
-+ libraries=['hunspell-1.3'],
- include_dirs=['/usr/include/hunspell'],
- sources=['hunspell.c'],
- extra_compile_args=['-Wall'])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-hunspell.git/commitdiff/59c75a236f956c1ed533eef917f888461669deb6
More information about the pld-cvs-commit
mailing list