OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 11-Feb-2003 11:20:02
Branch: HEAD Handle: 2003021110195902
Modified files:
openpkg-src/mysql4 mysql4.patch mysql4.spec
openpkg-web news.txt
Log:
move replace-utility out of the way, move mysqld into package-private
libexecdir
Summary:
Revision Changes Path
1.3 +8 -0 openpkg-src/mysql4/mysql4.patch
1.7 +7 -2 openpkg-src/mysql4/mysql4.spec
1.3263 +2 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql4.patch
--- openpkg-src/mysql4/mysql4.patch 5 Feb 2003 09:41:27 -0000 1.2
+++ openpkg-src/mysql4/mysql4.patch 11 Feb 2003 10:20:01 -0000 1.3
@@ -44,6 +44,14 @@
echo
fi
echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+--- scripts/msql2mysql.sh.dist Tue Feb 11 09:50:29 2003
++++ scripts/msql2mysql.sh Tue Feb 11 09:53:08 2003
+@@ -13,4 +13,4 @@
+ # described in the License. Among other things, the License requires that
+ # the copyright notice and this notice be preserved on all copies.
+
+-@bindir@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows
mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field
msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables
mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result
msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB
mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL
mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek
mysql_field_seek -- $*
++@libexecdir@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs
msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField
mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields
msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult
mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select
msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close
msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW
msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db
msqlFieldSeek mysql_field_seek -- $*
--- mysys/default.c.dist Wed Jan 29 12:29:20 2003
+++ mysys/default.c Wed Feb 5 09:58:40 2003
@@ -49,7 +49,7 @@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 mysql4.spec
--- openpkg-src/mysql4/mysql4.spec 5 Feb 2003 09:41:27 -0000 1.6
+++ openpkg-src/mysql4/mysql4.spec 11 Feb 2003 10:20:01 -0000 1.7
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20030205
+Release: 20030211
# package options
%option with_berkeleydb yes
@@ -113,6 +113,7 @@
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/%{name} \
--localstatedir=%{l_prefix}/var/%{name} \
+ --libexecdir=%{l_prefix}/libexec/%{name} \
--with-unix-socket-path=%{l_prefix}/var/%{name}/mysql.sock \
--with-mysqld-user=%{l_musr} \
--enable-thread-safe-client \
@@ -142,6 +143,10 @@
AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
DESTDIR=$RPM_BUILD_ROOT
+ # move utility 'replace', msql2mysql is patched for new path
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/replace \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}
+
# strip installation area
rm -rf $RPM_BUILD_ROOT%{l_prefix}/mysql-test
rm -rf $RPM_BUILD_ROOT%{l_prefix}/sql-bench
@@ -149,7 +154,7 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/share/%{name}/mysql-%{V_mysql}.spec
rm -f $RPM_BUILD_ROOT%{l_prefix}/share/%{name}/binary-configure
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
- strip $RPM_BUILD_ROOT%{l_prefix}/libexec/* 2>/dev/null || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/* 2>/dev/null || true
# install global configuration
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3262 -r1.3263 news.txt
--- openpkg-web/news.txt 11 Feb 2003 08:41:04 -0000 1.3262
+++ openpkg-web/news.txt 11 Feb 2003 10:19:59 -0000 1.3263
@@ -1,3 +1,5 @@
+11-Feb-2003: Upgraded package: P<mysql4-4.0.10gamma-20030211>
+11-Feb-2003: Upgraded package: P<xerces-c-2.2.0-20030211>
11-Feb-2003: Upgraded package: P<perl-xml-20030211-20030211>
11-Feb-2003: Upgraded package: P<perl-util-20030211-20030211>
11-Feb-2003: Upgraded package: P<perl-www-20030211-20030211>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
