To be compiliat with PLD spec coding style.

Status: NFY.

Changed files:
    mysql.spec -> 1.2

diff --git a/mysql.spec b/mysql.spec
index e1b30f903343d61a23cec9caece4f3b8ab48621f..3a67e7e9c3a168271f200ce192ec3b161ff0c88e 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,117 +1,65 @@
-%define mysql-version          3.22.14b-gamma
-%define shared_lib_version             5:2:0
-%define Release                        2col
+Summary:       MySQL: a very fast and reliable SQL database engine
+Name:          MySQL
+Version:       3.22.14b-gamma
+Release:       3
+Vendor:                LinuxLand International
+Copyright:     MySQL FREE PUBLIC LICENSE (See the file PUBLIC)
+Group:         Applications/Databases
+Source0:       http://www.tcx.se/Downloads/MySQL-3.22/mysql-%{mysql-version}.tar.gz
+Icon:          mysql.gif
+URL:           http://www.tcx.se/
+BuildRoot:     /tmp/%{Name}-%{Version}-root
 
-
-Name           : MySQL
-Version                : %{mysql-version}
-Release                : %{Release}
-
-Distribution           : OpenLinux 1.3 contrib
-Packager               : Stephan Seyboth <sseyboth@linuxland.de>
-Vendor         : LinuxLand International
-
-
-Source0                : http://www.tcx.se/Downloads/MySQL-3.22/mysql-%{mysql-version}.tar.gz
-
-BuildRoot      : /tmp/%{Name}-%{Version}-root
- 
-Provides               : msqlormysql MySQL-server
-
-
-Copyright      : MySQL FREE PUBLIC LICENSE (See the file PUBLIC)
-Icon           : mysql.gif
-URL            : http://www.tcx.se/
-
-Group          : Applications/Databases
-Summary                : MySQL: a very fast and reliable SQL database engine
 %Description
-MySQL is a true multi-user, multi-threaded SQL (Structured Query Language) database
-server. SQL is the most popular database language in the world. MySQL is a client/server
-implementation that consists of a server daemon mysqld and many different client
-programs/libraries. The main goals of MySQL are speed, robustness and easy to use. 
-The base upon which MySQL is built is a set of routines that have been used in a highly
-demanding production environment for many years. While MySQL is still in development,
-it already offers a rich and highly useful function set. See the documentation for more
+MySQL is a true multi-user, multi-threaded SQL (Structured Query Language)
+database server. SQL is the most popular database language in the world.
+MySQL is a client/server implementation that consists of a server daemon
+mysqld and many different client programs/libraries. The main goals of MySQL
+are speed, robustness and easy to use.  The base upon which MySQL is built
+is a set of routines that have been used in a highly demanding production
+environment for many years. While MySQL is still in development, it already
+offers a rich and highly useful function set. See the documentation for more
 information
 
-
 %Package client
-Requires               : %{Name} = %{Version}-%{Release}
+Summary:       MySQL client programs and libs
+Group:         Applications/Databases
+Requires:      %{name} = %{version}-%{release}
 
-Group          : Applications/Databases
-Summary                : MySQL client programs and libs
 %Description client
-This package contains the client part of the MySQL database. It includes utilities
-and libraries to access and manipulate data on a MySQL database Server
-
+This package contains the client part of the MySQL database. It includes
+utilities and libraries to access and manipulate data on a MySQL database
+Server.
 
 %Package devel
-Requires               : %{Name} = %{Version}-%{Release}  %{Name}-client = %{Version}-%{Release}
+Summary:       MySQL development header files and libraries
+Group:         Applications/Databases
+Requires:      %{name} = %{version}-%{release}
 
-Group          : Applications/Databases
-Summary                : MySQL development header files and libraries
 %Description devel
 This package contains the header files and libraries (shared and static) for
 developing applications that use the MySQL database.
 
+%prep
+%setup -n
 
