rpms/hyperestraier/devel hyperestraier.spec,1.5,1.6

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/hyperestraier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3422

Modified Files:
	hyperestraier.spec 
Log Message:
* Thu Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.10-2
- Fix java directory



Index: hyperestraier.spec
===================================================================
RCS file: /cvs/extras/rpms/hyperestraier/devel/hyperestraier.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hyperestraier.spec	4 May 2007 08:24:04 -0000	1.5
+++ hyperestraier.spec	14 Jun 2007 08:56:04 -0000	1.6
@@ -1,10 +1,10 @@
-%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}.2
+Release:	2%{?dist}
 Summary:	A full-text search system
 
 Group:		System Environment/Libraries
@@ -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,9 @@
 
 
 %changelog
+* 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