[pki-core/f18] Resolves Dogtag Trac #359 - Create builds for beta 1
Ade Lee
vakwetu at fedoraproject.org
Mon Oct 8 17:02:00 UTC 2012
commit 78cdadf1109ebf23ba25564926e78aca49e456bb
Author: Ade Lee <alee at redhat.com>
Date: Mon Oct 8 13:01:54 2012 -0400
Resolves Dogtag Trac #359 - Create builds for beta 1
.gitignore | 1 +
pki-core.spec | 80 ++++++++++++++++++++++++++------------------------------
sources | 2 +-
3 files changed, 39 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74f433c..604b4ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/pki-core-9.0.21.tar.gz
/pki-core-10.0.0.a1.tar.gz
/pki-core-10.0.0.a2.tar.gz
+/pki-core-10.0.0.b1.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index a3c8833..c7c7c92 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 .a2
+%global prerel .b1
# 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}37%{?prerel}%{?dist}
+Release: %{?relprefix}41%{?prerel}%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -39,7 +39,11 @@ BuildRequires: nss-devel
BuildRequires: openldap-devel
BuildRequires: pkgconfig
BuildRequires: policycoreutils
-BuildRequires: selinux-policy-devel
+%if 0%{?fedora} >= 18
+BuildRequires: selinux-policy-devel >= 3.11.1.23
+%else
+BuildRequires: selinux-policy-devel >= 3.10.0-151
+%endif
BuildRequires: velocity
BuildRequires: xalan-j2
BuildRequires: xerces-j2
@@ -137,7 +141,6 @@ Certificate System instances consisting of the following components: \
\
* pki-tools \
* pki-selinux \
- * pki-silent (required for IPA deployments; optional otherwise) \
\
Additionally, PKI Core contains the following fundamental packages \
required ONLY by ALL java-based Tomcat Certificate System instances: \
@@ -286,10 +289,13 @@ BuildArch: noarch
Provides: pki-deploy = %{version}-%{release}
Provides: pki-setup = %{version}-%{release}
+Provides: pki-silent = %{version}-%{release}
Obsoletes: pki-deploy < %{version}-%{release}
Obsoletes: pki-setup < %{version}-%{release}
+Obsoletes: pki-silent < %{version}-%{release}
+Requires: java >= 1:1.6.0
Requires: perl(File::Slurp)
Requires: perl(XML::LibXML)
Requires: perl-Crypt-SSLeay
@@ -357,6 +363,11 @@ BuildArch: noarch
Requires: policycoreutils
Requires: selinux-policy-targeted
+%if 0%{?fedora} >= 18
+Requires: selinux-policy >= 3.11.1.23
+%else
+Requires: selinux-policy >= 3.10.0-151
+%endif
%description -n pki-selinux
Selinux policies for the PKI components.
@@ -585,32 +596,6 @@ provided by the PKI Core used by the Certificate System.
%{overview}
-%package -n pki-silent
-Summary: Certificate System - Silent Installer
-Group: System Environment/Base
-
-BuildArch: noarch
-
-Requires: java >= 1:1.6.0
-Requires: pki-server = %{version}-%{release}
-
-%description -n pki-silent
-The PKI Silent Installer may be used to "automatically" configure
-the following PKI subsystems in a non-graphical (batch) fashion
-including:
-
- the Certificate Authority (CA),
- the Data Recovery Manager (DRM),
- the Online Certificate Status Protocol (OCSP) Manager,
- the Registration Authority (RA),
- the Token Key Service (TKS), and/or
- the Token Processing System (TPS).
-
-This package is a part of the PKI Core used by the Certificate System.
-
-%{overview}
-
-
%package -n pki-javadoc
Summary: Certificate System - PKI Framework Javadocs
Group: Documentation
@@ -735,7 +720,7 @@ echo "D /var/run/pki/tks 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfil
%{__rm} -rf %{buildroot}%{_unitdir}
%endif
-%{__rm} -rf %{buildroot}%{_datadir}/pki/shared/lib
+%{__rm} -rf %{buildroot}%{_datadir}/pki/server/lib
# tomcat6 has changed how TOMCAT_LOG is used.
# Need to adjust accordingly
@@ -1141,6 +1126,8 @@ fi
%{_javadir}/pki/pki-cmsbundle.jar
%{_javadir}/pki/pki-cmscore-%{version}.jar
%{_javadir}/pki/pki-cmscore.jar
+%{_javadir}/pki/pki-silent-%{version}.jar
+%{_javadir}/pki/pki-silent.jar
%{_javadir}/pki/pki-tomcat-%{version}.jar
%{_javadir}/pki/pki-tomcat.jar
%dir %{_localstatedir}/lock/pki/tomcat
@@ -1148,10 +1135,12 @@ fi
%{_bindir}/pkicreate
%{_bindir}/pkiremove
%{_bindir}/pki-setup-proxy
+%{_bindir}/pkisilent
%dir %{_datadir}/pki/scripts
%{_datadir}/pki/scripts/pkicommon.pm
%{_datadir}/pki/scripts/functions
%{_datadir}/pki/scripts/pki_apache_initscript
+%{_datadir}/pki/silent/
%dir %{_localstatedir}/lock/pki
%dir %{_localstatedir}/run/pki
%if 0%{?fedora} >= 16
@@ -1159,7 +1148,6 @@ fi
%endif
-
%if 0%{?fedora} >= 15
# Details:
#
@@ -1170,8 +1158,8 @@ fi
%endif
%{_datadir}/pki/setup/
-%dir %{_datadir}/pki/shared
-%{_datadir}/pki/shared/
+%dir %{_datadir}/pki/server
+%{_datadir}/pki/server/
%files -n pki-selinux
@@ -1295,15 +1283,6 @@ fi
%endif
-%files -n pki-silent
-%defattr(-,root,root,-)
-%doc base/silent/LICENSE
-%{_bindir}/pkisilent
-%{_javadir}/pki/pki-silent-%{version}.jar
-%{_javadir}/pki/pki-silent.jar
-%{_datadir}/pki/silent/
-
-
%if %{?_without_javadoc:0}%{!?_without_javadoc:1}
%files -n pki-javadoc
%defattr(-,root,root,-)
@@ -1312,6 +1291,21 @@ fi
%changelog
+* Mon Oct 8 2012 Ade Lee <alee at redhat.com> 10.0.0-0.41.b1
+- Added build requires for correct version of selinux-policy-devel
+
+* Mon Oct 8 2012 Ade Lee <alee at redhat.com> 10.0.0-0.40.b1
+- Update release to b1
+
+* Fri Oct 5 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.40.a2
+- Merged pki-silent into pki-server.
+
+* Fri Oct 5 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.39.a2
+- Renamed "shared" folder to "server".
+
+* Fri Oct 5 2012 Ade Lee <alee at redhat.com> 10.0.0-0.38.a2
+- Added required selinux versions for new policy.
+
* Tue Oct 2 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.37.a2
- Added Provides to packages replacing obsolete packages.
diff --git a/sources b/sources
index 4dc119d..55b9b97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c812619433e1a8394692c77417d4829c pki-core-10.0.0.a2.tar.gz
+cbea3b3449abf9026aafc2a5aee29b30 pki-core-10.0.0.b1.tar.gz
More information about the scm-commits
mailing list