SPECS (MYSQL_4_00): mysql.spec - main package does not require -li...

[glen]

Author: glen                         Date: Thu Dec 22 16:59:16 2005 GMT
Module: SPECS                         Tag: MYSQL_4_00
---- Log message:
- main package does not require -libs
- adapterized

---- Files affected:
SPECS:
   mysql.spec (1.235.2.11.2.2 -> 1.235.2.11.2.3) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.235.2.11.2.2 SPECS/mysql.spec:1.235.2.11.2.3
--- SPECS/mysql.spec:1.235.2.11.2.2	Wed Sep 21 12:15:28 2005
+++ SPECS/mysql.spec	Thu Dec 22 17:59:11 2005
@@ -26,7 +26,7 @@
 Version:	4.0.26
 Release:	1
 License:	GPL + MySQL FLOSS Exception
-Source0:	http://sunsite.icm.edu.pl/mysql/Downloads/MySQL-4.0/mysql-%{version}.tar.gz
+Source0:	http://sunsite.icm.edu.pl/mysql/Downloads/MySQL-4.0/%{name}-%{version}.tar.gz
 # Source0-md5:	4e2060a3875470e0d853391e8647a019
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
@@ -45,8 +45,8 @@
 Patch8:		%{name}-nptl.patch
 Icon:		mysql.gif
 URL:		http://www.mysql.com/
-#BuildRequires:	ORBit-devel
 BuildRequires:	/bin/ps
+#BuildRequires:	ORBit-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_bdb:BuildRequires:	db3-devel}
@@ -62,16 +62,15 @@
 BuildRequires:	rpmbuild(macros) >= 1.159
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
-PreReq:		rc-scripts >= 0.2.0
-Requires(pre):	/usr/bin/getgid
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/userdel
-Requires(postun):	/usr/sbin/groupdel
-Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name}-libs = %{version}-%{release}
 Requires:	/usr/bin/setsid
+Requires:	rc-scripts >= 0.2.0
 Provides:	MySQL-server
 Provides:	group(mysql)
 Provides:	msqlormysql
@@ -80,6 +79,7 @@
 Obsoletes:	mysql-server
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_sysconfdir	/etc/%{name}
 %define		_libexecdir	%{_sbindir}
 %define		_localstatedir	/var/lib/mysql
 %define		_mysqlhome	/home/services/mysql
@@ -138,8 +138,8 @@
 MySQL oryginalnie był tworzony, ponieważ autorzy w Tcx potrzebowali
 serwera SQL do obsługi bardzo dużych baz danych z szybkością o wiele
 większą, niż mogli zaoferować inni producenci baz danych. Używają go
-od 1996 roku w środowisku z ponad 40 bazami danych, 10 000 tabel,
-z których ponad 500 zawiera ponad 7 milionów rekordów - w sumie około
+od 1996 roku w środowisku z ponad 40 bazami danych, 10 000 tabel, z
+których ponad 500 zawiera ponad 7 milionów rekordów - w sumie około
 50GB krytycznych danych.
 
 Baza, na której oparty jest MySQL, składa się ze zbioru procedur,
@@ -314,8 +314,8 @@
 Summary(ru):	MySQL - ÂĹÎŢÍÁŇËÉ
 Summary(uk):	MySQL - ÂĹÎŢÍÁŇËÉ
 Group:		Applications/Databases
-Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-client
+Requires:	%{name} = %{version}-%{release}
 Requires:	perl(DBD::mysql)
 Obsoletes:	MySQL-bench
 
@@ -530,12 +530,12 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/logrotate.d/mysql
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mysql
 %attr(754,root,root) /etc/rc.d/init.d/mysql
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/mysql
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql
 %attr(751,root,root) %dir /etc/mysql
-%attr(640,root,mysql) %config(noreplace) %verify(not md5 size mtime) /etc/mysql/clusters.conf
-%attr(750,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/monit/*.monitrc
+%attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) /etc/mysql/clusters.conf
+%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
 %attr(755,root,root) %{_bindir}/isamchk
 %attr(755,root,root) %{_bindir}/isamlog
 %attr(755,root,root) %{_bindir}/myisamchk
@@ -552,7 +552,7 @@
 %attr(751,root,root) /var/lib/mysql
 %attr(750,mysql,mysql) %dir /var/log/mysql
 %attr(750,mysql,mysql) %dir /var/log/archiv/mysql
-%attr(640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysql/*
+%attr(640,mysql,mysql) %config(noreplace) %verify(not md5 mtime size) /var/log/mysql/*
 
 %{_infodir}/mysql.info*
 %dir %{_datadir}/mysql
@@ -655,6 +655,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.235.2.11.2.3  2005/12/22 16:59:11  glen
+- main package does not require -libs
+- adapterized
+
 Revision 1.235.2.11.2.2  2005/09/21 10:15:28  arekm
 - up to 4.0.26
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.235.2.11.2.2&r2=1.235.2.11.2.3&f=u