Juan Hernandez has uploaded a new change for review.
Change subject: packaging: Changes required for el6
......................................................................
packaging: Changes required for el6
Changes required to build for el6 distributions.
Change-Id: I96e8059d4ea65394ec331992cbf1a37ea1f94895
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M packaging/fedora/spec/ovirt-engine.spec.in
1 file changed, 9 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/12663/1
diff --git a/packaging/fedora/spec/ovirt-engine.spec.in
b/packaging/fedora/spec/ovirt-engine.spec.in
index 5a64de5..6c91ae2 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -2,7 +2,7 @@
%global product_name oVirt Engine
%global product_name_short oVirt Engine
%global user_description oVirt Manager
-%global install_poms 1
+%global install_poms 0
# Short names for engine directories:
%global engine_name ovirt-engine
@@ -98,12 +98,9 @@
BuildArch: noarch
# Build time requirements:
-BuildRequires: dos2unix
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: make
-BuildRequires: maven
BuildRequires: unzip
+BuildRequires: java-1.7.0-openjdk >= 1:1.7.0
# Run time requirements (most of these requirements should be
# moved to the subpackages):
@@ -111,24 +108,21 @@
Requires: cracklib-python
Requires: httpd
Requires: java-1.7.0-openjdk >= 1:1.7.0.9-2.3.3.2
-Requires: java
Requires: jpackage-utils
-Requires: log4j
Requires: mod_ssl
Requires: ntp
Requires: openssl
Requires: policycoreutils-python
Requires: python-configobj
Requires: python-cheetah
-Requires: ovirt-host-deploy-java
+Requires: xz
Requires: yum-plugin-versionlock
-Requires: ovirt-engine-cli
# For local database:
Requires: postgresql-server >= 8.4.7
# Require JBoss AS 7:
-Requires: jboss-as >= 7.1.1-9.3
+Requires: ovirt-engine-jbossas >= 7.1.1
# We can't require exactly the same version and release of the
# setup package because it needs to be updated independely as part
@@ -145,11 +139,6 @@
Requires: %{name}-dbscripts = %{version}-%{release}
Requires: %{name}-webadmin-portal = %{version}-%{release}
-# Require other tool packages:
-Requires: ovirt-iso-uploader
-Requires: ovirt-image-uploader
-Requires: ovirt-log-collector
-
# Make sure that obsolete subpackages are removed:
Obsoletes: %{name}-notification-service
Obsoletes: %{name}-tools-common
@@ -165,7 +154,6 @@
Summary: Engine core of %{product_name_short}
Group: Virtualization/Management
Requires: %{name} = %{version}-%{release}
-Requires: java
Requires: openssh
Requires: openssl
@@ -271,6 +259,10 @@
# locations:
make %{make_common_opts} install DESTDIR=%{buildroot}
+# Install the init script:
+install -dm 755 %{buildroot}%{_sysconfdir}/rc.d/init.d
+ln -s %{engine_data}/service/engine-service.py
%{buildroot}%{_sysconfdir}/rc.d/init.d/ovirt-engine
+
install -dm 755 %{buildroot}/%{engine_state}/deployments
install -dm 755 %{buildroot}/%{engine_state}/content
install -dm 755
%{buildroot}/%{engine_log}/{host-deploy,notifier,engine-manage-domains}
@@ -335,12 +327,6 @@
done
%endif
-# Install the systemd files:
-install -dm 755 %{buildroot}%{_unitdir}
-install -m 644 packaging/fedora/engine-service.systemd
%{buildroot}%{_unitdir}/%{engine_name}.service
-install -dm 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 644 packaging/resources/ovirt-tmpfilesd
%{buildroot}%{_sysconfdir}/tmpfiles.d/ovirt-engine.conf
-
%preun
if [ "$1" -eq 0 ]
@@ -400,7 +386,6 @@
# Misc configuration files:
%{engine_data}/conf
-%{_sysconfdir}/tmpfiles.d/ovirt-engine.conf
# Engine configuration files:
%dir %attr(-, %{engine_user}, %{engine_group}) %{engine_etc}
@@ -412,7 +397,7 @@
%dir %{_sysconfdir}/sysconfig/%{engine_name}.d
%{engine_data}/service
%{_bindir}/engine-service
-%{_unitdir}/%{engine_name}.service
+%{_initddir}/ovirt-engine
# Jar files used by all the components:
%dir %{engine_java}
--
To view, visit http://gerrit.ovirt.org/12663
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96e8059d4ea65394ec331992cbf1a37ea1f94895
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
