[packages/enchant] - updated to 1.6.1 - added sh patch

qboosh qboosh at pld-linux.org
Mon Dec 24 09:23:21 CET 2018


commit 6cb82942ac5b200dc6f380900a9d14c9ee44f781
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Dec 24 09:28:00 2018 +0100

    - updated to 1.6.1
    - added sh patch

 enchant-sh.patch | 24 ++++++++++++++++++++++++
 enchant.spec     | 25 ++++++++++++++++---------
 2 files changed, 40 insertions(+), 9 deletions(-)
---
diff --git a/enchant.spec b/enchant.spec
index 8033548..742a054 100644
--- a/enchant.spec
+++ b/enchant.spec
@@ -6,21 +6,27 @@ Summary:	libenchant - generic spell checking library
 Summary(pl.UTF-8):	libenchant - ogólna biblioteka sprawdzania pisowni
 Name:		enchant
 # version 2.x packaged as enchant2
-Version:	1.6.0
-Release:	7
+Version:	1.6.1
+Release:	1
 License:	LGPL v2
 Group:		Libraries
-Source0:	http://www.abisource.com/downloads/enchant/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	de11011aff801dc61042828041fb59c7
+# versions up to 1.6.0
+#Source0:	http://www.abisource.com/downloads/enchant/%{version}/%{name}-%{version}.tar.gz
+# 1.6.x > 1.6.0 (for 2.x see enchant2.spec)
+#Source0Download: https://github.com/AbiWord/enchant/releases
+Source0:	https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/%{name}-%{version}.tar.gz
+# Source0-md5:	4110afe7d7010acbb5c69dd1214fa936
 Patch0:		hunspell-1.4.patch
-URL:		http://www.abisource.com/enchant/
+Patch1:		%{name}-sh.patch
+URL:		https://www.abisource.com/projects/enchant/
 BuildRequires:	aspell-devel >= 2:0.50.0
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.62
 BuildRequires:	glib2-devel >= 1:2.12.0
 BuildRequires:	hspell-devel >= 0.9-3
-BuildRequires:	libtool
+BuildRequires:	hunspell-devel
+BuildRequires:	libtool >= 2:2
 BuildRequires:	libvoikko-devel
 BuildRequires:	pkgconfig
 BuildRequires:	uspell-devel >= 1.1.0
@@ -191,10 +197,11 @@ Moduł obsługujący backend zemberek (turecki) dla Enchanta.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal} -I ac-helpers
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 export CFLAGS="%{rpmcflags} -fpermissive"
@@ -226,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS NEWS README TODO
+%doc AUTHORS MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/enchant
 %attr(755,root,root) %{_bindir}/enchant-lsmod
 %attr(755,root,root) %{_libdir}/libenchant.so.*.*.*
diff --git a/enchant-sh.patch b/enchant-sh.patch
new file mode 100644
index 0000000..7407d10
--- /dev/null
+++ b/enchant-sh.patch
@@ -0,0 +1,24 @@
+--- enchant-1.6.1/configure.ac.orig	2017-04-04 23:13:57.000000000 +0200
++++ enchant-1.6.1/configure.ac	2018-12-23 12:14:42.036264559 +0100
+@@ -386,7 +386,7 @@
+          ,)
+        AC_CHECK_LIB(aspell,get_aspell_dict_info_list,ASPELL_CFLAGS="-DASPELL_0_50_0=1",)
+ 
+-       ASPELL_CFLAGS+=" -DHAVE_PSPELL_H"
++       ASPELL_CFLAGS="$ASPELL_CFLAGS -DHAVE_PSPELL_H"
+    elif test -f "$aspell_prefix/include/aspell.h"; then
+        AC_MSG_RESULT([yes (aspell)])
+ 
+@@ -511,9 +511,9 @@
+     AC_ARG_ENABLE(applespell, AS_HELP_STRING([--disable-applespell],[enable the applespell backend @<:@default=no@:>@]), build_applespell="$enableval", build_applespell=no)
+ 
+     if test "x$build_applespell" != "xno"; then
+-        APPLESPELL_CFLAGS+=" -DXP_TARGET_COCOA -xobjective-c"
+-        APPLESPELL_LIBS+=" -lobjc"
+-        APPLESPELL_LDFLAGS+=" -framework Cocoa"
++        APPLESPELL_CFLAGS="$APPLESPELL_CFLAGS -DXP_TARGET_COCOA -xobjective-c"
++        APPLESPELL_LIBS="$APPLESPELL_LIBS -lobjc"
++        APPLESPELL_LDFLAGS="$APPLESPELL_LDFLAGS -framework Cocoa"
+     fi
+ 
+ fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/enchant.git/commitdiff/6cb82942ac5b200dc6f380900a9d14c9ee44f781



More information about the pld-cvs-commit mailing list