diff options
| author | Ade Lee <alee@redhat.com> | 2012-09-13 17:27:52 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-09-13 17:27:52 -0400 |
| commit | 951598a0c5ffe4586462c30863526625207407af (patch) | |
| tree | a5369fcf37fc04f90b30303600f84f53842c61c9 | |
| parent | 7ffd677d414aa49b769493b35a594b6f66d1f747 (diff) | |
| download | pki-951598a0c5ffe4586462c30863526625207407af.tar.gz pki-951598a0c5ffe4586462c30863526625207407af.tar.xz pki-951598a0c5ffe4586462c30863526625207407af.zip | |
Added Conflicts for IPA 2.x and Build Requires for zip for mock problem
| -rw-r--r-- | specs/pki-core.spec | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 155f5b9a9..158e14ed9 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: pki-core Version: 10.0.0 -Release: %{?relprefix}32%{?prerel}%{?dist} +Release: %{?relprefix}33%{?prerel}%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -29,6 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # tomcatjss requires versioning since version 2.0.0 requires tomcat6 BuildRequires: cmake +BuildRequires: zip BuildRequires: java-devel >= 1:1.6.0 BuildRequires: redhat-rpm-config BuildRequires: ldapjdk @@ -220,6 +221,7 @@ BuildArch: noarch Obsoletes: pki-common < %{version}-%{release} Obsoletes: pki-util < %{version}-%{release} +Conflicts: freeipa-server < 3.0.0 Requires: apache-commons-codec Requires: apache-commons-lang Requires: apache-commons-logging @@ -1316,6 +1318,10 @@ fi %changelog +* Thu Sep 13 2012 Ade Lee <alee@redhat.com> 10.0.0-0.33.a1 +- Added Conflicts for IPA 2.X +- Added build requires for zip to work around mock problem + * Wed Sep 12 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.32.a1 - TRAC Ticket #312 - Dogtag 10: Automatically restart any running instances upon RPM "update" . . . |