summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-11-09 10:56:42 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-09 12:11:44 -0500
commit082234462970198c1522cbf2e5638b59cbb0258f (patch)
treee347522a1903e094c5ca38f3c0fa35ad4358540c
parent0f5ea13b32fe6198934ee6396fd012b740799f2f (diff)
downloadpki-ticket-328-10.zip
pki-ticket-328-10.tar.gz
pki-ticket-328-10.tar.xz
Removed CA, KRA, OCSP, TKS theme packages.ticket-328-10
The build scripts and spec files have been updated to no longer create theme packages for CA, KRA, OCSP, and TKS. Ticket #407
-rw-r--r--dogtag/CMakeLists.txt5
-rwxr-xr-xscripts/build_dogtag_pki6
-rwxr-xr-xscripts/compose_dogtag_pki_theme_packages2
-rw-r--r--specs/dogtag-pki-theme.spec162
-rw-r--r--specs/dogtag-pki.spec9
-rw-r--r--specs/ipa-pki-theme.spec44
-rw-r--r--specs/pki-core.spec9
7 files changed, 59 insertions, 178 deletions
diff --git a/dogtag/CMakeLists.txt b/dogtag/CMakeLists.txt
index d83f915..aa4f2fc 100644
--- a/dogtag/CMakeLists.txt
+++ b/dogtag/CMakeLists.txt
@@ -2,15 +2,10 @@ project(dogtag)
if (APPLICATION_FLAVOR_IPA_PKI_THEME)
add_subdirectory(common-ui)
- add_subdirectory(ca-ui)
endif (APPLICATION_FLAVOR_IPA_PKI_THEME)
if (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
add_subdirectory(common-ui)
- add_subdirectory(ca-ui)
- add_subdirectory(kra-ui)
- add_subdirectory(ocsp-ui)
add_subdirectory(ra-ui)
- add_subdirectory(tks-ui)
add_subdirectory(tps-ui)
add_subdirectory(console-ui)
endif (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
diff --git a/scripts/build_dogtag_pki b/scripts/build_dogtag_pki
index 5a63a69..91acc3b 100755
--- a/scripts/build_dogtag_pki
+++ b/scripts/build_dogtag_pki
@@ -118,11 +118,7 @@ PKI_CONSOLE_PACKAGES_DIR="${PKI_PWD}/packages.console"
# Establish PKI theme package names
PKI_SERVER_THEME=${PKI_FLAVOR}-pki-server-theme${RPM_EXT}
-PKI_CA_THEME=${PKI_FLAVOR}-pki-ca-theme${RPM_EXT}
-PKI_KRA_THEME=${PKI_FLAVOR}-pki-kra-theme${RPM_EXT}
-PKI_OCSP_THEME=${PKI_FLAVOR}-pki-ocsp-theme${RPM_EXT}
PKI_RA_THEME=${PKI_FLAVOR}-pki-ra-theme${RPM_EXT}
-PKI_TKS_THEME=${PKI_FLAVOR}-pki-tks-theme${RPM_EXT}
PKI_TPS_THEME=${PKI_FLAVOR}-pki-tps-theme${RPM_EXT}
PKI_CONSOLE_THEME=${PKI_FLAVOR}-pki-console-theme${RPM_EXT}
@@ -160,7 +156,7 @@ cd ${PKI_PWD}
${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_DOGTAG_PKI_THEME_PACKAGES} rpms
mv ${PKI_PACKAGES_DIR} ${PKI_DOGTAG_THEME_PACKAGES_DIR}
cd ${PKI_DOGTAG_THEME_PACKAGES_DIR}/${RPM_DIR}/${NOARCH}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SERVER_THEME} ${PKI_CA_THEME} ${PKI_KRA_THEME} ${PKI_OCSP_THEME} ${PKI_RA_THEME} ${PKI_TKS_THEME} ${PKI_TPS_THEME} ${PKI_CONSOLE_THEME}
+${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SERVER_THEME} ${PKI_RA_THEME} ${PKI_TPS_THEME} ${PKI_CONSOLE_THEME}
# Compose and install 'pki-core' packages
cd ${PKI_PWD}
diff --git a/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages
index 76ba2a1..a9c6b18 100755
--- a/scripts/compose_dogtag_pki_theme_packages
+++ b/scripts/compose_dogtag_pki_theme_packages
@@ -39,7 +39,7 @@ DOGTAG_PKI_THEME_VERSION="10.0.0.b2"
##
PKI_SPECS_FILE="${PKI_DIR}/specs/${DOGTAG_PKI_THEME}.spec"
-PKI_COMPONENT_LIST="test common-ui ca-ui kra-ui ocsp-ui tks-ui ra-ui tps-ui console-ui"
+PKI_COMPONENT_LIST="test common-ui ra-ui tps-ui console-ui"
##
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index ac4384e..347fba0 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}5%{?prerel}%{?dist}
+Release: %{?relprefix}6%{?prerel}%{?dist}
Summary: Certificate System - Dogtag PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -67,106 +67,61 @@ Group: System Environment/Base
Conflicts: redhat-pki-server-theme
Conflicts: redhat-pki-common-theme
Conflicts: redhat-pki-common-ui
+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-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}
-%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.
-
-%{overview}
-
-
-%package -n dogtag-pki-ca-theme
-Summary: Certificate System - Certificate 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-ca-theme
-Conflicts: redhat-pki-ca-ui
-
-# EPEL version of Dogtag "theme" ALWAYS replaces ALL versions of IPA "theme"
-Obsoletes: ipa-pki-ca-theme <= 9999
-Provides: ipa-pki-ca-theme = %{version}-%{release}
-%endif
-
-Obsoletes: dogtag-pki-ca-ui <= 9
-
+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-server-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-server-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.
@@ -199,32 +154,6 @@ 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-server-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
@@ -325,24 +254,6 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
%{_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
@@ -350,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
@@ -370,6 +275,9 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
%changelog
+* Fri Nov 9 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.6.b2
+- Removed Dogtag CA, KRA, OCSP, TKS themes.
+
* 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 theme package dependencies.
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 94a7633..f512d76 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -8,7 +8,7 @@
Summary: Dogtag Public Key Infrastructure (PKI) Suite
Name: dogtag-pki
Version: 10.0.0
-Release: %{?relprefix}14%{?prerel}%{?dist}
+Release: %{?relprefix}15%{?prerel}%{?dist}
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPLv2 and LGPLv2
URL: http://pki.fedoraproject.org/
@@ -84,13 +84,9 @@ Requires: jss-javadoc >= %{jss_version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Dogtag PKI theme packages
-Requires: dogtag-pki-ca-theme >= %{dogtag_pki_theme_version}
Requires: dogtag-pki-server-theme >= %{dogtag_pki_theme_version}
Requires: dogtag-pki-console-theme >= %{dogtag_pki_theme_version}
-Requires: dogtag-pki-kra-theme >= %{dogtag_pki_theme_version}
-Requires: dogtag-pki-ocsp-theme >= %{dogtag_pki_theme_version}
Requires: dogtag-pki-ra-theme >= %{dogtag_pki_theme_version}
-Requires: dogtag-pki-tks-theme >= %{dogtag_pki_theme_version}
Requires: dogtag-pki-tps-theme >= %{dogtag_pki_theme_version}
# Make certain that this 'meta' package requires the latest version(s)
@@ -198,6 +194,9 @@ rm -rf %{buildroot}
%doc README
%changelog
+* Fri Nov 9 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.15.b2
+- Removed CA, KRA, OCSP, TKS themes.
+
* Thu Nov 8 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.14.b2
- Renamed dogtag-pki-common-theme to dogtag-pki-server-theme.
diff --git a/specs/ipa-pki-theme.spec b/specs/ipa-pki-theme.spec
index bdb15a3..a649c95 100644
--- a/specs/ipa-pki-theme.spec
+++ b/specs/ipa-pki-theme.spec
@@ -7,7 +7,7 @@
Name: ipa-pki-theme
Version: 10.0.0
-Release: %{?relprefix}4%{?prerel}%{?dist}
+Release: %{?relprefix}5%{?prerel}%{?dist}
Summary: Certificate System - IPA PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -59,43 +59,30 @@ Group: System Environment/Base
Conflicts: dogtag-pki-server-theme
Conflicts: dogtag-pki-common-theme
Conflicts: dogtag-pki-common-ui
+Conflicts: dogtag-pki-ca-theme
+Conflicts: dogtag-pki-ca-ui
+
Conflicts: redhat-pki-server-theme
Conflicts: redhat-pki-common-theme
Conflicts: redhat-pki-common-ui
+Conflicts: redhat-pki-ca-theme
+Conflicts: redhat-pki-ca-ui
Obsoletes: ipa-pki-common-theme
Obsoletes: ipa-pki-common-ui
+Obsoletes: ipa-pki-ca-theme
Provides: pki-server-theme = %{version}-%{release}
Provides: pki-common-theme = %{version}-%{release}
Provides: pki-common-ui = %{version}-%{release}
-%description -n ipa-pki-server-theme
-This PKI Server Framework User Interface contains
-NO textual or graphical user interface for the PKI Server Framework.
-
-This package is used by the Certificate System utilized by IPA.
-
-%{overview}
-
-
-%package -n ipa-pki-ca-theme
-Summary: Certificate System - Certificate Authority User Interface
-Group: System Environment/Base
-
-Requires: ipa-pki-server-theme = %{version}-%{release}
-
-Conflicts: dogtag-pki-ca-theme
-Conflicts: dogtag-pki-ca-ui
-Conflicts: redhat-pki-ca-theme
-Conflicts: redhat-pki-ca-ui
-
+Provides: ipa-pki-ca-theme = %{version}-%{release}
Provides: pki-ca-theme = %{version}-%{release}
Provides: pki-ca-ui = %{version}-%{release}
-%description -n ipa-pki-ca-theme
-This Certificate Authority (CA) User Interface contains
-NO textual or graphical user interface for the CA.
+%description -n ipa-pki-server-theme
+This PKI Server Framework User Interface contains
+NO textual or graphical user interface for the PKI Server Framework.
This package is used by the Certificate System utilized by IPA.
@@ -134,13 +121,10 @@ cd build
%{_datadir}/pki/common-ui/
-%files -n ipa-pki-ca-theme
-%defattr(-,root,root,-)
-%doc dogtag/ca-ui/LICENSE
-%{_datadir}/pki/ca-ui/
-
-
%changelog
+* Fri Nov 9 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.5.b2
+- Removed IPA CA theme.
+
* Thu Nov 8 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.4.b2
- Renamed ipa-pki-common-theme to ipa-pki-server-theme.
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 418890e..0f2cb32 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.0
-Release: %{?relprefix}49%{?prerel}%{?dist}
+Release: %{?relprefix}50%{?prerel}%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -387,7 +387,6 @@ Group: System Environment/Daemons
BuildArch: noarch
Requires: java >= 1:1.6.0
-Requires: pki-ca-theme >= 10.0.0
Requires: pki-server = %{version}-%{release}
%if 0%{?fedora} >= 16
Requires(post): systemd-units
@@ -435,7 +434,6 @@ Group: System Environment/Daemons
BuildArch: noarch
Requires: java >= 1:1.6.0
-Requires: pki-kra-theme >= 10.0.0
Requires: pki-server = %{version}-%{release}
%if 0%{?fedora} >= 16
Requires(post): systemd-units
@@ -489,7 +487,6 @@ Group: System Environment/Daemons
BuildArch: noarch
Requires: java >= 1:1.6.0
-Requires: pki-ocsp-theme >= 10.0.0
Requires: pki-server = %{version}-%{release}
%if 0%{?fedora} >= 16
Requires(post): systemd-units
@@ -550,7 +547,6 @@ Group: System Environment/Daemons
BuildArch: noarch
Requires: java >= 1:1.6.0
-Requires: pki-tks-theme >= 10.0.0
Requires: pki-server = %{version}-%{release}
Requires: pki-symkey = %{version}-%{release}
%if 0%{?fedora} >= 16
@@ -1271,6 +1267,9 @@ fi
%changelog
+* Fri Nov 9 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.50.b2
+- Removed CA, KRA, OCSP, TKS themes.
+
* Thu Nov 8 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.49.b2
- Renamed pki-common-theme to pki-server-theme.