rpms/qdbm/F-7 qdbm.spec,1.4,1.5

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/qdbm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9443/qdbm/F-7

Modified Files:
	qdbm.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: qdbm.spec
===================================================================
RCS file: /cvs/extras/rpms/qdbm/F-7/qdbm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qdbm.spec	4 May 2007 07:04:26 -0000	1.4
+++ qdbm.spec	3 Aug 2007 11:21:28 -0000	1.5
@@ -4,8 +4,8 @@
 
 Name:		qdbm
 Version:	1.8.75
-Release:	1%{?dist}.1
-License:	LGPL
+Release:	3%{?dist}.1
+License:	LGPLv2+
 
 URL:		http://qdbm.sourceforge.net/
 Source0:	http://qdbm.sourceforge.net/%{name}-%{version}.tar.gz
@@ -15,7 +15,9 @@
 BuildRequires:	bzip2-devel
 BuildRequires:	gcc-java libgcj-devel
 # ruby-devel requires ruby-libs but not require ruby
-BuildRequires:	ruby ruby-devel
+BuildRequires:	ruby
+BuildRequires:	ruby-devel
+BuildRequires:	ruby(abi) = %{rubyver}
 BuildRequires:	perl(ExtUtils::MakeMaker)
 
 Summary:	Quick Database Manager
@@ -188,6 +190,10 @@
 %{__make} install DESTDIR=$RPM_BUILD_ROOT JAR=%{_bindir}/fastjar
 popd
 
+%{__mkdir_p} $RPM_BUILD_ROOT%{_javadir}
+%{__mv} -f $RPM_BUILD_ROOT%{_libdir}/*.jar \
+	$RPM_BUILD_ROOT%{_javadir}
+
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/qdbm/java/japidoc
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/qdbm/java/*.html
 rmdir $RPM_BUILD_ROOT%{_datadir}/qdbm/java
@@ -297,7 +303,7 @@
 %lang(ja) %doc java/jspex-ja.html
 
 %{_libdir}/libjqdbm.so*
-%{_libdir}/*.jar
+%{_javadir}/*.jar
 
 %files perl
 %defattr(-, root, root, -)
@@ -335,6 +341,12 @@
 
 
 %changelog
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.75-3.dist.1
+- License update
+
+* Thu Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.75-3
+- Fix java directory
+
 * Thu Mar 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.75-1
 - 1.8.75
 - Ruby subpackage description change according to Guildlines