diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 1160790..c467e65 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86e5ff42abb49bc5b0630e34081e57ce64d432fcd99d4c52a0eaf370633bdcfc -size 219 +oid sha256:9d7787ba1d8fcb24323d602ecf38185504f9b0edfca9e00533045c88867a9c42 +size 220 diff --git a/mariadb.spec b/mariadb.spec index 5f1b60e..b2c838a 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -36,7 +36,7 @@ Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Version: 5.5.29 -Release: 1 +Release: 0 %define srv_vers 5.5.29 Url: http://www.mariab.org Source: mariadb-%{version}.tar.bz2 @@ -83,10 +83,11 @@ Recommends: logrotate Requires: logrotate %endif # required by rcmysql -Requires: %{name}-client perl-base +Requires: %{name}-client Requires: %{name}-errormessages = %version -Provides: mysql-Max = %{srv_vers} +Requires: perl-base Provides: mysql = %{srv_vers} +Provides: mysql-Max = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides} = %{version} Obsoletes: %{extra_provides} < %{version} @@ -105,18 +106,16 @@ the Maria storage engine. This package only contains the server-side programs. %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: glibc-devel Requires: libmysqlclient18 = %version Requires: libmysqlclient_r18 = %version -Requires: glibc-devel Requires: openssl-devel Requires: zlib-devel Summary: MariaDB development header files and libraries -License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/C and C++ %description -n libmysqlclient-devel @@ -124,7 +123,6 @@ This package contains the development header files and libraries necessary to develop client applications for MariaDB. %package -n libmysqld18 -License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ Requires: %{name}-errormessages = %version @@ -134,13 +132,12 @@ This package contains the development header files and libraries for developing applications that embed the MariaDB. %package -n libmysqld-devel -License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files +Group: Development/Libraries/C and C++ # the headers files are the shared Requires: libmysqlclient-devel = %version -Requires: tcpd-devel Requires: libmysqld18 = %version -Group: Development/Libraries/C and C++ +Requires: tcpd-devel %description -n libmysqld-devel This package contains the development header files and libraries @@ -149,7 +146,6 @@ for developing applications that embed the MariaDB. %package -n libmysqlclient18 Summary: Shared Libraries for MariaDB -License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmysqlclient18 @@ -158,7 +154,6 @@ languages and applications need to dynamically load and use MariaDB. %package -n libmysqlclient_r18 Summary: Shared Libraries for MariaDB -License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmysqlclient_r18 @@ -191,7 +186,8 @@ This package provides the translated error messages for the standalone server daemon as well as the embedded server %package bench -Requires: %{name}-client perl-DBD-mysql +Requires: %{name}-client +Requires: perl-DBD-mysql Summary: Benchmarks for MariaDB Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} @@ -215,8 +211,8 @@ the directory /usr/share/sql-bench after starting MariaDB. Summary: MariaDB with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{version} -Provides: mysql-debug = %{srv_vers} Provides: %{name}-debug = %{srv_vers} +Provides: mysql-debug = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-debug-verion = %{version} Obsoletes: %{extra_provides}-debug-version < %{version} @@ -237,10 +233,10 @@ information on how to use the debug server. Summary: Testsuite for MariaDB Group: Productivity/Databases/Servers Requires: %{name} = %{version} -Requires: %{name}-client = %{version} -Requires: perl-DBD-mysql -Requires: %{name}-tools = %{version} Requires: %{name}-bench = %{version} +Requires: %{name}-client = %{version} +Requires: %{name}-tools = %{version} +Requires: perl-DBD-mysql Provides: mysql-test = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-test = %{version} @@ -280,7 +276,6 @@ applications with MariaDB. %if 0%{?cluster} > 0 %if 0%{?cluster} > 1 - %package -n libndbclient6 Summary: Shared Libraries for cluster client Group: Development/Libraries/Other @@ -382,7 +377,6 @@ rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result ####################################################################### # preun and posttran takes care of restart # ####################################################################### - %preun [ $1 = 1 ] || /usr/sbin/rcmysql stop @@ -433,14 +427,12 @@ fi %postun -n libmysqlclient_r18 -p /sbin/ldconfig %if 0%{cluster} > 1 - %post -n libndbclient6 -p /sbin/ldconfig %postun -n libndbclient6 -p /sbin/ldconfig %endif %if 0%{prefered} > 0 - %post -n libmysqld18 -p /sbin/ldconfig %postun -n libmysqld18 -p /sbin/ldconfig @@ -488,7 +480,6 @@ fi %config(noreplace) %attr(0640, root, mysql) /etc/mysqlaccess.conf %if 0%{prefered} > 0 - %files -n libmysqlclient-devel -f libmysqlclient-devel.files %defattr(-, root, root) /usr/include/mysql @@ -512,7 +503,6 @@ fi %{_libdir}/libmysqlclient.so.* %if 0%{cluster} > 1 - %files -n libndbclient6 %defattr(-, root, root) %{_libdir}/libndbclient.so.* @@ -548,7 +538,6 @@ fi %_bindir/mysqloptimize %if 0%{cluster} > 0 - %files ndb-storage -f mysql-ndb-storage.files %files ndb-management -f mysql-ndb-management.files