1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG 21900800 - ADD OBSOLETE ON MYSQL-CONNECTOR-C-SHARED AND MYSQL-CONNECTOR-C-DEVEL

Browse Source 
As MySQL Connector C 6.1 is end of life, added conflict with mysql-connector-c-shared dependencies
This commit is contained in:
Balasubramanian Kandasamy 2015-09-30 10:27:26 +05:30
parent ea9dbef661
commit 8ea58c474f
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packaging/rpm-oel/mysql.spec.in
View File

@ -301,6 +301,7 @@ Obsoletes: mysql-devel < %{version}-%{release}
Obsoletes: mariadb-devel Obsoletes: mariadb-devel
Provides: mysql-devel = %{version}-%{release} Provides: mysql-devel = %{version}-%{release}
Provides: mysql-devel%{?_isa} = %{version}-%{release} Provides: mysql-devel%{?_isa} = %{version}-%{release}
Conflicts: mysql-connector-c-shared-devel < 6.2
%description devel %description devel
This package contains the development header files and libraries necessary This package contains the development header files and libraries necessary
@ -323,6 +324,7 @@ Obsoletes: mysql-libs < %{version}-%{release}
Obsoletes: mariadb-libs Obsoletes: mariadb-libs
Provides: mysql-libs = %{version}-%{release} Provides: mysql-libs = %{version}-%{release}
Provides: mysql-libs%{?_isa} = %{version}-%{release} Provides: mysql-libs%{?_isa} = %{version}-%{release}
Conflicts: mysql-connector-c-shared < 6.2
%description libs %description libs
This package contains the shared libraries for MySQL client This package contains the shared libraries for MySQL client
@ -913,6 +915,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Sep 29 2015 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.47-1
- Added conflicts to mysql-connector-c-shared dependencies
* Tue Jul 22 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-5 * Tue Jul 22 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-5
- Provide mysql-compat-server dependencies - Provide mysql-compat-server dependencies

5
packaging/rpm-sles/mysql.spec.in
View File

@ -268,6 +268,7 @@ Obsoletes: mariadb-devel
Obsoletes: libmysqlclient-devel Obsoletes: libmysqlclient-devel
Provides: mysql-devel = %{version}-%{release} Provides: mysql-devel = %{version}-%{release}
Provides: libmysqlclient-devel = %{version}-%{release} Provides: libmysqlclient-devel = %{version}-%{release}
Conflicts: mysql-connector-c-shared-devel < 6.2
%description devel %description devel
This package contains the development header files and libraries necessary This package contains the development header files and libraries necessary
@ -293,6 +294,7 @@ Obsoletes: libmysqlclient_r18 < %{version}-%{release}
Provides: mysql-libs = %{version}-%{release} Provides: mysql-libs = %{version}-%{release}
Provides: libmysqlclient18 = %{version}-%{release} Provides: libmysqlclient18 = %{version}-%{release}
Provides: libmysqlclient_r18 = %{version}-%{release} Provides: libmysqlclient_r18 = %{version}-%{release}
Conflicts: mysql-connector-c-shared < 6.2
%description libs %description libs
This package contains the shared libraries for MySQL client This package contains the shared libraries for MySQL client
@ -779,6 +781,9 @@ fi
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
%changelog %changelog
* Tue Sep 29 2015 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.47-1
- Added conflicts to mysql-connector-c-shared dependencies
* Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.41-1 * Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.41-1
- Backport to 5.5.41 - Backport to 5.5.41