From 916d8f80400d197fb2d12fb6e2353d99d17feb73e332a99aeb410f6472f44328 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Tue, 19 Jun 2012 11:48:59 +0000 Subject: [PATCH 1/7] - updated to MariaDB 5.3.6 * Release notes: http://kb.askmonty.org/v/mariadb-5524-release-notes * Changelog: http://kb.askmonty.org/v/mariadb-5524-changelog OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=84 --- build.inc | 2 +- configuration-tweaks.tar.bz2 | 2 +- mariadb-5.5.23.tar.bz2 | 3 --- mariadb-5.5.24.tar.bz2 | 3 +++ mariadb.changes | 9 +++++++++ mariadb.spec | 6 +++--- mysql-patches.tar.bz2 | 4 ++-- 7 files changed, 19 insertions(+), 10 deletions(-) delete mode 100644 mariadb-5.5.23.tar.bz2 create mode 100644 mariadb-5.5.24.tar.bz2 diff --git a/build.inc b/build.inc index e9438c0..c2d5283 100644 --- a/build.inc +++ b/build.inc @@ -6,7 +6,7 @@ %if 0%{?suse_version} > 1140 export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter " %endif -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DFORCE_INIT_OF_VARS $WARN_DIS " +export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS " export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" %if 0%{use_cmake} < 1 diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 2a1d9b6..4f9b9fb 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:4874cb4a3c8a9f81cdc49aaf91de9e03bf36e46721a86355cf5fbe07cd7d7613 +oid sha256:aaf66464e7ac6efc42954db0f482d5a9ae03cc06f0564eb55a3fb5221925c0b1 size 217 diff --git a/mariadb-5.5.23.tar.bz2 b/mariadb-5.5.23.tar.bz2 deleted file mode 100644 index 84c9760..0000000 --- a/mariadb-5.5.23.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a1ac784a9e69a35a901b057c64d03d118aa58a4b41e3eed948638e3651f5b74 -size 20969691 diff --git a/mariadb-5.5.24.tar.bz2 b/mariadb-5.5.24.tar.bz2 new file mode 100644 index 0000000..af76b97 --- /dev/null +++ b/mariadb-5.5.24.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4223517a8c3fd3edd496268c3831798421fafb85d49b7f99e973f0158ae18fd3 +size 20943519 diff --git a/mariadb.changes b/mariadb.changes index ce9d38f..47ce261 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 19 10:52:13 CEST 2012 - mhrusecky@suse.cz + +- updated to MariaDB 5.3.6 + * Release notes: + http://kb.askmonty.org/v/mariadb-5524-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-5524-changelog + ------------------------------------------------------------------- Sat Jun 9 18:30:56 UTC 2012 - xgpub@tellas.gr diff --git a/mariadb.spec b/mariadb.spec index ddaab2c..565b472 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -34,9 +34,9 @@ Name: mariadb Summary: Server part of MariaDB -Version: 5.5.23 +Version: 5.5.24 Release: 1 -%define srv_vers 5.5.23 +%define srv_vers 5.5.24 License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: http://www.mariab.org @@ -489,7 +489,7 @@ fi %{_libdir}/libmariadbclient.so.* %dir %_libdir/mysql %dir %_libdir/mysql/plugin -%_libdir/mysql/plugin/dialog*.so +%_libdir/mysql/plugin/dialog.so %if 0%{cluster} > 1 diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index 4528ea1..a3d1249 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f165e6ee07af134e003c46eb59ac2fd2d2085108254c3ecb863b5eb16cd6c84 -size 11075 +oid sha256:d3f21fef0e7380382d842ecf0d583de275e4ceb66730c548605062f50ad4128e +size 11024 From ab2e5da063ebe4e7a2c1c15ad2f596e426c3c278d7713e3227c75ac512d6963b Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Tue, 19 Jun 2012 11:49:30 +0000 Subject: [PATCH 2/7] fix OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=85 --- configuration-tweaks.tar.bz2 | 4 ++-- mariadb.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 4f9b9fb..8410971 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:aaf66464e7ac6efc42954db0f482d5a9ae03cc06f0564eb55a3fb5221925c0b1 -size 217 +oid sha256:5c514079fadeddf3b89d6eb5d147145a31caf7d5a3db6c0c84c2274bfc905d30 +size 218 diff --git a/mariadb.spec b/mariadb.spec index 565b472..c4f955f 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -489,7 +489,7 @@ fi %{_libdir}/libmariadbclient.so.* %dir %_libdir/mysql %dir %_libdir/mysql/plugin -%_libdir/mysql/plugin/dialog.so +%_libdir/mysql/plugin/dialog*.so %if 0%{cluster} > 1 From 6d4f4c60f1798f05ff0bc6ececfcad9d08c5614ea8ad10901b7c74a169608ce9 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Tue, 19 Jun 2012 13:16:38 +0000 Subject: [PATCH 3/7] fix OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=86 --- configuration-tweaks.tar.bz2 | 4 ++-- mysql-patches.tar.bz2 | 4 ++-- series | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 8410971..3b3b46e 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:5c514079fadeddf3b89d6eb5d147145a31caf7d5a3db6c0c84c2274bfc905d30 -size 218 +oid sha256:2fc9cfcc3c103fd463dcc189b4491ee6fab5f274d863cdeb269e401225a90011 +size 219 diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index a3d1249..7273eea 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3f21fef0e7380382d842ecf0d583de275e4ceb66730c548605062f50ad4128e -size 11024 +oid sha256:d57f2d60bc39bfbd12e699015bdd106a246390a977625288b31b23bba27372ee +size 11019 diff --git a/series b/series index a3452b7..1799e60 100644 --- a/series +++ b/series @@ -9,4 +9,4 @@ mariadb-5.1.50-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch mysql-community-server-5.5.6-safe-process-in-bin.patch mariadb-5.5.20-group.patch -mariadb-5.5.23-ppc64-libdir.patch +mariadb-5.5.24-ppc64-libdir.patch From 2333ec5a99e71f0fabe71d4c41e63b8ee42c34a68cc6ad5b50933184addf34b4 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Tue, 19 Jun 2012 14:26:01 +0000 Subject: [PATCH 4/7] fix OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=87 --- mariadb.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mariadb.spec b/mariadb.spec index c4f955f..876290d 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -339,7 +339,9 @@ mysql-patches/tools/apply-series.sh "%{S:12}" # remove unneeded manpages ('make install' basically installs everything under # man/*) rm -f man/mysqlman.1 # dummy fallback manpage +[ \! -f man/CMakeLists.txt ] || sed -i 's|mysqlman.1||' man/CMakeLists.txt rm -f man/mysql.server.1 # init script, not installed in our rpm +[ \! -f man/CMakeLists.txt ] || sed -i 's|mysql.server.1||' man/CMakeLists.txt rm -f man/make_win_*.1 # windows build scripts rm -f man/comp_err.1 # built-time utility # 5.1 Carrier Grade Edition only / still under development as of 5.1.22 From a10f82b53d8d6eab1f29d3b678d8bb9203b77a8849a8f866e6551678b56e422f Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Tue, 19 Jun 2012 15:19:27 +0000 Subject: [PATCH 5/7] fix OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=88 --- install.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install.inc b/install.inc index d01c705..2aab16c 100644 --- a/install.inc +++ b/install.inc @@ -136,3 +136,5 @@ if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then fi mkdir -p '%buildroot'/etc/mysql bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf - +rm -rf '%buildroot'/etc/my.cnf.d +rm -rf '%buildroot'/usr/share/doc/%{name}-%{version} From 43b30ed18aeab09d5ebbd4f130af48dd748be49d095054e3b11e14b0dbd9e2ac Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Mon, 25 Jun 2012 12:08:16 +0000 Subject: [PATCH 6/7] - splitted out error messages and put them into diferent directory - updated to MariaDB 5.5.25 * Release notes: http://kb.askmonty.org/v/mariadb-5525-release-notes * Changelog: http://kb.askmonty.org/v/mariadb-5525-changelog - updated to MariaDB 5.5.24 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=89 --- build.inc | 1 + configuration-tweaks.tar.bz2 | 4 ++-- install.inc | 28 ++++++++++++++++++++++++++++ mariadb-5.5.24.tar.bz2 | 3 --- mariadb-5.5.25.tar.bz2 | 3 +++ mariadb.changes | 16 +++++++++++++++- mariadb.spec | 30 ++++++++++++++++++++++++------ mysql-patches.tar.bz2 | 4 ++-- series | 2 +- 9 files changed, 76 insertions(+), 15 deletions(-) delete mode 100644 mariadb-5.5.24.tar.bz2 create mode 100644 mariadb-5.5.25.tar.bz2 diff --git a/build.inc b/build.inc index c2d5283..4658ce7 100644 --- a/build.inc +++ b/build.inc @@ -102,6 +102,7 @@ BuildMySQL() { -DWITH_LIBEDIT=0 \ -DINSTALL_LAYOUT=RPM \ -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \ + -DINSTALL_MYSQLSHAREDIR=/usr/share/%{name} \ -DWITH_COMMENT="openSUSE MySQL rpm" \ -DWITH_EXTRA_CHARSET=all \ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 3b3b46e..ac18987 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:2fc9cfcc3c103fd463dcc189b4491ee6fab5f274d863cdeb269e401225a90011 -size 219 +oid sha256:a0f8a41033b8df8235bd98a5c03639a45a328ac3e037ec17c7cc1212f71e4765 +size 220 diff --git a/install.inc b/install.inc index 2aab16c..a34bfff 100644 --- a/install.inc +++ b/install.inc @@ -20,6 +20,11 @@ rm -f %buildroot%_libdir/mysql/plugin/*a rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}/usr/share/mysql/binary-configure +rm -f %{buildroot}/usr/share/mysql/errmsg-utf8.txt +rm -f %{buildroot}/usr/share/mysql/magic +rm -f %{buildroot}/usr/share/mysql/mysql-log-rotate +rm -f %{buildroot}/usr/share/mysql/mysql*.server rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run @@ -56,6 +61,19 @@ filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files +errmsg_list() +{ + echo '%%defattr(-, root, root)' + pushd %buildroot >/dev/null + for f in usr/share/%{name}/*; do + if test -e $f/errmsg.sys; then + echo "%%dir /$f" + fi + done + echo /usr/share/%{name}/errmsg-utf8.txt + popd >/dev/null +} +errmsg_list > errormessages.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) @@ -136,5 +154,15 @@ if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then fi mkdir -p '%buildroot'/etc/mysql bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf - +if [ -z "`ls '%buildroot'/usr/share/info/mysql.info*`" ]; then + install -D -m 0644 Docs/mysql.info "%buildroot/usr/share/info/mysql.info" + gzip -9 "%buildroot/usr/share/info/mysql.info" +fi +if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so`" ]; then + echo '%%dir %%_libdir/mysql' >> mysql-client.files + echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files + echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files +fi rm -rf '%buildroot'/etc/my.cnf.d rm -rf '%buildroot'/usr/share/doc/%{name}-%{version} +rm -rf '%buildroot'/usr/share/mysql/SELinux diff --git a/mariadb-5.5.24.tar.bz2 b/mariadb-5.5.24.tar.bz2 deleted file mode 100644 index af76b97..0000000 --- a/mariadb-5.5.24.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4223517a8c3fd3edd496268c3831798421fafb85d49b7f99e973f0158ae18fd3 -size 20943519 diff --git a/mariadb-5.5.25.tar.bz2 b/mariadb-5.5.25.tar.bz2 new file mode 100644 index 0000000..0556ab5 --- /dev/null +++ b/mariadb-5.5.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37fe39ca343c6fabab50edb446b19a5c68966933249f75451806607c689d68a8 +size 20987206 diff --git a/mariadb.changes b/mariadb.changes index 47ce261..208a04d 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,7 +1,21 @@ +------------------------------------------------------------------- +Mon Jun 25 14:05:10 CEST 2012 - mhrusecky@suse.cz + +- splitted out error messages and put them into diferent directory + +------------------------------------------------------------------- +Sat Jun 23 09:52:00 CEST 2012 - mhrusecky@suse.cz + +- updated to MariaDB 5.5.25 + * Release notes: + http://kb.askmonty.org/v/mariadb-5525-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-5525-changelog + ------------------------------------------------------------------- Tue Jun 19 10:52:13 CEST 2012 - mhrusecky@suse.cz -- updated to MariaDB 5.3.6 +- updated to MariaDB 5.5.24 * Release notes: http://kb.askmonty.org/v/mariadb-5524-release-notes * Changelog: diff --git a/mariadb.spec b/mariadb.spec index 876290d..b479526 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -34,9 +34,9 @@ Name: mariadb Summary: Server part of MariaDB -Version: 5.5.24 +Version: 5.5.25 Release: 1 -%define srv_vers 5.5.24 +%define srv_vers 5.5.25 License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: http://www.mariab.org @@ -76,6 +76,7 @@ Requires: logrotate %endif # required by rcmysql Requires: %{name}-client perl-base +Requires: %{name}-errormessages = %version Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} %if 0%{?use_extra_provides} > 0 @@ -118,6 +119,7 @@ necessary to develop client applications for MariaDB. License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ +Requires: %{name}-errormessages = %version %description -n libmysqld18 This package contains the development header files and libraries @@ -141,6 +143,7 @@ for developing applications that embed the MariaDB. Summary: Shared Libraries for MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other +Requires: %{name}-errormessages = %version %description -n libmariadbclient18 This package contains the shared libraries (.so) which certain @@ -150,6 +153,7 @@ languages and applications need to dynamically load and use MariaDB. Summary: Shared Libraries for MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other +Requires: %{name}-errormessages = %version %description -n libmariadbclient_r18 This package contains the shared libraries (.so) which certain @@ -172,6 +176,14 @@ Conflicts: otherproviders(mysql-client) %description client This package contains the standard clients for MariaDB. +%package errormessages +Summary: MySQL Community Server development header files and libraries +Group: Development/Libraries/C and C++ + +%description errormessages +This package provides the translated error messages for the standalone +server daemon as well as the embedded server + %package bench Requires: %{name}-client perl-DBD-mysql License: SUSE-GPL-2.0-with-FLOSS-exception @@ -454,7 +466,12 @@ fi %doc %{_infodir}/mysql.info.* /etc/init.d/mysql /usr/sbin/rcmysql -/usr/share/mysql/ +%dir /usr/share/%{name} +%dir /usr/share/mysql +/usr/share/%{name}/charsets/ +/usr/share/mysql/*.cnf +/usr/share/mysql/*.ini +/usr/share/%{name}/*.sql %ghost %dir %attr(755,mysql,mysql)/var/run/mysql %dir %{_libdir}/mysql %{_libdir}/mysql/mysqld.sym @@ -462,6 +479,10 @@ fi %dir %_libdir/mysql/plugin %_libdir/mysql/plugin/[!d]*.so +%files errormessages -f errormessages.files +%defattr(-, root, root) +/usr/share/%{name}/*/errmsg.sys + %files client -f mysql-client.files %defattr(-, root, root) %config(noreplace) %attr(0640, root, mysql) /etc/mysqlaccess.conf @@ -489,9 +510,6 @@ fi %files -n libmariadbclient18 %defattr(-, root, root) %{_libdir}/libmariadbclient.so.* -%dir %_libdir/mysql -%dir %_libdir/mysql/plugin -%_libdir/mysql/plugin/dialog*.so %if 0%{cluster} > 1 diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index 7273eea..fbec21d 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d57f2d60bc39bfbd12e699015bdd106a246390a977625288b31b23bba27372ee -size 11019 +oid sha256:fd455e9fb3f3dd1d6f50436742d8273ca4fd7ec2954cf86ac9a571325e28dbd6 +size 11057 diff --git a/series b/series index 1799e60..b986f33 100644 --- a/series +++ b/series @@ -4,7 +4,7 @@ mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch mariadb-5.2.6-install_db-quiet.patch mysql-community-server-5.1.51-mysql_config.patch -mysql-community-server-5.1.51-mysqld_multi-features.patch +mariadb-5.5.25-mysqld_multi-features.patch mariadb-5.1.50-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch mysql-community-server-5.5.6-safe-process-in-bin.patch From 8519420d1392e5c31251360d075dbd766a15ff0728b2610fc9537b650ee1c3ea Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Mon, 25 Jun 2012 13:27:59 +0000 Subject: [PATCH 7/7] template rewrite OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=90 --- configuration-tweaks.tar.bz2 | 2 +- mariadb.spec | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index ac18987..060ab41 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:a0f8a41033b8df8235bd98a5c03639a45a328ac3e037ec17c7cc1212f71e4765 +oid sha256:8de7d12f96916bb2847d171efcc8acfd30678051d7af9c66f96fcbd4d2db8209 size 220 diff --git a/mariadb.spec b/mariadb.spec index b479526..5edd64a 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -119,7 +119,6 @@ necessary to develop client applications for MariaDB. License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ -Requires: %{name}-errormessages = %version %description -n libmysqld18 This package contains the development header files and libraries @@ -143,7 +142,6 @@ for developing applications that embed the MariaDB. Summary: Shared Libraries for MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other -Requires: %{name}-errormessages = %version %description -n libmariadbclient18 This package contains the shared libraries (.so) which certain @@ -153,7 +151,6 @@ languages and applications need to dynamically load and use MariaDB. Summary: Shared Libraries for MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other -Requires: %{name}-errormessages = %version %description -n libmariadbclient_r18 This package contains the shared libraries (.so) which certain @@ -167,6 +164,7 @@ Provides: mysql-client = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-client = %{version} Obsoletes: %{extra_provides}-client < %{version} +Requires: %{name}-errormessages = %version %endif %if 0%{?prefered} > 0 Obsoletes: mysql-client < %{srv_vers}