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

fix some conditionals in the spec file

Browse Source
This commit is contained in:
Karsten Hopp 2018-01-22 11:51:01 +01:00
parent 6821ae2744
commit 59e646f0c7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ldapjdk.spec
View File

@ -4,7 +4,7 @@
Name: ldapjdk Name: ldapjdk
Version: 4.19 Version: 4.19
Release: 5%{?dist} Release: 6%{?dist}
Epoch: 0 Epoch: 0
Summary: The Mozilla LDAP Java SDK Summary: The Mozilla LDAP Java SDK
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -28,7 +28,7 @@ Requires: jpackage-utils >= 0:1.5
Requires: jss Requires: jss
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel BuildRequires: java-devel
%if 0%{?rhel} %if 0%{?rhel} <= 7
BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: jpackage-utils >= 0:1.5
%else %else
BuildRequires: javapackages-local 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) rm -fr $(find . -name CVS -type d)
# Link to build-system BRs # Link to build-system BRs
pwd pwd
%if 0%{?rhel} %if 0%{?rhel} <= 7
( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 jsse jaas jndi ) ( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 jsse jaas jndi )
%else %else
( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 ) ( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 )
@ -107,6 +107,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}/* %{_javadocdir}/%{name}/*
%changelog %changelog
* Wed Jan 03 2018 Karsten Hopp <karsten@redhat.com> - 4.19-5+4
- fix some conditionals
* Thu Oct 12 2017 Matthew Harmsen <mharmsen@redhat.com> 0:4.19-5 * Thu Oct 12 2017 Matthew Harmsen <mharmsen@redhat.com> 0:4.19-5
- Fix build for CentOS 7 - Fix build for CentOS 7