rpms/mysql8.0
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove mysql provides from devel sub-packages to not build against community-mysql if mysql-devel is specified

Browse Source
This commit is contained in:
Honza Horák 2013-04-30 21:06:11 +02:00 committed by Michal Schorm
parent 53e30da6fc
commit bcb6c3a615
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
community-mysql.spec
View File

@ -1,6 +1,6 @@
Name: community-mysql Name: community-mysql
Version: 5.5.31 Version: 5.5.31
Release: 4%{?dist} Release: 5%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
Group: Applications/Databases Group: Applications/Databases
@ -155,8 +155,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: openssl-devel%{?_isa} Requires: openssl-devel%{?_isa}
Conflicts: mariadb-devel Conflicts: mariadb-devel
Provides: mysql-devel = %{version}-%{release}
Provides: mysql-devel%{?_isa} = %{version}-%{release}
%description devel %description devel
MySQL is a multi-user, multi-threaded SQL database server. This MySQL is a multi-user, multi-threaded SQL database server. This
@ -182,8 +180,6 @@ Group: Applications/Databases
Requires: %{name}-embedded%{?_isa} = %{version}-%{release} Requires: %{name}-embedded%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Conflicts: mariadb-embedded-devel Conflicts: mariadb-embedded-devel
Provides: mysql-embedded-devel = %{version}-%{release}
Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release}
%description embedded-devel %description embedded-devel
MySQL is a multi-user, multi-threaded SQL database server. This MySQL is a multi-user, multi-threaded SQL database server. This
@ -702,6 +698,10 @@ install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/my
%{_mandir}/man1/mysql_client_test.1* %{_mandir}/man1/mysql_client_test.1*
%changelog %changelog
* Tue Apr 30 2013 Honza Horak <hhorak@redhat.com> 5.5.31-5
- Remove mysql provides from devel sub-packages to not build against
community-mysql if mysql-devel is specified
* Fri Apr 26 2013 Honza Horak <hhorak@redhat.com> 5.5.31-4 * Fri Apr 26 2013 Honza Horak <hhorak@redhat.com> 5.5.31-4
- Fix building with relro and PIE - Fix building with relro and PIE