[pki-console] Release Candidate 1

Ade Lee vakwetu at fedoraproject.org
Fri Dec 7 22:49:01 UTC 2012


commit 252599ea40902cf7661ffe7dd19e6c45140cd2dc
Author: Ade Lee <alee at redhat.com>
Date:   Fri Dec 7 17:48:59 2012 -0500

    Release Candidate 1

 .gitignore       |    1 +
 pki-console.spec |   33 +++++++++------------------------
 sources          |    2 +-
 3 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df58868..383c675 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ pki-console-1.3.2.tar.gz
 /pki-console-10.0.0.b1.tar.gz
 /pki-console-10.0.0.b2.tar.gz
 /pki-console-10.0.0.b3.tar.gz
+/pki-console-10.0.0.tar.gz
diff --git a/pki-console.spec b/pki-console.spec
index bda704e..92a5a37 100644
--- a/pki-console.spec
+++ b/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}11%{?prerel}%{?dist}
+Release:          1%{?dist}
 Summary:          Certificate System - PKI Console
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -17,39 +10,24 @@ BuildArch:        noarch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    cmake
+BuildRequires:    cmake >= 2.8.9-1
 BuildRequires:    idm-console-framework
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    ldapjdk
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
-%if 0%{?fedora} >= 17
 BuildRequires:    junit
-%else
-BuildRequires:    junit4
-%endif
-%if 0%{?fedora} >= 16
 BuildRequires:    jpackage-utils >= 1.7.5-10
 BuildRequires:    jss >= 4.2.6-24
 BuildRequires:    pki-base >= 10.0.0
-%else
-BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-24
-BuildRequires:    pki-base
-%endif
 
 Requires:         idm-console-framework
 Requires:         java >= 1:1.6.0
 Requires:         ldapjdk
 Requires:         pki-base >= 10.0.0
 Requires:         pki-console-theme >= 9.0.0
-%if 0%{?fedora} >= 16
 Requires:         jpackage-utils >= 1.7.5-10
 Requires:         jss >= 4.2.6-24
-%else
-Requires:         jpackage-utils
-Requires:         jss >= 4.2.6-24
-%endif
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
 
@@ -102,6 +80,13 @@ cd build
 
 
 %changelog
+* Fri Dec 7 2012 Ade Lee <alee at redhat.com> 10.0.0-1
+- Update to official release for rc1
+
+* Tue Nov 20 2012 Ade Lee <alee at redhat.com> 10.0.0-0.12.b3
+- Removed conditionals for fedora < 17
+- Update cmake version
+
 * Mon Nov 12 2012 Ade Lee <alee at redhat.com> 10.0.0-0.11.b3
 - Update release to b3
 
diff --git a/sources b/sources
index 9fbd570..324bdde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d5a76d6459cf9b3ac25a5f523337437  pki-console-10.0.0.b3.tar.gz
+8f0fc07f599fc537a1e20a29ccc83b32  pki-console-10.0.0.tar.gz


More information about the scm-commits mailing list