Accepting request 253511 from server:database

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/253511
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=44

configuration-tweaks.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ec50f340dbc624772923a07c72a66867b26ba2482cb2a9a4fe547e78a1cf89f
+oid sha256:fd263b82472d187e5fbe9c03c581be5156f3fe8a22b95b39d6208c8fb3b0a9c3
-size 222
+size 221

install.inc

@@ -86,7 +86,7 @@ install -m 660 %{S:14} %buildroot/etc/my.cnf
 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 @@ if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
 	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}

mariadb.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Sep 24 12:54:56 UTC 2014 - michal.hrusecky@opensuse.org
+
+- some CentOS/Fedora compatibility
+
+-------------------------------------------------------------------
+Wed Sep 24 08:08:36 UTC 2014 - michal.hrusecky@opensuse.org
+
+- systemd not depending on SUSE version anymore
+- fixing build on distributions with %docdir != %datadir/doc/%name
+
 -------------------------------------------------------------------
 Fri Sep 19 17:41:26 UTC 2014 - michal.hrusecky@opensuse.org
 

mariadb.spec

@@ -100,7 +100,11 @@ Requires:       logrotate
 # 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 < %{srv_vers}
 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 @@ fi
 %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