From 3a8ea6688e8f87e22e48b574425c1ebe0957534cd000317b724c1dee44250bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 5 May 2014 07:54:22 +0000 Subject: [PATCH] - Cleanup with spec-cleaner. - Do not provide static package. Nothing should staticaly link here anyway. With this also remove libtool archive. - Explicitely disable rpath and name all switches. - Autoreconf the sources after the patching. Also makes aarch64 happy this way. - Paralelize the check phase, no need to run it in just one thread. - Added patches: * hunspell-1.3.2-static-lib.patch OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hunspell?expand=0&rev=35 --- hunspell-1.3.2-static-lib.patch | 9 ++++++++ hunspell.changes | 14 +++++++++++ hunspell.spec | 41 +++++++++++++-------------------- 3 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 hunspell-1.3.2-static-lib.patch diff --git a/hunspell-1.3.2-static-lib.patch b/hunspell-1.3.2-static-lib.patch new file mode 100644 index 0000000..5bf9de7 --- /dev/null +++ b/hunspell-1.3.2-static-lib.patch @@ -0,0 +1,9 @@ +diff -urN hunspell-1.3.2.old/src/parsers/Makefile.am hunspell-1.3.2/src/parsers/Makefile.am +--- hunspell-1.3.2.old/src/parsers/Makefile.am 2011-09-15 11:50:40.251441126 +0200 ++++ hunspell-1.3.2/src/parsers/Makefile.am 2011-09-17 06:06:50.469615528 +0200 +@@ -1,4 +1,4 @@ +-lib_LIBRARIES=libparsers.a ++noinst_LIBRARIES=libparsers.a + libparsers_a_SOURCES=firstparser.cxx htmlparser.cxx \ + latexparser.cxx manparser.cxx \ + textparser.cxx diff --git a/hunspell.changes b/hunspell.changes index e4f9819..b6f445a 100644 --- a/hunspell.changes +++ b/hunspell.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon May 5 07:43:37 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner. +- Do not provide static package. Nothing should staticaly link here + anyway. With this also remove libtool archive. +- Explicitely disable rpath and name all switches. +- Autoreconf the sources after the patching. Also makes aarch64 + happy this way. +- Paralelize the check phase, no need to run it in just one thread. + +- Added patches: + * hunspell-1.3.2-static-lib.patch + ------------------------------------------------------------------- Fri Feb 21 20:50:48 UTC 2014 - schwab@linux-m68k.org diff --git a/hunspell.spec b/hunspell.spec index 5b08e39..03d6a8c 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -1,7 +1,7 @@ # # spec file for package hunspell # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,19 @@ # -Summary: Hunspell - a spell checker and morphological analyzer library +%define ver 1.3 +Name: hunspell +Version: 1.3.2 +Release: 0 +Summary: A spell checker and morphological analyzer library License: (GPL-2.0+ or LGPL-2.1+ or MPL-1.1+) and LGPL-2.1+ Group: System/Libraries - -Name: hunspell -%define ver 1.3 -Version: %{ver}.2 -Release: 0 Url: http://hunspell.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/%{name}/Hunspell/%{version}/%{name}-%{version}.tar.gz Source1: baselibs.conf Patch0: hashmgr-add-word.patch -BuildRequires: autoconf >= 2.59 +Patch1: hunspell-1.3.2-static-lib.patch +BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libstdc++-devel @@ -64,33 +64,31 @@ Requires: pkgconfig %description devel Includes and definitions for developing with hunspell. -%package static -Summary: Static hunspell library -Group: Development/Libraries/Other -Requires: %{name}-devel = %{version} - -%description static -Static hunspell library. - %prep %setup -q %patch0 -p1 +%patch1 -p1 %build +autoreconf -vi %configure \ + --enable-nls \ + --disable-static \ + --disable-rpath \ --with-ui \ --with-readline make %{?_smp_mflags} %install -%makeinstall +%make_install +find %{buildroot} -type f -name "*.la" -delete -print rm -f %{buildroot}%{_bindir}/example install -m 644 src/tools/{,un}munch.h %{buildroot}%{_includedir} ln -sf %{_libdir}/libhunspell-%{ver}.so.0.0.0 %{buildroot}%{_libdir}/libhunspell.so %find_lang %{name} %check -make check +make check %{?_smp_mflags} %post -p /sbin/ldconfig @@ -130,16 +128,9 @@ make check %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libhunspell*.so -%{_libdir}/libhunspell-*.la -%{_libdir}/libparsers.a %{_includedir}/%{name} %{_includedir}/munch.h %{_includedir}/unmunch.h -#%{_pkgconfigdir}/hunspell.pc %{_libdir}/pkgconfig/hunspell.pc -%files static -%defattr(644,root,root,755) -%{_libdir}/libhunspell-*.a - %changelog