-%ChangeLog
-* Thu Jan 25 1999 Stephan Seyboth <sseyboth@linuxland.de>
-- user/group creation doesn´t work with lisa-3.2, use useradd/groupadd,
-   hope nothing else uses uid/gid 83???
-
-* Thu Jan 07 1999 Stephan Seyboth <sseyboth@linuxland.de>
-- converted to COL style init
-- updated to 3.22.14b-gamma
-
-* Mon Dec 14 1998 Stephan Seyboth <sseyboth@linuxland.de>
-- updated to mysql 3.22.12-beta
-
-* Fri Dec 11 1998 Stephan Seyboth <sseyboth@linuxland.de>
-- added mysql_fix_privilege_tables, needed by postin
-
-* Thu Dec 10 1998 Stephan Seyboth <sseyboth@linuxland.de>
-- don´t build mysqld with all-static (where´s libdl.a on COL?)
-
-* Wed Dec 09 1998 Stephan Seyboth <sseyboth@linuxland.de>
-- initial Version based on rpm by David Axmark <david@detron.se>
- 
-
+%build
 
-%Prep
-
-%setup -n mysql-%{mysql-version}
-
-
-%Build
-
-sh -c  'PATH=/bin:/usr/bin \
-       CC=gcc \
-       CFLAGS="$RPM_OPT_FLAGS" \
-       CXX=gcc \
-       CXXFLAGS="$RPM_OPT_FLAGS" \
-       ./configure \
-               --enable-shared \
-               --enable-static \
-               --enable-assembler \
-               --with-mysqld-user=mysql \
-               --with-unix-socket-path=/var/lib/mysql/mysql.sock \
-               --prefix=/ \
-               --exec-prefix=/usr \
-               --libexecdir=/usr/sbin \
-               --sysconfdir=/etc \
-               --datadir=/usr/share \
-               --localstatedir=/var/lib/mysql \
-               --infodir=/usr/info \
-               --includedir=/usr/include \
-               --mandir=/usr/man'
+CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
+./configure \
+       --enable-shared \
+       --enable-static \
+       --enable-assembler \
+       --with-mysqld-user=mysql \
+       --with-unix-socket-path=/var/lib/mysql/mysql.sock \
+       --prefix=/usr \
+       --sysconfdir=/etc \
+       --localstatedir=/var/lib/mysql
 
 # benchdir does not fit in above model. Fix when we make a separate package
 make benchdir=$RPM_BUILD_ROOT/usr/share/sql-bench
 
-
-%Install
+%install
 
 %{mkDESTDIR}
 
@@ -205,7 +153,7 @@ chown -R mysql.mysql $mysql_datadir
 sleep 2
 
 
-%PreUn
+%preUn
 if test -x /etc/rc.d/init.d/mysql
 then
   /etc/rc.d/init.d/mysql stop > /dev/null
@@ -213,62 +161,79 @@ fi
 # Remove autostart of mysql
 lisa --SysV-init remove mysql $1
 
-%PostUn
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post client -p /sbin/ldconfig
 
 # We do not remove the mysql user since it may still own a lot of
 # database files.
 
 %Files
-%attr(-, root, root) %doc /usr/doc/MySQL-%{mysql-version}/
-
-%attr(755, root, root) /usr/bin/isamchk
-%attr(755, root, root) /usr/bin/isamlog
-%attr(755, root, root) /usr/bin/mysql_fix_privilege_tables
-%attr(755, root, root) /usr/bin/mysql_install_db
-%attr(755, root, root) /usr/bin/mysql_setpermission
-%attr(755, root, root) /usr/bin/mysql_zap
-%attr(755, root, root) /usr/bin/mysqlbug
-%attr(755, root, root) /usr/bin/perror
-%attr(755, root, root) /usr/bin/replace
-%attr(755, root, root) /usr/bin/resolveip
-%attr(755, root, root) /usr/bin/safe_mysqld
-
-%attr(644, root, root) /usr/info/mysql.info
+%defattr(644,root,root,755)
+%doc /usr/doc/MySQL-%{mysql-version}/
 
