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: 16-Jan-2003 18:32:09
Branch: HEAD Handle: 2003011617320701
Modified files:
openpkg-src/mysql4 mysql4.spec
openpkg-web news.txt
Log:
provide virtual package MYSQL, cleanups
Summary:
Revision Changes Path
1.2 +28 -17 openpkg-src/mysql4/mysql4.spec
1.2870 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql4.spec
--- openpkg-src/mysql4/mysql4.spec 16 Jan 2003 15:02:07 -0000 1.1
+++ openpkg-src/mysql4/mysql4.spec 16 Jan 2003 17:32:08 -0000 1.2
@@ -64,8 +64,8 @@
Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
Source1: my.cnf
Source2: my.pwd
-Source3: rc.mysql4
-Patch0: mysql4.patch
+Source3: rc.%{name}
+Patch0: %{name}.patch
# build information
Prefix: %{l_prefix}
@@ -74,6 +74,8 @@
PreReq: OpenPKG, openpkg >= 20030103
AutoReq: no
AutoReqProv: no
+Provides: MYSQL
+Conflicts: mysql
%description
MySQL is a multi-user Relational Database Management System (RDBMS),
@@ -107,9 +109,9 @@
CXXFLAGS="%{l_cxxflags -O}" \
./configure \
--prefix=%{l_prefix} \
- --sysconfdir=%{l_prefix}/etc/mysql4 \
- --localstatedir=%{l_prefix}/var/mysql \
- --with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
+ --sysconfdir=%{l_prefix}/etc/%{name} \
+ --localstatedir=%{l_prefix}/var/%{name} \
+ --with-unix-socket-path=%{l_prefix}/var/%{name}/mysql.sock \
--with-mysqld-user=%{l_musr} \
--enable-thread-safe-client \
%if "%{with_berkeleydb}" == "yes"
@@ -138,8 +140,17 @@
AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
DESTDIR=$RPM_BUILD_ROOT
+ # strip installation area
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/mysql-test
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/sql-bench
+ 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}/libexec/* 2>/dev/null || true
+
# install global configuration
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql4
+ %{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' \
@@ -147,10 +158,10 @@
-e 's;@mysql_bdb_log_buffer_size@;%{mysql_bdb_log_buffer_size};g' \
-e 's;@mysql_bdb_max_lock@;%{mysql_bdb_max_lock};g' \
%{SOURCE my.cnf} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/mysql4/
+ $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
%{l_shtool} install -c -m 600 \
%{SOURCE my.pwd} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/mysql4/
+ $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
# install run-command script
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
@@ -159,16 +170,16 @@
-e 's;@l_rusr@;%{l_rusr};g' \
-e 's;@l_rgrp@;%{l_rgrp};g' \
-e 's;@mysqld@;%{mysqld};g' \
- %{SOURCE rc.mysql4} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# make sure the database directory exists
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/mysql
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
# determine the package files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/mysql4/my.cnf' \
- '%config %{l_prefix}/etc/mysql4/my.pwd'
+ '%config %{l_prefix}/etc/%{name}/my.cnf' \
+ '%config %{l_prefix}/etc/%{name}/my.pwd'
%files -f files
@@ -178,14 +189,14 @@
%post
# create initial database
$RPM_INSTALL_PREFIX/bin/mysql_install_db \
- --defaults-file=$RPM_INSTALL_PREFIX/etc/mysql4/my.cnf
+ --defaults-file=$RPM_INSTALL_PREFIX/etc/%{name}/my.cnf
chown %{l_rusr}:%{l_rgrp} \
- $RPM_INSTALL_PREFIX/etc/mysql4/my.cnf \
- $RPM_INSTALL_PREFIX/etc/mysql4/my.pwd
- chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/mysql/
+ $RPM_INSTALL_PREFIX/etc/%{name}/my.cnf \
+ $RPM_INSTALL_PREFIX/etc/%{name}/my.pwd
+ chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/%{name}/
( echo "The MySQL package includes automated maintenance procedures"
echo "that require administrator access to the database. For this"
echo "to work you must keep a copy (plain text) of the administrator"
- echo "account in '$RPM_INSTALL_PREFIX/etc/mysql4/my.pwd'."
+ echo "account in '$RPM_INSTALL_PREFIX/etc/%{name}/my.pwd'."
) | %{l_rpmtool} msg -b -t notice
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2869 -r1.2870 news.txt
--- openpkg-web/news.txt 16 Jan 2003 17:02:30 -0000 1.2869
+++ openpkg-web/news.txt 16 Jan 2003 17:32:07 -0000 1.2870
@@ -1,3 +1,4 @@
+16-Jan-2003: Upgraded package: P<mysql4-4.0.9gamma-20030116>
16-Jan-2003: Upgraded package: P<myodbc-3.51.05-20030116>
16-Jan-2003: Upgraded package: P<rt-2.0.15-20030116>
16-Jan-2003: Upgraded package: P<postfix-2.0.2-20030116>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
