summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-11-21 10:16:04 -0500
committerAde Lee <alee@redhat.com>2012-11-21 10:47:50 -0500
commit871b4423babc140d984d4b49aa380710cfcaf72a (patch)
treebd3d543c10118d1a00bc767bf20f5c9e91cdb7d1
parent40e58f937d49f1a0029a226ab714cb54f12a9239 (diff)
downloadpki-871b4423babc140d984d4b49aa380710cfcaf72a.zip
pki-871b4423babc140d984d4b49aa380710cfcaf72a.tar.gz
pki-871b4423babc140d984d4b49aa380710cfcaf72a.tar.xz
Misc changes to get rhel 7 build to work
1. Modified cmake dependency 2. Corrected conditionals in spec file 3. Added paths for resteasy-base 4. Added paths to policy for resteasy-base
-rw-r--r--base/ca/src/CMakeLists.txt1
-rw-r--r--base/common/shared/conf/pki.policy20
-rw-r--r--base/common/src/CMakeLists.txt3
-rw-r--r--base/java-tools/src/CMakeLists.txt3
-rw-r--r--base/kra/src/CMakeLists.txt1
-rw-r--r--base/ocsp/src/CMakeLists.txt1
-rw-r--r--base/tks/src/CMakeLists.txt1
-rw-r--r--specs/pki-console.spec2
-rw-r--r--specs/pki-core.spec14
-rw-r--r--specs/pki-ra.spec2
-rw-r--r--specs/pki-tps.spec2
11 files changed, 40 insertions, 10 deletions
diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
index f4349ef..aa19cc4 100644
--- a/base/ca/src/CMakeLists.txt
+++ b/base/ca/src/CMakeLists.txt
@@ -29,6 +29,7 @@ find_file(JAXRS_API_JAR
jaxrs-api.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
# build pki-ca
diff --git a/base/common/shared/conf/pki.policy b/base/common/shared/conf/pki.policy
index d265986..9b71feb 100644
--- a/base/common/shared/conf/pki.policy
+++ b/base/common/shared/conf/pki.policy
@@ -118,6 +118,26 @@ grant codeBase "file:/usr/share/java/resteasy/resteasy-jettison-provider.jar" {
permission java.security.AllPermission;
};
+grant codeBase "file:/usr/share/java/resteasy-base/jaxrs-api.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/resteasy-base/resteasy-atom-provider.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/resteasy-base/resteasy-jaxb-provider.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/resteasy-base/resteasy-jaxrs.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/resteasy-base/resteasy-jettison-provider.jar" {
+ permission java.security.AllPermission;
+};
+
grant codeBase "file:/usr/share/java/scannotation.jar" {
permission java.security.AllPermission;
};
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index c589cb1..e21f13c 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -88,6 +88,7 @@ find_file(JAXRS_API_JAR
jaxrs-api.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
find_file(RESTEASY_JAXRS_JAR
@@ -95,6 +96,7 @@ find_file(RESTEASY_JAXRS_JAR
resteasy-jaxrs.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
find_file(RESTEASY_ATOM_PROVIDER_JAR
@@ -102,6 +104,7 @@ find_file(RESTEASY_ATOM_PROVIDER_JAR
resteasy-atom-provider.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
find_file(HTTPCLIENT_JAR
diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt
index 131375b..96aae5c 100644
--- a/base/java-tools/src/CMakeLists.txt
+++ b/base/java-tools/src/CMakeLists.txt
@@ -50,6 +50,7 @@ find_file(JAXRS_API_JAR
jaxrs-api.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
find_file(RESTEASY_JAXRS_JAR
@@ -57,6 +58,7 @@ find_file(RESTEASY_JAXRS_JAR
resteasy-jaxrs.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
find_file(RESTEASY_ATOM_PROVIDER_JAR
@@ -64,6 +66,7 @@ find_file(RESTEASY_ATOM_PROVIDER_JAR
resteasy-atom-provider.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
find_file(HTTPCLIENT_JAR
diff --git a/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt
index 7f570dd..d9ab25c 100644
--- a/base/kra/src/CMakeLists.txt
+++ b/base/kra/src/CMakeLists.txt
@@ -51,6 +51,7 @@ find_file(JAXRS_API_JAR
jaxrs-api.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
# '${JAVA_LIB_INSTALL_DIR}' jars
diff --git a/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt
index 36a1908..39468ca 100644
--- a/base/ocsp/src/CMakeLists.txt
+++ b/base/ocsp/src/CMakeLists.txt
@@ -51,6 +51,7 @@ find_file(JAXRS_API_JAR
jaxrs-api.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
# '${JAVA_LIB_INSTALL_DIR}' jars
diff --git a/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt
index cf82ccc..0ff69ae 100644
--- a/base/tks/src/CMakeLists.txt
+++ b/base/tks/src/CMakeLists.txt
@@ -51,6 +51,7 @@ find_file(JAXRS_API_JAR
jaxrs-api.jar
PATHS
/usr/share/java/resteasy
+ /usr/share/java/resteasy-base
)
diff --git a/specs/pki-console.spec b/specs/pki-console.spec
index a8b010e..49c6ebe 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 22ae569..e923452 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 aa5b451..fb620b2 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 8f014e6..53c18ec 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