Bugzilla Bug #668836 - Review Request: ipa-pki-theme

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1730 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 14 insertions, 121 deletions

diff --git a/pki/specs/ipa-pki-theme.spec b/pki/specs/ipa-pki-theme.spec
index 78233d874..158d5ea88 100644
--- a/pki/specs/ipa-pki-theme.spec
+++ b/pki/specs/ipa-pki-theme.spec
@@ -1,10 +1,6 @@
-###############################################################################
-###                       P A C K A G E   H E A D E R                       ###
-###############################################################################
-
 Name:             ipa-pki-theme
 Version:          9.0.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Certificate System - IPA PKI Theme Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -23,69 +19,25 @@ ExcludeArch:      ppc ppc64 s390 s390x
 %endif
 
 %global overview                                                       \
-==================================                                     \
-||  ABOUT "CERTIFICATE SYSTEM"  ||                                     \
-==================================                                     \
-                                                                       \
-Certificate System (CS) is an enterprise software system designed      \
-to manage enterprise Public Key Infrastructure (PKI) deployments.      \
-                                                                       \
-The IPA PKI Suite is comprised of the following subsystems:            \
-                                                                       \
-  * Certificate Authority (CA)                                         \
-                                                                       \
-Additionally, it provides javadocs on portions of the API, as well as  \
-various command-line tools used to assist with an IPA deployment.      \
-                                                                       \
-To successfully deploy instances of a CA,                              \
-a Tomcat Web Server must be up and running locally on this machine.    \
-                                                                       \
-To meet the database storage requirements of each CA                   \
-instance, a 389 Directory Server must be up and running either locally \
-on this machine, or remotely over the attached network connection.     \
-                                                                       \
-IPA utilizes the 'pkicreate' utility to install a PKI subsystem, and   \
-the 'pkisilent' utility to perform a batch configuration of this PKI   \
-subsystem.                                                             \
-                                                                       \
-After installation of this package, IPA utilizes the 'pkicreate' and   \
-'pkiremove' utilities to respectively create and remove PKI instances. \
-                                                                       \
-For deployment purposes, IPA PKI requires ALL of the subpackages       \
-defined by the "pki-core" package.                                     \
-                                                                       \
+Several PKI packages require a "virtual" Theme component.  These       \
+"virtual" Theme components are "Provided" by various Theme "flavors"   \
+including "dogtag", "redhat", and "ipa".  Consequently,                \
+all "dogtag", "redhat", and "ipa" Theme components MUST be             \
+mutually exclusive!                                                    \
 %{nil}
 
 %description %{overview}
 
 
-###############################################################################
-###                   S U B P A C K A G E   H E A D E R S                   ###
-###############################################################################
-
-##############################
-##   ipa-pki-common-theme   ##
-##############################
-
 %package -n       ipa-pki-common-theme
 Summary:          Certificate System - PKI Common Framework User Interface
 Group:            System Environment/Base
 
-# NOTE:  Several PKI packages require a "virtual" Theme component.  These
-#        "virtual" Theme components are "Provided" by various Theme "flavors"
-#        including "dogtag", "redhat", and "ipa".  Consequently,
-#        all "dogtag", "redhat", and "ipa" Theme components MUST be
-#        mutually exclusive!
 Conflicts:        dogtag-pki-common-theme
 Conflicts:        dogtag-pki-common-ui
 Conflicts:        redhat-pki-common-theme
 Conflicts:        redhat-pki-common-ui
 
-Obsoletes:        ipa-pki-common-theme < %{version}-%{release}
-Obsoletes:        ipa-pki-common-ui <= %{version}
-Obsoletes:        null-pki-common-theme <= %{version}
-Obsoletes:        null-pki-common-ui <= %{version}
-
 Provides:         pki-common-theme = %{version}-%{release}
 Provides:         pki-common-ui = %{version}-%{release}
 
@@ -98,29 +50,15 @@ This package is used by the Certificate System utilized by IPA.
 %{overview}
 
 
-##############################
-##     ipa-pki-ca-theme     ##
-##############################
-
 %package -n       ipa-pki-ca-theme
 Summary:          Certificate System - Certificate Authority User Interface
 Group:            System Environment/Base
 
-# NOTE:  Several PKI packages require a "virtual" Theme component.  These
-#        "virtual" Theme components are "Provided" by various Theme "flavors"
-#        including "dogtag", "redhat", and "ipa".  Consequently,
-#        all "dogtag", "redhat", and "ipa" Theme components MUST be
-#        mutually exclusive!
 Conflicts:        dogtag-pki-ca-theme
 Conflicts:        dogtag-pki-ca-ui
 Conflicts:        redhat-pki-ca-theme
 Conflicts:        redhat-pki-ca-ui
 
-Obsoletes:        ipa-pki-ca-theme < %{version}-%{release}
-Obsoletes:        ipa-pki-ca-ui <= %{version}
-Obsoletes:        null-pki-ca-theme <= %{version}
-Obsoletes:        null-pki-ca-ui <= %{version}
-
 Provides:         pki-ca-theme = %{version}-%{release}
 Provides:         pki-ca-ui = %{version}-%{release}
 
@@ -133,10 +71,6 @@ This package is used by the Certificate System utilized by IPA.
 %{overview}
 
 
-###############################################################################
-###                   P A C K A G E   P R O C E S S I N G                   ###
-###############################################################################
-
 %prep
 
 
@@ -154,51 +88,11 @@ cd build
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
-###############################################################################
-###                 P A C K A G E   I N S T A L L A T I O N                 ###
-###############################################################################
-
 %install
 %{__rm} -rf %{buildroot}
 cd build
-%{__make} install DESTDIR=%{buildroot}
-
-
-###############################################################################
-###              S U B P A C K A G E   I N S T A L L A T I O N              ###
-###############################################################################
-
-##############################
-##   ipa-pki-common-theme   ##
-##############################
-
+%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
 
-##############################
-##     ipa-pki-ca-theme     ##
-##############################
-
-
-###############################################################################
-###  P R E  &  P O S T   I N S T A L L / U N I N S T A L L   S C R I P T S  ###
-###############################################################################
-
-##############################
-##   ipa-pki-common-theme   ##
-##############################
-
-
-##############################
-##     ipa-pki-ca-theme     ##
-##############################
-
-
-###############################################################################
-###   I N V E N T O R Y   O F   F I L E S   A N D   D I R E C T O R I E S   ### 
-###############################################################################
-
-##############################
-##   ipa-pki-common-theme   ##
-##############################
 
 %files -n ipa-pki-common-theme
 %defattr(-,root,root,-)
@@ -207,10 +101,6 @@ cd build
 %{_datadir}/pki/common-ui/
 
 
-##############################
-##     ipa-pki-ca-theme     ##
-##############################
-
 %files -n ipa-pki-ca-theme
 %defattr(-,root,root,-)
 %doc dogtag/ca-ui/LICENSE
@@ -218,11 +108,14 @@ cd build
 %{_datadir}/pki/ca-ui/
 
 
-###############################################################################
-###                            C H A N G E L O G                            ###
-###############################################################################
-
 %changelog
+* Thu Jan 13 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-2
+- Bugzilla Bug #668836 - Review Request: ipa-pki-theme
+-   Modified overview to pertain more to these packages
+-   Removed "Obsoletes:" lines (only pertinent to internal deployments)
+-   Modified installation section to preserve timestamps
+-   Removed sectional comments
+
 * Wed Dec 1 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
 - Initial revision. (kwright@redhat.com & mharmsen@redhat.com)