rpms/ldapjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix rhel conditionals

Browse Source
This commit is contained in:
Matthew Harmsen 2018-05-30 09:34:06 -07:00
parent 56999e4ec9
commit 2012c5c96d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ldapjdk.spec
View File

@ -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 <releng@fedoraproject.org> - 0:4.19-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
- Fix rhel conditionals
* Wed Jan 03 2018 Karsten Hopp <karsten@redhat.com> - 4.19-5+4
- fix some conditionals