diff options
Diffstat (limited to 'pki/specs')
-rw-r--r-- | pki/specs/dogtag-pki-theme.spec | 19 | ||||
-rw-r--r-- | pki/specs/pki-console.spec | 16 | ||||
-rw-r--r-- | pki/specs/pki-core.spec | 46 | ||||
-rw-r--r-- | pki/specs/pki-kra.spec | 11 | ||||
-rw-r--r-- | pki/specs/pki-ocsp.spec | 11 | ||||
-rw-r--r-- | pki/specs/pki-tks.spec | 11 |
6 files changed, 102 insertions, 12 deletions
diff --git a/pki/specs/dogtag-pki-theme.spec b/pki/specs/dogtag-pki-theme.spec index 5c7b64730..0d6580623 100644 --- a/pki/specs/dogtag-pki-theme.spec +++ b/pki/specs/dogtag-pki-theme.spec @@ -1,5 +1,5 @@ Name: dogtag-pki-theme -Version: 9.0.7 +Version: 9.0.8 Release: 1%{?dist} Summary: Certificate System - Dogtag PKI Theme Components URL: http://pki.fedoraproject.org/ @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 1.7.5-10 +%else BuildRequires: jpackage-utils +%endif Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz @@ -270,7 +274,7 @@ This package is used by the Dogtag Certificate System. %build %{__mkdir_p} build cd build -%cmake -DBUILD_DOGTAG_PKI_THEME:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_DOGTAG_PKI_THEME:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -346,6 +350,17 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl %changelog +* Mon Sep 12 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.8-1 +- 'dogtag-pki-ca-theme' +- 'dogtag-pki-common-theme' +- 'dogtag-pki-console-theme' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'dogtag-pki-kra-theme' +- 'dogtag-pki-ocsp-theme' +- 'dogtag-pki-ra-theme' +- 'dogtag-pki-tks-theme' +- 'dogtag-pki-tps-theme' + * Tue Aug 23 2011 Ade Lee <alee@redhat.com> 9.0.7-1 - 'dogtag-pki-ca-theme' - Bugzilla Bug #712931 - CS requires too many ports diff --git a/pki/specs/pki-console.spec b/pki/specs/pki-console.spec index beb851dcc..ef59bac69 100644 --- a/pki/specs/pki-console.spec +++ b/pki/specs/pki-console.spec @@ -1,5 +1,5 @@ Name: pki-console -Version: 9.0.3 +Version: 9.0.4 Release: 1%{?dist} Summary: Certificate System - PKI Console URL: http://pki.fedoraproject.org/ @@ -13,7 +13,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: idm-console-framework BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: ldapjdk BuildRequires: nspr-devel @@ -22,6 +26,11 @@ BuildRequires: pki-util Requires: idm-console-framework Requires: java >= 1:1.6.0 +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 1.7.5-10 +%else +Requires: jpackage-utils +%endif Requires: jss >= 4.2.6-17 Requires: ldapjdk Requires: pki-console-theme @@ -54,7 +63,7 @@ following "Mutually-Exclusive" PKI Theme packages: %build %{__mkdir_p} build cd build -%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CONSOLE:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CONSOLE:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -72,6 +81,9 @@ cd build %changelog +* Wed Aug 31 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.4-1 +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Thu Jul 14 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.3-1 - Bugzilla Bug #700462 - No action on clicking "Help" button of pkiconsole's right pane (alee) diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec index eaf0ee232..a0422bd1f 100644 --- a/pki/specs/pki-core.spec +++ b/pki/specs/pki-core.spec @@ -1,5 +1,5 @@ Name: pki-core -Version: 9.0.13 +Version: 9.0.14 Release: 1%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ @@ -14,7 +14,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # pki-ca-theme requires versioning to meet runtime requirements BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 0:1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: ldapjdk BuildRequires: nspr-devel @@ -123,7 +127,11 @@ Summary: Symmetric Key JNI Package Group: System Environment/Libraries Requires: java >= 1:1.6.0 +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 0:1.7.5-10 +%else Requires: jpackage-utils +%endif Requires: jss >= 4.2.6-17 Requires: nss @@ -164,7 +172,11 @@ Group: System Environment/Base BuildArch: noarch Requires: java >= 1:1.6.0 +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 0:1.7.5-10 +%else Requires: jpackage-utils +%endif Requires: jss >= 4.2.6-17 Requires: ldapjdk Requires: osutil @@ -206,6 +218,11 @@ Group: System Environment/Base BuildArch: noarch Requires: java >= 1:1.6.0 +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 0:1.7.5-10 +%else +Requires: jpackage-utils +%endif Requires: pki-native-tools = %{version}-%{release} Requires: pki-util = %{version}-%{release} @@ -399,7 +416,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 .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CORE:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -410,11 +427,18 @@ cd build cd %{buildroot}%{_libdir}/symkey %{__rm} symkey.jar +%if 0%{?fedora} >= 16 +%{__rm} %{buildroot}%{_jnidir}/symkey.jar +%{__mv} symkey-%{version}.jar %{buildroot}%{_jnidir}/symkey.jar +%else %{__ln_s} symkey-%{version}.jar symkey.jar +%endif +%if 0%{?rhel} || 0%{?fedora} < 16 cd %{buildroot}%{_jnidir} %{__rm} symkey.jar %{__ln_s} %{_libdir}/symkey/symkey.jar symkey.jar +%endif %if 0%{?fedora} >= 15 # Details: @@ -642,6 +666,24 @@ fi %changelog +* Fri Sep 9 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.14-1 +- 'pki-setup' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-symkey' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-native-tools' +- 'pki-util' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-java-tools' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-common' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-selinux' +- 'pki-ca' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . +- 'pki-silent' +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Tue Sep 6 2011 Ade Lee <alee@redhat.com> 9.0.13-1 - 'pki-setup' - Bugzilla Bug #699809 - Convert CS to use systemd (alee) diff --git a/pki/specs/pki-kra.spec b/pki/specs/pki-kra.spec index ef8c2c434..59402b490 100644 --- a/pki/specs/pki-kra.spec +++ b/pki/specs/pki-kra.spec @@ -1,5 +1,5 @@ Name: pki-kra -Version: 9.0.6 +Version: 9.0.7 Release: 1%{?dist} Summary: Certificate System - Data Recovery Manager URL: http://pki.fedoraproject.org/ @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 0:1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -104,7 +108,7 @@ Additionally, Certificate System requires ONE AND ONLY ONE of the following %build %{__mkdir_p} build cd build -%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_KRA:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_KRA:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -197,6 +201,9 @@ fi %changelog +* Mon Sep 12 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.7-1 +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Tue Sep 6 2011 Ade Lee <alee@redhat.com> 9.0.6-1 - Bugzilla Bug #699809 - Convert CS to use systemd (alee) diff --git a/pki/specs/pki-ocsp.spec b/pki/specs/pki-ocsp.spec index 3467d042a..a056c689b 100644 --- a/pki/specs/pki-ocsp.spec +++ b/pki/specs/pki-ocsp.spec @@ -1,5 +1,5 @@ Name: pki-ocsp -Version: 9.0.5 +Version: 9.0.6 Release: 1%{?dist} Summary: Certificate System - Online Certificate Status Protocol Manager URL: http://pki.fedoraproject.org/ @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 0:1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -112,7 +116,7 @@ Additionally, Certificate System requires ONE AND ONLY ONE of the following %build %{__mkdir_p} build cd build -%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_OCSP:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_OCSP:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -208,6 +212,9 @@ fi %changelog +* Mon Sep 12 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.6-1 +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Tue Sep 6 2011 Ade Lee <alee@redhat.com> 9.0.5-1 - Bugzilla Bug #699809 - Convert CS to use systemd (alee) diff --git a/pki/specs/pki-tks.spec b/pki/specs/pki-tks.spec index 3001b5c53..8aee0d624 100644 --- a/pki/specs/pki-tks.spec +++ b/pki/specs/pki-tks.spec @@ -1,5 +1,5 @@ Name: pki-tks -Version: 9.0.5 +Version: 9.0.6 Release: 1%{?dist} Summary: Certificate System - Token Key Service URL: http://pki.fedoraproject.org/ @@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: java-devel >= 1:1.6.0 +%if 0%{?fedora} >= 16 +BuildRequires: jpackage-utils >= 0:1.7.5-10 +%else BuildRequires: jpackage-utils +%endif BuildRequires: jss >= 4.2.6-17 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -105,7 +109,7 @@ Additionally, Certificate System requires ONE AND ONLY ONE of the following %build %{__mkdir_p} build cd build -%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_TKS:BOOL=ON .. +%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_TKS:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} .. %{__make} VERBOSE=1 %{?_smp_mflags} @@ -197,6 +201,9 @@ fi %changelog +* Mon Sep 12 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.6-1 +- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . + * Tue Sep 6 2011 Ade Lee <alee@redhat.com> 9.0.5-1 - Bugzilla Bug #699809 - Convert CS to use systemd |