From 01662309bf0d773dfcb7b302f70c3b7c8980d4e3d6adcbc57bf38c7673bcd0a0 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Mon, 3 Oct 2011 12:02:00 +0000 Subject: [PATCH 1/2] update OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=53 --- mariadb-5.2.8.tar.bz2 | 3 --- mariadb-5.2.9.tar.bz2 | 3 +++ mariadb.changes | 9 ++++++++ mariadb.spec | 48 +++++++++++-------------------------------- 4 files changed, 24 insertions(+), 39 deletions(-) delete mode 100644 mariadb-5.2.8.tar.bz2 create mode 100644 mariadb-5.2.9.tar.bz2 diff --git a/mariadb-5.2.8.tar.bz2 b/mariadb-5.2.8.tar.bz2 deleted file mode 100644 index 9969373..0000000 --- a/mariadb-5.2.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d93930ecd3584854aabd161aaa0643cf4f37d9eac972e59d38662c9a6838a161 -size 19011956 diff --git a/mariadb-5.2.9.tar.bz2 b/mariadb-5.2.9.tar.bz2 new file mode 100644 index 0000000..d9bfe59 --- /dev/null +++ b/mariadb-5.2.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ada8f5bcdedf48f74b8d0c1d8180c35a811f3a6b2446d1f58941cf3e5f4d461 +size 19019197 diff --git a/mariadb.changes b/mariadb.changes index 6e6b29c..bcac94b 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Oct 2 23:47:02 CEST 2011 - mhrusecky@suse.cz + +- updated to MariaDB 5.2.9 + * Release notes: + http://kb.askmonty.org/v/mariadb-529-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-529-changelog + ------------------------------------------------------------------- Wed Aug 24 16:04:32 CEST 2011 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index 7d635bd..c38b382 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -31,7 +31,7 @@ Name: mariadb Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 5.2.8 +Version: 5.2.9 Release: 1 %define srv_vers 5.1.57 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -52,11 +52,7 @@ Source12: series BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils -%else -PreReq: /usr/sbin/useradd /usr/sbin/usermod /usr/sbin/groupadd -%endif PreReq: coreutils sed grep -%if 0%{?suse_version} PreReq: %install_info_prereq %insserv_prereq %endif BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel zlib-devel @@ -439,7 +435,7 @@ done %pre #------------------------------------------------------------------------------- /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || : -/usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \ +/usr/sbin/useradd -r -o -g mysql -c "MySQL database admin" \ -s /bin/false -d /var/lib/mysql mysql 2> /dev/null || : /usr/sbin/usermod -g mysql -s /bin/false mysql || : @@ -487,30 +483,22 @@ fi #------------------------------------------------------------------------------- -%post -n libmariadbclient16 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%post -n libmariadbclient16 -p /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%postun -n libmariadbclient16 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%postun -n libmariadbclient16 -p /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%post -n libmariadbclient_r16 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%post -n libmariadbclient_r16 -p /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%postun -n libmariadbclient_r16 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%postun -n libmariadbclient_r16 -p /sbin/ldconfig #------------------------------------------------------------------------------- %endif @@ -518,44 +506,32 @@ fi #------------------------------------------------------------------------------- -%post -n libmysqlclient16 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%post -n libmysqlclient16 -p /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%postun -n libmysqlclient16 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%postun -n libmysqlclient16 -p /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%post -n libmysqlclient_r16 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%post -n libmysqlclient_r16 -p /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%postun -n libmysqlclient_r16 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%postun -n libmysqlclient_r16 -p /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%post -n libmysqld0 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%post -n libmysqld0 -p /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%postun -n libmysqld0 -#------------------------------------------------------------------------------- -/sbin/ldconfig +%postun -n libmysqld0 -p /sbin/ldconfig #------------------------------------------------------------------------------- %endif From 44ce241bbfc51f071b024a8990f2982d0dca9e1b34568ff0451f61156b44d01f Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Tue, 18 Oct 2011 12:28:51 +0000 Subject: [PATCH 2/2] - re-adding static mysql user id OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=54 --- mariadb.changes | 5 +++++ mariadb.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mariadb.changes b/mariadb.changes index bcac94b..8d34938 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 18 14:26:19 CEST 2011 - mhrusecky@suse.cz + +- re-adding static mysql user id + ------------------------------------------------------------------- Sun Oct 2 23:47:02 CEST 2011 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index c38b382..11187fc 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -435,7 +435,7 @@ done %pre #------------------------------------------------------------------------------- /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || : -/usr/sbin/useradd -r -o -g mysql -c "MySQL database admin" \ +/usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \ -s /bin/false -d /var/lib/mysql mysql 2> /dev/null || : /usr/sbin/usermod -g mysql -s /bin/false mysql || :