[arch-commits] Commit in mysql/repos/extra-i686 (PKGBUILD my.cnf mysql.install)
Andrea Scarpino
andrea at archlinux.org
Wed Nov 18 12:29:40 UTC 2009
Date: Wednesday, November 18, 2009 @ 07:29:40
Author: andrea
Revision: 58954
Modified:
mysql/repos/extra-i686/PKGBUILD
mysql/repos/extra-i686/my.cnf
Deleted:
mysql/repos/extra-i686/mysql.install
---------------+
PKGBUILD | 13 +++++--------
my.cnf | 4 ++--
mysql.install | 4 ----
3 files changed, 7 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-11-18 12:07:26 UTC (rev 58953)
+++ PKGBUILD 2009-11-18 12:29:40 UTC (rev 58954)
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58936 2009-11-17 20:14:17Z andrea $
+# $Id: PKGBUILD 58953 2009-11-18 12:07:26Z andrea $
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
# Contributor: judd <jvinet at zeroflux.org>
@@ -6,7 +6,7 @@
pkgbase=mysql
pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
pkgver=5.1.40
-pkgrel=1
+pkgrel=2
pkgdesc="A fast SQL database server"
arch=('i686' 'x86_64')
license=('GPL')
@@ -19,8 +19,8 @@
'mysqld.conf.d')
md5sums=('32e7373c16271606007374396e6742ad'
'09f64b1da689f0bc60e17172f9aa0b38'
- '3d19dcb0b520aece9b0c43043b24099b'
- '4a9077fc95ec6db1d5420e0cdc74d31c')
+ '26589ea08b78fc38dd174caeb93b810c'
+ '4a9077fc95ec6db1d5420e0cdc74d31c')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -98,8 +98,6 @@
done
cd client
-
- sed -i -e 's|\$(top_builddir)/libmysql/libmysqlclient.la|/usr/lib/mysql/libmysqlclient.so|g' Makefile
make link_sources
make || return 1
make DESTDIR=${pkgdir} install
@@ -112,7 +110,6 @@
backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
depends=('mysql-clients')
optdepends=('perl-dbi' 'perl-dbd-mysql')
- install=mysql.install
cd ${srcdir}/${pkgbase}-${pkgver}
pushd include || return
@@ -135,6 +132,6 @@
rm -f ${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysql_upgrade,mysqladmin,mysqlbinlog,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest,mysqltest_embedded}
rm -rf ${pkgdir}/usr/{include,lib}
- # create directory for PID file
+ # create directory for PID and sock files
install -d ${pkgdir}/var/run/mysqld
}
Modified: my.cnf
===================================================================
--- my.cnf 2009-11-18 12:07:26 UTC (rev 58953)
+++ my.cnf 2009-11-18 12:29:40 UTC (rev 58954)
@@ -12,14 +12,14 @@
[client]
#password = your_password
port = 3306
-socket = /tmp/mysqld/mysql.sock
+socket = /var/run/mysqld/mysqld.sock
# Here follows entries for some specific programs
# The MySQL server
[mysqld]
port = 3306
-socket = /tmp/mysqld/mysql.sock
+socket = /var/run/mysqld/mysqld.sock
datadir = /var/lib/mysql
skip-locking
key_buffer = 16M
Deleted: mysql.install
===================================================================
--- mysql.install 2009-11-18 12:07:26 UTC (rev 58953)
+++ mysql.install 2009-11-18 12:29:40 UTC (rev 58954)
@@ -1,4 +0,0 @@
-post_upgrade() {
- echo ">> MySQL configuration file now is into /etc/mysql/ directory."
- echo ">> Remember to replace it with your old configuration file."
-}
More information about the arch-commits
mailing list