From 4f7ada50dc59c5d2c2a61da6cf245b5bdea9a6f4 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Wed, 14 Mar 2012 13:44:47 -0700 Subject: Corrected 'junit' dependency check --- pki/specs/pki-console.spec | 10 ++++++---- pki/specs/pki-core.spec | 15 ++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pki/specs/pki-console.spec b/pki/specs/pki-console.spec index ad655b85e..987fd7e45 100644 --- a/pki/specs/pki-console.spec +++ b/pki/specs/pki-console.spec @@ -7,7 +7,7 @@ Name: pki-console Version: 10.0.0 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} Summary: Certificate System - PKI Console URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -26,18 +26,17 @@ BuildRequires: nss-devel %if 0%{?fedora} >= 17 BuildRequires: junit %else +BuildRequires: junit4 +%endif %if 0%{?fedora} >= 16 BuildRequires: jpackage-utils >= 1.7.5-10 BuildRequires: jss >= 4.2.6-19.1 -BuildRequires: junit4 BuildRequires: pki-util >= 9.0.15 %else BuildRequires: jpackage-utils BuildRequires: jss >= 4.2.6-17 -BuildRequires: junit4 BuildRequires: pki-util %endif -%endif Requires: idm-console-framework Requires: java >= 1:1.6.0 @@ -97,6 +96,9 @@ cd build %changelog +* Wed Mar 14 2012 Matthew Harmsen 10.0.0-0.3.a1 +- Corrected 'junit' dependency check + * Wed Feb 22 2012 Matthew Harmsen 10.0.0-0.2.a1 - Bugzilla Bug #788787 - added 'junit'/'junit4' build-time requirements diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec index f7a702fd1..e4adb1cdb 100644 --- a/pki/specs/pki-core.spec +++ b/pki/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}9%{?prerel}%{?dist} +Release: %{?relprefix}10%{?prerel}%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -45,26 +45,24 @@ BuildRequires: candlepin-deps >= 0.0.21-1 %if 0%{?fedora} >= 17 BuildRequires: junit %else +BuildRequires: junit4 +%endif %if 0%{?fedora} >= 16 BuildRequires: jpackage-utils >= 0:1.7.5-10 BuildRequires: jss >= 4.2.6-19.1 -BuildRequires: junit4 BuildRequires: systemd-units BuildRequires: tomcatjss >= 6.0.2 %else %if 0%{?fedora} >= 15 BuildRequires: jpackage-utils BuildRequires: jss >= 4.2.6-17 -BuildRequires: junit4 BuildRequires: tomcatjss >= 6.0.0 %else BuildRequires: jpackage-utils BuildRequires: jss >= 4.2.6-17 -BuildRequires: junit4 BuildRequires: tomcatjss >= 2.0.0 %endif %endif -%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz @@ -1300,11 +1298,14 @@ fi %changelog -* Mon Mar 12 2012 Matthew Harmsen 10.0.0-9.a1 +* Wed Mar 14 2012 Matthew Harmsen 10.0.0-0.10.a1 +- Corrected 'junit' dependency check + +* Mon Mar 12 2012 Matthew Harmsen 10.0.0-0.9.a1 - Initial attempt at PKI deployment framework described in 'http://pki.fedoraproject.org/wiki/PKI_Instance_Deployment'. -* Fri Mar 09 2012 Jack Magne 10.0.0-8.a1 +* Fri Mar 09 2012 Jack Magne 10.0.0-0.8.a1 - Added support for pki-jndi-realm in tomcat6 in pki-common and pki-kra. - Ticket #69. -- cgit