summaryrefslogtreecommitdiffstats
path: root/specs/dogtag-pki-theme.spec
diff options
context:
space:
mode:
Diffstat (limited to 'specs/dogtag-pki-theme.spec')
-rw-r--r--specs/dogtag-pki-theme.spec66
1 files changed, 39 insertions, 27 deletions
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index deb9aa845..d64299074 100644
--- a/specs/dogtag-pki-theme.spec
+++ b/specs/dogtag-pki-theme.spec
@@ -7,7 +7,7 @@
Name: dogtag-pki-theme
Version: 10.0.0
-Release: %{?relprefix}4%{?prerel}%{?dist}
+Release: %{?relprefix}5%{?prerel}%{?dist}
Summary: Certificate System - Dogtag PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -58,28 +58,32 @@ for its corresponding "ipa" theme package or "dogtag" theme package. \
%description %{overview}
-%package -n dogtag-pki-common-theme
-Summary: Certificate System - PKI Common Framework User Interface
+%package -n dogtag-pki-server-theme
+Summary: Certificate System - PKI Server Framework Theme
Group: System Environment/Base
%if 0%{?rhel}
# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
+Conflicts: redhat-pki-server-theme
Conflicts: redhat-pki-common-theme
Conflicts: redhat-pki-common-ui
# EPEL version of Dogtag "theme" ALWAYS replaces ALL versions of IPA "theme"
+Obsoletes: ipa-pki-server-theme <= 9999
Obsoletes: ipa-pki-common-theme <= 9999
-Provides: ipa-pki-common-theme = %{version}-%{release}
+Provides: ipa-pki-server-theme = %{version}-%{release}
%endif
-Obsoletes: dogtag-pki-common-ui <= 9
+Obsoletes: dogtag-pki-common-theme
+Obsoletes: dogtag-pki-common-ui
+Provides: pki-server-theme = %{version}-%{release}
Provides: pki-common-theme = %{version}-%{release}
Provides: pki-common-ui = %{version}-%{release}
-%description -n dogtag-pki-common-theme
-This PKI Common Framework User Interface contains
-the Dogtag textual and graphical user interface for the PKI Common Framework.
+%description -n dogtag-pki-server-theme
+This PKI Server Framework Theme contains
+the Dogtag textual and graphical user interface for the PKI Server Framework.
This package is used by the Dogtag Certificate System.
@@ -87,10 +91,10 @@ This package is used by the Dogtag Certificate System.
%package -n dogtag-pki-ca-theme
-Summary: Certificate System - Certificate Authority User Interface
+Summary: Certificate System - Certificate Authority Theme
Group: System Environment/Base
-Requires: dogtag-pki-common-theme = %{version}-%{release}
+Requires: dogtag-pki-server-theme = %{version}-%{release}
%if 0%{?rhel}
# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
@@ -108,7 +112,7 @@ Provides: pki-ca-theme = %{version}-%{release}
Provides: pki-ca-ui = %{version}-%{release}
%description -n dogtag-pki-ca-theme
-This Certificate Authority (CA) User Interface contains
+This Certificate Authority (CA) Theme contains
the Dogtag textual and graphical user interface for the CA.
This package is used by the Dogtag Certificate System.
@@ -117,10 +121,10 @@ This package is used by the Dogtag Certificate System.
%package -n dogtag-pki-kra-theme
-Summary: Certificate System - Data Recovery Manager User Interface
+Summary: Certificate System - Data Recovery Manager Theme
Group: System Environment/Base
-Requires: dogtag-pki-common-theme = %{version}-%{release}
+Requires: dogtag-pki-server-theme = %{version}-%{release}
%if 0%{?rhel}
# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
@@ -134,7 +138,7 @@ Provides: pki-kra-theme = %{version}-%{release}
Provides: pki-kra-ui = %{version}-%{release}
%description -n dogtag-pki-kra-theme
-This Data Recovery Manager (DRM) User Interface contains
+This Data Recovery Manager (DRM) Theme contains
the Dogtag textual and graphical user interface for the DRM.
This package is used by the Dogtag Certificate System.
@@ -143,10 +147,10 @@ This package is used by the Dogtag Certificate System.
%package -n dogtag-pki-ocsp-theme
-Summary: Certificate System - Online Certificate Status Protocol Manager User Interface
+Summary: Certificate System - Online Certificate Status Protocol Manager Theme
Group: System Environment/Base
-Requires: dogtag-pki-common-theme = %{version}-%{release}
+Requires: dogtag-pki-server-theme = %{version}-%{release}
%if 0%{?rhel}
# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
@@ -160,7 +164,7 @@ Provides: pki-ocsp-theme = %{version}-%{release}
Provides: pki-ocsp-ui = %{version}-%{release}
%description -n dogtag-pki-ocsp-theme
-This Online Certificate Status Protocol (OCSP) Manager User Interface contains
+This Online Certificate Status Protocol (OCSP) Manager Theme contains
the Dogtag textual and graphical user interface for the OCSP Manager.
This package is used by the Dogtag Certificate System.
@@ -169,9 +173,11 @@ This package is used by the Dogtag Certificate System.
%package -n dogtag-pki-ra-theme
-Summary: Certificate System - Registration Authority User Interface
+Summary: Certificate System - Registration Authority Theme
Group: System Environment/Base
+Requires: dogtag-pki-server-theme = %{version}-%{release}
+
%if 0%{?rhel}
# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
Conflicts: redhat-pki-ra-theme
@@ -184,7 +190,7 @@ Provides: pki-ra-theme = %{version}-%{release}
Provides: pki-ra-ui = %{version}-%{release}
%description -n dogtag-pki-ra-theme
-This Registration Authority (RA) User Interface contains
+This Registration Authority (RA) Theme contains
the Dogtag textual and graphical user interface for the RA.
This package is used by the Dogtag Certificate System.
@@ -193,10 +199,10 @@ This package is used by the Dogtag Certificate System.
%package -n dogtag-pki-tks-theme
-Summary: Certificate System - Token Key Service User Interface
+Summary: Certificate System - Token Key Service Theme
Group: System Environment/Base
-Requires: dogtag-pki-common-theme = %{version}-%{release}
+Requires: dogtag-pki-server-theme = %{version}-%{release}
%if 0%{?rhel}
# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
@@ -210,7 +216,7 @@ Provides: pki-tks-theme = %{version}-%{release}
Provides: pki-tks-ui = %{version}-%{release}
%description -n dogtag-pki-tks-theme
-This Token Key Service (TKS) User Interface contains
+This Token Key Service (TKS) Theme contains
the Dogtag textual and graphical user interface for the TKS.
This package is used by the Dogtag Certificate System.
@@ -219,9 +225,11 @@ This package is used by the Dogtag Certificate System.
%package -n dogtag-pki-tps-theme
-Summary: Certificate System - Token Processing System User Interface
+Summary: Certificate System - Token Processing System Theme
Group: System Environment/Base
+Requires: dogtag-pki-server-theme = %{version}-%{release}
+
%if 0%{?rhel}
# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
Conflicts: redhat-pki-tps-theme
@@ -234,7 +242,7 @@ Provides: pki-tps-theme = %{version}-%{release}
Provides: pki-tps-ui = %{version}-%{release}
%description -n dogtag-pki-tps-theme
-This Token Processing System (TPS) User Interface contains
+This Token Processing System (TPS) Theme contains
the Dogtag textual and graphical user interface for the TPS.
This package is used by the Dogtag Certificate System.
@@ -243,7 +251,7 @@ This package is used by the Dogtag Certificate System.
%package -n dogtag-pki-console-theme
-Summary: Certificate System - PKI Console User Interface
+Summary: Certificate System - PKI Console Theme
Group: System Environment/Base
Requires: java >= 1:1.6.0
@@ -260,7 +268,7 @@ Provides: pki-console-theme = %{version}-%{release}
Provides: pki-console-ui = %{version}-%{release}
%description -n dogtag-pki-console-theme
-This PKI Console User Interface contains
+This PKI Console Theme contains
the Dogtag textual and graphical user interface for the PKI Console.
This package is used by the Dogtag Certificate System.
@@ -309,7 +317,7 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
# However, RA and TPS subsystems still require their own individual
# ownership of this directory.
-%files -n dogtag-pki-common-theme
+%files -n dogtag-pki-server-theme
%defattr(-,root,root,-)
%doc dogtag/common-ui/LICENSE
%dir %{_datadir}/pki
@@ -361,6 +369,10 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
%changelog
+* Thu Nov 8 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.5.b2
+- Renamed dogtag-pki-common-theme to dogtag-pki-server-theme.
+- Fixed dogtag-pki-ra-theme and dogtag-pki-tps-theme dependencies.
+
* Mon Oct 29 2012 Ade Lee <alee@redhat.com> 10.0.0-0.4.b2
- Update release to b2