-%attr(755, root, root) /usr/sbin/mysqld
+%attr(755,root,root) /usr/bin/isamchk
+%attr(755,root,root) /usr/bin/isamlog
+%attr(755,root,root) /usr/bin/mysql_fix_privilege_tables
+%attr(755,root,root) /usr/bin/mysql_install_db
+%attr(755,root,root) /usr/bin/mysql_setpermission
+%attr(755,root,root) /usr/bin/mysql_zap
+%attr(755,root,root) /usr/bin/mysqlbug
+%attr(755,root,root) /usr/bin/perror
+%attr(755,root,root) /usr/bin/replace
+%attr(755,root,root) /usr/bin/resolveip
+%attr(755,root,root) /usr/bin/safe_mysqld
 
-%attr(644, root, root) /etc/logrotate.d/mysql
-%attr(755, root, root) /etc/rc.d/init.d/mysql
-%attr(644, root, root) %config /etc/sysconfig/daemons/mysql
+%attr(644,root,root) /usr/info/mysql.info
 
+%attr(755,root,root) /usr/sbin/mysqld
 
-%attr(755, root, root) /usr/share/mysql/
+%attr(644,root,root) /etc/logrotate.d/mysql
+%attr(754,root,root) /etc/rc.d/init.d/mysql
+%config /etc/sysconfig/daemons/mysql
 
-
-%Post client
-/sbin/ldconfig
+%attr(755,root,root) /usr/share/mysql/
 
 %Files client
-%attr(644, root, root) /usr/lib/libmysqlclient.so.5 
-%attr(755, root, root) /usr/lib/libmysqlclient.so.5.0.2
+%attr(755,root,root) /usr/lib/libmysqlclient.so.*.*
 
-%attr(755, root, root) /usr/bin/msql2mysql
-%attr(755, root, root) /usr/bin/mysql
-%attr(755, root, root) /usr/bin/mysqlaccess
-%attr(755, root, root) /usr/bin/mysqladmin
-%attr(755, root, root) /usr/bin/mysqlbug
-%attr(755, root, root) /usr/bin/mysqldump
-%attr(755, root, root) /usr/bin/mysqlimport
-%attr(755, root, root) /usr/bin/mysqlshow
+%attr(755,root,root) /usr/bin/msql2mysql
+%attr(755,root,root) /usr/bin/mysql
+%attr(755,root,root) /usr/bin/mysqlaccess
+%attr(755,root,root) /usr/bin/mysqladmin
+%attr(755,root,root) /usr/bin/mysqlbug
+%attr(755,root,root) /usr/bin/mysqldump
+%attr(755,root,root) /usr/bin/mysqlimport
+%attr(755,root,root) /usr/bin/mysqlshow
 
-%attr(644, root, man) %doc /usr/man/man1/mysql.1
+/usr/man/man1/mysql.1.*
 
 
 %Files devel
 %dir /usr/include/mysql
 %dir /usr/lib/mysql
-%attr(644, root, root) /usr/include/mysql/*
-%attr(644, root, root) /usr/lib/mysql/*
-%attr(644, root, root) /usr/lib/libmysqlclient.so
-%attr(755, root, root) /usr/bin/comp_err
+%attr(644,root,root) /usr/include/mysql/*
+%attr(644,root,root) /usr/lib/mysql/*
+%attr(644,root,root) /usr/lib/libmysqlclient.so
+%attr(755,root,root) /usr/bin/comp_err
+
+%ChangeLog
+* Thu Jan 25 1999 Stephan Seyboth <sseyboth@linuxland.de>
+- user/group creation doesn´t work with lisa-3.2, use useradd/groupadd,
+   hope nothing else uses uid/gid 83???
+
+* Thu Jan 07 1999 Stephan Seyboth <sseyboth@linuxland.de>
+- converted to COL style init
+- updated to 3.22.14b-gamma
+
+* Mon Dec 14 1998 Stephan Seyboth <sseyboth@linuxland.de>
+- updated to mysql 3.22.12-beta
+
+* Fri Dec 11 1998 Stephan Seyboth <sseyboth@linuxland.de>
+- added mysql_fix_privilege_tables, needed by postin
+
+* Thu Dec 10 1998 Stephan Seyboth <sseyboth@linuxland.de>
+- don´t build mysqld with all-static (where´s libdl.a on COL?)
+
+* Wed Dec 09 1998 Stephan Seyboth <sseyboth@linuxland.de>
+- initial Version based on rpm by David Axmark <david@detron.se>