diff --git a/mariadb.spec b/mariadb.spec index d9d223b..2b302f9 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1,7 +1,7 @@ # -# spec file for package mariadb (Version 5.2.3) +# spec file for package mariadb # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,8 +32,8 @@ Name: mariadb Summary: A True Multiuser, Multithreaded SQL Database Server Version: 5.2.7 +Release: 1 %define srv_vers 5.1.57 -Release: 0 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers Url: http://www.mysql.com @@ -61,7 +61,7 @@ PreReq: %install_info_prereq %insserv_prereq %endif BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel zlib-devel %if 0%{?suse_version} -BuildRequires: pwdutils tcpd-devel libevent-devel +BuildRequires: libevent-devel pwdutils tcpd-devel %endif %if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8 BuildRequires: fdupes @@ -80,6 +80,7 @@ Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} Conflicts: otherproviders(mysql) Patch1: mariadb-strict-aliasing.patch + %description MariaDB is a backward compatible, drop-in replacement branch of the MySQL Database Server. It includes all major open source storage engines, including @@ -90,6 +91,7 @@ This package only contains the server-side programs. %if ! 0%{?prefered} > 0 #------------------------------------------------------------------------------- + %package -n libmariadbclient16 #------------------------------------------------------------------------------- Summary: MariaDB Shared Libraries @@ -125,6 +127,7 @@ Authors: %if 0%{?prefered} > 0 #------------------------------------------------------------------------------- + %package -n libmysqlclient-devel #------------------------------------------------------------------------------- # mysql-devel was last used in openSUSE 10.2 @@ -207,6 +210,7 @@ Authors: %endif #------------------------------------------------------------------------------- + %package client #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -247,8 +251,11 @@ Authors: #------------------------------------------------------------------------------- %if %{defined mdkversion} + %package debuging + %else + %package debug %endif #------------------------------------------------------------------------------- @@ -260,9 +267,13 @@ Provides: mysql-debug = %{srv_vers} Conflicts: otherproviders(mysql-debug) %if %{defined mdkversion} + %description debuging + %else + %description debug + %endif A version of the mysql server that has some debug code turned on. It should be only used to track down problems with the standard @@ -275,8 +286,8 @@ Authors: Michael Widenius David Axmark - #------------------------------------------------------------------------------- + %package test #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -325,6 +336,7 @@ Authors: %if 0%{?cluster} > 0 #------------------------------------------------------------------------------- + %package ndb-storage #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -383,6 +395,7 @@ advanced user. They should be used with caution. %endif #------------------------------------------------------------------------------- + %prep #------------------------------------------------------------------------------- %setup -q -n mariadb-%version -D -a 9 @@ -410,16 +423,19 @@ done %patch1 #------------------------------------------------------------------------------- + %build #------------------------------------------------------------------------------- %{expand:%(cat %_sourcedir/build.inc)} #------------------------------------------------------------------------------- + %install #------------------------------------------------------------------------------- %{expand:%(cat %_sourcedir/install.inc)} #------------------------------------------------------------------------------- + %pre #------------------------------------------------------------------------------- /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || : @@ -428,6 +444,7 @@ done /usr/sbin/usermod -g mysql -s /bin/false mysql || : #------------------------------------------------------------------------------- + %preun #------------------------------------------------------------------------------- [ $1 = 1 ] || /usr/sbin/rcmysql stop @@ -449,6 +466,7 @@ chown -Rv mysql:mysql var/mysql/ fi #------------------------------------------------------------------------------- + %posttrans #------------------------------------------------------------------------------- %install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* @@ -468,24 +486,28 @@ fi %if ! 0%{prefered} > 0 #------------------------------------------------------------------------------- + %post -n libmariadbclient16 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %postun -n libmariadbclient16 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %post -n libmariadbclient_r16 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %postun -n libmariadbclient_r16 #------------------------------------------------------------------------------- /sbin/ldconfig @@ -495,36 +517,42 @@ fi %if 0%{prefered} > 0 #------------------------------------------------------------------------------- + %post -n libmysqlclient16 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %postun -n libmysqlclient16 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %post -n libmysqlclient_r16 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %postun -n libmysqlclient_r16 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %post -n libmysqld0 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %postun -n libmysqld0 #------------------------------------------------------------------------------- /sbin/ldconfig @@ -532,6 +560,7 @@ fi %endif #------------------------------------------------------------------------------- + %postun #------------------------------------------------------------------------------- if [ $1 = 0 ]; then @@ -541,12 +570,14 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %clean #------------------------------------------------------------------------------- [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -f mysql.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -567,6 +598,7 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files client -f mysql-client.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -575,6 +607,7 @@ fi %if ! 0%{prefered} > 0 #------------------------------------------------------------------------------- + %files -n libmariadbclient16 #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -582,6 +615,7 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -n libmariadbclient_r16 #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -591,6 +625,7 @@ fi %endif %if 0%{prefered} > 0 #------------------------------------------------------------------------------- + %files -n libmysqlclient-devel -f libmysqlclient-devel.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -601,6 +636,7 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -n libmysqld-devel #------------------------------------------------------------------------------- %defattr(-,root,root) @@ -609,6 +645,7 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -n libmysqld0 #------------------------------------------------------------------------------- %defattr(-,root,root) @@ -616,6 +653,7 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -n libmysqlclient16 #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -623,6 +661,7 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files -n libmysqlclient_r16 #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -631,6 +670,7 @@ fi %endif #------------------------------------------------------------------------------- + %files bench -f mysql-bench.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -639,8 +679,10 @@ fi #------------------------------------------------------------------------------- %if %{defined mdkversion} + %files debuging %else + %files debug %endif #------------------------------------------------------------------------------- @@ -650,6 +692,7 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files test -f mysql-test.files #------------------------------------------------------------------------------- %defattr(-, root, root) @@ -663,6 +706,7 @@ fi #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files tools -f mysql-tools.files %defattr(-, root, root) %_bindir/mysqlrepair @@ -672,18 +716,22 @@ fi %if 0%{cluster} > 0 #------------------------------------------------------------------------------- + %files ndb-storage -f mysql-ndb-storage.files #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files ndb-management -f mysql-ndb-management.files #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files ndb-tools -f mysql-ndb-tools.files #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- + %files ndb-extra -f mysql-ndb-extra.files #------------------------------------------------------------------------------- %endif diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000