[dogtag-pki-theme] Dogtag Trac Ticket 414 - Create Beta 3 builds
Ade Lee
vakwetu at fedoraproject.org
Tue Nov 13 03:53:14 UTC 2012
commit d8123681cbd4bf380f48b48688ca19909a8712b1
Author: Ade Lee <alee at redhat.com>
Date: Mon Nov 12 22:53:12 2012 -0500
Dogtag Trac Ticket 414 - Create Beta 3 builds
.gitignore | 1 +
dogtag-pki-theme.spec | 190 +++++++++++++++----------------------------------
sources | 2 +-
3 files changed, 59 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0198fb8..57d1aed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/dogtag-pki-theme-10.0.0.a2.tar.gz
/dogtag-pki-theme-10.0.0.b1.tar.gz
/dogtag-pki-theme-10.0.0.b2.tar.gz
+/dogtag-pki-theme-10.0.0.b3.tar.gz
diff --git a/dogtag-pki-theme.spec b/dogtag-pki-theme.spec
index deb9aa8..85a779d 100644
--- a/dogtag-pki-theme.spec
+++ b/dogtag-pki-theme.spec
@@ -1,13 +1,13 @@
# for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
# also remove the space between % and global - this space is needed because
# fedpkg verrel stupidly ignores comment lines
-%global prerel .b2
+%global prerel .b3
# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
%global relprefix 0.
Name: dogtag-pki-theme
Version: 10.0.0
-Release: %{?relprefix}4%{?prerel}%{?dist}
+Release: %{?relprefix}7%{?prerel}%{?dist}
Summary: Certificate System - Dogtag PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -58,110 +58,70 @@ 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 User Interface
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-common-theme <= 9999
-Provides: ipa-pki-common-theme = %{version}-%{release}
-%endif
-
-Obsoletes: dogtag-pki-common-ui <= 9
-
-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.
-
-This package is used by the Dogtag Certificate System.
-
-%{overview}
-
-
-%package -n dogtag-pki-ca-theme
-Summary: Certificate System - Certificate Authority User Interface
-Group: System Environment/Base
-
-Requires: dogtag-pki-common-theme = %{version}-%{release}
-
-%if 0%{?rhel}
-# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
Conflicts: redhat-pki-ca-theme
Conflicts: redhat-pki-ca-ui
+Conflicts: redhat-pki-kra-theme
+Conflicts: redhat-pki-kra-ui
+Conflicts: redhat-pki-ocsp-theme
+Conflicts: redhat-pki-ocsp-ui
+Conflicts: redhat-pki-tks-theme
+Conflicts: redhat-pki-tks-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
Obsoletes: ipa-pki-ca-theme <= 9999
+Obsoletes: ipa-pki-kra-theme <= 9999
+
+Provides: ipa-pki-server-theme = %{version}-%{release}
+Provides: ipa-pki-common-theme = %{version}-%{release}
Provides: ipa-pki-ca-theme = %{version}-%{release}
+Provides: ipa-pki-kra-theme = %{version}-%{release}
%endif
-Obsoletes: dogtag-pki-ca-ui <= 9
+Obsoletes: dogtag-pki-common-theme
+Obsoletes: dogtag-pki-common-ui
+Obsoletes: dogtag-pki-ca-theme
+Obsoletes: dogtag-pki-ca-ui
+Obsoletes: dogtag-pki-kra-theme
+Obsoletes: dogtag-pki-kra-ui
+Obsoletes: dogtag-pki-ocsp-theme
+Obsoletes: dogtag-pki-ocsp-ui
+Obsoletes: dogtag-pki-tks-theme
+Obsoletes: dogtag-pki-tks-ui
+
+Provides: pki-server-theme = %{version}-%{release}
+Provides: pki-common-theme = %{version}-%{release}
+Provides: pki-common-ui = %{version}-%{release}
+Provides: dogtag-pki-ca-theme = %{version}-%{release}
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
-the Dogtag textual and graphical user interface for the CA.
-
-This package is used by the Dogtag Certificate System.
-
-%{overview}
-
-
-%package -n dogtag-pki-kra-theme
-Summary: Certificate System - Data Recovery Manager User Interface
-Group: System Environment/Base
-
-Requires: dogtag-pki-common-theme = %{version}-%{release}
-
-%if 0%{?rhel}
-# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
-Conflicts: redhat-pki-kra-theme
-Conflicts: redhat-pki-kra-ui
-%endif
-
-Obsoletes: dogtag-pki-kra-ui <= 9
-
+Provides: dogtag-pki-kra-theme = %{version}-%{release}
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
-the Dogtag textual and graphical user interface for the DRM.
-
-This package is used by the Dogtag Certificate System.
-
-%{overview}
-
-
-%package -n dogtag-pki-ocsp-theme
-Summary: Certificate System - Online Certificate Status Protocol Manager User Interface
-Group: System Environment/Base
-
-Requires: dogtag-pki-common-theme = %{version}-%{release}
-
-%if 0%{?rhel}
-# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
-Conflicts: redhat-pki-ocsp-theme
-Conflicts: redhat-pki-ocsp-ui
-%endif
-
-Obsoletes: dogtag-pki-ocsp-ui <= 9
-
+Provides: dogtag-pki-ocsp-theme = %{version}-%{release}
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
-the Dogtag textual and graphical user interface for the OCSP Manager.
+Provides: dogtag-pki-tks-theme = %{version}-%{release}
+Provides: pki-tks-theme = %{version}-%{release}
+Provides: pki-tks-ui = %{version}-%{release}
+
+%description -n dogtag-pki-server-theme
+This PKI Server Framework User Interface contains
+the Dogtag textual and graphical user interface for the PKI Server Framework.
This package is used by the Dogtag Certificate System.
@@ -172,6 +132,8 @@ This package is used by the Dogtag Certificate System.
Summary: Certificate System - Registration Authority User Interface
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
@@ -192,36 +154,12 @@ This package is used by the Dogtag Certificate System.
%{overview}
-%package -n dogtag-pki-tks-theme
-Summary: Certificate System - Token Key Service User Interface
-Group: System Environment/Base
-
-Requires: dogtag-pki-common-theme = %{version}-%{release}
-
-%if 0%{?rhel}
-# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
-Conflicts: redhat-pki-tks-theme
-Conflicts: redhat-pki-tks-ui
-%endif
-
-Obsoletes: dogtag-pki-tks-ui <= 9
-
-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
-the Dogtag textual and graphical user interface for the TKS.
-
-This package is used by the Dogtag Certificate System.
-
-%{overview}
-
-
%package -n dogtag-pki-tps-theme
Summary: Certificate System - Token Processing System User Interface
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
@@ -309,31 +247,13 @@ 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
%{_datadir}/pki/common-ui/
-%files -n dogtag-pki-ca-theme
-%defattr(-,root,root,-)
-%doc dogtag/ca-ui/LICENSE
-%{_datadir}/pki/ca-ui/
-
-
-%files -n dogtag-pki-kra-theme
-%defattr(-,root,root,-)
-%doc dogtag/kra-ui/LICENSE
-%{_datadir}/pki/kra-ui/
-
-
-%files -n dogtag-pki-ocsp-theme
-%defattr(-,root,root,-)
-%doc dogtag/ocsp-ui/LICENSE
-%{_datadir}/pki/ocsp-ui/
-
-
%files -n dogtag-pki-ra-theme
%defattr(-,root,root,-)
%doc dogtag/ra-ui/LICENSE
@@ -341,12 +261,6 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
%{_datadir}/pki/ra-ui/
-%files -n dogtag-pki-tks-theme
-%defattr(-,root,root,-)
-%doc dogtag/tks-ui/LICENSE
-%{_datadir}/pki/tks-ui/
-
-
%files -n dogtag-pki-tps-theme
%defattr(-,root,root,-)
%doc dogtag/tps-ui/LICENSE
@@ -361,6 +275,16 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
%changelog
+* Mon Nov 12 2012 Ade Lee <alee at redhat.com> 10.0.0-0.7.b3
+- Update release to b3
+
+* Fri Nov 9 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.6.b2
+- Removed Dogtag CA, KRA, OCSP, TKS theme packages.
+
+* Thu Nov 8 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.5.b2
+- Renamed dogtag-pki-common-theme to dogtag-pki-server-theme.
+- Fixed theme package dependencies.
+
* Mon Oct 29 2012 Ade Lee <alee at redhat.com> 10.0.0-0.4.b2
- Update release to b2
diff --git a/sources b/sources
index 15f1a81..8fc0165 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52074c3d90da4fde0eb00a67f07d9925 dogtag-pki-theme-10.0.0.b2.tar.gz
+65860ac9e55501729633020e6960e092 dogtag-pki-theme-10.0.0.b3.tar.gz
More information about the scm-commits
mailing list