Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2014-10-05 20:29:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2014-09-28 19:53:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2014-10-05 20:29:14.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Sep 24 12:54:56 UTC 2014 - [email protected] + +- some CentOS/Fedora compatibility + +------------------------------------------------------------------- +Wed Sep 24 08:08:36 UTC 2014 - [email protected] + +- systemd not depending on SUSE version anymore +- fixing build on distributions with %docdir != %datadir/doc/%name + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.7kiCSE/_old 2014-10-05 20:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.7kiCSE/_new 2014-10-05 20:29:16.000000000 +0200 @@ -100,7 +100,11 @@ # required by rcmysql Requires: %{name}-client Requires: %{name}-errormessages = %version +%if 0%{?suse_version} Requires: perl-base +%else +Requires: perl +%endif # systemd requirements for openSUSE >= 12.1 %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(systemd) @@ -121,6 +125,11 @@ Obsoletes: mysql-Max < %{srv_vers} %endif Conflicts: otherproviders(mysql) +# Compatibility with Fedora/CentOS +Provides: mysql-server = %{srv_vers} +Provides: mariadb-server = %{srv_vers} +Conflicts: otherproviders(mysql-server) +Conflicts: otherproviders(mariadb-server) %description MariaDB is a backward compatible, drop-in replacement branch of the MySQL @@ -541,7 +550,7 @@ %if %have_info %doc %{_infodir}/mysql.info.* %endif -%if 0%{?suse_version} >= 1210 && 0%{?use_systemd} > 0 +%if 0%{?use_systemd} > 0 %dir /usr/lib/mysql /usr/lib/mysql/rcmysql /usr/lib/systemd/system/mysql.service ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.7kiCSE/_old 2014-10-05 20:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.7kiCSE/_new 2014-10-05 20:29:16.000000000 +0200 @@ -86,7 +86,7 @@ for i in "${DOCS[@]}"; do install -m 644 "${i}" "${DOCDIR}" || true done -%if 0%{?suse_version} >= 1210 && 0%{?use_systemd} > 0 +%if 0%{?use_systemd} > 0 install -D -m 755 %_sourcedir/rc.mysql.systemd '%buildroot'/usr/lib/mysql/rcmysql sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/usr/lib/mysql/rcmysql ln -sf service '%buildroot'/usr/sbin/rcmysql @@ -163,6 +163,14 @@ echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files fi +if [ %{_defaultdocdir} \!= /usr/share/doc ]; then rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}* +fi +if [ %{name} \!= mysql ]; then +rm -rf '%buildroot'/usr/share/doc/mysql +fi +if [ %{name} \!= mariadb ]; then +rm -rf '%buildroot'/usr/share/doc/mariadb +fi rm -f '%buildroot'/usr/share/doc/* 2> /dev/null || true rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
