Yaniv Bronhaim has uploaded a new change for review.

Change subject: Re-review vdsm spec
......................................................................

Re-review vdsm spec

The patch fixed fedora-review report warnings:
1. Using %{_libdir} instead of explicit path
2. Specifies vdsm-infra version to obsoletes
3. Require python2-devel instead of python-devel
4. Removed %config(noreplace) from %{_tmpfilesdir}/%{vdsm_name}.conf
which is not needed (see bug for more details)

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1361659
Change-Id: Ie005f2d45500119d8f52c49fa17eb766cda72e8e
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M vdsm.spec.in
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/61844/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index dba1f33..9b87e93 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -56,14 +56,14 @@
 Group:          Applications/System
 License:        GPLv2+
 Url:            http://www.ovirt.org/wiki/Vdsm
-Source0:        %{vdsm_name}-%{version}.tar.gz
+Source0:        
https://bronhaim.fedorapeople.org/%{vdsm_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %{!?_licensedir:%global license %%doc}
 
 BuildRequires: cyrus-sasl-lib
 BuildRequires: python
-BuildRequires: python-devel
+BuildRequires: python2-devel
 BuildRequires: python-mock
 BuildRequires: python-netaddr
 BuildRequires: python-nose
@@ -156,7 +156,7 @@
 Requires: mom >= 0.5.3
 Requires(pre): shadow-utils
 
-Obsoletes: %{name}-infra
+Obsoletes: %{name}-infra >= 4.16.0
 
 %if 0%{?with_openvswitch}
 Requires: openvswitch >= 2.0.0
@@ -765,8 +765,8 @@
 install -Dm 0644 vdsm/limits.conf \
                  %{buildroot}/etc/security/limits.d/99-vdsm.conf
 
-install -Dm 0755 init/systemd/systemd-vdsmd 
%{buildroot}/usr/lib/systemd/systemd-vdsmd
-install -Dm 0644 init/systemd/85-vdsmd.preset 
%{buildroot}/usr/lib/systemd/system-preset/85-vdsmd.preset
+install -Dm 0755 init/systemd/systemd-vdsmd 
%{buildroot}%{_libdir}/systemd/systemd-vdsmd
+install -Dm 0644 init/systemd/85-vdsmd.preset 
%{buildroot}%{_libdir}/systemd/system-preset/85-vdsmd.preset
 install -Dm 0644 init/systemd/vdsmd.service 
%{buildroot}%{_unitdir}/vdsmd.service
 install -Dm 0644 init/systemd/vdsm-network.service 
%{buildroot}%{_unitdir}/vdsm-network.service
 install -Dm 0644 init/systemd/supervdsmd.service 
%{buildroot}%{_unitdir}/supervdsmd.service
@@ -901,8 +901,8 @@
 %defattr(-, root, root, -)
 %doc README lib/vdsm/vdsm.conf.sample
 %license COPYING
-/usr/lib/systemd/systemd-vdsmd
-/usr/lib/systemd/system-preset/85-vdsmd.preset
+%{_libdir}/systemd/systemd-vdsmd
+%{_libdir}/systemd/system-preset/85-vdsmd.preset
 %{_unitdir}/vdsmd.service
 %{_unitdir}/vdsm-network.service
 %{_unitdir}/supervdsmd.service
@@ -967,7 +967,7 @@
 %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
 %config(noreplace) %{_sysconfdir}/sysctl.d/vdsm.conf
 %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf
-%config(noreplace) %{_tmpfilesdir}/%{vdsm_name}.conf
+%{_tmpfilesdir}/%{vdsm_name}.conf
 %{_sysconfdir}/dhcp/dhclient.d/sourceRoute.sh
 %{_sysconfdir}/sudoers.d/50_vdsm
 %{_sysconfdir}/cron.hourly/vdsm-logrotate


-- 
To view, visit https://gerrit.ovirt.org/61844
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie005f2d45500119d8f52c49fa17eb766cda72e8e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Reply via email to