Fix of broken cross mysql-mariadb dependecies
Fix of community-mysql server-client dependecy
This commit is contained in:
Michal Schorm
parent
fddd774f2c
commit
edace6bcbd
|
|
@ -80,7 +80,7 @@
|
|||
|
||||
Name: community-mysql
|
||||
Version: 5.7.17
|
||||
Release: 3%{?with_debug:.debug}%{?dist}
|
||||
Release: 4%{?with_debug:.debug}%{?dist}
|
||||
Summary: MySQL client programs and shared libraries
|
||||
Group: Applications/Databases
|
||||
URL: http://www.mysql.com
|
||||
|
|
@ -173,9 +173,9 @@ BuildRequires: perl(Test::More)
|
|||
BuildRequires: perl(Time::HiRes)
|
||||
%{?with_init_systemd:BuildRequires: systemd}
|
||||
|
||||
Requires: bash
|
||||
Requires: fileutils
|
||||
Requires: grep
|
||||
|
||||
|
||||
Requires: bash fileutils grep
|
||||
Requires: %{name}-common%{?_isa} = %{sameevr}
|
||||
|
||||
%if %{with mysql_names}
|
||||
|
|
@ -217,7 +217,7 @@ Provides: mysql-libs%{?_isa} = %{sameevr}
|
|||
%endif
|
||||
|
||||
%description libs
|
||||
The mysql-libs package provides the essential shared libraries for any
|
||||
The mysql-libs package provides the essential shared libraries for any
|
||||
MySQL client program or interface. You will need to install this package
|
||||
to use any other MySQL package or any clients that need to connect to a
|
||||
MySQL server.
|
||||
|
|
@ -267,7 +267,10 @@ MySQL packages.
|
|||
Summary: The MySQL server and related files
|
||||
Group: Applications/Databases
|
||||
|
||||
Requires: %{name}%{?_isa} = %{sameevr}
|
||||
# Require any mysql client, but prefer community-mysql client for community-mysql server
|
||||
Suggests: %{name}%{?_isa} = %{sameevr}
|
||||
Requires: mysql%{?_isa}
|
||||
|
||||
Requires: %{name}-common%{?_isa} = %{sameevr}
|
||||
Requires: %{_sysconfdir}/my.cnf
|
||||
Requires: %{_sysconfdir}/my.cnf.d
|
||||
|
|
@ -292,6 +295,8 @@ Obsoletes: mysql-bench%{?_isa}
|
|||
Obsoletes: community-mysql-bench < 5.7.8
|
||||
%{?with_conflicts:Conflicts: mariadb-server}
|
||||
%{?with_conflicts:Conflicts: mariadb-galera-server}
|
||||
# A dependency mistake was made, to fix it, old version of the utils must be Obsoleted. Affected versions: F24, F25, F26 until their EOL.
|
||||
Obsoletes: mariadb-server-utils < 3:10.1.21-3
|
||||
|
||||
%description server
|
||||
MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
|
||||
|
|
@ -849,7 +854,6 @@ fi
|
|||
%{_bindir}/mysql_ssl_rsa_setup
|
||||
%{_bindir}/mysql_tzinfo_to_sql
|
||||
%{_bindir}/mysql_upgrade
|
||||
%{_bindir}/mysqlbinlog
|
||||
%if %{with init_systemd}
|
||||
%{_bindir}/mysqld_pre_systemd
|
||||
%else
|
||||
|
|
@ -966,6 +970,10 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Feb 15 2017 Michal Schorm <mschorm@redhat.com> - 5.7.17-4
|
||||
- Fix of broken cross mysql-mariadb dependecies
|
||||
- Fix of community-mysql server-client dependecy
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.17-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
@ -1182,7 +1190,7 @@ fi
|
|||
- outfile_loaddata resolved on all archs
|
||||
- Solaris files not installed, no need to remove
|
||||
- Simplify multilib install
|
||||
- Use install's -D option some places
|
||||
- Use install's -D option some places
|
||||
- Add explicit conflict with mariadb-galera-server
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.17-3
|
||||
|
|
@ -2113,7 +2121,7 @@ Resolves: #199368
|
|||
pinging mysql server (#108779)
|
||||
|
||||
* Mon Oct 27 2003 Kim Ho <kho@redhat.com> 3.23.58-4
|
||||
- update mysql.init to wait (max 10 seconds) for mysql server to
|
||||
- update mysql.init to wait (max 10 seconds) for mysql server to
|
||||
start (#58732)
|
||||
|
||||
* Mon Oct 27 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-3
|
||||
|
|
@ -2130,7 +2138,7 @@ Resolves: #199368
|
|||
- rebuilt
|
||||
|
||||
* Wed Jul 02 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.57-1
|
||||
- revert to prior version of MySQL due to license incompatibilities
|
||||
- revert to prior version of MySQL due to license incompatibilities
|
||||
with packages that link against the client. The MySQL folks are
|
||||
looking into the issue.
|
||||
|
||||
|
|
@ -2141,18 +2149,18 @@ Resolves: #199368
|
|||
- rebuilt
|
||||
|
||||
* Thu May 29 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-2
|
||||
- fix filter-requires-mysql.sh with less restrictive for mysql-bench
|
||||
- fix filter-requires-mysql.sh with less restrictive for mysql-bench
|
||||
|
||||
* Wed May 28 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-1
|
||||
- update for MySQL 4.0
|
||||
- back-level shared libraries available in mysqlclient10 package
|
||||
|
||||
* Fri May 09 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.56-2
|
||||
- add sql-bench package (#90110)
|
||||
- add sql-bench package (#90110)
|
||||
|
||||
* Wed Mar 19 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.56-1
|
||||
- upgrade to 3.23.56 for security fixes
|
||||
- remove patch for double-free (included in 3.23.56)
|
||||
- remove patch for double-free (included in 3.23.56)
|
||||
|
||||
* Tue Feb 18 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.54a-11
|
||||
- enable thread safe client
|
||||
|
|
@ -2210,11 +2218,11 @@ Resolves: #199368
|
|||
- rebuild
|
||||
|
||||
* Thu Jul 18 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-3
|
||||
- Fix #63543 and #63542
|
||||
- Fix #63543 and #63542
|
||||
|
||||
* Thu Jul 11 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-2
|
||||
- Turn off bdb on PPC(#68591)
|
||||
- Turn off the assembly optimizations, for safety.
|
||||
- Turn off the assembly optimizations, for safety.
|
||||
|
||||
* Wed Jun 26 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-1
|
||||
- Work around annoying auto* thinking this is a crosscompile
|
||||
|
|
@ -2256,12 +2264,12 @@ Resolves: #199368
|
|||
- 3.23.48
|
||||
|
||||
* Thu Jan 17 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-4
|
||||
- Use kill, not mysqladmin, to flush logs and shut down. Thus,
|
||||
- Use kill, not mysqladmin, to flush logs and shut down. Thus,
|
||||
an admin password can be set with no problems.
|
||||
- Remove reload from init script
|
||||
|
||||
* Wed Jan 16 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-3
|
||||
- remove db3-devel from buildrequires,
|
||||
- remove db3-devel from buildrequires,
|
||||
MySQL has had its own bundled copy since the mid thirties
|
||||
|
||||
* Sun Jan 6 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-1
|
||||
|
|
@ -2270,7 +2278,7 @@ Resolves: #199368
|
|||
|
||||
* Mon Dec 3 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.46-1
|
||||
- 3.23.46
|
||||
- use -fno-rtti and -fno-exceptions, and set CXX to increase stability.
|
||||
- use -fno-rtti and -fno-exceptions, and set CXX to increase stability.
|
||||
Recommended by mysql developers.
|
||||
|
||||
* Sun Nov 25 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.45-1
|
||||
|
|
@ -2292,7 +2300,7 @@ Resolves: #199368
|
|||
* Tue Aug 14 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.41-1
|
||||
- 3.23.41 bugfix release
|
||||
- disable innodb, to avoid the broken updates
|
||||
- Use "mysqladmin flush_logs" instead of kill -HUP in logrotate
|
||||
- Use "mysqladmin flush_logs" instead of kill -HUP in logrotate
|
||||
script (#51711)
|
||||
|
||||
* Sat Jul 21 2001 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
|
|
@ -2341,7 +2349,7 @@ Resolves: #199368
|
|||
- small i18n-fixes to initscript (action needs $)
|
||||
|
||||
* Tue Jan 30 2001 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
- make it shut down and rotate logs without using mysqladmin
|
||||
- make it shut down and rotate logs without using mysqladmin
|
||||
(from #24909)
|
||||
|
||||
* Mon Jan 29 2001 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
|
|
@ -2366,14 +2374,14 @@ Resolves: #199368
|
|||
- as above in logrotate script
|
||||
- changes to the init sequence - put most of the data
|
||||
in /etc/my.cnf instead of hardcoding in the init script
|
||||
- use /var/run/mysqld/mysqld.pid instead of
|
||||
- use /var/run/mysqld/mysqld.pid instead of
|
||||
/var/run/mysqld/pid
|
||||
- use standard safe_mysqld
|
||||
- shut down cleaner
|
||||
|
||||
* Mon Jan 08 2001 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
- 3.23.30
|
||||
- do an explicit chmod on /var/lib/mysql in post, to avoid
|
||||
- do an explicit chmod on /var/lib/mysql in post, to avoid
|
||||
any problems with broken permissons. There is a report
|
||||
of rm not changing this on its own (#22989)
|
||||
|
||||
|
|
@ -2422,7 +2430,7 @@ Resolves: #199368
|
|||
instead of tempnam().
|
||||
- revert changes made yesterday, the problem is now
|
||||
isolated
|
||||
|
||||
|
||||
* Tue Oct 17 2000 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
- use the compat C++ compiler FTTB. Argh.
|
||||
- add requirement of ncurses4 (see above)
|
||||
|
|
@ -2439,8 +2447,8 @@ Resolves: #199368
|
|||
- rename config file to /etc/my.cnf, which is what
|
||||
mysqld wants... doh. (#17432)
|
||||
- include a changed safe_mysqld, so the pid file option
|
||||
works.
|
||||
- make mysql dir world readable to they can access the
|
||||
works.
|
||||
- make mysql dir world readable to they can access the
|
||||
mysql socket. (#17432)
|
||||
- 3.23.24
|
||||
|
||||
|
|
@ -2451,7 +2459,7 @@ Resolves: #199368
|
|||
- Add "|| :" to condrestart to avoid non-zero exit code
|
||||
|
||||
* Thu Aug 24 2000 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
- it's mysql.com, not mysql.org and use correct path to
|
||||
- it's mysql.com, not mysql.org and use correct path to
|
||||
source (#16830)
|
||||
|
||||
* Wed Aug 16 2000 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
|
|
@ -2488,8 +2496,8 @@ Resolves: #199368
|
|||
- more cleanups in initscript
|
||||
|
||||
* Thu Jul 13 2000 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
- add a patch to work around compiler bug
|
||||
(from monty@mysql.com)
|
||||
- add a patch to work around compiler bug
|
||||
(from monty@mysql.com)
|
||||
|
||||
* Wed Jul 12 2000 Trond Eivind Glomsrd <teg@redhat.com>
|
||||
- don't build the SQL daemon statically (glibc problems)
|
||||
|
|
|
|||
Loading…
Reference in New Issue