[nss-util] Remove an unwise Obsolete that doesn't actually solve a conflict
Elio Maldonado
emaldonado at fedoraproject.org
Wed Oct 3 21:28:25 UTC 2012
commit c6c258c6951a44ee37c0e58e073656fbfa2cf0fb
Author: Elio Maldonado <emaldona at redhat.com>
Date: Wed Oct 3 13:05:58 2012 -0700
Remove an unwise Obsolete that doesn't actually solve a conflict
- nss-util-devel now provides the hasht.h header previously supplied by nss-devel
- this causes an install conflict that must be solved
nss-util.spec | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/nss-util.spec b/nss-util.spec
index 4db88fe..525dadf 100644
--- a/nss-util.spec
+++ b/nss-util.spec
@@ -52,8 +52,6 @@ Utilities for Network Security Services and the Softoken module
%package devel
Summary: Development libraries for Network Security Services Utilities
Group: Development/Libraries
-# prevents install conflicts caused by hasht.h having moved to this package
-Obsoletes: nss-softoken-devel < 3.14
Requires: nss-util = %{version}-%{release}
Requires: nspr-devel >= %{nspr_version}
Requires: pkgconfig
@@ -225,7 +223,6 @@ done
- Update to NSS_3_14_BETA1
- Add patch so utilmod doesn't include any headers from softoken
- Remove the relro patch that rebase renders obsolete
-- Add an Obsoletes to prevent install conflicts caused by having moved hasht.h to this package
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list