diff --git a/ovirt-engine-dwh-4.4.4.1.tar.gz b/ovirt-engine-dwh-4.4.4.1.tar.gz new file mode 100644 index 0000000..3c94ac0 Binary files /dev/null and b/ovirt-engine-dwh-4.4.4.1.tar.gz differ diff --git a/ovirt-engine-dwh-4.4.7.3.tar.gz b/ovirt-engine-dwh-4.4.7.3.tar.gz deleted file mode 100644 index 7dc6dc0..0000000 Binary files a/ovirt-engine-dwh-4.4.7.3.tar.gz and /dev/null differ diff --git a/ovirt-engine-dwh.spec b/ovirt-engine-dwh.spec index 58d5ecf..d6af295 100644 --- a/ovirt-engine-dwh.spec +++ b/ovirt-engine-dwh.spec @@ -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}"} Name: ovirt-engine-dwh -Version: 4.4.7.3 +Version: 4.4.4.1 Release: 2 License: LGPLv2 and ASL 2.0 Summary: %{product_name} Group: Virtualization/Management URL: http://www.ovirt.org 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: %{commons_collections} BuildRequires: %{dom4j} @@ -73,14 +74,14 @@ Requires: %{commons_collections} Requires: %{dom4j} Requires: %{name}-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: javapackages-tools Requires: logrotate Requires: postgresql-jdbc -Requires: postgresql-server >= 12.0 -Requires: postgresql-contrib >= 12.0 +Requires: postgresql-server +Requires: postgresql-contrib %description 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} BuildRequires: python3 BuildRequires: python3-devel -Requires: python%{python3_pkgversion}-ovirt-setup-lib +Requires: python%{python3_pkgversion}-ovirt-setup-lib Requires: %{name} >= 3.6.0 -Requires: postgresql-server >= 12.0 -Requires: postgresql-contrib >= 12.0 +Requires: postgresql-server +Requires: postgresql-contrib %description setup %{product_description} setup package. @@ -112,10 +113,10 @@ Requires: postgresql-contrib >= 12.0 %package grafana-integration-setup Summary: %{product_name} Grafana integration setup 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: grafana >= 7.3 -Requires: grafana-postgres >= 7.3 +Requires: grafana >= 6.2 +Requires: grafana-postgres >= 6.2 Requires: httpd Requires: mod_ssl BuildRequires: python3 @@ -123,29 +124,24 @@ BuildRequires: python3-devel Requires: python3-ovirt-setup-lib Requires: python3-jinja2 -Requires: postgresql-server >= 12.0 -Requires: postgresql-contrib >= 12.0 +Requires: postgresql-server +Requires: postgresql-contrib %description grafana-integration-setup %{product_description} Grafana integration setup package. %prep -javac -version -echo %{_javadir} -echo $JAVA_HOME -echo $JRE_HOME -echo $CLASSPATH -echo $PATH -export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-11.0.11.9-6.oe1.aarch64 -export JRE_HOME=/usr/lib/jvm/jre-11-openjdk-11.0.11.9-6.oe1.aarch64 -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 +pushd /usr/lib/jvm/ + dir=`ls | grep java-11-openjdk-` + jredir=`ls | grep jre-11-openjdk-` + export JAVA_HOME="/usr/lib/jvm/${dir}" + export JRE_HOME="/usr/lib/jvm/${jredir}" + export CLASSPATH=$JAVA_HOME/lib:$JRE_HOME/lib:$CLASSPATH + export PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH +popd %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 make %{make_common_opts} @@ -272,8 +268,8 @@ fi %{_sysconfdir}/grafana/conf/ %changelog -* Fri Apr 1 2022 liqiuyu - 4.4.7.3-2 -- Remove the dist +* Wed Mar 23 2022 jiangxinyu - 4.4.4.1-2 +- Change requires from postgresql-13-contrib and postgresql-13-server to postgresql-contrib and postgresql-server -* Thu Sep 9 2021 shenhongyi - 4.4.7.3-1 -- Package init +* Thu Sep 16 2021 Ge Wang - 4.4.4.1-1 +- Init package