Skip to content

Commit f36cf6c

Browse files
edewataedewata
committed
Updated spec templates
The spec templates have been updated to require the latest JSS and TomcatJSS. Change-Id: I35c61e0e806b25e48de8370603656ca6abd3b0ae
1 parent c5b2587 commit f36cf6c

File tree

4 files changed

+111
-111
lines changed

4 files changed

+111
-111
lines changed

‎specs/dogtag-pki.spec.in

+36-36
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,24 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
170170
%define pki_gid 17
171171
%define pki_homedir /usr/share/pki
172172

173+
%global saveFileContext() \
174+
if [ -s /etc/selinux/config ]; then \
175+
. %{_sysconfdir}/selinux/config; \
176+
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
177+
if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
178+
cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.%{name}; \
179+
fi \
180+
fi;
181+
182+
%global relabel() \
183+
. %{_sysconfdir}/selinux/config; \
184+
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
185+
selinuxenabled; \
186+
if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.%{name} ]; then \
187+
fixfiles -C ${FILE_CONTEXT}.%{name} restore; \
188+
rm -f ${FILE_CONTEXT}.%name; \
189+
fi;
190+
173191
################################################################################
174192
# Build Dependencies
175193
################################################################################
@@ -314,8 +332,8 @@ BuildRequires: jpackage-utils >= 0:1.7.5-10
314332
BuildRequires: jss >= 4.4.0-11
315333
BuildRequires: tomcatjss >= 7.2.1-4
316334
%else
317-
BuildRequires: jss >= 4.5.0-0.2
318-
BuildRequires: tomcatjss >= 7.3.0
335+
BuildRequires: jss >= 4.5.0-0.3
336+
BuildRequires: tomcatjss >= 7.3.2
319337
%endif
320338
BuildRequires: systemd-units
321339

@@ -344,37 +362,6 @@ BuildRequires: systemd
344362
BuildRequires: zlib
345363
BuildRequires: zlib-devel
346364

347-
%global saveFileContext() \
348-
if [ -s /etc/selinux/config ]; then \
349-
. %{_sysconfdir}/selinux/config; \
350-
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
351-
if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
352-
cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.%{name}; \
353-
fi \
354-
fi;
355-
356-
%global relabel() \
357-
. %{_sysconfdir}/selinux/config; \
358-
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
359-
selinuxenabled; \
360-
if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.%{name} ]; then \
361-
fixfiles -C ${FILE_CONTEXT}.%{name} restore; \
362-
rm -f ${FILE_CONTEXT}.%name; \
363-
fi;
364-
365-
%description
366-
367-
Dogtag PKI is an enterprise software system designed
368-
to manage enterprise Public Key Infrastructure deployments.
369-
370-
PKI consists of the following components:
371-
372-
* Certificate Authority (CA)
373-
* Key Recovery Authority (KRA)
374-
* Online Certificate Status Protocol (OCSP) Manager
375-
* Token Key Service (TKS)
376-
* Token Processing Service (TPS)
377-
378365
%if %{with meta}
379366

380367
# Make certain that this 'meta' package requires the latest version(s)
@@ -411,6 +398,19 @@ Requires: esc >= 1.1.1
411398

412399
%endif # with meta
413400

401+
%description
402+
403+
Dogtag PKI is an enterprise software system designed
404+
to manage enterprise Public Key Infrastructure deployments.
405+
406+
PKI consists of the following components:
407+
408+
* Certificate Authority (CA)
409+
* Key Recovery Authority (KRA)
410+
* Online Certificate Status Protocol (OCSP) Manager
411+
* Token Key Service (TKS)
412+
* Token Processing Service (TPS)
413+
414414
%if %{with base}
415415
################################################################################
416416
%package -n pki-symkey
@@ -423,7 +423,7 @@ Requires: jpackage-utils >= 0:1.7.5-10
423423
%if 0%{?rhel} && 0%{?rhel} <= 7
424424
Requires: jss >= 4.4.0-11
425425
%else
426-
Requires: jss >= 4.5.0-0.2
426+
Requires: jss >= 4.5.0-0.3
427427
%endif
428428
Requires: nss >= 3.36.1
429429

@@ -562,7 +562,7 @@ Requires: jpackage-utils >= 0:1.7.5-10
562562
%if 0%{?rhel} && 0%{?rhel} <= 7
563563
Requires: jss >= 4.4.0-11
564564
%else
565-
Requires: jss >= 4.5.0-0.2
565+
Requires: jss >= 4.5.0-0.3
566566
%endif
567567
Requires: ldapjdk >= 4.19-5
568568
Requires: pki-base >= %{version}-%{release}
@@ -712,7 +712,7 @@ Requires(pre): shadow-utils
712712
%if 0%{?rhel} && 0%{?rhel} <= 7
713713
Requires: tomcatjss >= 7.2.1-4
714714
%else
715-
Requires: tomcatjss >= 7.3.0
715+
Requires: tomcatjss >= 7.3.2
716716
%endif
717717

718718
%if 0%{?rhel} && 0%{?rhel} <= 7

‎specs/pki-core.spec.in

