diff options
author | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-03-04 19:54:03 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-03-04 19:54:03 -0700 |
commit | 668bf1d09f5dc0d63c12fc94962545447b9409f8 (patch) | |
tree | 687706da4c2058db66151ee1661fc42feb9e5ea1 /specs | |
parent | 9e78f981e923c879033c26eebad0cb803d66b8d9 (diff) | |
download | pki-668bf1d09f5dc0d63c12fc94962545447b9409f8.tar.gz pki-668bf1d09f5dc0d63c12fc94962545447b9409f8.tar.xz pki-668bf1d09f5dc0d63c12fc94962545447b9409f8.zip |
Rebase to 10.3.x
- PKI TRAC Ticket #1724 - Rebase pki-core to 10.3.x
Diffstat (limited to 'specs')
-rw-r--r-- | specs/dogtag-pki-theme.spec | 7 | ||||
-rw-r--r-- | specs/dogtag-pki.spec | 7 | ||||
-rw-r--r-- | specs/pki-console.spec | 7 | ||||
-rw-r--r-- | specs/pki-core.spec | 17 |
4 files changed, 30 insertions, 8 deletions
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec index e9abc546d..c2abc3037 100644 --- a/specs/dogtag-pki-theme.spec +++ b/specs/dogtag-pki-theme.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-theme -Version: 10.3.0 -Release: 0.1%{?dist} +Version: 10.3.0.a1 +Release: 1%{?dist} Summary: Certificate System - Dogtag PKI Theme Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -166,6 +166,9 @@ cd build %changelog +* Fri Mar 4 2016 Dogtag Team <pki-devel@redhat.com> 10.3.0.a1-1 +- Build for F24 alpha + * Sat Aug 8 2015 Dogtag Team <pki-devel@redhat.com> 10.3.0-0.1 - Updated version number to 10.3.0-0.1 diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec index bf196866d..10c98bac8 100644 --- a/specs/dogtag-pki.spec +++ b/specs/dogtag-pki.spec @@ -1,7 +1,7 @@ Summary: Dogtag Public Key Infrastructure (PKI) Suite Name: dogtag-pki -Version: 10.3.0 -Release: 0.1%{?dist} +Version: 10.3.0.a1 +Release: 1%{?dist} # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPLv2 and LGPLv2 URL: http://pki.fedoraproject.org/ @@ -94,6 +94,9 @@ rm -rf %{buildroot} %doc README %changelog +* Fri Mar 4 2016 Dogtag Team <pki-devel@redhat.com> 10.3.0.a1-1 +- Build for F24 alpha + * Sat Aug 8 2015 Dogtag Team <pki-devel@redhat.com> 10.3.0-0.1 - Updated version number to 10.3.0-0.1 diff --git a/specs/pki-console.spec b/specs/pki-console.spec index fdf852965..1841667eb 100644 --- a/specs/pki-console.spec +++ b/specs/pki-console.spec @@ -1,6 +1,6 @@ Name: pki-console -Version: 10.3.0 -Release: 0.1%{?dist} +Version: 10.3.0.a1 +Release: 1%{?dist} Summary: Certificate System - PKI Console URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -91,6 +91,9 @@ cd build %changelog +* Fri Mar 4 2016 Dogtag Team <pki-devel@redhat.com> 10.3.0.a1-1 +- Build for F24 alpha + * Sat Aug 8 2015 Dogtag Team <pki-devel@redhat.com> 10.3.0-0.1 - Updated version number to 10.3.0-0.1 diff --git a/specs/pki-core.spec b/specs/pki-core.spec index a46190bf4..74a3f74e3 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -42,8 +42,8 @@ %define pki_homedir /usr/share/pki Name: pki-core -Version: 10.3.0 -Release: 0.5%{?dist} +Version: 10.3.0.a1 +Release: 1%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -164,6 +164,13 @@ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{release}/%{name}-%{version}%{?prerel}.tar.gz %endif +# Obtain version phase number (e. g. - used by "alpha", "beta", etc.) +# +# NOTE: For "alpha" releases, will be ".a1", ".a2", etc. +# For "beta" releases, will be ".b1", ".b2", etc. +# +%define version_phase "%(echo `echo %{version} | awk -F. '{ print $4 }'`)" + %global saveFileContext() \ if [ -s /etc/selinux/config ]; then \ . %{_sysconfdir}/selinux/config; \ @@ -723,6 +730,9 @@ cd build -DBUILD_PKI_CORE:BOOL=ON \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \ +%if %{version_phase} + -DAPPLICATION_VERSION_PHASE="%{version_phase}" \ +%endif %if ! %{with_tomcat7} -DWITH_TOMCAT7:BOOL=OFF \ %endif @@ -1095,6 +1105,9 @@ systemctl daemon-reload %endif # %{with server} %changelog +* Fri Mar 4 2016 Dogtag Team <pki-devel@redhat.com> 10.3.0.a1-1 +- Build for F24 alpha + * Tue Mar 1 2016 Dogtag Team <pki-devel@redhat.com> 10.3.0-0.5 - PKI Trac Ticket #1399 - Move java components out of pki-base |