Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: spec: split ovirt-host-deploy-offline into own spec ......................................................................
packaging: spec: split ovirt-host-deploy-offline into own spec rpm dependencies are quite primitive and set at build time and not at install time, the dmidecode dependency cannot be use as it is platform specific in noarch package. rpm does not allow building base package as noarch while subpackages as arch specific, we cannot have the offline subpackage depend on arch specific packages. the reasonable solutions are: 1. make the entire package arch specific, it is illogical to accept rpm limitation and enforce it on good package. 2. create a package that provides dmidecode, so it can be installed at archs that do not provide dmidecode. this again is ugly. 3. move ovirt-host-deploy-offline into own arch specific primary package. solution 3 was implemented. a target of offline-tarball was added to create a tarball that can be served as source for packaging. Change-Id: I26513d02fd1c95a2a515781884a7283e77a5c2ff Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile.am M configure.ac A ovirt-host-deploy-offline.spec.in M ovirt-host-deploy.spec.in 4 files changed, 77 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy refs/changes/51/19151/1 diff --git a/Makefile.am b/Makefile.am index 746c0b2..9110d02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,3 +98,18 @@ update-po: POTFILES.in $(MAKE) -C po update-po + +# +# offline-tarball to simlify creation +# of release tarball for the offline package +# +OFFLINE_FILES = \ + ovirt-host-deploy-offline.spec \ + conf.d/50-offline-packager.conf \ + $(NULL) +OFFLINE_TARBALL = $(PACKAGE_TARNAME)-offline-$(PACKAGE_VERSION).tar.gz +offline-tarball: $(OFFLINE_TARBALL) +$(OFFLINE_TARBALL): $(OFFLINE_FILES) + tar -czf $(PACKAGE_TARNAME)-offline-$(PACKAGE_VERSION).tar.gz \ + --transform "s#^#$$(echo $(OFFLINE_TARBALL) | sed 's/\.tar.*//')/#" \ + $(OFFLINE_FILES) diff --git a/configure.ac b/configure.ac index 8624d33..a1fd8c6 100644 --- a/configure.ac +++ b/configure.ac @@ -162,6 +162,7 @@ AC_CONFIG_FILES([ Makefile ovirt-host-deploy.spec + ovirt-host-deploy-offline.spec build/Makefile po/Makefile.in src/Makefile diff --git a/ovirt-host-deploy-offline.spec.in b/ovirt-host-deploy-offline.spec.in new file mode 100644 index 0000000..1b3dd22 --- /dev/null +++ b/ovirt-host-deploy-offline.spec.in @@ -0,0 +1,61 @@ +# +# ovirt-host-deploy -- ovirt host deployer +# Copyright (C) 2012-2013 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + +%global package_version @PACKAGE_VERSION@ + +Summary: oVirt host deploy tool offline settings +Name: @PACKAGE_NAME@-offline +Version: @PACKAGE_RPM_VERSION@ +Release: @PACKAGE_RPM_RELEASE@%{?release_suffix}%{?dist} +License: LGPLv2+ +URL: http://www.ovirt.org +Source: http://resources.ovirt.org/releases/stable/3.3/%{name}-%{package_version}.tar.gz +Group: Applications/System + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: iproute +Requires: libselinux-python +Requires: m2crypto +Requires: python +Requires: tuned +Requires: util-linux +Requires: vdsm +Requires: vdsm-cli +%ifarch %{ix86} x86_64 +Requires: dmidecode +%endif + +%description +Host deployment tool for oVirt project. + +%prep +%setup -q -n %{name}-%{package_version} + +%install +rm -rf "%{buildroot}" + +install -d -m 755 "%{buildroot}%{_sysconfdir}/ovirt-host-deploy.conf.d" +install -pm 644 conf.d/50-offline-packager.conf "%{buildroot}%{_sysconfdir}/ovirt-host-deploy.conf.d" + +%files +%{_sysconfdir}/ovirt-host-deploy.conf.d/50-offline-packager.conf + +%changelog +* Wed Sep 11 2013 Alon Bar-Lev <[email protected]> - 1.1.0-1 +- Release. diff --git a/ovirt-host-deploy.spec.in b/ovirt-host-deploy.spec.in index 11955e9..bf70d4e 100644 --- a/ovirt-host-deploy.spec.in +++ b/ovirt-host-deploy.spec.in @@ -97,20 +97,6 @@ This package contains the API documentation for %{name}. %endif -%package offline -Summary: ovirt-host-deploy offline dependencies -Requires: dmidecode -Requires: iproute -Requires: libselinux-python -Requires: m2crypto -Requires: python -Requires: tuned -Requires: util-linux -Requires: vdsm -Requires: vdsm-cli -%description offline -meta package for offline setup - %if 0%{?rhel:1} %package repolib Summary: %{name} maven repo @@ -171,7 +157,6 @@ %endif install -d -m 755 "%{buildroot}%{_sysconfdir}/%{name}.conf.d" -install -pm 644 conf.d/50-offline-packager.conf "%{buildroot}%{_sysconfdir}/%{name}.conf.d" %if 0%{?rhel:1} install -d "%{buildroot}%{maven2brewrepodir}" @@ -233,9 +218,6 @@ %endif %endif - -%files offline -%{_sysconfdir}/%{name}.conf.d/50-offline-packager.conf %if 0%{?rhel:1} %files repolib -- To view, visit http://gerrit.ovirt.org/19151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26513d02fd1c95a2a515781884a7283e77a5c2ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-host-deploy Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
