OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Mar-2003 21:11:58
Branch: HEAD Handle: 2003032420115701
Modified files:
openpkg-src/mysql4 my.cnf mysql4.spec rc.mysql4
openpkg-web news.txt
Log:
speclint police: no need to use macros here, shell variables are
sufficient
Summary:
Revision Changes Path
1.5 +3 -3 openpkg-src/mysql4/my.cnf
1.11 +22 -22 openpkg-src/mysql4/mysql4.spec
1.4 +2 -2 openpkg-src/mysql4/rc.mysql4
1.3813 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/my.cnf
============================================================================
$ cvs diff -u -r1.4 -r1.5 my.cnf
--- openpkg-src/mysql4/my.cnf 21 Feb 2003 08:43:59 -0000 1.4
+++ openpkg-src/mysql4/my.cnf 24 Mar 2003 20:11:58 -0000 1.5
@@ -39,9 +39,9 @@
set-variable = tmp_table_size=32M
# Berkeley DB
-set-variable = [EMAIL PROTECTED]@
-set-variable = [EMAIL PROTECTED]@
-set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
# Innobase
#set-variable = innodb_buffer_pool_size=70M
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 mysql4.spec
--- openpkg-src/mysql4/mysql4.spec 18 Mar 2003 19:16:48 -0000 1.10
+++ openpkg-src/mysql4/mysql4.spec 24 Mar 2003 20:11:58 -0000 1.11
@@ -39,28 +39,12 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20030318
+Release: 20030324
# package options
%option with_berkeleydb yes
%option with_innobase no
-# package option decisions
-%if "%{with_berkeleydb}" == "yes"
-%define mysql_bdb_cache_size 8M
-%define mysql_bdb_log_buffer_size 32k
-%define mysql_bdb_max_lock 10000
-%else
-%define mysql_bdb_cache_size 0
-%define mysql_bdb_log_buffer_size 0
-%define mysql_bdb_max_lock 0
-%endif
-%if "%{with_berkeleydb}" == "yes" || "%{with_innobase}" == "yes"
-%define mysqld mysqld
-%else
-%define mysqld mysqld-max
-%endif
-
# list of sources
Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
Source1: my.cnf
@@ -152,17 +136,33 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
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}/bin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/* 2>/dev/null || true
+ # determine default parameters
+%if "%{with_berkeleydb}" == "yes"
+ l_mysql_bdb_cache_size=8M
+ l_mysql_bdb_log_buffer_size=32k
+ l_mysql_bdb_max_lock=10000
+%else
+ l_mysql_bdb_cache_size=0
+ l_mysql_bdb_log_buffer_size=0
+ l_mysql_bdb_max_lock=0
+%endif
+%if "%{with_berkeleydb}" == "yes" || "%{with_innobase}" == "yes" ||
"%{with_gemini}" == "yes"
+ l_mysqld=mysqld
+%else
+ l_mysqld=mysqld-max
+%endif
+
# install global configuration
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_rusr@;%{l_rusr};g' \
- -e 's;@mysql_bdb_cache_size@;%{mysql_bdb_cache_size};g' \
- -e 's;@mysql_bdb_log_buffer_size@;%{mysql_bdb_log_buffer_size};g' \
- -e 's;@mysql_bdb_max_lock@;%{mysql_bdb_max_lock};g' \
+ -e "s;@l_mysql_bdb_cache_size@;${l_mysql_bdb_cache_size};g" \
+ -e "s;@l_mysql_bdb_log_buffer_size@;${l_mysql_bdb_log_buffer_size};g" \
+ -e "s;@l_mysql_bdb_max_lock@;${l_mysql_bdb_max_lock};g" \
%{SOURCE my.cnf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
%{l_shtool} install -c -m 600 \
@@ -175,7 +175,7 @@
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_rusr@;%{l_rusr};g' \
-e 's;@l_rgrp@;%{l_rgrp};g' \
- -e 's;@mysqld@;%{mysqld};g' \
+ -e "s;@l_mysqld@;${l_mysqld};g" \
%{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# make sure the database directory exists
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/rc.mysql4
============================================================================
$ cvs diff -u -r1.3 -r1.4 rc.mysql4
--- openpkg-src/mysql4/rc.mysql4 16 Jan 2003 18:49:35 -0000 1.3
+++ openpkg-src/mysql4/rc.mysql4 24 Mar 2003 20:11:58 -0000 1.4
@@ -24,7 +24,7 @@
opServiceEnabled mysql4 || exit 0
cd @l_prefix@
@l_prefix@/bin/mysqld_safe >/dev/null 2>&1 \
- [EMAIL PROTECTED]@ \
+ [EMAIL PROTECTED]@ \
--pid-file="$mysql4_pid_file" \
--err-log="$mysql4_log_err" &
@@ -41,7 +41,7 @@
--defaults-extra-file=${mysql4_pwd_file} \
shutdown
@l_prefix@/bin/mysqld_safe >/dev/null 2>&1 \
- [EMAIL PROTECTED]@ \
+ [EMAIL PROTECTED]@ \
--pid-file="$mysql4_pid_file" \
--err-log="$mysql4_log_err" &
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3812 -r1.3813 news.txt
--- openpkg-web/news.txt 24 Mar 2003 20:08:33 -0000 1.3812
+++ openpkg-web/news.txt 24 Mar 2003 20:11:57 -0000 1.3813
@@ -1,3 +1,4 @@
+24-Mar-2003: Upgraded package: P<mysql4-4.0.12-20030324>
24-Mar-2003: Upgraded package: P<mysql-3.23.56-20030324>
24-Mar-2003: Upgraded package: P<openpkg-20030324-20030324>
24-Mar-2003: Upgraded package: P<gcc33-3.3s20030324-20030324>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
