[packages/mecab] - new URLs, updated to 0.994 - added libexec patch - removed obsolete segv,libdir patches - ipadic m

[qboosh]

commit 649f42fa523aecbb72a84fd8c8a2139a1407c3f7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 24 09:50:08 2012 +0100

    - new URLs, updated to 0.994
    - added libexec patch
    - removed obsolete segv,libdir patches
    - ipadic moved to separate spec (mecab-ipadic)

 mecab-libdir.patch  | 12 ------------
 mecab-libexec.patch | 11 +++++++++++
 mecab-segv.patch    | 11 -----------
 mecab.spec          | 47 ++++++++++++++++++++++++-----------------------
 4 files changed, 35 insertions(+), 46 deletions(-)
---
diff --git a/mecab.spec b/mecab.spec
index 30ce705..36f5ae5 100644
--- a/mecab.spec
+++ b/mecab.spec
@@ -1,20 +1,16 @@
-# TODO: should dictionary (over 60MB) be separated to subpackage or not?
-%define	ipadicversion	2.7.0
 %include	/usr/lib/rpm/macros.perl
 Summary:	Yet Another Part-of-Speech and Morphological Analyzer
 Summary(pl.UTF-8):	Jeszcze jeden analizator części mowy i morfologii
 Name:		mecab
-Version:	0.80
-Release:	2
-License:	LGPL
+Version:	0.994
+Release:	1
+License:	GPL v2 or LGPL v2.1 or BSD
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/mecab/%{name}-%{version}.tar.gz
-# Source0-md5:	d7d49fbbf431ebec233342a1882798b9
-Source1:	http://chasen.aist-nara.ac.jp/stable/ipadic/ipadic-%{ipadicversion}.tar.gz
-# Source1-md5:	f36d315cae25b086a889b7090c674977
-Patch0:		%{name}-segv.patch
-Patch1:		%{name}-libdir.patch
-URL:		http://mecab.sourceforge.net/
+#Source0Download: http://code.google.com/p/mecab/downloads/list
+Source0:	http://mecab.googlecode.com/files/%{name}-%{version}.tar.gz
+# Source0-md5:	990df7701f33e80688233ab01d4104a0
+Patch0:		%{name}-libexec.patch
+URL:		http://code.google.com/p/mecab/
 BuildRequires:	automake
 BuildRequires:	libstdc++-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,10 +50,6 @@ Statyczna biblioteka MeCab.
 %setup -q
 %patch0 -p1
 
-tar xzf %{SOURCE1} -C dic
-
-%patch1 -p1
-
 %build
 cp -f /usr/share/automake/config.sub .
 %configure
@@ -68,6 +60,7 @@ cp -f /usr/share/automake/config.sub .
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}/mecab/dic
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -80,19 +73,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README doc/*.html
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%{_libdir}/mecab
+%doc AUTHORS BSD COPYING README doc/*.html
+%attr(755,root,root) %{_bindir}/mecab
+%attr(755,root,root) %{_libdir}/libmecab.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmecab.so.2
+%dir %{_libdir}/mecab
+%attr(755,root,root) %{_libdir}/mecab/mecab-cost-train
+%attr(755,root,root) %{_libdir}/mecab/mecab-dict-gen
+%attr(755,root,root) %{_libdir}/mecab/mecab-dict-index
+%attr(755,root,root) %{_libdir}/mecab/mecab-system-eval
+%attr(755,root,root) %{_libdir}/mecab/mecab-test-gen
+%dir %{_libdir}/mecab/dic
 %{_mandir}/man1/mecab.1*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mecabrc
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_bindir}/mecab-config
+%attr(755,root,root) %{_libdir}/libmecab.so
+%{_libdir}/libmecab.la
 %{_includedir}/mecab.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libmecab.a
diff --git a/mecab-libdir.patch b/mecab-libdir.patch
deleted file mode 100644
index 80f602a..0000000
--- a/mecab-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -burN mecab-0.79.orig/dic/Makefile.in mecab-0.79/dic/Makefile.in
---- mecab-0.79.orig/dic/Makefile.in	2004-09-12 15:27:11.195109848 +0200
-+++ mecab-0.79/dic/Makefile.in	2004-09-12 15:40:39.378247336 +0200
-@@ -97,7 +97,7 @@
- install_sh = @install_sh@
- sort = @SORT@
- uniq = @UNIQ@
--dicdir = @prefix@/lib/mecab/dic/ipadic
-+dicdir = @libdir@/mecab/dic/ipadic
- charset = @CHARSET@
- dic_DATA = dic.csv connect.csv da.me matrix.me feature.me info.me token.me dicrc
- CLEANFILES = *.me dic.csv connect.csv
diff --git a/mecab-libexec.patch b/mecab-libexec.patch
new file mode 100644
index 0000000..743f0fe
--- /dev/null
+++ b/mecab-libexec.patch
@@ -0,0 +1,11 @@
+--- mecab-0.994/mecab-config.in.orig	2011-10-22 21:21:24.000000000 +0200
++++ mecab-0.994/mecab-config.in	2012-11-21 08:17:30.109770150 +0100
+@@ -107,7 +107,7 @@
+ 	;;
+ 
+     --libexecdir)
+-       	echo @prefix@/libexec/mecab
++       	echo @libdir@/mecab
+        	;;
+ 	
+     --sysconfdir)
diff --git a/mecab-segv.patch b/mecab-segv.patch
deleted file mode 100644
index 4690fa7..0000000
--- a/mecab-segv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mecab-0.76/src/dictionary_maker.cpp.orig	2003-06-29 21:39:30.000000000 +0200
-+++ mecab-0.76/src/dictionary_maker.cpp	2003-10-24 01:00:17.924228480 +0200
-@@ -32,7 +32,7 @@
-   {
-     std::vector <unsigned int> result;
-     getIdList (csv, result);
--    return result [result.size()-1];
-+    return result.size() ? (result [result.size()-1]) : 0;
-   }
- 
-   unsigned int DictionaryMaker::getIdList (Csv &csv, 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mecab.git/commitdiff/649f42fa523aecbb72a84fd8c8a2139a1407c3f7