Fix evaluation of %%obsoletemysql
This commit is contained in:
parent
647547d07f
commit
6595c88db1
58
mariadb.spec
58
mariadb.spec
@ -69,8 +69,11 @@ Requires: grep, fileutils, bash
|
|||||||
Conflicts: MySQL
|
Conflicts: MySQL
|
||||||
# MariaDB replaces mysql packages
|
# MariaDB replaces mysql packages
|
||||||
Provides: mysql = %{version}-%{release}
|
Provides: mysql = %{version}-%{release}
|
||||||
%{!?obsoletemysql:Conflicts: mysql}
|
%if 0%obsoletemysql
|
||||||
%{?obsoletemysql:Obsoletes: mysql < %{last_mysql_evr}}
|
Obsoletes: mysql < %{last_mysql_evr}
|
||||||
|
%else
|
||||||
|
Conflicts: mysql
|
||||||
|
%endif
|
||||||
# mysql-cluster used to be built from this SRPM, but no more
|
# mysql-cluster used to be built from this SRPM, but no more
|
||||||
Obsoletes: mysql-cluster < 5.1.44
|
Obsoletes: mysql-cluster < 5.1.44
|
||||||
|
|
||||||
@ -92,8 +95,11 @@ Summary: The shared libraries required for MariaDB/MySQL clients
|
|||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
Requires: /sbin/ldconfig
|
Requires: /sbin/ldconfig
|
||||||
Provides: mysql-libs = %{version}-%{release}
|
Provides: mysql-libs = %{version}-%{release}
|
||||||
%{!?obsoletemysql:Conflicts: mysql-libs}
|
%if 0%obsoletemysql
|
||||||
%{?obsoletemysql:Obsoletes: mysql-libs < %{last_mysql_evr}}
|
Obsoletes: mysql-libs < %{last_mysql_evr}
|
||||||
|
%else
|
||||||
|
Conflicts: mysql-libs
|
||||||
|
%endif
|
||||||
|
|
||||||
%description libs
|
%description libs
|
||||||
The mariadb-libs package provides the essential shared libraries for any
|
The mariadb-libs package provides the essential shared libraries for any
|
||||||
@ -123,8 +129,11 @@ Requires(post): systemd-sysv
|
|||||||
Requires: perl-DBI, perl-DBD-MySQL
|
Requires: perl-DBI, perl-DBD-MySQL
|
||||||
Conflicts: MySQL-server
|
Conflicts: MySQL-server
|
||||||
Provides: mysql-server = %{version}-%{release}
|
Provides: mysql-server = %{version}-%{release}
|
||||||
%{!?obsoletemysql:Conflicts: mysql-server}
|
%if 0%obsoletemysql
|
||||||
%{?obsoletemysql:Obsoletes: mysql-server < %{last_mysql_evr}}
|
Obsoletes: mysql-server < %{last_mysql_evr}
|
||||||
|
%else
|
||||||
|
Conflicts: mysql-server
|
||||||
|
%endif
|
||||||
|
|
||||||
%description server
|
%description server
|
||||||
MariaDB is a multi-user, multi-threaded SQL database server. It is a
|
MariaDB is a multi-user, multi-threaded SQL database server. It is a
|
||||||
@ -142,8 +151,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
|||||||
Requires: openssl-devel%{?_isa}
|
Requires: openssl-devel%{?_isa}
|
||||||
Conflicts: MySQL-devel
|
Conflicts: MySQL-devel
|
||||||
Provides: mysql-devel = %{version}-%{release}
|
Provides: mysql-devel = %{version}-%{release}
|
||||||
%{!?obsoletemysql:Conflicts: mysql-devel}
|
%if 0%obsoletemysql
|
||||||
%{?obsoletemysql:Obsoletes: mysql-devel < %{last_mysql_evr}}
|
Obsoletes: mysql-devel < %{last_mysql_evr}
|
||||||
|
%else
|
||||||
|
Conflicts: mysql-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
MariaDB is a multi-user, multi-threaded SQL database server. This
|
MariaDB is a multi-user, multi-threaded SQL database server. This
|
||||||
@ -157,8 +169,11 @@ Summary: MariaDB as an embeddable library
|
|||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
Requires: /sbin/ldconfig
|
Requires: /sbin/ldconfig
|
||||||
Provides: mysql-embedded = %{version}-%{release}
|
Provides: mysql-embedded = %{version}-%{release}
|
||||||
%{!?obsoletemysql:Conflicts: mysql-embedded}
|
%if 0%obsoletemysql
|
||||||
%{?obsoletemysql:Obsoletes: mysql-embedded < %{last_mysql_evr}}
|
Obsoletes: mysql-embedded < %{last_mysql_evr}
|
||||||
|
%else
|
||||||
|
Conflicts: mysql-embedded
|
||||||
|
%endif
|
||||||
|
|
||||||
%description embedded
|
%description embedded
|
||||||
MariaDB is a multi-user, multi-threaded SQL database server. This
|
MariaDB is a multi-user, multi-threaded SQL database server. This
|
||||||
@ -173,8 +188,11 @@ 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}
|
||||||
Provides: mysql-embedded-devel = %{version}-%{release}
|
Provides: mysql-embedded-devel = %{version}-%{release}
|
||||||
%{!?obsoletemysql:Conflicts: mysql-embedded-devel}
|
%if 0%obsoletemysql
|
||||||
%{?obsoletemysql:Obsoletes: mysql-embedded-devel < %{last_mysql_evr}}
|
Obsoletes: mysql-embedded-devel < %{last_mysql_evr}
|
||||||
|
%else
|
||||||
|
Conflicts: mysql-embedded-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
%description embedded-devel
|
%description embedded-devel
|
||||||
MariaDB is a multi-user, multi-threaded SQL database server. This
|
MariaDB is a multi-user, multi-threaded SQL database server. This
|
||||||
@ -189,8 +207,11 @@ Group: Applications/Databases
|
|||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Conflicts: MySQL-bench
|
Conflicts: MySQL-bench
|
||||||
Provides: mysql-bench = %{version}-%{release}
|
Provides: mysql-bench = %{version}-%{release}
|
||||||
%{!?obsoletemysql:Conflicts: mysql-bench}
|
%if 0%obsoletemysql
|
||||||
%{?obsoletemysql:Obsoletes: mysql-bench < %{last_mysql_evr}}
|
Obsoletes: mysql-bench < %{last_mysql_evr}
|
||||||
|
%else
|
||||||
|
Conflicts: mysql-bench
|
||||||
|
%endif
|
||||||
|
|
||||||
%description bench
|
%description bench
|
||||||
MariaDB is a multi-user, multi-threaded SQL database server. This
|
MariaDB is a multi-user, multi-threaded SQL database server. This
|
||||||
@ -207,8 +228,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
|||||||
Requires: %{name}-server%{?_isa} = %{version}-%{release}
|
Requires: %{name}-server%{?_isa} = %{version}-%{release}
|
||||||
Conflicts: MySQL-test
|
Conflicts: MySQL-test
|
||||||
Provides: mysql-test = %{version}-%{release}
|
Provides: mysql-test = %{version}-%{release}
|
||||||
%{!?obsoletemysql:Conflicts: mysql-test}
|
%if 0%obsoletemysql
|
||||||
%{?obsoletemysql:Obsoletes: mysql-test < %{last_mysql_evr}}
|
Obsoletes: mysql-test < %{last_mysql_evr}
|
||||||
|
%else
|
||||||
|
Conflicts: mysql-test
|
||||||
|
%endif
|
||||||
|
|
||||||
%description test
|
%description test
|
||||||
MariaDB is a multi-user, multi-threaded SQL database server. This
|
MariaDB is a multi-user, multi-threaded SQL database server. This
|
||||||
@ -724,7 +748,7 @@ fi
|
|||||||
* Mon Jan 28 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-6
|
* Mon Jan 28 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-6
|
||||||
- Removed %%{_isa} from provides/obsoletes, which doesn't allow
|
- Removed %%{_isa} from provides/obsoletes, which doesn't allow
|
||||||
proper obsoleting
|
proper obsoleting
|
||||||
- Do not obsolete mysql in time of testing
|
- Do not obsolete mysql at the time of testing
|
||||||
|
|
||||||
* Thu Jan 10 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-5
|
* Thu Jan 10 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-5
|
||||||
- Added licenses LGPLv2 and BSD
|
- Added licenses LGPLv2 and BSD
|
||||||
|
Loading…
Reference in New Issue
Block a user