summaryrefslogtreecommitdiffstats
path: root/specs/dogtag-pki.spec
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2013-11-15 11:46:36 -0500
committerAde Lee <alee@redhat.com>2013-11-15 14:18:35 -0500
commit03944af46c5b5a811f0fac02d03f69d0e2256668 (patch)
tree0393aa133603f4b3296c73b9c7a769e6c10f330a /specs/dogtag-pki.spec
parent88b5bfea749ead60c609cab9ee406e09f33e93d6 (diff)
downloadpki-03944af46c5b5a811f0fac02d03f69d0e2256668.tar.gz
pki-03944af46c5b5a811f0fac02d03f69d0e2256668.tar.xz
pki-03944af46c5b5a811f0fac02d03f69d0e2256668.zip
Cleaned up spec files and update release number for release build
Ticket 788
Diffstat (limited to 'specs/dogtag-pki.spec')
-rw-r--r--specs/dogtag-pki.spec67
1 files changed, 5 insertions, 62 deletions
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index d69c492cd..498645d0b 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -1,7 +1,7 @@
Summary: Dogtag Public Key Infrastructure (PKI) Suite
Name: dogtag-pki
Version: 10.1.0
-Release: 0.2%{?dist}
+Release: 1%{?dist}
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPLv2 and LGPLv2
URL: http://pki.fedoraproject.org/
@@ -9,8 +9,6 @@ Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-# Establish MINIMUM package versions based upon platform
-%if 0%{?rhel} || 0%{?fedora} >= 19
%define dogtag_pki_theme_version 10.1.0
%define esc_version 1.1.0
%define jss_version 4.2.6-28
@@ -22,61 +20,6 @@ BuildArch: noarch
%define pki_tps_version 10.1.0
%define pki_console_version 10.1.0
%define tomcatjss_version 7.1.0
-%else
-%if 0%{?fedora} >= 18
-%define dogtag_pki_theme_version 10.1.0
-%define esc_version 1.1.0
-%define jss_version 4.2.6-24
-%define pki_core_version 10.1.0
-%define pki_kra_version 10.1.0
-%define pki_ocsp_version 10.1.0
-%define pki_ra_version 10.1.0
-%define pki_tks_version 10.1.0
-%define pki_tps_version 10.1.0
-%define pki_console_version 10.1.0
-%define tomcatjss_version 7.0.0-4
-%else
-%if 0%{?fedora} >= 17
-%define dogtag_pki_theme_version 10.1.0
-%define esc_version 1.1.0
-%define jss_version 4.2.6-24
-%define pki_core_version 10.1.0
-%define pki_kra_version 10.1.0
-%define pki_ocsp_version 10.1.0
-%define pki_ra_version 10.1.0
-%define pki_tks_version 10.1.0
-%define pki_tps_version 10.1.0
-%define pki_console_version 10.1.0
-%define tomcatjss_version 7.0.0-3
-%else
-%if 0%{?fedora} >= 16
-%define dogtag_pki_theme_version 10.1.0
-%define esc_version 1.1.0
-%define jss_version 4.2.6-24
-%define pki_core_version 10.1.0
-%define pki_kra_version 10.1.0
-%define pki_ocsp_version 10.1.0
-%define pki_ra_version 10.1.0
-%define pki_tks_version 10.1.0
-%define pki_tps_version 10.1.0
-%define pki_console_version 10.1.0
-%define tomcatjss_version 6.0.2
-%else
-%define dogtag_pki_theme_version 10.1.0
-%define esc_version 1.1.0
-%define jss_version 4.2.6-24
-%define pki_core_version 10.1.0
-%define pki_kra_version 10.1.0
-%define pki_ocsp_version 10.1.0
-%define pki_ra_version 10.1.0
-%define pki_tks_version 10.1.0
-%define pki_tps_version 10.1.0
-%define pki_console_version 10.1.0
-%define tomcatjss_version 2.0.0
-%endif
-%endif
-%endif
-%endif
Requires: apache-commons-codec
@@ -102,11 +45,7 @@ Requires: pki-tools >= %{pki_core_version}
Requires: pki-symkey >= %{pki_core_version}
Requires: pki-base >= %{pki_core_version}
-%if 0%{?fedora} <= 17
-Requires: pki-selinux >= %{pki_core_version}
-%else
Requires: selinux-policy-base >= 3.11.1-43
-%endif
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Dogtag PKI core javadocs
@@ -186,6 +125,10 @@ rm -rf %{buildroot}
%doc README
%changelog
+* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1
+- Trac Ticket 788 - Clean up spec files
+- Update release number for release build
+
* Sun Nov 10 2013 Ade Lee <alee@redhat.com> 10.1.0-0.2
- Change release number for beta build