From: Jakub Bogusz Date: Sat, 17 Nov 2012 15:49:28 +0000 (+0100) Subject: - added no-libiconv patch to avoid using libiconv if found (iconv() is in glibc) X-Git-Tag: auto/th/mana-0.2.1-7~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=308ad1353e0b9d92ff2a1d871b62e9388440cae6;p=packages%2Fmana.git - added no-libiconv patch to avoid using libiconv if found (iconv() is in glibc) --- diff --git a/mana-no-libiconv.patch b/mana-no-libiconv.patch new file mode 100644 index 0000000..934dee1 --- /dev/null +++ b/mana-no-libiconv.patch @@ -0,0 +1,13 @@ +--- mana-0.2.1/configure.in.orig 2006-06-11 20:01:00.000000000 +0200 ++++ mana-0.2.1/configure.in 2012-11-17 16:46:57.579669747 +0100 +@@ -44,8 +44,9 @@ + AC_SUBST(ICONV_CFLAGS) + fi]) + ++AC_CHECK_FUNC(iconv, [], [ + AC_CHECK_LIB(iconv, iconv, [], [ +- AC_CHECK_HEADER(iconv.h, [], AC_MSG_ERROR([ChaSen needs iconv]))]) ++ AC_MSG_ERROR([ChaSen needs iconv])])]) + + AC_DEFUN(cl_VAR_ICONV_ARG, [ + for CODE in $2; do diff --git a/mana.spec b/mana.spec index 48a9aa4..375b7f4 100644 --- a/mana.spec +++ b/mana.spec @@ -7,15 +7,16 @@ Summary(pl.UTF-8): Silnik konwersji kana(romaji)-kanji, wykorzystujący algorytm Name: mana Version: 0.2.1 Release: 6 -License: GPL v2 +License: GPL v2+ Group: Applications/Text Source0: http://dl.sourceforge.jp/shinji/20514/%{name}-%{version}.tar.bz2 # Source0-md5: 3a173e9c6047ed18ae8080cfcd38f3a4 Patch0: %{name}-DESTDIR.patch Patch1: %{name}-change_scheme_dir.patch Patch2: %{name}-chasen.patch +Patch3: %{name}-no-libiconv.patch URL: http://sourceforge.jp/projects/shinji/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.13 BuildRequires: automake BuildRequires: gdbm-devel BuildRequires: glib2-devel @@ -53,6 +54,7 @@ Wsparcie Mana dla UIM-a. %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p1 mv lib/{,mana-}chasen.h @@ -60,6 +62,7 @@ mv lib/{,mana-}chasen.h %{__libtoolize} %{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} %configure %{__make} -j1 @@ -79,8 +82,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README -%attr(755,root,root) %{_bindir}/* +%doc README {AUTHORS,COPYING,NEWS,README}.chasen +%attr(755,root,root) %{_bindir}/mana +%attr(755,root,root) %{_bindir}/mana-config %dir %{_libdir}/mana %attr(755,root,root) %{_libdir}/mana/make*