[pki-core] Updated spec for rhel 7 builds, new cmake

[Ade Lee]

commit 2cbea3dee5e51b7352632bd75ea6ebeeb4c0eb54
Author: Ade Lee <alee at redhat.com>
Date:   Wed Nov 21 10:59:52 2012 -0500

    Updated spec for rhel 7 builds, new cmake

 pki-core.spec |   14 +++++++-------
 sources       |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/pki-core.spec b/pki-core.spec
index 22ae569..e923452 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -22,7 +22,7 @@ Group:            System Environment/Daemons
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    cmake >= 2.8.10.1-1
+BuildRequires:    cmake >= 2.8.9-1
 BuildRequires:    zip
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    redhat-rpm-config
@@ -49,7 +49,7 @@ BuildRequires:    jss >= 4.2.6-24
 BuildRequires:    systemd-units
 BuildRequires:    tomcatjss >= 7.0.0-3
 
-%if 0%{?fedora} <= 17
+%if ! 0%{?rhel} && 0%{?fedora} <= 17
 BuildRequires:    tomcatjss >= 6.0.2
 BuildRequires:    selinux-policy-devel >= 3.10.0-151
 %endif
@@ -251,7 +251,7 @@ Requires:         pki-server-theme >= 10.0.0
 Requires:         pki-base = %{version}-%{release}
 Requires:         pki-tools = %{version}-%{release}
 
-%if 0%{?fedora} <= 17
+%if ! 0%{?rhel} && 0%{?fedora} <= 17
 Requires:         pki-selinux = %{version}-%{release}
 %else
 Requires:         selinux-policy-base >= 3.11.1-43
@@ -279,7 +279,7 @@ The package contains scripts to create and remove PKI subsystems.
 
 %{overview}
 
-%if 0%{?fedora} <= 17
+%if ! 0%{?rhel} && 0%{?fedora} <= 17
 %package -n       pki-selinux
 Summary:          Certificate System - PKI Selinux Policies
 Group:            System Environment/Base
@@ -472,7 +472,7 @@ cd build
 	-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
 	-DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
 	%{?_without_javadoc:-DWITH_JAVADOC:BOOL=OFF} \
-%if 0%{?fedora} <= 17
+%if ! 0%{?rhel} && 0%{?fedora} <= 17
         -DBUILD_PKI_SELINUX:BOOL=ON \
 %endif
 	..
@@ -538,7 +538,7 @@ if [ -d /etc/sysconfig/pki/%i ]; then                                        \
 fi                                                                           \
 )
 
-%if 0%{?fedora} <= 17
+%if ! 0%{?rhel} && 0%{?fedora} <= 17
 %pre -n pki-selinux
 %saveFileContext targeted
 
@@ -870,7 +870,7 @@ fi
 %dir %{_datadir}/pki/server
 %{_datadir}/pki/server/
 
-%if 0%{?fedora} <= 17
+%if ! 0%{?rhel} && 0%{?fedora} <= 17
 %files -n pki-selinux
 %defattr(-,root,root,-)
 %doc base/selinux/LICENSE
diff --git a/sources b/sources
index 1f3c9c3..bfda001 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd8f2f36b21e04785797621dd0db36e2  pki-core-10.0.0.b3.tar.gz
+e4991b0df4dd6ba775ea6e140d095d21  pki-core-10.0.0.b3.tar.gz