packages/ovirt-engine-dwh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!16 [sync] PR-15: Rebase 22.09 from 22.03-LTS

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @wm-wm-wm 
Signed-off-by: @wm-wm-wm
This commit is contained in:
openeuler-ci-bot 2022-08-11 04:50:48 +00:00 committed by Gitee
commit 71109741ac
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ovirt-engine-dwh-4.4.4.1.tar.gz Normal file
View File

Binary file not shown.

BIN
ovirt-engine-dwh-4.4.7.3.tar.gz
View File

Binary file not shown.

60
ovirt-engine-dwh.spec
View File

@ -45,15 +45,16 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d
%{?EXTRA_BUILD_FLAGS:EXTRA_BUILD_FLAGS="%{EXTRA_BUILD_FLAGS}"} %{?EXTRA_BUILD_FLAGS:EXTRA_BUILD_FLAGS="%{EXTRA_BUILD_FLAGS}"}
Name: ovirt-engine-dwh Name: ovirt-engine-dwh
Version: 4.4.7.3 Version: 4.4.4.1
Release: 2 Release: 2
License: LGPLv2 and ASL 2.0 License: LGPLv2 and ASL 2.0
Summary: %{product_name} Summary: %{product_name}
Group: Virtualization/Management Group: Virtualization/Management
URL: http://www.ovirt.org URL: http://www.ovirt.org
BuildArch: noarch BuildArch: noarch
Source: http://resources.ovirt.org/pub/src/ovirt-engine-dwh/ovirt-engine-dwh-4.4.7.3.tar.gz Source: http://resources.ovirt.org/pub/src/ovirt-engine-dwh/ovirt-engine-dwh-4.4.4.1.tar.gz
BuildRequires: java-11-openjdk-devel >= 11.0.4
BuildRequires: java-1.8.0-openjdk-devel BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: %{commons_collections} BuildRequires: %{commons_collections}
BuildRequires: %{dom4j} BuildRequires: %{dom4j}
@ -73,14 +74,14 @@ Requires: %{commons_collections}
Requires: %{dom4j} Requires: %{dom4j}
Requires: %{name}-setup >= %{version}-%{release} Requires: %{name}-setup >= %{version}-%{release}
Requires: %{name}-grafana-integration-setup >= %{version}-%{release} Requires: %{name}-grafana-integration-setup >= %{version}-%{release}
Requires: java-11-openjdk-headless Requires: java-11-openjdk-headless >= 11.0.4
Requires: jpackage-utils Requires: jpackage-utils
Requires: javapackages-tools Requires: javapackages-tools
Requires: logrotate Requires: logrotate
Requires: postgresql-jdbc Requires: postgresql-jdbc
Requires: postgresql-server >= 12.0 Requires: postgresql-server
Requires: postgresql-contrib >= 12.0 Requires: postgresql-contrib
%description %description
The %{product_description} package provides The %{product_description} package provides
@ -100,11 +101,11 @@ Requires: ovirt-engine-setup-plugin-ovirt-engine-common >= 4.4.0
Requires: %{name}-grafana-integration-setup = %{version}-%{release} Requires: %{name}-grafana-integration-setup = %{version}-%{release}
BuildRequires: python3 BuildRequires: python3
BuildRequires: python3-devel BuildRequires: python3-devel
Requires: python%{python3_pkgversion}-ovirt-setup-lib Requires: python%{python3_pkgversion}-ovirt-setup-lib
Requires: %{name} >= 3.6.0 Requires: %{name} >= 3.6.0
Requires: postgresql-server >= 12.0 Requires: postgresql-server
Requires: postgresql-contrib >= 12.0 Requires: postgresql-contrib
%description setup %description setup
%{product_description} setup package. %{product_description} setup package.
@ -112,10 +113,10 @@ Requires: postgresql-contrib >= 12.0
%package grafana-integration-setup %package grafana-integration-setup
Summary: %{product_name} Grafana integration setup Summary: %{product_name} Grafana integration setup
Group: Virtualization/Management Group: Virtualization/Management
Requires: ovirt-engine-setup-plugin-ovirt-engine-common >= 4.4.7 Requires: ovirt-engine-setup-plugin-ovirt-engine-common >= 4.4.0
Requires: %{name}-setup = %{version}-%{release} Requires: %{name}-setup = %{version}-%{release}
Requires: grafana >= 7.3 Requires: grafana >= 6.2
Requires: grafana-postgres >= 7.3 Requires: grafana-postgres >= 6.2
Requires: httpd Requires: httpd
Requires: mod_ssl Requires: mod_ssl
BuildRequires: python3 BuildRequires: python3
@ -123,29 +124,24 @@ BuildRequires: python3-devel
Requires: python3-ovirt-setup-lib Requires: python3-ovirt-setup-lib
Requires: python3-jinja2 Requires: python3-jinja2
Requires: postgresql-server >= 12.0 Requires: postgresql-server
Requires: postgresql-contrib >= 12.0 Requires: postgresql-contrib
%description grafana-integration-setup %description grafana-integration-setup
%{product_description} Grafana integration setup package. %{product_description} Grafana integration setup package.
%prep %prep
javac -version pushd /usr/lib/jvm/
echo %{_javadir} dir=`ls | grep java-11-openjdk-`
echo $JAVA_HOME jredir=`ls | grep jre-11-openjdk-`
echo $JRE_HOME export JAVA_HOME="/usr/lib/jvm/${dir}"
echo $CLASSPATH export JRE_HOME="/usr/lib/jvm/${jredir}"
echo $PATH export CLASSPATH=$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-11.0.11.9-6.oe1.aarch64 export PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
export JRE_HOME=/usr/lib/jvm/jre-11-openjdk-11.0.11.9-6.oe1.aarch64 popd
export CLASSPATH=$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH
export PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
javac -version
echo $JAVA_HOME
echo $JRE_HOME
echo $CLASSPATH
echo $PATH
%setup -c -q %setup -c -q
sed -i '/export JAVA_HOME/d' automation/build-artifacts.sh
sed -i '/export JAVA_HOME/d' automation/build-artifacts-manual.sh
%build %build
make %{make_common_opts} make %{make_common_opts}
@ -272,8 +268,8 @@ fi
%{_sysconfdir}/grafana/conf/ %{_sysconfdir}/grafana/conf/
%changelog %changelog
* Fri Apr 1 2022 liqiuyu <liqiuyu@kylinos.cn> - 4.4.7.3-2 * Wed Mar 23 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 4.4.4.1-2
- Remove the dist - Change requires from postgresql-13-contrib and postgresql-13-server to postgresql-contrib and postgresql-server
* Thu Sep 9 2021 shenhongyi <shenhongyi2@huawei.com> - 4.4.7.3-1 * Thu Sep 16 2021 Ge Wang <wangge20@huawei.com> - 4.4.4.1-1
- Package init - Init package