Yaniv Dary has uploaded a new change for review.
Change subject: packaging: moved some names to variables.
......................................................................
packaging: moved some names to variables.
Change-Id: I87227051a06921248ba7574ae1d5ebeddb5fe8b0
Signed-off-by: Yaniv Dary <yd...@redhat.com>
---
M ovirt-engine-reports.spec.in
1 file changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/38/25338/1
diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in
index c7983e5..0f538e8 100644
--- a/ovirt-engine-reports.spec.in
+++ b/ovirt-engine-reports.spec.in
@@ -1,7 +1,9 @@
%global product_name Reports package for oVirt Virtualization Management
%global product_description oVirt virtualization reports
+%global engine_name ovirt-engine
%global reports_name ovirt-engine-reports
+%global reports_jasper_suffix %{nil}
%global reports_java %{_javadir}/%{reports_name}
%global engine_group ovirt
%global engine_user ovirt
@@ -34,9 +36,9 @@
Group: Virtualization/Management
URL: http://www.ovirt.org
BuildArch: noarch
-Source:
http://ovirt.org/releases/stable/src/@PACKAGE_NAME@-@package_vers...@.tar.gz
+Source0:
http://ovirt.org/releases/stable/src/@PACKAGE_NAME@-@package_vers...@.tar.gz
-BuildRequires: jasperreports-server >= 5.5.0-6
+BuildRequires: jasperreports-server%{reports_jasper_suffix} >= 5.5.0-6
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: log4j
@@ -44,12 +46,12 @@
BuildRequires: ant
Requires: %{name}-setup >= %{version}-%{release}
-Requires: jasperreports-server < 5.6.0
-Requires: jasperreports-server >= 5.5.0-6
+Requires: jasperreports-server%{reports_jasper_suffix} < 5.6.0
+Requires: jasperreports-server%{reports_jasper_suffix} >= 5.5.0-6
Requires: java
Requires: jpackage-utils
Requires: m2crypto
-Requires: ovirt-engine >= 3.4.0
+Requires: %{engine_name} >= 3.4.0
Requires: patch
# bug#862355
@@ -67,15 +69,15 @@
Group: Virtualization/Management
Requires: cracklib-python
Requires: libxml2-python
-Requires: ovirt-engine-dwh-setup
-Requires: ovirt-engine-setup-plugin-ovirt-engine-common
+Requires: %{engine_name}-dwh-setup
+Requires: %{engine_name}-setup-plugin-ovirt-engine-common
Requires: python
%description setup
%{product_description} setup package.
%prep
-%setup -c -q
+%setup -c -T -a 0 -n ovirt-reports
%build
make %{make_common_opts}
--
To view, visit http://gerrit.ovirt.org/25338
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87227051a06921248ba7574ae1d5ebeddb5fe8b0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <yd...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
