[mariadb] Fix evaluation of %%obsoletemysql
Honza Horak
hhorak at fedoraproject.org
Mon Jan 28 10:59:02 UTC 2013
commit 6595c88db12a46576713e238ce973a31f45a077f
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date: Mon Jan 28 11:58:18 2013 +0100
Fix evaluation of %%obsoletemysql
mariadb.spec | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 deletions(-)
---
diff --git a/mariadb.spec b/mariadb.spec
index 3c71d01..23a11d3 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -69,8 +69,11 @@ Requires: grep, fileutils, bash
Conflicts: MySQL
# MariaDB replaces mysql packages
Provides: mysql = %{version}-%{release}
-%{!?obsoletemysql:Conflicts: mysql}
-%{?obsoletemysql:Obsoletes: mysql < %{last_mysql_evr}}
+%if 0%obsoletemysql
+Obsoletes: mysql < %{last_mysql_evr}
+%else
+Conflicts: mysql
+%endif
# mysql-cluster used to be built from this SRPM, but no more
Obsoletes: mysql-cluster < 5.1.44
@@ -92,8 +95,11 @@ Summary: The shared libraries required for MariaDB/MySQL clients
Group: Applications/Databases
Requires: /sbin/ldconfig
Provides: mysql-libs = %{version}-%{release}
-%{!?obsoletemysql:Conflicts: mysql-libs}
-%{?obsoletemysql:Obsoletes: mysql-libs < %{last_mysql_evr}}
+%if 0%obsoletemysql
+Obsoletes: mysql-libs < %{last_mysql_evr}
+%else
+Conflicts: mysql-libs
+%endif
%description libs
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
Conflicts: MySQL-server
Provides: mysql-server = %{version}-%{release}
-%{!?obsoletemysql:Conflicts: mysql-server}
-%{?obsoletemysql:Obsoletes: mysql-server < %{last_mysql_evr}}
+%if 0%obsoletemysql
+Obsoletes: mysql-server < %{last_mysql_evr}
+%else
+Conflicts: mysql-server
+%endif
%description server
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}
Conflicts: MySQL-devel
Provides: mysql-devel = %{version}-%{release}
-%{!?obsoletemysql:Conflicts: mysql-devel}
-%{?obsoletemysql:Obsoletes: mysql-devel < %{last_mysql_evr}}
+%if 0%obsoletemysql
+Obsoletes: mysql-devel < %{last_mysql_evr}
+%else
+Conflicts: mysql-devel
+%endif
%description devel
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -157,8 +169,11 @@ Summary: MariaDB as an embeddable library
Group: Applications/Databases
Requires: /sbin/ldconfig
Provides: mysql-embedded = %{version}-%{release}
-%{!?obsoletemysql:Conflicts: mysql-embedded}
-%{?obsoletemysql:Obsoletes: mysql-embedded < %{last_mysql_evr}}
+%if 0%obsoletemysql
+Obsoletes: mysql-embedded < %{last_mysql_evr}
+%else
+Conflicts: mysql-embedded
+%endif
%description embedded
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}-devel%{?_isa} = %{version}-%{release}
Provides: mysql-embedded-devel = %{version}-%{release}
-%{!?obsoletemysql:Conflicts: mysql-embedded-devel}
-%{?obsoletemysql:Obsoletes: mysql-embedded-devel < %{last_mysql_evr}}
+%if 0%obsoletemysql
+Obsoletes: mysql-embedded-devel < %{last_mysql_evr}
+%else
+Conflicts: mysql-embedded-devel
+%endif
%description embedded-devel
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -189,8 +207,11 @@ Group: Applications/Databases
Requires: %{name}%{?_isa} = %{version}-%{release}
Conflicts: MySQL-bench
Provides: mysql-bench = %{version}-%{release}
-%{!?obsoletemysql:Conflicts: mysql-bench}
-%{?obsoletemysql:Obsoletes: mysql-bench < %{last_mysql_evr}}
+%if 0%obsoletemysql
+Obsoletes: mysql-bench < %{last_mysql_evr}
+%else
+Conflicts: mysql-bench
+%endif
%description bench
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}
Conflicts: MySQL-test
Provides: mysql-test = %{version}-%{release}
-%{!?obsoletemysql:Conflicts: mysql-test}
-%{?obsoletemysql:Obsoletes: mysql-test < %{last_mysql_evr}}
+%if 0%obsoletemysql
+Obsoletes: mysql-test < %{last_mysql_evr}
+%else
+Conflicts: mysql-test
+%endif
%description test
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -724,7 +748,7 @@ fi
* Mon Jan 28 2013 Honza Horak <hhorak at redhat.com> 5.5.28a-6
- Removed %%{_isa} from provides/obsoletes, which doesn't allow
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 at redhat.com> 5.5.28a-5
- Added licenses LGPLv2 and BSD
More information about the scm-commits
mailing list