diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2013-06-10 13:34:24 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2013-06-11 19:28:17 -0400 |
| commit | 34fe36d79d03e9579b49648fb9d51246fb5b71dd (patch) | |
| tree | 5afa18a805028a7ac4083af3404820e028a2e96a | |
| parent | 99e5dc7fec0cc9c4b78ab694e55e6c484e497d2f (diff) | |
Fixed library paths for RHEL 7.
The build files have been modified to use the correct library paths
on RHEL 7:
- libldap.so and liblber.so are in /usr/lib64
- jss4.jar is in /usr/lib
- Tomcat JSS filename is tomcatjss.jar
| -rw-r--r-- | cmake/Modules/FindLdap.cmake | 2 | ||||
| -rw-r--r-- | specs/pki-core.spec | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmake/Modules/FindLdap.cmake b/cmake/Modules/FindLdap.cmake index be4693bd7..730cbd1ab 100644 --- a/cmake/Modules/FindLdap.cmake +++ b/cmake/Modules/FindLdap.cmake @@ -39,6 +39,7 @@ else (LDAP_LIBRARIES AND LDAP_INCLUDE_DIRS) ldap PATHS /usr/lib + /usr/lib64 /usr/local/lib /opt/local/lib /sw/lib @@ -49,6 +50,7 @@ else (LDAP_LIBRARIES AND LDAP_INCLUDE_DIRS) lber PATHS /usr/lib + /usr/lib64 /usr/local/lib /opt/local/lib /sw/lib diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 0a462ff5f..b8f8726f5 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -520,7 +520,7 @@ chmod 644 %{buildroot}%{_mandir}/man5/* chmod 644 %{buildroot}%{_mandir}/man8/* # Fedora 18 and 17: Substitute 'tomcat7jss.jar' for 'tomcatjss.jar' -%if 0%{?fedora} <= 18 +%if ! 0%{?rhel} && 0%{?fedora} <= 18 sed -i -e 's/grant codeBase "file:\/usr\/share\/java\/tomcatjss.jar" {/grant codeBase "file:\/usr\/share\/java\/tomcat7jss.jar" {/' %{buildroot}%{_datadir}/pki/server/conf/pki.policy sed -i -e 's/pki_tomcatjss_jar=\/usr\/share\/java\/tomcatjss.jar/pki_tomcatjss_jar=\/usr\/share\/java\/tomcat7jss.jar/' %{buildroot}%{_sysconfdir}/pki/default.cfg sed -i -e 's/ \[tomcatjss.jar\]=\${java_dir}\/tomcatjss.jar/ \[tomcatjss.jar\]=\${java_dir}\/tomcat7jss.jar/' %{buildroot}%{_datadir}/pki/scripts/operations @@ -610,7 +610,7 @@ end %post -n pki-base -%if 0%{?fedora} <= 18 +%if ! 0%{?rhel} && 0%{?fedora} <= 18 if [ "`uname -i`" == "x86_64" ] then sed -i -e 's/^JNI_JAR_DIR=.*$/JNI_JAR_DIR=\/usr\/lib64\/java/' %{_datadir}/pki/etc/pki.conf |