From 6208ca279f60ce3969d44ba3044a2f48c9e748fc Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 22 Apr 2012 15:40:12 +0200 Subject: [PATCH] libdb + db4: The devel packages should conflict each other. --- db4/db4.nm | 8 +++++++- libdb/libdb.nm | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/db4/db4.nm b/db4/db4.nm index 8f994393a..82e7255b6 100644 --- a/db4/db4.nm +++ b/db4/db4.nm @@ -7,7 +7,7 @@ name = db4 version_major = 4.8 version_minor = 30 version = %{version_major}.%{version_minor} -release = 4 +release = 5 epoch = 1 thisapp = db-%{version} @@ -88,6 +88,12 @@ packages # Overwrite because of epoch != 0. requires = %{name}=%{epoch}:%{thisver} + # You cannot install libdb-devel and db4-devel + # at the same time. + conflicts + libdb-devel + end + files %{includedir} %{libdir}/libdb.so diff --git a/libdb/libdb.nm b/libdb/libdb.nm index 9fd650894..bee134c56 100644 --- a/libdb/libdb.nm +++ b/libdb/libdb.nm @@ -8,7 +8,7 @@ version_major = 5 version_minor = 2 version_patch = 36 version = %{version_major}.%{version_minor}.%{version_patch} -release = 2 +release = 3 thisapp = db-%{version} soversion = %{version_major}.%{version_minor} @@ -87,6 +87,12 @@ packages package %{name}-devel template DEVEL + # You cannot install libdb-devel and db4-devel + # at the same time. + conflicts + db4-devel + end + files += !%{libdir}/libdb-%{soversion}.so files += !%{libdir}/libdb_sql-%{soversion}.so end -- 2.39.2