From: Jakub Bogusz Date: Sun, 16 Apr 2017 05:56:24 +0000 (+0200) Subject: - new X-Git-Tag: auto/th/tmispell-0.5.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=58f98017ca347e3c745253f96ee467dc7d245ed6;p=packages%2Ftmispell.git - new - added glibmm patch to use system glibmm (included sources are a bit outdated) --- 58f98017ca347e3c745253f96ee467dc7d245ed6 diff --git a/tmispell-glibmm.patch b/tmispell-glibmm.patch new file mode 100644 index 0000000..b058e0d --- /dev/null +++ b/tmispell-glibmm.patch @@ -0,0 +1,102 @@ +--- tmispell-rel-0.5.0/configure.ac.orig 2009-02-10 17:08:13.000000000 +0100 ++++ tmispell-rel-0.5.0/configure.ac 2017-04-15 23:07:29.326418125 +0200 +@@ -72,6 +72,7 @@ AC_SEARCH_LIBS(initscr, ncurses curses, + Do you have Ncurses installed?])]) + + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0.0) ++PKG_CHECK_MODULES(GLIBMM, glibmm-2.4 >= 2.4.0) + + dnl ## Config file + if test "x${sysconfdir}" = 'x${prefix}/etc'; then +--- tmispell-rel-0.5.0/enchant/voikko_provider.cc.orig 2009-02-10 17:08:13.000000000 +0100 ++++ tmispell-rel-0.5.0/enchant/voikko_provider.cc 2017-04-15 23:15:31.759745946 +0200 +@@ -253,13 +253,13 @@ voikko_provider_dispose (EnchantProvider + ::g_free (me); + } + +-static char * ++static const char * + voikko_provider_identify (EnchantProvider * me) + { + return "voikko"; + } + +-static char * ++static const char * + voikko_provider_describe (EnchantProvider * me) + { + return "Voikko Provider"; +--- tmispell-rel-0.5.0/src/Makefile.am.orig 2009-02-10 17:08:13.000000000 +0100 ++++ tmispell-rel-0.5.0/src/Makefile.am 2017-04-15 23:06:57.813085150 +0200 +@@ -1,15 +1,9 @@ +-INCLUDES=$(GLIB_CFLAGS) -Iglibmm +- +-USTRING_SOURCES = glibmm/convert.h glibmm/error.h glibmm/exception.h glibmm/unicode.h \ +- glibmm/ustring.h glibmm/utility.h glibmm/convert.cc glibmm/error.cc \ +- glibmm/exception.cc glibmm/glibmmconfig.h glibmm/unicode.cc glibmm/ustring.cc \ +- glibmm/private/convert_p.h glibmm/private/unicode_p.h +- ++INCLUDES=$(GLIB_CFLAGS) $(GLIBMM_CFLAGS) + + MAINTAINERCLEANFILES = Makefile.in .deps config.hh config.hh.in stamp-h.in + + bin_PROGRAMS = tmispell +-tmispell_LDADD = @INTLLIBS@ $(GLIB_LIBS) ++tmispell_LDADD = @INTLLIBS@ $(GLIBMM_LIBS) $(GLIB_LIBS) + tmispell_SOURCES = \ + charset.hh \ + charset.cc \ +@@ -41,8 +35,7 @@ tmispell_SOURCES = \ + tmispell.hh \ + spell.cc \ + spell.hh \ +- voikko.hxx \ +- $(USTRING_SOURCES) ++ voikko.hxx + + #### Debug + #### +--- tmispell-rel-0.5.0/src/options.cc.orig 2009-02-10 17:08:13.000000000 +0100 ++++ tmispell-rel-0.5.0/src/options.cc 2017-04-15 23:10:35.616415996 +0200 +@@ -21,6 +21,7 @@ + * + * Parse command line options and assume sensible defaults. + */ ++#include + #include + #include + #include +--- tmispell-rel-0.5.0/enchant/Makefile.am.orig 2009-02-10 17:08:13.000000000 +0100 ++++ tmispell-rel-0.5.0/enchant/Makefile.am 2017-04-16 07:26:51.886076004 +0200 +@@ -2,19 +2,11 @@ + + target_lib = libenchant_voikko.la + +-INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) ++INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(GLIBMM_CFLAGS) + + voikko_LTLIBRARIES = $(target_lib) + voikkodir = $(libdir)/enchant + +-USTRING_SOURCES = \ +- $(top_srcdir)/src/glibmm/convert.cc \ +- $(top_srcdir)/src/glibmm/exception.cc \ +- $(top_srcdir)/src/glibmm/error.cc \ +- $(top_srcdir)/src/glibmm/unicode.cc \ +- $(top_srcdir)/src/glibmm/ustring.cc \ +- $(top_srcdir)/src/glibmm/utility.cc +- + TMISPELL_SOURCES = \ + $(top_srcdir)/src/charset.cc \ + $(top_srcdir)/src/charset.hh \ +@@ -31,8 +23,8 @@ + $(top_srcdir)/src/tmerror.cc \ + $(top_srcdir)/src/tmerror.hh + +-libenchant_voikko_la_LIBADD= $(ENCHANT_LIBS) $(ENCHANT_LIBS) ++libenchant_voikko_la_LIBADD= $(ENCHANT_LIBS) $(GLIBMM_LIBS) + libenchant_voikko_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined + libenchant_voikko_la_SOURCES = \ +- voikko_provider.cc $(TMISPELL_SOURCES) $(USTRING_SOURCES) ++ voikko_provider.cc $(TMISPELL_SOURCES) + libenchant_voikko_lalibdir=$(libdir)/enchant diff --git a/tmispell.spec b/tmispell.spec new file mode 100644 index 0000000..026f973 --- /dev/null +++ b/tmispell.spec @@ -0,0 +1,83 @@ +Summary: Ispell compatible front-end for spell-checking modules +Summary(pl.UTF-8): Zgodny z Ispellem frontend dla modułów sprawdzających pisownię +Name: tmispell +Version: 0.5.0 +Release: 1 +License: GPL v2+ +Group: Applications/Text +#Source0Download: https://github.com/voikko/tmispell/releases +Source0: https://github.com/voikko/tmispell/archive/rel-0.5.0/%{name}-%{version}.tar.gz +# Source0-md5: d7f745f3618c2f480faa36fd4fb0fe72 +Patch0: %{name}-glibmm.patch +URL: http://voikko.puimula.org/ +BuildRequires: autoconf >= 2.52 +BuildRequires: automake +BuildRequires: enchant-devel >= 1.1.6 +BuildRequires: gettext-tools +BuildRequires: glib2-devel >= 2.0.0 +BuildRequires: glibmm-devel >= 2.4.0 +BuildRequires: libstdc++-devel >= 6:4.3 +BuildRequires: libtool >= 2:1.5 +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Tmispell is a transparent wrapper around Ispell. Many programs (e.g. +mail clients and document processors) use Ispell for spell-checking. +Since Tmispell imitates Ispell, these programs use automatically +Tmispell (and therefore e.g. Voikko) without any changes needed. +Additionally Tmispell can launch the real Ispell if there is no module +for the selected language. + +%description -l pl.UTF-8 +Tmispell to przezroczysty wrapper na Ispella. Wiele programów (np. +klientów pocztowych czy procesorów tekstu) wykorzystuje Ispella do +sprawdzania pisowni. Ponieważ Tmispell imituje Ispella, programy te +automatycznie używają Tmispella (i poprzez niego np. Voikko) bez +potrzeby żadnych zmian. Ponadto Tmispell potrafi uruchomić prawdziwego +Ispella, jeśli nie ma modułu dla wybranego języka. + +%prep +%setup -q -n tmispell-rel-%{version} +%patch0 -p1 + +# force system glibmm +%{__rm} -r src/glibmm + +# missing file +grep -l -e '\<_\>' src/*.cc enchant/*.cc > po/POTFILES.in + +%build +%{__glib_gettextize} +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +CXXFLAGS="%{rpmcxxflags} -std=c++0x" +%configure \ + --disable-static +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +# voikko module already included in enchant sources +%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/enchant + +%find_lang tmispell-voikko + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f tmispell-voikko.lang +%defattr(644,root,root,755) +%doc AUTHORS ChangeLog NEWS README +%lang(fi) %doc LUEMINUT NEWS.fi +%attr(755,root,root) %{_bindir}/tmispell +%{_mandir}/man1/tmispell.1* +%{_mandir}/man5/tmispell.conf.5*