[dogtag-pki-theme] Release Candidate 1
Ade Lee
vakwetu at fedoraproject.org
Fri Dec 7 22:49:05 UTC 2012
commit c4701a80696dbbf675ccfb8f0dc5b9d1b52e9b09
Author: Ade Lee <alee at redhat.com>
Date: Fri Dec 7 17:49:03 2012 -0500
Release Candidate 1
.gitignore | 1 +
dogtag-pki-theme.spec | 93 ++++++++++--------------------------------------
sources | 2 +-
3 files changed, 22 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57d1aed..ab6cd01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/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
+/dogtag-pki-theme-10.0.0.tar.gz
diff --git a/dogtag-pki-theme.spec b/dogtag-pki-theme.spec
index 5e10a20..9c59968 100644
--- a/dogtag-pki-theme.spec
+++ b/dogtag-pki-theme.spec
@@ -1,13 +1,6 @@
-# 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 .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}8%{?prerel}%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - Dogtag PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -75,6 +68,10 @@ Conflicts: redhat-pki-ocsp-theme
Conflicts: redhat-pki-ocsp-ui
Conflicts: redhat-pki-tks-theme
Conflicts: redhat-pki-tks-ui
+Conflicts: redhat-pki-ra-theme
+Conflicts: redhat-pki-ra-ui
+Conflicts: redhat-pki-tps-theme
+Conflicts: redhat-pki-tps-ui
# EPEL version of Dogtag "theme" ALWAYS replaces ALL versions of IPA "theme"
Obsoletes: ipa-pki-server-theme <= 9999
@@ -98,6 +95,10 @@ Obsoletes: dogtag-pki-ocsp-theme <= %{version}-%{release}
Obsoletes: dogtag-pki-ocsp-ui
Obsoletes: dogtag-pki-tks-theme <= %{version}-%{release}
Obsoletes: dogtag-pki-tks-ui
+Obsoletes: dogtag-pki-ra-theme <= %{version}-%{release}
+Obsoletes: dogtag-pki-ra-ui
+Obsoletes: dogtag-pki-tps-theme <= %{version}-%{release}
+Obsoletes: dogtag-pki-tps-ui
Provides: dogtag-pki-common-theme = %{version}-%{release}
Provides: pki-server-theme = %{version}-%{release}
@@ -120,61 +121,17 @@ 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.
-
-%{overview}
-
-
-%package -n dogtag-pki-ra-theme
-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
-Conflicts: redhat-pki-ra-ui
-%endif
-
-Obsoletes: dogtag-pki-ra-ui <= 9
-
+Provides: dogtag-pki-ra-theme = %{version}-%{release}
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
-the Dogtag textual and graphical user interface for the RA.
-
-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
-Conflicts: redhat-pki-tps-ui
-%endif
-
-Obsoletes: dogtag-pki-tps-ui <= 9
-
+Provides: dogtag-pki-tps-theme = %{version}-%{release}
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
-the Dogtag textual and graphical user interface for the TPS.
+%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.
@@ -233,8 +190,6 @@ cd build
cd build
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
-chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
-
# NOTE: Several "theme" packages require ownership of the "/usr/share/pki"
# directory because the PKI subsystems (CA, DRM, OCSP, TKS, RA, TPS)
@@ -255,20 +210,6 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
%{_datadir}/pki/common-ui/
-%files -n dogtag-pki-ra-theme
-%defattr(-,root,root,-)
-%doc dogtag/ra-ui/LICENSE
-%dir %{_datadir}/pki
-%{_datadir}/pki/ra-ui/
-
-
-%files -n dogtag-pki-tps-theme
-%defattr(-,root,root,-)
-%doc dogtag/tps-ui/LICENSE
-%dir %{_datadir}/pki
-%{_datadir}/pki/tps-ui/
-
-
%files -n dogtag-pki-console-theme
%defattr(-,root,root,-)
%doc dogtag/console-ui/LICENSE
@@ -276,6 +217,12 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl
%changelog
+* Fri Dec 7 2012 Ade Lee <alee at redhat.com> 10.0.0-1
+- Update to official release for rc1
+
+* Wed Nov 21 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.9.b3
+- Removed Dogtag RA and TPS packages.
+
* Tue Nov 13 2012 Ade Lee <alee at redhat.com> 10.0.0-0.8.b3
- Added needed Requires for dogtag-pki-common-theme
diff --git a/sources b/sources
index 56ea3d4..88e42eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a21bafc38af43ccf42b43933cb49629 dogtag-pki-theme-10.0.0.b3.tar.gz
+b35b85b272102bf2d3fb95f5bb6faee2 dogtag-pki-theme-10.0.0.tar.gz
More information about the scm-commits
mailing list