diff --git a/baselibs.conf b/baselibs.conf index f28702c..ad6c1ab 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libmysqlclient16 -libmysqlclient_r16 +libmariadbclient16 +libmariadbclient_r16 diff --git a/build.inc b/build.inc index 386ff2e..3a22f68 100644 --- a/build.inc +++ b/build.inc @@ -3,13 +3,11 @@ %else %define socketpath /var/run/mysql %endif -autoreconf -f -i -export WARN_DIS=" -Wno-unused-parameter " -%if 0%{?suse_version} > 1140 -export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable " -%endif -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS" +export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing -Wno-unused-parameter -Wno-unused-but-set-variable" export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" + +%if 0%{use_cmake} < 1 +autoreconf -f -i # Make the compile a function, since we do multiple builds BuildMySQL() { # The --enable-assembler simply does nothing on systems that do not @@ -18,7 +16,6 @@ BuildMySQL() { mkdir _build$suffix pushd _build$suffix ../configure \ - --with-libevent \ --enable-assembler \ --without-readline \ --infodir=%{_infodir} \ @@ -48,6 +45,7 @@ BuildMySQL() { %endif --with-ssl=/usr \ --with-plugins=%{builtin_plugins} \ + --without-plugin-handlersocket \ HOSTNAME="/bin/hostname -f" \ "$@" # Add this for MyISAM RAID support: @@ -69,7 +67,7 @@ BuildMySQL() { popd } # Build the client, extra tools, libraries -BuildMySQL "" --without-embedded-server +BuildMySQL "" --with-embedded-server # build mysqld-debug BuildMySQL "-debug" --with-debug --without-embedded-server @@ -85,3 +83,31 @@ rm -rf tmp cd .. %endif +%else # cmake build + +BuildMySQL() { + mkdir _build$1 + pushd _build$1 + shift + cmake -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + -DWITH_READLINE=0 \ + -DWITH_LIBEDIT=0 \ + -DINSTALL_LAYOUT=RPM \ + -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \ + -DWITH_COMMENT="openSUSE MySQL rpm" \ + -DWITH_EXTRA_CHARSET=all \ + -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ + -DWITH_EMBEDDED_SERVER=true \ + -DDENABLE_DOWNLOADS=false \ + "$@" .. + make %{?jobs:-j%jobs} + nm --numeric-sort sql/mysqld > sql/mysqld.sym + popd +} + +BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share +BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug +%endif diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 new file mode 100644 index 0000000..3d1b32a --- /dev/null +++ b/configuration-tweaks.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2208b70bf0b17e8d6110b7fb4800eeef66704c694a1e49e05498f4d417549d34 +size 216 diff --git a/default_plugins.cnf b/default_plugins.cnf deleted file mode 100644 index 66f3d94..0000000 --- a/default_plugins.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[server] -plugin-load=blackhole=ha_blackhole.so -plugin-load=federated=ha_federated.so -plugin-load=archive=ha_archive.so diff --git a/install.inc b/install.inc index 6f54fb9..eceecf8 100644 --- a/install.inc +++ b/install.inc @@ -7,14 +7,20 @@ install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug # install the client, extra tools, libraries and the standard server make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym +# remove handler socket client +rm -f %buildroot%_libdir/libhsclient* +rm -f %buildroot%_bindir/hsclient* +rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so # remove most static libs (FIXME: don't build them at all...) rm -f %buildroot%_libdir/libmysqlclient*a +rm -f %buildroot%_libdir/libmysqlservices*a rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la rm -f %buildroot%_libdir/mysql/plugin/*a # XXX: package these? The ndb tools are linked statically atm rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run -rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} @@ -45,29 +51,33 @@ filelist mysqlslap >mysql-bench.files filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) -filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files +filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mytop hsclient >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files -filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files +filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} >mysql-ndb-extra.files ### files not installed by make install # Create directory structure -DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) +DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) DOCDIR=%buildroot%_defaultdocdir/%name install -d -m 755 ${DOCDIR} install -d -m 755 %buildroot/etc/logrotate.d install -d -m 755 %buildroot/etc/init.d install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql -%if 0%{?prefered} > 0 +%if 0%{?prefered} > 0%{?use_cmake} install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so %endif install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf -install -m 644 "${DOCS[@]}" ${DOCDIR} +for i in "${DOCS[@]}"; do + install -m 644 "${i}" "${DOCDIR}" || true +done install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql +# this is used by the init script +install -m 755 -d %buildroot/var/run/mysql # SuSEfirewall service description install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql @@ -108,14 +118,17 @@ done rm -rf '%buildroot'/%_libdir/libmysqld.* rm -rf '%buildroot'/%_libdir/*.la rm -rf '%buildroot'/%_libdir/*.so -rm -rf '%buildroot'/%_libdir/*.a rm -rf '%buildroot'/%_includedir rm -rf '%buildroot'/%_datadir/man/*/mysql_config* rm -rf '%buildroot'/%_datadir/aclocal +rm -rf '%buildroot'/%_libdir/*.a %endif sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then + mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf +fi mkdir -p '%buildroot'/etc/mysql -[ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql +bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf - diff --git a/mariadb-5.2.10.tar.bz2 b/mariadb-5.2.10.tar.bz2 new file mode 100644 index 0000000..4b5cd55 --- /dev/null +++ b/mariadb-5.2.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4f129108f512b1853e17d0fd83a84c2e025c5f5c9ee53dd72e651491f200c38 +size 19112928 diff --git a/mariadb-5.2.9.tar.bz2 b/mariadb-5.2.9.tar.bz2 deleted file mode 100644 index d9bfe59..0000000 --- a/mariadb-5.2.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ada8f5bcdedf48f74b8d0c1d8180c35a811f3a6b2446d1f58941cf3e5f4d461 -size 19019197 diff --git a/mariadb.changes b/mariadb.changes index 0fc0cf1..411ee11 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 8 10:39:05 CET 2011 - mhrusecky@suse.cz + +- migrated to the new common template +- updated to MariaDB 5.2.10 + * Release notes: + http://kb.askmonty.org/v/mariadb-5210-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-5210-changelog + ------------------------------------------------------------------- Wed Nov 23 09:27:43 UTC 2011 - coolo@suse.com diff --git a/mariadb.spec b/mariadb.spec index 619e5ee..d5b1302 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -19,8 +19,9 @@ # Few definitions which will alter build %define prefered 0 +%define use_cmake 0 %define cluster 0 -%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb +%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -30,14 +31,13 @@ #Vendor: %vendor Name: mariadb -Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 5.2.9 +Summary: Server part of MariaDB +Version: 5.2.10 Release: 1 -%define srv_vers 5.1.57 +%define srv_vers 5.1.60 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers -Url: http://www.mysql.com -# http://askmonty.org/downloads/r/http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.47/kvm-tarbake-jaunty-x86/%{name}-%{version}.tar.gz +Url: http://www.mariab.org Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf Source3: README.debug @@ -49,15 +49,16 @@ Source9: mysql-patches.tar.bz2 Source10: build.inc Source11: install.inc Source12: series +Source13: configuration-tweaks.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils -PreReq: coreutils sed grep PreReq: %install_info_prereq %insserv_prereq %endif -BuildRequires: gcc-c++ libtool ncurses-devel openssl-devel procps readline-devel zlib-devel +BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel +BuildRequires: cmake libtool zlib-devel %if 0%{?suse_version} -BuildRequires: libevent-devel pwdutils tcpd-devel +BuildRequires: pwdutils tcpd-devel %endif %if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8 BuildRequires: fdupes @@ -74,8 +75,11 @@ Requires: logrotate Requires: %{name}-client perl-base Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql < %{srv_vers} +Obsoletes: mysql-Max < %{srv_vers} +%endif Conflicts: otherproviders(mysql) -Patch1: mariadb-strict-aliasing.patch %description MariaDB is a backward compatible, drop-in replacement branch of the MySQL @@ -84,13 +88,50 @@ the Maria storage engine. This package only contains the server-side programs. -%if ! 0%{?prefered} > 0 +%if 0%{?prefered} > 0 -#------------------------------------------------------------------------------- +%package -n libmysqlclient-devel +# mysql-devel was last used in openSUSE 10.2 +Provides: mysql-devel = %srv_vers-%release +Obsoletes: mysql-devel < %srv_vers +Requires: libmysqlclient16 = %version +Requires: libmysqlclient_r16 = %version +Requires: glibc-devel +Requires: openssl-devel +Requires: zlib-devel +Summary: MariaDB development header files and libraries +License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +Group: Development/Libraries/C and C++ + +%description -n libmysqlclient-devel +This package contains the development header files and libraries +necessary to develop client applications for MariaDB. + +%package -n libmysqld16 +License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +Summary: MariaDB embedded server development files +Group: Development/Libraries/C and C++ + +%description -n libmysqld16 +This package contains the development header files and libraries +for developing applications that embed the MariaDB. + +%package -n libmysqld-devel +License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +Summary: MariaDB embedded server development files +# the headers files are the shared +Requires: libmysqlclient-devel = %version +Requires: tcpd-devel +Requires: libmysqld16 = %version +Group: Development/Libraries/C and C++ + +%description -n libmysqld-devel +This package contains the development header files and libraries +for developing applications that embed the MariaDB. +%endif %package -n libmariadbclient16 -#------------------------------------------------------------------------------- -Summary: MariaDB Shared Libraries +Summary: Shared Libraries for MariaDB License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/Other @@ -98,15 +139,8 @@ Group: Development/Libraries/Other This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. -Authors: --------- - Michael Widenius - David Axmark - -#------------------------------------------------------------------------------- %package -n libmariadbclient_r16 -#------------------------------------------------------------------------------- -Summary: MariaDB Shared Libraries +Summary: Shared Libraries for MariaDB License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/Other @@ -114,152 +148,52 @@ Group: Development/Libraries/Other This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. -Authors: --------- - Michael Widenius - David Axmark - -%endif -%if 0%{?prefered} > 0 - -#------------------------------------------------------------------------------- - -%package -n libmysqlclient-devel -#------------------------------------------------------------------------------- -# mysql-devel was last used in openSUSE 10.2 -Provides: mysql-devel = %srv_vers-%release -Requires: libmysqlclient16 = %{version} libmysqlclient_r16 = %{version} glibc-devel zlib-devel openssl-devel -Summary: MariaDB Development Header Files and Libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Group: Development/Libraries/C and C++ - -%description -n libmysqlclient-devel -This package contains the development header files and libraries -necessary to develop MariaDB client applications. - -Authors: --------- - Michael Widenius - David Axmark - -#------------------------------------------------------------------------------- -%package -n libmysqld0 -#------------------------------------------------------------------------------- -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB embedded server development files -# the headers files are the shared -Requires: libmysqlclient-devel = %{version} -Group: Development/Libraries/C and C++ - -%description -n libmysqld0 -This package contains the development header files and libraries -for developing application that embed the MariaDB server - - -#------------------------------------------------------------------------------- -%package -n libmysqld-devel -#------------------------------------------------------------------------------- -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB embedded server development files -# the headers files are the shared -Requires: libmysqlclient-devel = %{version} -Requires: libmysqld0 = %{version} -Group: Development/Libraries/C and C++ - -%description -n libmysqld-devel -This package contains the development header files and libraries -for developing application that embed the MariaDB server - -#------------------------------------------------------------------------------- -%package -n libmysqlclient16 -#------------------------------------------------------------------------------- -Summary: MariaDB Shared Libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Group: Development/Libraries/Other - -%description -n libmysqlclient16 -This package contains the shared libraries (.so) which certain -languages and applications need to dynamically load and use MariaDB. - -Authors: --------- - Michael Widenius - David Axmark - - -#------------------------------------------------------------------------------- -%package -n libmysqlclient_r16 -#------------------------------------------------------------------------------- -Summary: MariaDB Shared Libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Group: Development/Libraries/Other - -%description -n libmysqlclient_r16 -This package contains the shared libraries (.so) which certain -languages and applications need to dynamically load and use MariaDB. - -Authors: --------- - Michael Widenius - David Axmark - -%endif - -#------------------------------------------------------------------------------- - %package client -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB Client +Summary: Client for MariaDB Group: Productivity/Databases/Clients Provides: mysql-client = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-client < %{srv_vers} +%endif Conflicts: otherproviders(mysql-client) %description client -This package contains the standard MariaDB clients. +This package contains the standard clients for MariaDB. -Authors: --------- - Michael Widenius - David Axmark - - -#------------------------------------------------------------------------------- %package bench -#------------------------------------------------------------------------------- Requires: %{name}-client perl-DBD-mysql License: LGPLv2.1 -Summary: MariaDB - Benchmarks +Summary: Benchmarks for MariaDB Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-bench < %{srv_vers} +%endif Conflicts: otherproviders(mysql-bench) %description bench -This package contains MariaDB benchmark scripts and data. +This package contains benchmark scripts and data for MariaDB. To run these database benchmarks, start the script "run-all-tests" in the directory /usr/share/sql-bench after starting MariaDB. -Authors: --------- - Michael Widenius - David Axmark -#------------------------------------------------------------------------------- %if %{defined mdkversion} %package debuging - %else %package debug %endif -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB server with debug options turned on +Summary: MariaDB with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{version} Provides: mysql-debug = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-debug < %{srv_vers} +%endif Conflicts: otherproviders(mysql-debug) %if %{defined mdkversion} @@ -271,23 +205,15 @@ Conflicts: otherproviders(mysql-debug) %description debug %endif -A version of the mysql server that has some debug code turned on. +A version of the MariaDB that has some debug code turned on. It should be only used to track down problems with the standard -servers. Note that merely installing this package won't replace the +servers. Note that merely installing this package will bot replace the standard server. Read /usr/share/doc/packages/mysql/README.debug for information on how to use the debug server. -Authors: --------- - Michael Widenius - David Axmark - -#------------------------------------------------------------------------------- - %package test -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB testsuite +Summary: Testsuite for MariaDB Group: Productivity/Databases/Servers Requires: %{name} = %{version} Requires: %{name}-client = %{version} @@ -295,22 +221,17 @@ Requires: perl-DBD-mysql Requires: %{name}-tools = %{version} Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-test < %{srv_vers} +%endif Conflicts: otherproviders(mysql-test) %description test -This package contains the MariaDB test scripts and data. +This package contains the test scripts and data for MariaDB. To run the testsuite, run /usr/share/mysql-test/suse-test-run. -Authors: --------- - Michael Widenius - David Axmark - - -#------------------------------------------------------------------------------- %package tools -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB tools Group: Productivity/Databases/Servers @@ -318,27 +239,23 @@ Requires: perl-DBD-mysql # make sure this package is installed when updating from 10.2 and older Provides: mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror Provides: mysql-tools = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-tools < %{srv_vers} +%endif Conflicts: otherproviders(mysql-tools) %description tools -A set of scripts for administering a MariaDB server or developing +A set of scripts for administering a MariaDB or developing applications with MariaDB. -Authors: --------- - Michael Widenius - David Axmark - %if 0%{?cluster} > 0 -#------------------------------------------------------------------------------- - %package ndb-storage -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine Group: Productivity/Databases/Servers Provides: mysql-ndb-storage = %{srv_vers} +Obsoletes: mysql-ndb-storage < %{srv_vers} Conflicts: otherproviders(mysql-ndb-storage) %description ndb-storage @@ -347,13 +264,12 @@ It is necessary to have this package installed on all computers that should store ndbcluster table data. -#------------------------------------------------------------------------------- %package ndb-management -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine management Group: Productivity/Databases/Servers Provides: mysql-ndb-management = %{srv_vers} +Obsoletes: mysql-ndb-management < %{srv_vers} Conflicts: otherproviders(mysql-ndb-management) %description ndb-management @@ -361,40 +277,32 @@ This package contains ndbcluster storage engine management. It is necessary to have this package installed on at least one computer in the cluster. - -#------------------------------------------------------------------------------- %package ndb-tools -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine basic tools Group: Productivity/Databases/Servers Provides: mysql-ndb-tools = %{srv_vers} +Obsoletes: mysql-ndb-tools < %{srv_vers} Conflicts: otherproviders(mysql-ndb-tools) %description ndb-tools This package contains ndbcluster storage engine basic tools. - -#------------------------------------------------------------------------------- %package ndb-extra -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine extra tools Group: Productivity/Databases/Servers Provides: mysql-ndb-extra = %{srv_vers} +Obsoletes: mysql-ndb-extra < %{srv_vers} Conflicts: otherproviders(mysql-ndb-extra) %description ndb-extra This package contains some extra ndbcluster storage engine tools for the advanced user. They should be used with caution. - %endif -#------------------------------------------------------------------------------- - %prep -#------------------------------------------------------------------------------- -%setup -q -n mariadb-%version -D -a 9 +%setup -q -n mariadb-%{version} -D -a 9 cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . # apply patches from series @@ -411,39 +319,31 @@ rm -f man/ndbd_redo_log_reader.1 # breaks VPATH builds when in sourcedir, is generated in the builddirs rm -f sql/sql_builtin.cc sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh -%if ! 0%{?prefered} > 0 +%if 0%{prefered} < 1 for i in `grep -Rl mysqlclient .`; do sed -i 's|mysqlclient|mariadbclient|g' $i done %endif -%patch1 - -#------------------------------------------------------------------------------- %build -#------------------------------------------------------------------------------- %{expand:%(cat %_sourcedir/build.inc)} -#------------------------------------------------------------------------------- - %install -#------------------------------------------------------------------------------- %{expand:%(cat %_sourcedir/install.inc)} -#------------------------------------------------------------------------------- - %pre -#------------------------------------------------------------------------------- /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || : /usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \ -s /bin/false -d /var/lib/mysql mysql 2> /dev/null || : /usr/sbin/usermod -g mysql -s /bin/false mysql || : -#------------------------------------------------------------------------------- +####################################################################### +# preun and posttran takes care of restart # +####################################################################### %preun -#------------------------------------------------------------------------------- [ $1 = 1 ] || /usr/sbin/rcmysql stop + %pretrans -p if posix.access("/usr/sbin/rcmysql", "x") then restart = os.execute("/usr/sbin/rcmysql status > /dev/null") @@ -464,7 +364,6 @@ if posix.stat(dbfile, "uid") == 0 then end %posttrans -#------------------------------------------------------------------------------- %install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* if [ -d /var/lib/mysql ]; then touch /var/lib/mysql/.run-mysql_upgrade @@ -479,83 +378,36 @@ if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d /var/run/mysql/restar rmdir /var/run/mysql/restart || : fi -%if ! 0%{prefered} > 0 - -#------------------------------------------------------------------------------- +####################################################################### +# Various ldconfig post scripts # +####################################################################### %post -n libmariadbclient16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %postun -n libmariadbclient16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %post -n libmariadbclient_r16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %postun -n libmariadbclient_r16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- -%endif %if 0%{prefered} > 0 -#------------------------------------------------------------------------------- +%post -n libmysqld18 -p /sbin/ldconfig -%post -n libmysqlclient16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%postun -n libmysqlclient16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%post -n libmysqlclient_r16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%postun -n libmysqlclient_r16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%post -n libmysqld0 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%postun -n libmysqld0 -p /sbin/ldconfig -#------------------------------------------------------------------------------- +%postun -n libmysqld18 -p /sbin/ldconfig %endif -#------------------------------------------------------------------------------- - %postun -#------------------------------------------------------------------------------- if [ $1 = 0 ]; then %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.* %{insserv_cleanup} fi -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- - -%clean -#------------------------------------------------------------------------------- -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- +####################################################################### +# Files section # +####################################################################### %files -f mysql.files -#------------------------------------------------------------------------------- %defattr(-, root, root) %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf %dir %attr(0750, root, mysql) /etc/mysql @@ -566,94 +418,48 @@ fi /etc/init.d/mysql /usr/sbin/rcmysql /usr/share/mysql/ +%ghost %dir %attr(755,mysql,mysql)/var/run/mysql %dir %{_libdir}/mysql %{_libdir}/mysql/mysqld.sym %config /etc/sysconfig/SuSEfirewall2.d/services/mysql %dir %_libdir/mysql/plugin %_libdir/mysql/plugin/*.so -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files client -f mysql-client.files -#------------------------------------------------------------------------------- %defattr(-, root, root) -%config /etc/mysqlaccess.conf -#------------------------------------------------------------------------------- +%config(noreplace) %attr(0640, root, mysql) /etc/mysqlaccess.conf -%if ! 0%{prefered} > 0 -#------------------------------------------------------------------------------- - -%files -n libmariadbclient16 -#------------------------------------------------------------------------------- -%defattr(-, root, root) -%{_libdir}/libmariadbclient.so.* -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%files -n libmariadbclient_r16 -#------------------------------------------------------------------------------- -%defattr(-, root, root) -%{_libdir}/libmariadbclient_r.so.* -#------------------------------------------------------------------------------- - -%endif %if 0%{prefered} > 0 -#------------------------------------------------------------------------------- %files -n libmysqlclient-devel -f libmysqlclient-devel.files -#------------------------------------------------------------------------------- %defattr(-, root, root) /usr/include/mysql %{_libdir}/libmysqlclient.so %{_libdir}/libmysqlclient_r.so /usr/share/aclocal/mysql.m4 -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files -n libmysqld-devel -#------------------------------------------------------------------------------- %defattr(-,root,root) %_libdir/libmysqld.a %_libdir/libmysqld.so -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- - -%files -n libmysqld0 -#------------------------------------------------------------------------------- +%files -n libmysqld18 %defattr(-,root,root) %_libdir/libmysqld.so.* -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%files -n libmysqlclient16 -#------------------------------------------------------------------------------- -%defattr(-, root, root) -%{_libdir}/libmysqlclient.so.* -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%files -n libmysqlclient_r16 -#------------------------------------------------------------------------------- -%defattr(-, root, root) -%{_libdir}/libmysqlclient_r.so.* -#------------------------------------------------------------------------------- %endif -#------------------------------------------------------------------------------- +%files -n libmariadbclient16 +%defattr(-, root, root) +%{_libdir}/libmariadbclient.so.* + +%files -n libmariadbclient_r16 +%defattr(-, root, root) +%{_libdir}/libmariadbclient_r.so.* %files bench -f mysql-bench.files -#------------------------------------------------------------------------------- %defattr(-, root, root) /usr/share/sql-bench -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- %if %{defined mdkversion} %files debuging @@ -661,16 +467,11 @@ fi %files debug %endif -#------------------------------------------------------------------------------- %defattr(-, root, root) /usr/sbin/mysqld-debug %{_libdir}/mysql/mysqld-debug.sym -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files test -f mysql-test.files -#------------------------------------------------------------------------------- %defattr(-, root, root) %{_bindir}/my_safe_process %_mandir/man1/mysql-test-run.pl.1* @@ -679,37 +480,23 @@ fi %dir %attr(755, root, root)/usr/share/mysql-test /usr/share/mysql-test/[^v]* %dir %attr(755, mysql, mysql) /usr/share/mysql-test/var -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files tools -f mysql-tools.files %defattr(-, root, root) %_bindir/mysqlrepair %_bindir/mysqlanalyze %_bindir/mysqloptimize -#------------------------------------------------------------------------------- %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 %changelog diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index 61605f2..b2ebfd1 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d03c3a824fe4f07732525a6ea1b001ec3291fb97b830eecaf43fc3c1ea27bda -size 16959 +oid sha256:85526171cf750bcd99cddae596e163df31e907ab69706f5dcf478c2c06824f96 +size 16287 diff --git a/series b/series index 06ad93c..1764e1f 100644 --- a/series +++ b/series @@ -9,12 +9,12 @@ mariadb-5.2.6-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch mariadb-5.2.6-install_db-quiet.patch -mysql-community-server-5.1.51-myslq-test.patch +mariadb-5.2.10-myslq-test.patch mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch -mariadb-5.2.6-plugins-avoid-version.patch +mariadb-5.2.10-plugins-avoid-version.patch mariadb-5.1.50-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch mariadb-5.2.4-libmysql-no-pkglibdir.patch mysql-community-server-5.1.53-ssl-compilation-fix.patch -mariadb-5.2.6-compilation-fix.patch +mariadb-5.2.10-compilation-fix.patch