Rebase for aspell 0.60.8

Change-Id: I4800e6acb939f1a903e3ea554932c104bae28d3c
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index b9be4ce..d59781d 100644 (file)
--- a/Makefile.am
+++ b/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\
@@ -209,7 +211,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

diff --git a/lib5/Makefile.am b/lib5/Makefile.am
index c17d1cf..db6d20f 100644 (file)
--- a/lib5/Makefile.am
+++ b/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/modules/speller/default/writable.cpp b/modules/speller/default/writable.cpp
index 63172a4..7dc8448 100644 (file)
--- a/modules/speller/default/writable.cpp
+++ b/modules/speller/default/writable.cpp
@@ -298,7 +298,7 @@ static inline void set_sl(WordEntry & res, Str w)
 
 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;
@@ -741,7 +741,7 @@ WritableReplDict::Enum * WritableReplDict::detailed_elements() const {
 
 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;

diff --git a/packaging/aspell.changes b/packaging/aspell.changes
new file mode 100644 (file)
index 0000000..4f8e6f9
--- /dev/null
+++ b/packaging/aspell.changes
@@ -0,0 +1,3 @@
+* Thu Feb 21 2013 Anas Nashif <anas.nashif@intel.com> upstream/0.60.6.1@84637c6
+- Initial Packaging
+

diff --git a/packaging/aspell.manifest b/packaging/aspell.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
+++ b/packaging/aspell.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>

diff --git a/packaging/aspell.spec b/packaging/aspell.spec
new file mode 100644 (file)
index 0000000..1ac7100
--- /dev/null
+++ b/packaging/aspell.spec
@@ -0,0 +1,170 @@
+# 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
+Release:        0
+License:        LGPL-2.1+
+Summary:        A Free and Open Source Spell Checker
+Url:            http://aspell.net/
+Group:          System/Libraries
+Source0:        ftp://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
+Source1001:    aspell.manifest
+BuildRequires:  fdupes
+BuildRequires:  gcc-c++
+BuildRequires:  gettext-tools
+BuildRequires:  libtool
+BuildRequires:  ncurses-devel
+
+%description
+GNU Aspell is a spell checker designed to eventually replace Ispell. It
+can be used as a library or as an independent spell checker.
+
+Its main feature is that it does a much better job of coming up with
+possible suggestions than just about any other spell checker available
+for the English language, including Ispell and Microsoft Word. It also
+has many other technical enhancements over Ispell, such as using shared
+memory for dictionaries and intelligently handling personal
+dictionaries when more than one Aspell process is open at once.
+
+%package devel
+Summary:        Include Files and Libraries Mandatory for Development with aspell
+Group:          Development/Libraries
+Requires:       glibc-devel
+Requires:       libaspell = %{version}
+Requires:       libpspell = %{version}
+
+%description devel
+This package contains all necessary include files and libraries needed
+to develop applications that require aspell.
+
+%package ispell
+Summary:        GNU Aspell - Ispell compatibility
+Group:          System/Tools
+Requires:       %{name} = %{version}
+
+%description ispell
+GNU Aspell is a spell checker designed to eventually replace Ispell. It
+can be used as a library or as an independent spell checker.
+
+This package contains an ispell script for compatibility reasons so that
+programs that expect the "ispell" command will work correctly.
+
+%package spell
+Summary:        GNU Aspell - Spell compatibility
+Group:          System/Tools
+Requires:       %{name} = %{version}
+
+%description spell
+GNU Aspell is a spell checker designed to eventually replace Ispell. It
+can be used as a library or as an independent spell checker.
+
+This package contains a spell script for compatibility reasons so that programs
+that expect the "spell" command will work correctly.
+
+%package -n libaspell
+Summary:        GNU Aspell Library
+Group:          System/Libraries
+
+%description -n libaspell
+GNU Aspell is a spell checker designed to eventually replace Ispell. It
+can be used as a library or as an independent spell checker.
+
+This package contains the aspell library.
+
+%package -n libpspell
+Summary:        GNU Aspell - Pspell Compatibility Library
+Group:          System/Libraries
+
+%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.
+
+This package contains the pspell compatibility library.
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+autoreconf -fiv
+export CXXFLAGS="%{optflags} `ncursesw6-config --cflags`"
+#this is an ugly kludge , don't look :-)
+export LDFLAGS="`ncursesw6-config --libs`"
+%configure \
+    --enable-curses="-lncursesw" \
+ --disable-rpath
+
+make %{?_smp_mflags}
+
+%install
+%make_install
+# 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}
+%fdupes -s %{buildroot}
+
+%find_lang %{name}
+
+
+%docs_package
+
+%post -n libaspell -p /sbin/ldconfig
+
+%postun -n libaspell -p /sbin/ldconfig
+
+%post -n libpspell -p /sbin/ldconfig
+
+%postun -n libpspell -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license COPYING 
+%{_bindir}/aspell
+%{_bindir}/aspell-import
+%{_bindir}/pre*
+%{_bindir}/run-with-aspell
+%{_bindir}/word-list-compress
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%doc manual/aspell-dev.html/
+%{_bindir}/pspell-config
+%{_includedir}/pspell/
+%{_includedir}/*.h
+%{_libdir}/libaspell.so
+%{_libdir}/libpspell.so
+%doc %{_infodir}/%{name}-dev.info%{ext_info}
+%doc %{_mandir}/man1/pspell-config.1%{ext_man}
+
+%files ispell
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_bindir}/ispell
+
+%files spell
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_bindir}/spell
+
+%files -n libaspell
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/aspell-0.60/
+%{_libdir}/libaspell.so.15*
+
+%files -n libpspell
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libpspell.so.15*

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
new file mode 100644 (file)
index 0000000..2f491ff
--- /dev/null
+++ b/packaging/baselibs.conf
@@ -0,0 +1,2 @@
+libaspell
+libpspell

diff --git a/scripts/run-with-aspell.create b/scripts/run-with-aspell.create
index 42c400d..e9e3af5 100644 (file)
--- a/scripts/run-with-aspell.create
+++ b/scripts/run-with-aspell.create
@@ -3,5 +3,5 @@
 echo "#!/bin/sh"
 echo "PATH=$1:\$PATH"
 echo "export PATH"
-echo "exec \$@"
+echo "exec \"\$@\""