[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf)

[Andrea Scarpino]

    Date: Wednesday, December 22, 2010 @ 08:41:29
  Author: andrea
Revision: 103660

upgpkg: mysql 5.5.8-2
enable skip-networking in default config; fix plugins and localization path

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf

----------+
 PKGBUILD |   16 ++++++++--------
 my.cnf   |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-22 13:39:56 UTC (rev 103659)
+++ PKGBUILD	2010-12-22 13:41:29 UTC (rev 103660)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mysql.com/"
@@ -17,7 +17,7 @@
         'my.cnf')
 md5sums=('42e866302b61f5e213afd33e04677017'
          '2234207625baa29b2ff7d7b4f088abce'
-         '69336edb8a16294b18eaec22fee7ea68')
+         '1c949c0dbea5206af0db14942d9927b6')
 
 build() {
   cd "${srcdir}"
@@ -34,9 +34,12 @@
     -DMYSQL_DATADIR=/var/lib/mysql \
     -DINSTALL_INFODIR=/usr/share/mysql/docs \
     -DINSTALL_MANDIR=/usr/share/man \
+    -DINSTALL_PLUGINDIR=/usr/share/mysql/lib/plugin \
     -DINSTALL_SCRIPTDIR=/usr/bin \
     -DINSTALL_DOCREADMEDIR=/usr/share/mysql \
     -DINSTALL_SUPPORTFILESDIR=/usr/share/mysql \
+    -DINSTALL_MYSQLSHAREDIR=/usr/share/mysql \
+    -DINSTALL_SHAREDIR=/usr/share/mysql \
     -DWITH_READLINE=OFF \
     -DWITH_SSL=system \
     -DWITH_LIBWRAP=ON \
@@ -98,9 +101,7 @@
 
   # provided by libmysqlclient
   rm -f ${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm -f ${pkgdir}/usr/lib/libmysqlclient*
-  rm -f ${pkgdir}/usr/lib/libmysqld.a
-  rm -f ${pkgdir}/usr/lib/libmysqlservices.a
+  rm -rf ${pkgdir}/usr/lib/
   rm -rf ${pkgdir}/usr/include/
   
   # provided by mysql-clients
@@ -108,11 +109,10 @@
 
   # not needed
   rm -rf ${pkgdir}/usr/{mysql-test,sql-bench}
-  rm -f ${pkgdir}/usr/lib/mysql/plugin/*.a
 
   # These shouldn't be here
   rm -rf ${pkgdir}/usr/docs
   install -d ${pkgdir}/var/lib/mysql
-  mv ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
-  chmod -R 700 ${pkgdir}/var/lib/mysql/
+  cp -rfa ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
+  rm -rf ${pkgdir}/usr/data
 }

Modified: my.cnf
===================================================================
--- my.cnf	2010-12-22 13:39:56 UTC (rev 103659)
+++ my.cnf	2010-12-22 13:41:29 UTC (rev 103660)
@@ -43,7 +43,7 @@
 # Note that using this option without enabling named pipes on Windows
 # (via the "enable-named-pipe" option) will render mysqld useless!
 # 
-#skip-networking
+skip-networking
 
 # Replication Master Server (default)
 # binary logging is required for replication