+37-37
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Name: pki-core
33
################################################################################
44

5-
Summary: Dogtag PKI Core Package
5+
Summary: PKI Core Package
66
URL: http://www.dogtagpki.org/
77
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
88
License: GPLv2 and LGPLv2
@@ -177,6 +177,24 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
177177
%define pki_gid 17
178178
%define pki_homedir /usr/share/pki
179179

180+
%global saveFileContext() \
181+
if [ -s /etc/selinux/config ]; then \
182+
. %{_sysconfdir}/selinux/config; \
183+
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
184+
if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
185+
cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.%{name}; \
186+
fi \
187+
fi;
188+
189+
%global relabel() \
190+
. %{_sysconfdir}/selinux/config; \
191+
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
192+
selinuxenabled; \
193+
if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.%{name} ]; then \
194+
fixfiles -C ${FILE_CONTEXT}.%{name} restore; \
195+
rm -f ${FILE_CONTEXT}.%name; \
196+
fi;
197+
180198
################################################################################
181199
# Build Dependencies
182200
################################################################################
@@ -321,8 +339,8 @@ BuildRequires: jpackage-utils >= 0:1.7.5-10
321339
BuildRequires: jss >= 4.4.0-11
322340
BuildRequires: tomcatjss >= 7.2.1-4
323341
%else
324-
BuildRequires: jss >= 4.5.0-0.2
325-
BuildRequires: tomcatjss >= 7.3.0
342+
BuildRequires: jss >= 4.5.0-0.3
343+
BuildRequires: tomcatjss >= 7.3.2
326344
%endif
327345
BuildRequires: systemd-units
328346

@@ -351,37 +369,6 @@ BuildRequires: systemd
351369
BuildRequires: zlib
352370
BuildRequires: zlib-devel
353371

354-
%global saveFileContext() \
355-
if [ -s /etc/selinux/config ]; then \
356-
. %{_sysconfdir}/selinux/config; \
357-
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
358-
if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
359-
cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.%{name}; \
360-
fi \
361-
fi;
362-
363-
%global relabel() \
364-
. %{_sysconfdir}/selinux/config; \
365-
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
366-
selinuxenabled; \
367-
if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.%{name} ]; then \
368-
fixfiles -C ${FILE_CONTEXT}.%{name} restore; \
369-
rm -f ${FILE_CONTEXT}.%name; \
370-
fi;
371-
372-
%description
373-
374-
Dogtag PKI is an enterprise software system designed
375-
to manage enterprise Public Key Infrastructure deployments.
376-
377-
PKI consists of the following components:
378-
379-
* Certificate Authority (CA)
380-
* Key Recovery Authority (KRA)
381-
* Online Certificate Status Protocol (OCSP) Manager
382-
* Token Key Service (TKS)
383-
* Token Processing Service (TPS)
384-
385372
%if %{with meta}
386373

387374
# Make certain that this 'meta' package requires the latest version(s)
@@ -418,6 +405,19 @@ Requires: esc >= 1.1.1
418405

419406
%endif # with meta
420407

408+
%description
409+
410+
Dogtag PKI is an enterprise software system designed
411+
to manage enterprise Public Key Infrastructure deployments.
412+
413+
PKI consists of the following components:
414+
415+
* Certificate Authority (CA)
416+
* Key Recovery Authority (KRA)
417+
* Online Certificate Status Protocol (OCSP) Manager
418+
* Token Key Service (TKS)
419+
* Token Processing Service (TPS)
420+
421421
%if %{with base}
422422
################################################################################
423423
%package -n pki-symkey
@@ -430,7 +430,7 @@ Requires: jpackage-utils >= 0:1.7.5-10
430430
%if 0%{?rhel} && 0%{?rhel} <= 7
431431
Requires: jss >= 4.4.0-11
432432
%else
433-
Requires: jss >= 4.5.0-0.2
433+
Requires: jss >= 4.5.0-0.3
434434
%endif
435435
Requires: nss >= 3.36.1
436436

@@ -569,7 +569,7 @@ Requires: jpackage-utils >= 0:1.7.5-10
569569
%if 0%{?rhel} && 0%{?rhel} <= 7
570570
Requires: jss >= 4.4.0-11
571571
%else
572-
Requires: jss >= 4.5.0-0.2
572+
Requires: jss >= 4.5.0-0.3
573573
%endif
574574
Requires: ldapjdk >= 4.19-5
575575
Requires: pki-base >= %{version}-%{release}
@@ -719,7 +719,7 @@ Requires(pre): shadow-utils
719719
%if 0%{?rhel} && 0%{?rhel} <= 7
720720
Requires: tomcatjss >= 7.2.1-4
721721
%else
722-
Requires: tomcatjss >= 7.3.0
722+
Requires: tomcatjss >= 7.3.2
723723
%endif
724724

725725
%if 0%{?rhel} && 0%{?rhel} <= 7

‎specs/pki.spec.in

+37-37
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Name: pki
33
################################################################################
44

