[pki-core] Resolves Trac #349 - Create alpha2 builds
Ade Lee
vakwetu at fedoraproject.org
Mon Oct 1 20:06:47 UTC 2012
commit cc4e6ee03a9781509cdaeff5c9787a2cce04fa88
Author: Ade Lee <alee at redhat.com>
Date: Mon Oct 1 16:06:42 2012 -0400
Resolves Trac #349 - Create alpha2 builds
.gitignore | 1 +
pki-core.spec | 83 ++++++++++++++++++++++++++-------------------------------
sources | 2 +-
3 files changed, 40 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac2db0b..74f433c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/pki-core-9.0.20.tar.gz
/pki-core-9.0.21.tar.gz
/pki-core-10.0.0.a1.tar.gz
+/pki-core-10.0.0.a2.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index 158e14e..de46f0b 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -1,7 +1,7 @@
# 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 .a1
+%global prerel .a2
# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
%global relprefix 0.
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.0
-Release: %{?relprefix}33%{?prerel}%{?dist}
+Release: %{?relprefix}36%{?prerel}%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -113,7 +113,6 @@ to manage enterprise Public Key Infrastructure (PKI) deployments. \
\
PKI Core contains ALL top-level java-based Tomcat PKI components: \
\
- * pki-setup \
* pki-symkey \
* pki-base \
* pki-tools \
@@ -138,7 +137,6 @@ Certificate System instances consisting of the following components: \
\
* pki-tools \
* pki-selinux \
- * pki-setup \
* pki-silent (required for IPA deployments; optional otherwise) \
\
Additionally, PKI Core contains the following fundamental packages \
@@ -165,26 +163,6 @@ ONLY ONE of the following "Mutually-Exclusive" PKI Theme packages: \
%description %{overview}
-%package -n pki-setup
-Summary: Certificate System - PKI Instance Creation & Removal Scripts
-Group: System Environment/Base
-
-BuildArch: noarch
-
-Requires: perl(File::Slurp)
-Requires: perl(XML::LibXML)
-Requires: perl-Crypt-SSLeay
-Requires: policycoreutils
-Requires: openldap-clients
-
-%description -n pki-setup
-PKI setup scripts are used to create and remove instances from PKI deployments.
-
-This package is a part of the PKI Core used by the Certificate System.
-
-%{overview}
-
-
%package -n pki-symkey
Summary: Symmetric Key JNI Package
Group: System Environment/Libraries
@@ -301,7 +279,13 @@ Group: System Environment/Base
BuildArch: noarch
Obsoletes: pki-deploy < %{version}-%{release}
+Obsoletes: pki-setup < %{version}-%{release}
+Requires: perl(File::Slurp)
+Requires: perl(XML::LibXML)
+Requires: perl-Crypt-SSLeay
+Requires: policycoreutils
+Requires: openldap-clients
Requires: jython >= 2.2.1
Requires: pki-common-theme >= 10.0.0
Requires: pki-base = %{version}-%{release}
@@ -657,7 +641,8 @@ This package is a part of the PKI Core used by the Certificate System.
%build
%{__mkdir_p} build
cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var \
+%cmake -DVERSION=%{version}-%{release} \
+ -DVAR_INSTALL_DIR:PATH=/var \
-DBUILD_PKI_CORE:BOOL=ON \
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
@@ -1045,24 +1030,6 @@ fi
## PKI deployment process
%endif
-%files -n pki-setup
-%defattr(-,root,root,-)
-%doc base/setup/LICENSE
-%{_bindir}/pkicreate
-%{_bindir}/pkiremove
-%{_bindir}/pki-setup-proxy
-%dir %{_datadir}/pki
-%dir %{_datadir}/pki/scripts
-%{_datadir}/pki/scripts/pkicommon.pm
-%{_datadir}/pki/scripts/functions
-%{_datadir}/pki/scripts/pki_apache_initscript
-%dir %{_localstatedir}/lock/pki
-%dir %{_localstatedir}/run/pki
-%if 0%{?fedora} >= 16
-%{_bindir}/pkicontrol
-%endif
-
-
%files -n pki-symkey
%defattr(-,root,root,-)
%doc base/symkey/LICENSE
@@ -1073,6 +1040,8 @@ fi
%files -n pki-base
%defattr(-,root,root,-)
%doc base/common/LICENSE
+%dir %{_datadir}/pki
+%{_datadir}/pki/VERSION
%dir %{_javadir}/pki
%{_javadir}/pki/pki-cmsutil-%{version}.jar
%{_javadir}/pki/pki-cmsutil.jar
@@ -1090,7 +1059,6 @@ fi
%{_bindir}/setpin
%{_bindir}/sslget
%{_bindir}/tkstool
-%dir %{_datadir}/pki
%{_datadir}/pki/native-tools/
%{_bindir}/AtoB
%{_bindir}/AuditVerify
@@ -1126,7 +1094,6 @@ fi
%dir %{python_sitelib}/pki
%{python_sitelib}/pki/_*
%{python_sitelib}/pki/deployment/
-%dir %{_datadir}/pki
%dir %{_datadir}/pki/deployment
%{_datadir}/pki/deployment/config/
%dir %{_datadir}/pki/deployment/spawn
@@ -1165,6 +1132,20 @@ fi
%{_javadir}/pki/pki-tomcat.jar
%dir %{_localstatedir}/lock/pki/tomcat
%dir %{_localstatedir}/run/pki/tomcat
+%{_bindir}/pkicreate
+%{_bindir}/pkiremove
+%{_bindir}/pki-setup-proxy
+%dir %{_datadir}/pki/scripts
+%{_datadir}/pki/scripts/pkicommon.pm
+%{_datadir}/pki/scripts/functions
+%{_datadir}/pki/scripts/pki_apache_initscript
+%dir %{_localstatedir}/lock/pki
+%dir %{_localstatedir}/run/pki
+%if 0%{?fedora} >= 16
+%{_bindir}/pkicontrol
+%endif
+
+
%if 0%{?fedora} >= 15
# Details:
@@ -1318,6 +1299,18 @@ fi
%changelog
+* Mon Oct 1 2012 Ade Lee <alee at redhat.com> 10.0.0-0.36.a2
+- Update release to a2
+
+* Sun Sep 30 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.36.a1
+- Modified CMake to use RPM version number
+
+* Tue Sep 25 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.35.a1
+- Added VERSION file
+
+* Mon Sep 24 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.34.a1
+- Merged pki-setup into pki-server
+
* Thu Sep 13 2012 Ade Lee <alee at redhat.com> 10.0.0-0.33.a1
- Added Conflicts for IPA 2.X
- Added build requires for zip to work around mock problem
diff --git a/sources b/sources
index fb773db..8ea0d1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-489d93c7c92e6c5187dac1ab277f535a pki-core-10.0.0.a1.tar.gz
+f4cf6258b57c591a58a8d3ea1cfd4386 pki-core-10.0.0.a2.tar.gz
More information about the scm-commits
mailing list