SPECS: mysql-connector-j.spec - unify java package; rel 2

[glen]

Author: glen                         Date: Wed Dec 12 22:59:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package; rel 2

---- Files affected:
SPECS:
   mysql-connector-j.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/mysql-connector-j.spec
diff -u SPECS/mysql-connector-j.spec:1.12 SPECS/mysql-connector-j.spec:1.13
--- SPECS/mysql-connector-j.spec:1.12	Tue Oct  9 18:05:32 2007
+++ SPECS/mysql-connector-j.spec	Wed Dec 12 23:59:26 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	MySQL Connector/J - sterownik JDBC dla MySQL-a
 Name:		mysql-connector-j
 Version:	5.0.8
-Release:	1
+Release:	2
 License:	GPL v2+ + MySQL FLOSS Exception
 Group:		Libraries
 Source0:	http://mysql.tonnikala.org/Downloads/Connector-J/%{name}ava-%{version}.tar.gz
@@ -15,6 +15,7 @@
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,21 +54,22 @@
 
 %prep
 %setup -q -n %{name}ava-%{version}
-rm -f docs/README # duplicate
+rm docs/README
 
 %build
-export JAVA_HOME="%{java_home}"
-required_jars='jaxp_parser_impl'
-export CLASSPATH=$(build-classpath $required_jars)
+required_jars="jaxp_parser_impl"
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
 %ant
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_examplesdir},%{_javadocdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT%{_javadir}
 
+# jars
 install build/mysql-connector-java-%{version}/mysql-connector-java-%{version}-bin.jar \
 	$RPM_BUILD_ROOT%{_javadir}/mysql-connector-java-%{version}.jar
-ln -sf mysql-connector-java-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/mysql-connector-java.jar
+ln -s mysql-connector-java-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/mysql-connector-java.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +77,7 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES EXCEPTIONS-CONNECTOR-J README
-%{_javadir}/*
+%{_javadir}/*.jar
 
 %files doc
 %defattr(644,root,root,755)
@@ -87,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007-12-12 22:59:26  glen
+- unify java package; rel 2
+
 Revision 1.12  2007-10-09 16:05:32  glen
 - update to 5.0.8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mysql-connector-j.spec?r1=1.12&r2=1.13&f=u