packages: mariadb/mariadb.spec R/O fixes

[arekm]

Author: arekm                        Date: Tue Jan 19 07:53:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
R/O fixes

---- Files affected:
packages/mariadb:
   mariadb.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/mariadb/mariadb.spec
diff -u packages/mariadb/mariadb.spec:1.6 packages/mariadb/mariadb.spec:1.7
--- packages/mariadb/mariadb.spec:1.6	Tue Jan 19 08:36:10 2010
+++ packages/mariadb/mariadb.spec	Tue Jan 19 08:53:09 2010
@@ -109,14 +109,12 @@
 Requires(pre):	/usr/sbin/useradd
 Requires(triggerpostun):	sed >= 4.0
 Requires:	/usr/bin/setsid
-Requires:	mysql-charsets = %{version}-%{release}
+Requires:	%{name}-charsets = %{version}-%{release}
 Requires:	rc-scripts >= 0.2.0
 Provides:	MariaDB-server
 Provides:	group(mysql)
 Provides:	msqlormysql
 Provides:	user(mysql)
-Obsoletes:	MariaDB
-Obsoletes:	mysql-server
 Conflicts:	logrotate < 3.7-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -249,7 +247,7 @@
 Summary:	MariaDB additional utilities
 Summary(pl.UTF-8):	Dodatkowe narzędzia do MariaDB
 Group:		Applications/Databases
-Requires:	mysql-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description extras
 MariaDB additional utilities except Perl scripts (they may be found in
@@ -263,7 +261,7 @@
 Summary:	MariaDB additional utilities written in Perl
 Summary(pl.UTF-8):	Dodatkowe narzędzia do MariaDB napisane w Perlu
 Group:		Applications/Databases
-Requires:	mysql-extras = %{version}-%{release}
+Requires:	%{name}-extras = %{version}-%{release}
 Requires:	perl(DBD::mysql)
 
 %description extras-perl
@@ -279,9 +277,8 @@
 Summary(ru.UTF-8):	MariaDB клиент
 Summary(uk.UTF-8):	MariaDB клієнт
 Group:		Applications/Databases
-Requires:	mysql-charsets = %{version}-%{release}
-Requires:	mysql-libs = %{version}-%{release}
-Obsoletes:	MariaDB-client
+Requires:	%{name}-charsets = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description client
 This package contains the standard MariaDB clients.
@@ -305,8 +302,6 @@
 Summary:	Shared libraries for MariaDB
 Summary(pl.UTF-8):	Biblioteki dzielone MariaDB
 Group:		Libraries
-Obsoletes:	libmysql10
-Obsoletes:	mysql-doc < 4.1.12
 
 %description libs
 Shared libraries for MariaDB.
@@ -321,11 +316,9 @@
 Summary(ru.UTF-8):	MariaDB - хедеры и библиотеки разработчика
 Summary(uk.UTF-8):	MariaDB - хедери та бібліотеки програміста
 Group:		Development/Libraries
-Requires:	mysql-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 %{?with_ssl:Requires:	openssl-devel}
 Requires:	zlib-devel
-Obsoletes:	MariaDB-devel
-Obsoletes:	libmysql10-devel
 
 %description devel
 This package contains the development header files and libraries
@@ -358,8 +351,7 @@
 Summary(ru.UTF-8):	MariaDB - статические библиотеки
 Summary(uk.UTF-8):	MariaDB - статичні бібліотеки
 Group:		Development/Libraries
-Requires:	mysql-devel = %{version}-%{release}
-Obsoletes:	MariaDB-static
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 MariaDB static libraries.
@@ -382,10 +374,9 @@
 Summary(ru.UTF-8):	MariaDB - бенчмарки
 Summary(uk.UTF-8):	MariaDB - бенчмарки
 Group:		Applications/Databases
-Requires:	mysql = %{version}-%{release}
-Requires:	mysql-client
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-client
 Requires:	perl(DBD::mysql)
-Obsoletes:	MariaDB-bench
 
 %description bench
 This package contains MariaDB benchmark scripts and data.
@@ -418,7 +409,7 @@
 Summary:	MariaDB - NDB Storage Engine Daemon
 Summary(pl.UTF-8):	MariaDB - demon silnika przechowywania danych NDB
 Group:		Applications/Databases
-Requires:	mysql-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description ndb
 This package contains the standard MariaDB NDB Storage Engine Daemon.
@@ -431,7 +422,7 @@
 Summary:	MariaDB - NDB Clients
 Summary(pl.UTF-8):	MariaDB - programy klienckie NDB
 Group:		Applications/Databases
-Requires:	mysql-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description ndb-client
 This package contains the standard MariaDB NDB Clients.
@@ -443,7 +434,7 @@
 Summary:	MariaDB - NDB Management Daemon
 Summary(pl.UTF-8):	MariaDB - demon zarządzający NDB
 Group:		Applications/Databases
-Requires:	mysql-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description ndb-mgm
 This package contains the standard MariaDB NDB Management Daemon.
@@ -455,7 +446,7 @@
 Summary:	MariaDB - NDB CPC Daemon
 Summary(pl.UTF-8):	MariaDB - demon NDB CPC
 Group:		Applications/Databases
-Requires:	mysql-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description ndb-cpc
 This package contains the standard MariaDB NDB CPC Daemon.
@@ -976,6 +967,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/01/19 07:53:09  arekm
+R/O fixes
+
 Revision 1.6  2010/01/19 07:36:10  arekm
 - enable libevent for http://askmonty.org/wiki/index.php/Manual:Pool_of_Threads
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mariadb/mariadb.spec?r1=1.6&r2=1.7&f=u