From bd015e052f4005d902cc687d95d2ae1ba864af4984460572f3210e7eee61b283 Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Mon, 30 Jan 2012 13:38:58 +0000
Subject: [PATCH] - adding /ush/share/aclocal in files - renaming *-debug
 package to *-debug-version to avoid conflicts

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=63
---
 configuration-tweaks.tar.bz2 |  4 ++--
 mariadb.changes              |  6 ++++++
 mariadb.spec                 | 28 +++++-----------------------
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 63ef7f9..5fc5cd0 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:a6a82370b12eb2daa97f425658eb11e0310bd1eb02c5406feb68a49e090a61a7
-size 219
+oid sha256:72d934e6c98ab3d1c2f90fa723949733903f8f2cea79c840d6b799991b1dad82
+size 218
diff --git a/mariadb.changes b/mariadb.changes
index 9c72445..8120fef 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 30 08:46:31 UTC 2012 - mhrusecky@suse.cz
+
+- adding /ush/share/aclocal in files
+- renaming *-debug package to *-debug-version to avoid conflicts
+
 -------------------------------------------------------------------
 Mon Jan 30 08:23:32 UTC 2012 - mhrusecky@suse.cz
 
diff --git a/mariadb.spec b/mariadb.spec
index b8545ec..07ac9f0 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -179,32 +179,19 @@ To run these database benchmarks, start the script "run-all-tests" in
 the directory /usr/share/sql-bench after starting MariaDB.
 
 
-%if %{defined mdkversion}
-
-%package debuging
-%else
-
-%package debug
-%endif
+%package debug-version
 License:        GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MariaDB with debug options turned on
 Group:          Productivity/Databases/Servers
 Requires:       %{name} = %{version}
 Provides:       mysql-debug = %{srv_vers}
+Provides:       %{name}-debug = %{srv_vers}
 %if 0%{?prefered} > 0
 Obsoletes:      mysql-debug < %{srv_vers}
 %endif
 Conflicts:      otherproviders(mysql-debug)
 
-%if %{defined mdkversion}
-
-%description debuging
-
-%else
-
-%description debug
-
-%endif
+%description debug-version
 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 will bot replace the
@@ -436,6 +423,7 @@ fi
 /usr/include/mysql
 %{_libdir}/libmysqlclient.so
 %{_libdir}/libmysqlclient_r.so
+%dir /usr/share/aclocal
 /usr/share/aclocal/mysql.m4
 
 %files -n libmysqld-devel
@@ -460,13 +448,7 @@ fi
 %defattr(-, root, root)
 /usr/share/sql-bench
 
-%if %{defined mdkversion}
-
-%files debuging
-%else
-
-%files debug
-%endif
+%files debug-version
 %defattr(-, root, root)
 /usr/sbin/mysqld-debug
 %{_libdir}/mysql/mysqld-debug.sym