rpms/hyperestraier/FC-6 hyperestraier.spec,1.2,1.3

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/hyperestraier/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9443/hyperestraier/FC-6

Modified Files:
	hyperestraier.spec 
Log Message:
- Fri Aug 3
  * Mass license update (regarding to GPL/LGPL) + mecab-ipadic
    Tol: 28 packages (out of 39 packages I maintain)

    Well, now I got somewhat tired...



Index: hyperestraier.spec
===================================================================
RCS file: /cvs/extras/rpms/hyperestraier/FC-6/hyperestraier.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hyperestraier.spec	22 Mar 2007 10:52:41 -0000	1.2
+++ hyperestraier.spec	3 Aug 2007 11:20:52 -0000	1.3
@@ -1,14 +1,14 @@
-%define	rubyver	1.8
+%define		rubyver		1.8
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-
+%define		qdbm_ver	1.8.75
 
 Name:		hyperestraier
 Version:	1.4.10
-Release:	1%{?dist}
+Release:	2%{?dist}.1
 Summary:	A full-text search system
 
 Group:		System Environment/Libraries
-License:	LGPL
+License:	LGPLv2+
 URL:		http://hyperestraier.sourceforge.net/
 Source0:	http://hyperestraier.sourceforge.net/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,8 +18,10 @@
 BuildRequires:	lzo-devel >= 2.02
 %endif
 BuildRequires:	gcc-java libgcj-devel
-BuildRequires:	qdbm-devel >= 1.8.75
-BuildRequires:	ruby-rdoc ruby-devel
+BuildRequires:	qdbm-devel >= %{qdbm_ver}
+BuildRequires:	ruby-rdoc
+BuildRequires:	ruby-devel
+BuildRequires:	ruby(abi) = %{rubyver}
 BuildRequires:	perl(ExtUtils::MakeMaker)
 
 %description
@@ -33,7 +35,7 @@
 Summary:	Libraries and Header files for Hyper Estraier
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	qdbm-devel >= 1.8.46
+Requires:	qdbm-devel >= %{qdbm_ver}
 Requires:	pkgconfig
 
 %description devel
@@ -152,6 +154,9 @@
 pushd javanative/
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
 popd
+%{__mkdir_p} $RPM_BUILD_ROOT%{_javadir}
+%{__mv} -f $RPM_BUILD_ROOT%{_libdir}/*.jar \
+	$RPM_BUILD_ROOT%{_javadir}
 
 ## 3. For perl
 pushd perlnative
@@ -213,7 +218,7 @@
 %doc javanative/overview.html
 %doc javanative/example/
 
-%{_libdir}/*.jar
+%{_javadir}/*.jar
 %{_libdir}/libj*.so*
 
 %files perl
@@ -236,6 +241,12 @@
 
 
 %changelog
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.10-2.dist.1
+- License update
+
+* Thu Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.10-2
+- Fix java directory
+
 * Thu Mar 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.10-1
 - 1.4.10
 - Ruby subpackage description change according to Guildlines