From 2012c5c96db628e1fa026ca8e6f0924d9106324c Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: May 30 2018 16:34:06 +0000 Subject: Fix rhel conditionals --- diff --git a/ldapjdk.spec b/ldapjdk.spec index 6d55ec0..717b304 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ Requires: jpackage-utils >= 0:1.5 Requires: jss BuildRequires: ant BuildRequires: java-devel -%if 0%{?rhel} <= 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: jpackage-utils >= 0:1.5 %else BuildRequires: javapackages-local @@ -62,7 +62,7 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar rm -fr $(find . -name CVS -type d) # Link to build-system BRs pwd -%if 0%{?rhel} <= 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 ( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 jsse jaas jndi ) %else ( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 ) @@ -109,6 +109,7 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog * Wed Feb 07 2018 Fedora Release Engineering - 0:4.19-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +- Fix rhel conditionals * Wed Jan 03 2018 Karsten Hopp - 4.19-5+4 - fix some conditionals