|
 |
7c7f29 |
From 6e3de01c0a6f07f82d514d0d7f546a4eb408a445 Mon Sep 17 00:00:00 2001
|
|
|
7c7f29 |
From: Viktor Ashirov <vashirov@redhat.com>
|
|
|
7c7f29 |
Date: Mon, 11 Jul 2016 10:10:42 +0200
|
|
|
7c7f29 |
Subject: [PATCH 3/3] Ticket #48918 - Upgrade to 389-ds-base >= 1.3.5.5 doesn't
|
|
|
7c7f29 |
install 389-ds-base-snmp
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Bug description:
|
|
|
7c7f29 |
During upgrade from 389-ds-base version <1.3.5.5 additional
|
|
|
7c7f29 |
package 389-ds-base-snmp is not installed.
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Fix description:
|
|
|
7c7f29 |
Move "Obsoletes:" section from %description to %package.
|
|
|
7c7f29 |
|
|
|
7c7f29 |
https://fedorahosted.org/389/ticket/48918
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Reviewed by: nhosoi@redhat.com.
|
|
|
7c7f29 |
|
|
|
7c7f29 |
(cherry picked from commit f593ae7790e3372c6812bfe59e58e6d709ec171f)
|
|
|
7c7f29 |
---
|
|
|
7c7f29 |
rpm/389-ds-base.spec.in | 10 ++++------
|
|
|
7c7f29 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
7c7f29 |
|
|
|
7c7f29 |
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
|
|
|
7c7f29 |
index d08d379..0924cb5 100644
|
|
|
7c7f29 |
--- a/rpm/389-ds-base.spec.in
|
|
|
7c7f29 |
+++ b/rpm/389-ds-base.spec.in
|
|
|
7c7f29 |
@@ -47,6 +47,8 @@ Group: System Environment/Daemons
|
|
|
7c7f29 |
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
7c7f29 |
Obsoletes: %{name}-selinux
|
|
|
7c7f29 |
Conflicts: selinux-policy-base < 3.9.8
|
|
|
7c7f29 |
+# upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp
|
|
|
7c7f29 |
+Obsoletes: %{name} <= 1.3.5.4
|
|
|
7c7f29 |
Requires: %{name}-libs = %{version}-%{release}
|
|
|
7c7f29 |
Provides: ldif2ldbm
|
|
|
7c7f29 |
|
|
|
7c7f29 |
@@ -152,9 +154,6 @@ isn't what you want. Please contact support immediately.
|
|
|
7c7f29 |
Please see http://seclists.org/oss-sec/2016/q1/363 for more information.
|
|
|
7c7f29 |
%endif
|
|
|
7c7f29 |
|
|
|
7c7f29 |
-# upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp
|
|
|
7c7f29 |
-Obsoletes: %{name} <= 1.3.5.4
|
|
|
7c7f29 |
-
|
|
|
7c7f29 |
%package libs
|
|
|
7c7f29 |
Summary: Core libraries for 389 Directory Server (%{variant})
|
|
|
7c7f29 |
Group: System Environment/Daemons
|
|
|
7c7f29 |
@@ -213,13 +212,12 @@ Development Libraries and headers for the 389 Directory Server base package.
|
|
|
7c7f29 |
Summary: SNMP Agent for 389 Directory Server
|
|
|
7c7f29 |
Group: System Environment/Daemons
|
|
|
7c7f29 |
Requires: %{name} = %{version}-%{release}
|
|
|
7c7f29 |
+# upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp
|
|
|
7c7f29 |
+Obsoletes: %{name} <= 1.3.5.4
|
|
|
7c7f29 |
|
|
|
7c7f29 |
%description snmp
|
|
|
7c7f29 |
SNMP Agent for the 389 Directory Server base package.
|
|
|
7c7f29 |
|
|
|
7c7f29 |
-# upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp
|
|
|
7c7f29 |
-Obsoletes: %{name} <= 1.3.5.4
|
|
|
7c7f29 |
-
|
|
|
7c7f29 |
%package tests
|
|
|
7c7f29 |
Summary: The lib389 Continuous Integration Tests
|
|
|
7c7f29 |
Group: Development/Libraries
|
|
|
7c7f29 |
--
|
|
|
7c7f29 |
2.4.11
|
|
|
7c7f29 |
|