diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2012-02-22 20:46:30 -0800 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-02-22 20:46:30 -0800 |
commit | 5d293f5e51a1c79ea1727431cda6a5d17f1378c5 (patch) | |
tree | ecc5ab63bab89bb27ff3b5e2eac267851563d6b0 | |
parent | 5a04c625bfa441442265ce7ad234b08bed6be0f5 (diff) | |
download | pki-5d293f5e51a1c79ea1727431cda6a5d17f1378c5.tar.gz pki-5d293f5e51a1c79ea1727431cda6a5d17f1378c5.tar.xz pki-5d293f5e51a1c79ea1727431cda6a5d17f1378c5.zip |
Fixed several miscellaneous build issues
(see https://fedorahosted.org/pki/ticket/104)
-rw-r--r-- | pki/specs/pki-console.spec | 11 | ||||
-rw-r--r-- | pki/specs/pki-core.spec | 16 |
2 files changed, 24 insertions, 3 deletions
diff --git a/pki/specs/pki-console.spec b/pki/specs/pki-console.spec index 8bf9cbada..ad655b85e 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}1%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist} Summary: Certificate System - PKI Console URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -23,15 +23,21 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ldapjdk BuildRequires: nspr-devel BuildRequires: nss-devel +%if 0%{?fedora} >= 17 +BuildRequires: junit +%else %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 @@ -91,6 +97,9 @@ cd build %changelog +* Wed Feb 22 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.2.a1 +- Bugzilla Bug #788787 - added 'junit'/'junit4' build-time requirements + * Wed Feb 1 2012 Nathan Kinder <nkinder@redhat.com> 10.0.0-0.1.a1 - Updated package version number diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec index 01409c22a..151fe4bd6 100644 --- a/pki/specs/pki-core.spec +++ b/pki/specs/pki-core.spec @@ -7,7 +7,7 @@ Name: pki-core Version: 10.0.0 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -148,6 +148,8 @@ Group: System Environment/Base BuildArch: noarch +Requires: perl(File::Slurp) +Requires: perl(XML::LibXML) Requires: perl-Crypt-SSLeay Requires: policycoreutils Requires: openldap-clients @@ -655,7 +657,7 @@ This package is a part of the PKI Core used by the Certificate System. %build %{__mkdir_p} build cd build -%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CORE:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CORE:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} .. %{__make} VERBOSE=1 %{?_smp_mflags} all %{__make} VERBOSE=1 %{?_smp_mflags} test @@ -1214,6 +1216,16 @@ fi %changelog +* Wed Feb 22 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.3.a1 +- Add '-DSYSTEMD_LIB_INSTALL_DIR' override flag to 'cmake' to address changes + in fundamental path structure in Fedora 17 +- 'pki-setup' +- Hard-code Perl dependencies to protect against bugs such as + Bugzilla Bug #772699 - Adapt perl and python fileattrs to + changed file 5.10 magics +- 'pki-selinux' +- Bugzilla Bug #795966 - pki-selinux policy is kind of a mess + * Mon Feb 20 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.2.a1 - Integrated 'pki-kra' into 'pki-core' - Integrated 'pki-ocsp' into 'pki-core' |