summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-12-07 17:00:39 -0500
committerAde Lee <alee@redhat.com>2012-12-07 17:00:39 -0500
commitf73a662d037ed7e48c0fd419f5c926cafaa5b32f (patch)
tree414b7a2a11ec5134991876b2ecacf2a9682456fa
parent34851bbce6462deb7464659ebe07cbc575e9942b (diff)
downloadpki-f73a662d037ed7e48c0fd419f5c926cafaa5b32f.zip
pki-f73a662d037ed7e48c0fd419f5c926cafaa5b32f.tar.gz
pki-f73a662d037ed7e48c0fd419f5c926cafaa5b32f.tar.xz
Update to rc1 build
-rwxr-xr-xscripts/compose_dogtag_pki_theme_packages2
-rwxr-xr-xscripts/compose_ipa_pki_theme_packages2
-rwxr-xr-xscripts/compose_pki_console_packages2
-rwxr-xr-xscripts/compose_pki_core_packages2
-rwxr-xr-xscripts/compose_pki_migrate_packages2
-rwxr-xr-xscripts/compose_pki_ra_packages2
-rwxr-xr-xscripts/compose_pki_tps_packages2
-rw-r--r--specs/dogtag-pki-theme.spec12
-rw-r--r--specs/dogtag-pki.spec12
-rw-r--r--specs/ipa-pki-theme.spec12
-rw-r--r--specs/pki-console.spec12
-rw-r--r--specs/pki-core.spec14
-rw-r--r--specs/pki-migrate.spec12
-rw-r--r--specs/pki-ra.spec12
-rw-r--r--specs/pki-tps.spec12
15 files changed, 39 insertions, 73 deletions
diff --git a/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages
index a937dfa..e98c2b2 100755
--- a/scripts/compose_dogtag_pki_theme_packages
+++ b/scripts/compose_dogtag_pki_theme_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
##
DOGTAG_PKI_THEME="dogtag-pki-theme"
-DOGTAG_PKI_THEME_VERSION="10.0.0.b3"
+DOGTAG_PKI_THEME_VERSION="10.0.0"
##
diff --git a/scripts/compose_ipa_pki_theme_packages b/scripts/compose_ipa_pki_theme_packages
index 9dd5911..4d4ec90 100755
--- a/scripts/compose_ipa_pki_theme_packages
+++ b/scripts/compose_ipa_pki_theme_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
##
IPA_PKI_THEME="ipa-pki-theme"
-IPA_PKI_THEME_VERSION="10.0.0.b3"
+IPA_PKI_THEME_VERSION="10.0.0"
##
diff --git a/scripts/compose_pki_console_packages b/scripts/compose_pki_console_packages
index 5994681..f126d9c 100755
--- a/scripts/compose_pki_console_packages
+++ b/scripts/compose_pki_console_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
##
PKI_CONSOLE="pki-console"
-PKI_CONSOLE_VERSION="10.0.0.b3"
+PKI_CONSOLE_VERSION="10.0.0"
##
diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages
index a30b9ae..a923574 100755
--- a/scripts/compose_pki_core_packages
+++ b/scripts/compose_pki_core_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
##
PKI_CORE="pki-core"
-PKI_CORE_VERSION="10.0.0.b3"
+PKI_CORE_VERSION="10.0.0"
##
diff --git a/scripts/compose_pki_migrate_packages b/scripts/compose_pki_migrate_packages
index 957a9d1..f7d4eae 100755
--- a/scripts/compose_pki_migrate_packages
+++ b/scripts/compose_pki_migrate_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
##
PKI_MIGRATE="pki-migrate"
-PKI_MIGRATE_VERSION="10.0.0.b3"
+PKI_MIGRATE_VERSION="10.0.0"
##
diff --git a/scripts/compose_pki_ra_packages b/scripts/compose_pki_ra_packages
index dd7de5f..0b603ea 100755
--- a/scripts/compose_pki_ra_packages
+++ b/scripts/compose_pki_ra_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
##
PKI_RA="pki-ra"
-PKI_RA_VERSION="10.0.0.b3"
+PKI_RA_VERSION="10.0.0"
##
diff --git a/scripts/compose_pki_tps_packages b/scripts/compose_pki_tps_packages
index a9f0e81..79d9c91 100755
--- a/scripts/compose_pki_tps_packages
+++ b/scripts/compose_pki_tps_packages
@@ -31,7 +31,7 @@ PKI_PWD=`pwd`
##
PKI_TPS="pki-tps"
-PKI_TPS_VERSION="10.0.0.b3"
+PKI_TPS_VERSION="10.0.0"
##
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index 934dc42..9c59968 100644
--- a/specs/dogtag-pki-theme.spec
+++ b/specs/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}9%{?prerel}%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - Dogtag PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -224,6 +217,9 @@ cd build
%changelog
+* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
+- Update to official release for rc1
+
* Wed Nov 21 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.9.b3
- Removed Dogtag RA and TPS packages.
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 09f08cd..8978482 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -1,14 +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 .b3
-# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
-%global relprefix 0.
-
Summary: Dogtag Public Key Infrastructure (PKI) Suite
Name: dogtag-pki
Version: 10.0.0
-Release: %{?relprefix}16%{?prerel}%{?dist}
+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/
@@ -194,6 +187,9 @@ rm -rf %{buildroot}
%doc README
%changelog
+* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
+- Update to official release for rc1
+
* Mon Nov 12 2012 Ade Lee <alee@redhat.com> 10.0.0-0.16.b3
- Update release to b3
diff --git a/specs/ipa-pki-theme.spec b/specs/ipa-pki-theme.spec
index 13bae93..1a19019 100644
--- a/specs/ipa-pki-theme.spec
+++ b/specs/ipa-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: ipa-pki-theme
Version: 10.0.0
-Release: %{?relprefix}6%{?prerel}%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - IPA PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -122,6 +115,9 @@ cd build
%changelog
+* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
+- Update to official release for rc1
+
* Mon Nov 12 2012 Ade Lee <alee@redhat.com> 10.0.0-0.6.b3
- Update release to b3
diff --git a/specs/pki-console.spec b/specs/pki-console.spec
index 49c6ebe..92a5a37 100644
--- a/specs/pki-console.spec
+++ b/specs/pki-console.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: pki-console
Version: 10.0.0
-Release: %{?relprefix}12%{?prerel}%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - PKI Console
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -87,6 +80,9 @@ cd build
%changelog
+* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
+- Update to official release for rc1
+
* Tue Nov 20 2012 Ade Lee <alee@redhat.com> 10.0.0-0.12.b3
- Removed conditionals for fedora < 17
- Update cmake version
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index e78022f..119a5c1 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -1,12 +1,3 @@
-# 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
-# we are assuming f17+ and rhel 7+
-
-%global prerel .b3
-# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
-%global relprefix 0.
-
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
@@ -14,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.0
-Release: %{?relprefix}56%{?prerel}%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -963,6 +954,9 @@ fi
%changelog
+* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
+- Update to official release for rc1
+
* Thu Dec 8 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.56.b3
- TRAC Ticket #315 - Man pages for pkispawn/pkidestroy.
- Added place-holders for 'pki.1' and 'pki_default.cfg.5' man pages.
diff --git a/specs/pki-migrate.spec b/specs/pki-migrate.spec
index 02cd826..035392c 100644
--- a/specs/pki-migrate.spec
+++ b/specs/pki-migrate.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: pki-migrate
Version: 10.0.0
-Release: %{?relprefix}4%{?prerel}%{?dist}
+Release: 1%{?dist}
Summary: Red Hat Certificate System - PKI Migration Scripts
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -78,6 +71,9 @@ cd build
%changelog
+* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
+- Update to official release for rc1
+
* Mon Nov 12 2012 Ade Lee <alee@redhat.com> 10.0.0-0.4.b3
- Update release to b3
diff --git a/specs/pki-ra.spec b/specs/pki-ra.spec
index fb620b2..64de4ce 100644
--- a/specs/pki-ra.spec
+++ b/specs/pki-ra.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: pki-ra
Version: 10.0.0
-Release: %{?relprefix}12%{?prerel}%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - Registration Authority
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -197,6 +190,9 @@ fi
%changelog
+* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
+- Update to official release for rc1
+
* Tue Nov 20 2012 Ade Lee <alee@redhat.com> 10.0.0-0.12.b3
- Update spec fiel to support fedora >= 17 and rhel 7+
- Update cmake version
diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec
index 53c18ec..9eeb241 100644
--- a/specs/pki-tps.spec
+++ b/specs/pki-tps.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: pki-tps
Version: 10.0.0
-Release: %{?relprefix}12%{?prerel}%{?dist}
+Release: 1%{?dist}
Summary: Certificate System - Token Processing System
URL: http://pki.fedoraproject.org/
License: LGPLv2
@@ -230,6 +223,9 @@ fi
%changelog
+* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
+- Update to official release for rc1
+
* Tue Nov 20 2012 Ade Lee <alee@redhat.com> 10.0.0-0.12.b3
- Update spec fiel to support fedora >= 17 and rhel 7+
- Update cmake version