5-
Summary: Dogtag PKI Package
5+
Summary: PKI Package
66
URL: http://www.dogtagpki.org/
77
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
88
License: GPLv2 and LGPLv2
@@ -165,6 +165,24 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
165165
%define pki_gid 17
166166
%define pki_homedir /usr/share/pki
167167

168+
%global saveFileContext() \
169+
if [ -s /etc/selinux/config ]; then \
170+
. %{_sysconfdir}/selinux/config; \
171+
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
172+
if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
173+
cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.%{name}; \
174+
fi \
175+
fi;
176+
177+
%global relabel() \
178+
. %{_sysconfdir}/selinux/config; \
179+
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
180+
selinuxenabled; \
181+
if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.%{name} ]; then \
182+
fixfiles -C ${FILE_CONTEXT}.%{name} restore; \
183+
rm -f ${FILE_CONTEXT}.%name; \
184+
fi;
185+
168186
################################################################################
169187
# Build Dependencies
170188
################################################################################
@@ -309,8 +327,8 @@ BuildRequires: jpackage-utils >= 0:1.7.5-10
309327
BuildRequires: jss >= 4.4.0-11
310328
BuildRequires: tomcatjss >= 7.2.1-4
311329
%else
312-
BuildRequires: jss >= 4.5.0-0.2
313-
BuildRequires: tomcatjss >= 7.3.0
330+
BuildRequires: jss >= 4.5.0-0.3
331+
BuildRequires: tomcatjss >= 7.3.2
314332
%endif
315333
BuildRequires: systemd-units
316334

@@ -339,37 +357,6 @@ BuildRequires: systemd
339357
BuildRequires: zlib
340358
BuildRequires: zlib-devel
341359

342-
%global saveFileContext() \
343-
if [ -s /etc/selinux/config ]; then \
344-
. %{_sysconfdir}/selinux/config; \
345-
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
346-
if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
347-
cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.%{name}; \
348-
fi \
349-
fi;
350-
351-
%global relabel() \
352-
. %{_sysconfdir}/selinux/config; \
353-
FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
354-
selinuxenabled; \
355-
if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.%{name} ]; then \
356-
fixfiles -C ${FILE_CONTEXT}.%{name} restore; \
357-
rm -f ${FILE_CONTEXT}.%name; \
358-
fi;
359-
360-
%description
361-
362-
Dogtag PKI is an enterprise software system designed
363-
to manage enterprise Public Key Infrastructure deployments.
364-
365-
PKI consists of the following components:
366-
367-
* Certificate Authority (CA)
368-
* Key Recovery Authority (KRA)
369-
* Online Certificate Status Protocol (OCSP) Manager
370-
* Token Key Service (TKS)
371-
* Token Processing Service (TPS)
372-
373360
%if %{with meta}
374361

375362
# Make certain that this 'meta' package requires the latest version(s)
@@ -406,6 +393,19 @@ Requires: esc >= 1.1.1
406393

407394
%endif # with meta
408395

396+
%description
397+
398+
Dogtag PKI is an enterprise software system designed
399+
to manage enterprise Public Key Infrastructure deployments.
400+
401+
PKI consists of the following components:
402+
403+
* Certificate Authority (CA)
404+
* Key Recovery Authority (KRA)
405+
* Online Certificate Status Protocol (OCSP) Manager
406+
* Token Key Service (TKS)
407+
* Token Processing Service (TPS)
408+
409409
%if %{with base}
410410
################################################################################
411411
%package -n pki-symkey
@@ -418,7 +418,7 @@ Requires: jpackage-utils >= 0:1.7.5-10
418418
%if 0%{?rhel} && 0%{?rhel} <= 7
419419
Requires: jss >= 4.4.0-11
420420
%else
421-
Requires: jss >= 4.5.0-0.2
421+
Requires: jss >= 4.5.0-0.3
422422
%endif
423423
Requires: nss >= 3.36.1
424424

@@ -557,7 +557,7 @@ Requires: jpackage-utils >= 0:1.7.5-10
557557
%if 0%{?rhel} && 0%{?rhel} <= 7
558558
Requires: jss >= 4.4.0-11
559559
%else
560-
Requires: jss >= 4.5.0-0.2
560+
Requires: jss >= 4.5.0-0.3
561561
%endif
562562
Requires: ldapjdk >= 4.19-5
563563
Requires: pki-base >= %{version}-%{release}
@@ -707,7 +707,7 @@ Requires(pre): shadow-utils
707707
%if 0%{?rhel} && 0%{?rhel} <= 7
708708
Requires: tomcatjss >= 7.2.1-4
709709
%else
710-
Requires: tomcatjss >= 7.3.0
710+
Requires: tomcatjss >= 7.3.2
711711
%endif
712712

713713
%if 0%{?rhel} && 0%{?rhel} <= 7

‎travis/pki-build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function upload {
1515

1616
echo "Installing PKI build dependencies"
1717

18-
dnf builddep -y --spec ${BUILDDIR}/pki/specs/pki.spec.in
18+
dnf builddep -y --allowerasing --spec ${BUILDDIR}/pki/specs/pki.spec.in
1919

2020
echo "Building PKI packages"
2121

0 commit comments

Comments
 (0)