Attachment 713937 Details for Bug 924345 – Difference between MySQL.spec and community-mysql.spec

[patch] Difference between MySQL.spec and community-mysql.spec

community-mysql.spec.diff (text/plain), 5.41 KB, created by Honza Horak on 2013-03-21 15:22:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2013-03-21 15:22:04 UTC

Size: 5.41 KB

patch

obsolete

>--- MySQL.spec	2013-03-12 15:23:22.000000000 +0100
>+++ community-mysql.spec	2013-03-21 15:02:45.330365546 +0100
>@@ -1,6 +1,6 @@
>-Name: MySQL
>+Name: community-mysql
> Version: 5.5.30
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> 
> Summary: MySQL client programs and shared libraries
> Group: Applications/Databases
>@@ -39,25 +39,25 @@ Source15: rh-skipped-tests-arm.list
> Source999: filter-requires-mysql.sh
> 
> # Comments for these patches are in the patch files.
>-Patch1: MySQL-errno.patch
>-Patch2: MySQL-strmov.patch
>-Patch3: MySQL-install-test.patch
>-Patch4: MySQL-expired-certs.patch
>-Patch5: MySQL-stack-guard.patch
>-Patch6: MySQL-chain-certs.patch
>-Patch7: MySQL-versioning.patch
>-Patch8: MySQL-dubious-exports.patch
>-Patch10: MySQL-plugin-bool.patch
>-Patch11: MySQL-s390-tsc.patch
>-Patch14: MySQL-va-list.patch
>-Patch15: MySQL-netdevname.patch
>-Patch16: MySQL-logrotate.patch
>-Patch17: MySQL-plugin-test.patch
>-Patch18: MySQL-cipherspec.patch
>-Patch19: MySQL-file-contents.patch
>-Patch20: MySQL-string-overflow.patch
>-Patch21: MySQL-dh1024.patch
>-Patch22: MySQL-major.patch
>+Patch1: community-mysql-errno.patch
>+Patch2: community-mysql-strmov.patch
>+Patch3: community-mysql-install-test.patch
>+Patch4: community-mysql-expired-certs.patch
>+Patch5: community-mysql-stack-guard.patch
>+Patch6: community-mysql-chain-certs.patch
>+Patch7: community-mysql-versioning.patch
>+Patch8: community-mysql-dubious-exports.patch
>+Patch10: community-mysql-plugin-bool.patch
>+Patch11: community-mysql-s390-tsc.patch
>+Patch14: community-mysql-va-list.patch
>+Patch15: community-mysql-netdevname.patch
>+Patch16: community-mysql-logrotate.patch
>+Patch17: community-mysql-plugin-test.patch
>+Patch18: community-mysql-cipherspec.patch
>+Patch19: community-mysql-file-contents.patch
>+Patch20: community-mysql-string-overflow.patch
>+Patch21: community-mysql-dh1024.patch
>+Patch22: community-mysql-major.patch
> 
> BuildRequires: perl, readline-devel, openssl-devel
> BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
>@@ -74,8 +74,7 @@ Requires: %{name}-common%{?_isa} = %{ver
> # mariadb is MySQL replacement that is used in Fedora as a default
> # MySQL implementation
> Conflicts: mariadb
>-# mysql-cluster used to be built from this SRPM, but no more
>-Obsoletes: mysql-cluster < 5.1.44
>+Provides: mysql = %{version}-%{release}
> 
> # When rpm 4.9 is universal, this could be cleaned up:
> %global __perl_requires %{SOURCE999}
>@@ -97,6 +96,7 @@ Summary: The shared libraries required f
> Group: Applications/Databases
> Requires: /sbin/ldconfig
> Requires: %{name}-common%{?_isa} = %{version}-%{release}
>+Provides: mysql-libs = %{version}-%{release}
> 
> %description libs
> The mysql-libs package provides the essential shared libraries for any 
>@@ -108,6 +108,7 @@ MySQL server.
> 
> Summary: The shared files required for MySQL server and client
> Group: Applications/Databases
>+Provides: mysql-common = %{version}-%{release}
> 
> %description common
> The mysql-common package provides the essential shared files for any 
>@@ -137,6 +138,7 @@ Requires(post): systemd-sysv
> # mysqlhotcopy needs DBI/DBD support
> Requires: perl-DBI, perl-DBD-MySQL
> Conflicts: mariadb-server
>+Provides: mysql-server = %{version}-%{release}
> 
> %description server
> MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
>@@ -152,6 +154,7 @@ Requires: %{name}%{?_isa} = %{version}-%
> Requires: %{name}-libs%{?_isa} = %{version}-%{release}
> Requires: openssl-devel%{?_isa}
> Conflicts: mariadb-devel
>+Provides: mysql-devel = %{version}-%{release}
> 
> %description devel
> MySQL is a multi-user, multi-threaded SQL database server. This
>@@ -162,6 +165,7 @@ developing MySQL client applications.
> 
> Summary: MySQL as an embeddable library
> Group: Applications/Databases
>+Provides: mysql-embedded = %{version}-%{release}
> 
> %description embedded
> MySQL is a multi-user, multi-threaded SQL database server. This
>@@ -175,6 +179,7 @@ Group: Applications/Databases
> Requires: %{name}-embedded%{?_isa} = %{version}-%{release}
> Requires: %{name}-devel%{?_isa} = %{version}-%{release}
> Conflicts: mariadb-embedded-devel
>+Provides: mysql-embedded-devel = %{version}-%{release}
> 
> %description embedded-devel
> MySQL is a multi-user, multi-threaded SQL database server. This
>@@ -187,6 +192,7 @@ Summary: MySQL benchmark scripts and dat
> Group: Applications/Databases
> Requires: mysql%{?_isa}
> Conflicts: mariadb-bench
>+Provides: mysql-bench = %{version}-%{release}
> 
> %description bench
> MySQL is a multi-user, multi-threaded SQL database server. This
>@@ -201,6 +207,7 @@ Requires: mysql%{?_isa}
> Requires: %{name}-common%{?_isa} = %{version}-%{release}
> Requires: %{name}-server%{?_isa} = %{version}-%{release}
> Conflicts: mariadb-test
>+Provides: mysql-test = %{version}-%{release}
> 
> %description test
> MySQL is a multi-user, multi-threaded SQL database server. This
>@@ -314,6 +321,7 @@ gcc -I../../include $CFLAGS mysql-embedd
> LD_LIBRARY_PATH=. ldd ./a.out
> cd ../..
> 
>+%check
> %if %runselftest
>   # hack to let 32- and 64-bit tests run concurrently on same build machine
>   case `uname -m` in
>@@ -683,6 +691,11 @@ install -m 0644 mysql-test/rh-skipped-te
> %{_mandir}/man1/mysql_client_test.1*
> 
> %changelog
>+* Wed Mar 20 2013 Honza Horak <hhorak@redhat.com> 5.5.30-5
>+- Renaming package MySQL to community-mysql to handle issues
>+  introduced by case-insensitive operations of yum and for proper
>+  prioritizing mariadb over community-mysql
>+
> * Tue Mar 12 2013 Honza Horak <hhorak@redhat.com> 5.5.30-4
> - Allow server to be installed without client side
> - Separate -lib and -common sub-packages

Actions: View | Diff

Attachments on bug 924345: 713937