Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	percona-server.spec
@@ -25,6 +25,8 @@ %define mysqldatadir /var/lib/mysql %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com +MYSQL_RPMBUILD_TEST="no" + # ------------------------------------------------------------------------------ # Meta information, don't remove! # ------------------------------------------------------------------------------ @@ -158,6 +160,7 @@ Group: Applications/Databases Requires: chkconfig coreutils shadow-utils grep procps Obsoletes: Percona-XtraDB-server-51 +Obsoletes: MySQL-server-percona Provides: msqlormysql mysql-server MySQL-server %description -n Percona-Server-server%{package_suffix} @@ -182,6 +185,7 @@ Summary: Percona-Server - Client Group: Applications/Databases Obsoletes: Percona-XtraDB-client%{package_suffix} +Obsoletes: MySQL-client-percona Provides: mysql-client MySQL-client mysql MySQL %description -n Percona-Server-client%{package_suffix} @@ -197,6 +201,7 @@ Summary: Percona-Server - Test suite Group: Applications/Databases Obsoletes: Percona-XtraDB-test%{package_suffix} +Obsoletes: MySQL-test-percona Provides: mysql-test MySQL-test AutoReqProv: no @@ -211,6 +216,7 @@ Summary: Percona-Server - Development header files and libraries Group: Applications/Databases Obsoletes: Percona-XtraDB-devel%{package_suffix} +Obsoletes: MySQL-devel-percona Provides: mysql-devel MySQL-devel %description -n Percona-Server-devel%{package_suffix} @@ -225,6 +231,7 @@ Summary: Percona-Server - Shared libraries Group: Applications/Databases Obsoletes: Percona-XtraDB-shared%{package_suffix} +Obsoletes: MySQL-shared-percona Provides: mysql-shared MySQL-shared %description -n Percona-Server-shared%{package_suffix} x 1 @@ -25,6 +25,8 @@ 2 %define mysqldatadir /var/lib/mysql 3 %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com 4 5 +MYSQL_RPMBUILD_TEST="no" 6 + 7 # ------------------------------------------------------------------------------ 8 # Meta information, don't remove! 9 # ------------------------------------------------------------------------------ 10 @@ -158,6 +160,7 @@ 11 Group: Applications/Databases 12 Requires: chkconfig coreutils shadow-utils grep procps 13 Obsoletes: Percona-XtraDB-server-51 14 +Obsoletes: MySQL-server-percona 15 Provides: msqlormysql mysql-server MySQL-server 16 17 %description -n Percona-Server-server%{package_suffix} 18 @@ -182,6 +185,7 @@ 19 Summary: Percona-Server - Client 20 Group: Applications/Databases 21 Obsoletes: Percona-XtraDB-client%{package_suffix} 22 +Obsoletes: MySQL-client-percona 23 Provides: mysql-client MySQL-client mysql MySQL 24 25 %description -n Percona-Server-client%{package_suffix} 26 @@ -197,6 +201,7 @@ 27 Summary: Percona-Server - Test suite 28 Group: Applications/Databases 29 Obsoletes: Percona-XtraDB-test%{package_suffix} 30 +Obsoletes: MySQL-test-percona 31 Provides: mysql-test MySQL-test 32 AutoReqProv: no 33 34 @@ -211,6 +216,7 @@ 35 Summary: Percona-Server - Development header files and libraries 36 Group: Applications/Databases 37 Obsoletes: Percona-XtraDB-devel%{package_suffix} 38 +Obsoletes: MySQL-devel-percona 39 Provides: mysql-devel MySQL-devel 40 41 %description -n Percona-Server-devel%{package_suffix} 42 @@ -225,6 +231,7 @@ 43 Summary: Percona-Server - Shared libraries 44 Group: Applications/Databases 45 Obsoletes: Percona-XtraDB-shared%{package_suffix} 46 +Obsoletes: MySQL-shared-percona 47 Provides: mysql-shared MySQL-shared 48 49 %description -n Percona-Server-shared%{package_suffix} 50