update

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=113

build.inc

@@ -109,6 +109,7 @@ BuildMySQL() {
 			-DWITH_INNOBASE_STORAGE_ENGINE=1                             \
 			-DWITH_PERFSCHEMA_STORAGE_ENGINE=1                           \
 			-DWITH_EMBEDDED_SERVER=true                                  \
+			-DCOMPILATION_COMMENT="openSUSE package"                     \
 			-DDENABLE_DOWNLOADS=false                                    \
 			"$@" ..
 	make %{?jobs:-j%jobs}

configuration-tweaks.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d7787ba1d8fcb24323d602ecf38185504f9b0edfca9e00533045c88867a9c42
+oid sha256:1abd3f67af2880a6b0f4b66131516cfa1ca5df16713e7e972197184c47525e11
-size 220
+size 319

mariadb-5.5.29.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d6df248b16736c2d3e9f163bb672390d59625f28520410bb746cf8a6d843dfc
-size 21299322

mariadb-5.5.30.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a964665ed6bcf1cec9785a7d5ce5e093b44bc5107acfa747320a70f2834c19d5
+size 21257832

mariadb.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Mar 26 13:56:50 CET 2013 - mhrusecky@suse.cz
+
+- little cleanup of systemd
+
+-------------------------------------------------------------------
+Tue Mar 26 11:11:37 CET 2013 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.5.29
+  * Release notes:
+    http://kb.askmonty.org/v/mariadb-5529-release-notes
+  * Changelog:
+    http://kb.askmonty.org/v/mariadb-5529-changelog
+
 -------------------------------------------------------------------
 Tue Mar 12 16:03:07 UTC 2013 - tpaszkowski@suse.com
 

mariadb.spec

@@ -35,9 +35,9 @@ Name:           mariadb
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Productivity/Databases/Servers
-Version:        5.5.29
+Version:        5.5.30
 Release:        0
-%define srv_vers 5.5.29
+%define srv_vers 5.5.30
 Url:            http://www.mariab.org
 Source:         mariadb-%{version}.tar.bz2
 Source2:        baselibs.conf
@@ -77,9 +77,6 @@ BuildRequires:  fdupes
 %if 0%{?fedora_version} > 11
 BuildRequires:  sqlite
 %endif
-%if 0%{?suse_version} >= 1210
-BuildRequires:  systemd
-%endif
 %if 0%{?suse_version} > 1030
 Recommends:     logrotate
 %else
@@ -91,6 +88,7 @@ Requires:       %{name}-errormessages = %version
 Requires:       perl-base
 # systemd requirements for openSUSE >= 12.1
 %if 0%{?suse_version} >= 1210
+BuildRequires:  systemd
 %{?systemd_requires}
 %endif
 Provides:       mysql = %{srv_vers}
@@ -396,10 +394,6 @@ rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
 #######################################################################
 %preun
 [ $1 = 1 ] || /usr/sbin/rcmysql stop
-# systemd requirment
-%if 0%{?suse_version} >= 1210
-%service_del_preun mysql.service
-%endif
 
 %pretrans -p <lua>
 if posix.access("/usr/sbin/rcmysql", "x") then
@@ -410,7 +404,6 @@ if posix.access("/usr/sbin/rcmysql", "x") then
     os.execute("/bin/mkdir -p /var/run/mysql/restart")
   end
 end
-
 dbfile="var/mysql/mysql/db.ISM"
 olddir="var/mysql"
 newdir="var/lib/mysql"
@@ -463,11 +456,11 @@ fi
 if [ $1 = 0 ]; then
 	%install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.*
 	%{insserv_cleanup}
+	rm -f "/var/lib/systemd/migrated/mysql.service"
+	if [ -x /usr/bin/systemctl ]; then
+		/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+	fi
 fi
-# systemd requirment
-%if 0%{?suse_version} >= 1210
-%service_del_postun mysql.service
-%endif
 
 #######################################################################
 # Files section                                                       #

mysql-patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab62b051b2d913334d421d92dfbe156e55e5571fd163f57d1c58587550ae9341
+oid sha256:58dbc3e1be513b1b61c81dacd3fd6899ed364ed93f0f04e2c0cbc066d62b5582
-size 11762
+size 11760