diff options
Diffstat (limited to 'specs')
-rw-r--r-- | specs/pki-console.spec | 2 | ||||
-rw-r--r-- | specs/pki-core.spec | 14 | ||||
-rw-r--r-- | specs/pki-ra.spec | 2 | ||||
-rw-r--r-- | specs/pki-tps.spec | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/specs/pki-console.spec b/specs/pki-console.spec index a8b010ea3..49c6ebe43 100644 --- a/specs/pki-console.spec +++ b/specs/pki-console.spec @@ -17,7 +17,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake >= 2.8.10.1-1 +BuildRequires: cmake >= 2.8.9-1 BuildRequires: idm-console-framework BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ldapjdk diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 22ae5699d..e9234529a 100644 --- a/specs/pki-core.spec +++ b/specs/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/specs/pki-ra.spec b/specs/pki-ra.spec index aa5b4516d..fb620b282 100644 --- a/specs/pki-ra.spec +++ b/specs/pki-ra.spec @@ -17,7 +17,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake >= 2.8.10.1-1 +BuildRequires: cmake >= 2.8.9-1 BuildRequires: nspr-devel BuildRequires: nss-devel diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec index 8f014e692..53c18ec2c 100644 --- a/specs/pki-tps.spec +++ b/specs/pki-tps.spec @@ -15,7 +15,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: apr-devel BuildRequires: apr-util-devel BuildRequires: cyrus-sasl-devel |