OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Nov-2008 10:48:11
Branch: HEAD Handle: 2008112709480900
Modified files:
openpkg-src/mysql51 mysql51.spec
Log:
sync with mysql package
Summary:
Revision Changes Path
1.34 +36 -3 openpkg-src/mysql51/mysql51.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 mysql51.spec
--- openpkg-src/mysql51/mysql51.spec 27 Nov 2008 07:45:17 -0000 1.33
+++ openpkg-src/mysql51/mysql51.spec 27 Nov 2008 09:48:09 -0000 1.34
@@ -26,6 +26,7 @@
%define V_minor 30
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
+%define V_jdbc 5.1.7
# package information
Name: mysql51
@@ -52,6 +53,7 @@
%option with_embedded no
%option with_charset utf8
%option with_collation utf8_unicode_ci
+%option with_jdbc no
# fixing implicit inter-plugin dependencies and correlations
%if "%{with_ndbcluster}" == "yes"
@@ -61,9 +63,10 @@
# list of sources
Source0:
http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
-Source1: my.cnf
-Source2: my.pwd
-Source3: rc.mysql
+Source1:
http://ftp.gwdg.de/pub/misc/mysql/Downloads/Connector-J/mysql-connector-java-%{V_jdbc}.tar.gz
+Source2: my.cnf
+Source3: my.pwd
+Source4: rc.mysql
Patch0: mysql51.patch
# build information
@@ -77,6 +80,10 @@
BuildPreReq: openssl
PreReq: openssl
%endif
+%if "%{with_jdbc}" == "yes"
+BuildPreReq: java, JAVA-JDK, ant
+PreReq: java, JAVA-JDK, ant
+%endif
AutoReq: no
AutoReqProv: no
Provides: mysql = %{version}-%{release}
@@ -96,9 +103,17 @@
url = http://dev.mysql.com/downloads/mysql/%{V_major}.html
regex = mysql-(__VER__)\.tar\.gz
}
+ prog mysql51:connector-jdbc = {
+ version = %{V_jdbc}
+ url =
http://dev.mysql.com/downloads/connector/j/%{V_major}.html
+ regex = mysql-connector-java-(__VER__)\.tar\.gz
+ }
%prep
%setup -q -n mysql-%{V_mysql}
+%if "%{with_jdbc}" == "yes"
+ %setup -q -n mysql-%{V_mysql} -T -D -a 1
+%endif
%patch -p0
%build
@@ -188,6 +203,15 @@
# build source tree
%{l_make} %{l_mflags}
+ # build JDBC driver
+%if "%{with_jdbc}" == "yes"
+ ( cd mysql-connector-java-%{V_jdbc}
+ export JAVA_PLATFORM="sun-jdk"
+ eval `%{l_prefix}/bin/java-toolkit -e`
+ %{l_prefix}/bin/ant
+ ) || exit $?
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -263,6 +287,15 @@
) || exit $?
%endif
+ # install JDBC driver
+%if "%{with_jdbc}" == "yes"
+ ( cd mysql-connector-java-%{V_jdbc}
+ %{l_shtool} install -c -m 644 \
+
build/mysql-connector-java-%{V_jdbc}/mysql-connector-java-%{V_jdbc}-bin.jar \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/mysql/mysql.jar
+ ) || exit $?
+%endif
+
# determine the package files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%if "%{with_server}" == "yes"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
