Add packaging

diff --git a/packaging/aspell-epmty_file.patch b/packaging/aspell-epmty_file.patch
deleted file mode 100644 (file)
index feca110..0000000
--- a/packaging/aspell-epmty_file.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- common/convert.cpp.orig
-+++ common/convert.cpp
-@@ -813,6 +813,7 @@ namespace acommon {
-   {
-     ToUniLookup lookup;
-     void decode(const char * in, int size, FilterCharVector & out) const {
-+      if (size == 0) return; // if size == 0 then while loop cause SIGSEGV
-       const char * stop = in + size; // this is OK even if size == -1
-       while (*in && in != stop) {
-         out.append(from_utf8(in, stop));
---- Makefile.am.orig
-+++ Makefile.am
-@@ -29,8 +29,10 @@ lib_LTLIBRARIES = libaspell.la
- 
- if PSPELL_COMPATIBILITY
- lib_LTLIBRARIES += libpspell.la
-+libpspell_la_CXXFLAGS = -fvisibility-inlines-hidden
- endif
- 
-+libaspell_la_CXXFLAGS = -fvisibility-inlines-hidden
- libaspell_la_SOURCES =\
-   common/cache.cpp\
-   common/string.cpp\
-@@ -194,7 +196,7 @@ libaspell_la_SOURCES +=\
- else # not COMPILE_IN_FILTERS
- 
- dynamic_optfiles += ${optfiles}
--filter_ldflags = -module -avoid-version
-+filter_ldflags = -avoid-version -module -shared -export-dynamic
- 
- ### Add name of filter library containing your filter. Name always
- ### must look like lib<filtername>-filter.la see development manual
---- lib5/Makefile.am.orig
-+++ lib5/Makefile.am
-@@ -1,9 +1,9 @@
--
-+AM_CXXFLAGS = -fvisibility-inlines-hidden
- if INCREMENTED_SONAME
- 
- lib_LTLIBRARIES = libaspell.la
- libaspell_la_SOURCES = aspell-dummy.cpp
--libaspell_la_LDFLAGS = -version-info 16:0:1
-+libaspell_la_LDFLAGS = -no-undefined -version-info 16:0:1
- libaspell_la_LIBADD = ../libaspell.la
- 
- if PSPELL_COMPATIBILITY

diff --git a/packaging/aspell-quotes.patch b/packaging/aspell-quotes.patch
deleted file mode 100644 (file)
index 7c8043b..0000000
--- a/packaging/aspell-quotes.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- scripts/run-with-aspell.create
-+++ scripts/run-with-aspell.create
-@@ -3,5 +3,5 @@
- echo "#!/bin/sh"
- echo "PATH=$1:\$PATH"
- echo "export PATH"
--echo "exec \$@"
-+echo "exec \"\$@\""
- 

diff --git a/packaging/aspell-strict-aliasing.patch b/packaging/aspell-strict-aliasing.patch
deleted file mode 100644 (file)
index ea47998..0000000
--- a/packaging/aspell-strict-aliasing.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- modules/speller/default/writable.cpp
-+++ modules/speller/default/writable.cpp
-@@ -672,7 +672,7 @@
- 
- static void repl_next(WordEntry * w)
- {
--  const Str * & i   = (const Str * &)(w->intr[0]);
-+  const Str * i   = (const Str * )(w->intr[0]);
-   const Str *   end = (const Str *  )(w->intr[1]);
-   set_word(*w, *i);
-   ++i;
---- modules/speller/default/writable.cpp
-+++ modules/speller/default/writable.cpp
-@@ -246,7 +246,7 @@
- 
- static void soundslike_next(WordEntry * w)
- {
--  const Str * & i   = (const Str * &)(w->intr[0]);
-+  const Str * i   = (const Str * )(w->intr[0]);
-   const Str *   end = (const Str *  )(w->intr[1]);
-   set_word(*w, *i);
-   ++i;

diff --git a/packaging/aspell.spec b/packaging/aspell.spec
index dc05658..5cbdb50 100644 (file)
--- a/packaging/aspell.spec
+++ b/packaging/aspell.spec
@@ -1,4 +1,13 @@
+# Copyright (c) 2012 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
 Name:           aspell
 Version:        0.60.6.1
@@ -8,22 +17,11 @@ Summary:        A Free and Open Source Spell Checker
 Url:            http://aspell.net/
 Group:          Productivity/Text/Spell
 Source0:        ftp://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
-Patch0:         aspell-strict-aliasing.patch
-Patch1:         aspell-quotes.patch
-Patch2:         aspell-epmty_file.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gettext-tools
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
-Recommends:     aspell-en
-Suggests:       aspell-ispell
-Suggests:       aspell-spell
-Provides:       pspell = %{version}
-Obsoletes:      pspell < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires(post): info
-Requires(preun): info
 
 %description
 GNU Aspell is a spell checker designed to eventually replace Ispell. It
@@ -41,11 +39,7 @@ Summary:        Include Files and Libraries Mandatory for Development with aspel
 Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
 Requires:       libaspell = %{version}
-Requires:       libpspell15 = %{version}
-Provides:       pspell-devel = %{version}
-Obsoletes:      pspell-devel < %{version}
-Requires(post): info
-Requires(preun): info
+Requires:       libpspell = %{version}
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -55,7 +49,6 @@ to develop applications that require aspell.
 Summary:        GNU Aspell - Ispell compatibility
 Group:          Productivity/Text/Spell
 Requires:       %{name} = %{version}
-Conflicts:      ispell
 
 %description ispell
 GNU Aspell is a spell checker designed to eventually replace Ispell. It
@@ -68,7 +61,6 @@ programs that expect the "ispell" command will work correctly.
 Summary:        GNU Aspell - Spell compatibility
 Group:          Productivity/Text/Spell
 Requires:       %{name} = %{version}
-Provides:       spell
 
 %description spell
 GNU Aspell is a spell checker designed to eventually replace Ispell. It
@@ -87,11 +79,11 @@ can be used as a library or as an independent spell checker.
 
 This package contains the aspell library.
 
-%package -n libpspell15
+%package -n libpspell
 Summary:        GNU Aspell - Pspell Compatibility Library
 Group:          System/Libraries
 
-%description -n libpspell15
+%description -n libpspell
 GNU Aspell is a spell checker designed to eventually replace Ispell. It
 can be used as a library or as an independent spell checker.
 
@@ -99,9 +91,6 @@ This package contains the pspell compatibility library.
 
 %prep
 %setup -q
-%patch0
-%patch1
-%patch2
 
 %build
 autoreconf -fiv
@@ -119,22 +108,12 @@ make %{?_smp_mflags}
 # Links for compatibility reasons (ispell and spell)
 ln -s %{_libdir}/aspell-0.60/ispell %{buildroot}%{_bindir}
 ln -s %{_libdir}/aspell-0.60/spell %{buildroot}%{_bindir}
-find %{buildroot} -name "*.la" -type f -print -delete
 %fdupes -s %{buildroot}
 
 %find_lang %{name}
 
-%post
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
-%preun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
-
-%post devel
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info%{ext_info}
-
-%preun devel
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info%{ext_info}
+%docs_package
 
 %post -n libaspell -p /sbin/ldconfig
 
@@ -143,16 +122,12 @@ find %{buildroot} -name "*.la" -type f -print -delete
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING README TODO
-%doc manual/aspell.html/
+%license COPYING 
 %{_bindir}/aspell
 %{_bindir}/aspell-import
 %{_bindir}/pre*
 %{_bindir}/run-with-aspell
 %{_bindir}/word-list-compress
-%doc %{_infodir}/%{name}.info%{ext_info}
-%doc %{_mandir}/man1/*.1%{ext_man}
-%exclude %{_mandir}/man1/pspell-config.1%{ext_man}
 
 %files devel
 %defattr(-,root,root,-)
@@ -178,6 +153,6 @@ find %{buildroot} -name "*.la" -type f -print -delete
 %{_libdir}/aspell-0.60/
 %{_libdir}/libaspell.so.15*
 
-%files -n libpspell15
+%files -n libpspell
 %defattr(-,root,root,-)
 %{_libdir}/libpspell.so.15*