[vzctl] spec: fix whitespaces, macros instead of bash vars, link
Andrey Vagin
avagin at fedoraproject.org
Mon Jul 22 09:14:11 UTC 2013
commit b482dcab1384df42bb474329ee38157c14b2bab7
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Fri Jul 19 21:10:30 2013 +0400
spec: fix whitespaces, macros instead of bash vars, link
From 6981c415197278fdf51c844a97277a72d3e54699 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Fri, 19 Jul 2013 21:02:06 +0400
Subject: [PATCH 4/5] spec: fix whitespaces, macros instead of bash vars,
link
In future $RPM_BUILD_ROOT and other bash vars will droped. Also
all macros has at the beginning '/' and we should (for better)
anymore use '/%{macros}'.
Delete hardcoded paths, delete ls ins %install section (not needed).
Fix link to directory. Link isn't directory. Link is file.
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Signed-off-by: Andrey Vagin <avagin at openvz.org>
vzctl.spec | 101 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 49 insertions(+), 52 deletions(-)
---
diff --git a/vzctl.spec b/vzctl.spec
index 079399b..babc951 100644
--- a/vzctl.spec
+++ b/vzctl.spec
@@ -67,7 +67,7 @@ i.e. create, start, shutdown, set various options and limits etc.
%patch1 -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" %configure \
+CFLAGS="%{optflags}" %configure \
vzdir=%{_vzdir} \
--enable-bashcomp \
--enable-logrotate \
@@ -76,59 +76,58 @@ CFLAGS="$RPM_OPT_FLAGS" %configure \
make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT vpsconfdir=%{_vpsconfdir} \
+make DESTDIR=%{buildroot} vpsconfdir=%{_vpsconfdir} \
install install-redhat-from-spec
-ln -s ../sysconfig/vz-scripts $RPM_BUILD_ROOT/%{_configdir}/conf
-ln -s ../vz/vz.conf $RPM_BUILD_ROOT/etc/sysconfig/vz
+ln -s ../sysconfig/vz-scripts %{buildroot}%{_configdir}/conf
+ln -s ../vz/vz.conf %{buildroot}%{_sysconfdir}/sysconfig/vz
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libvzctl.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libvzctl.so
-rm -f $RPM_BUILD_ROOT/%_libdir/libvzchown.la
-rm -f $RPM_BUILD_ROOT/%_libdir/libvzchown.so.*
+rm -f %{buildroot}%{_libdir}/libvzctl.la
+rm -f %{buildroot}%{_libdir}/libvzctl.so
+rm -f %{buildroot}%{_libdir}/libvzchown.la
+rm -f %{buildroot}%{_libdir}/libvzchown.so.*
# Those are binaries that either are not ported to vzctl with Upstream Linux,
# or are not applicable to that case. "make install" will copy them over, so we
# just ignore them.
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzsplit
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzlist
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzmemcheck
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzcpucheck
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vznetcfg
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vznetaddbr
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzcalc
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzcptcheck
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzpid
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzcfgvalidate
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzifup-post
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzeventd
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzmigrate
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzubc
-
-rm -f $RPM_BUILD_ROOT/%{_netdir}/ifup-venet
-rm -f $RPM_BUILD_ROOT/%{_netdir}/ifdown-venet
-rm -f $RPM_BUILD_ROOT/%{_netdir}/ifcfg-venet0
-
-rm -f $RPM_BUILD_ROOT/%{_initddir}/vz
-rm -f $RPM_BUILD_ROOT/%{_initddir}/vzeventd
-
-rm -f $RPM_BUILD_ROOT/%{_udevrulesdir}/*
-
-rm -f $RPM_BUILD_ROOT/%{_scriptdir}/vzevent-reboot
-rm -f $RPM_BUILD_ROOT/%{_scriptdir}/vzevent-stop
-rm -f $RPM_BUILD_ROOT/%{_scriptdir}/initd-functions
-
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzeventd.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzubc.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzcalc.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzcptcheck.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzcfgvalidate.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzcpucheck.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzifup-post.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzlist.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzmemcheck.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzmigrate.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzpid.8
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzsplit.8
-ls $RPM_BUILD_ROOT/%{_mandir}/man8/
+rm -f %{buildroot}%{_sbindir}/vzsplit
+rm -f %{buildroot}%{_sbindir}/vzlist
+rm -f %{buildroot}%{_sbindir}/vzmemcheck
+rm -f %{buildroot}%{_sbindir}/vzcpucheck
+rm -f %{buildroot}%{_sbindir}/vznetcfg
+rm -f %{buildroot}%{_sbindir}/vznetaddbr
+rm -f %{buildroot}%{_sbindir}/vzcalc
+rm -f %{buildroot}%{_sbindir}/vzcptcheck
+rm -f %{buildroot}%{_sbindir}/vzpid
+rm -f %{buildroot}%{_sbindir}/vzcfgvalidate
+rm -f %{buildroot}%{_sbindir}/vzifup-post
+rm -f %{buildroot}%{_sbindir}/vzeventd
+rm -f %{buildroot}%{_sbindir}/vzmigrate
+rm -f %{buildroot}%{_sbindir}/vzubc
+
+rm -f %{buildroot}%{_netdir}/ifup-venet
+rm -f %{buildroot}%{_netdir}/ifdown-venet
+rm -f %{buildroot}%{_netdir}/ifcfg-venet0
+
+rm -f %{buildroot}%{_initddir}/vz
+rm -f %{buildroot}%{_initddir}/vzeventd
+
+rm -f %{buildroot}%{_udevrulesdir}/*
+
+rm -f %{buildroot}%{_scriptdir}/vzevent-reboot
+rm -f %{buildroot}%{_scriptdir}/vzevent-stop
+rm -f %{buildroot}%{_scriptdir}/initd-functions
+
+rm -f %{buildroot}%{_mandir}/man8/vzeventd.8
+rm -f %{buildroot}%{_mandir}/man8/vzubc.8
+rm -f %{buildroot}%{_mandir}/man8/vzcalc.8
+rm -f %{buildroot}%{_mandir}/man8/vzcptcheck.8
+rm -f %{buildroot}%{_mandir}/man8/vzcfgvalidate.8
+rm -f %{buildroot}%{_mandir}/man8/vzcpucheck.8
+rm -f %{buildroot}%{_mandir}/man8/vzifup-post.8
+rm -f %{buildroot}%{_mandir}/man8/vzlist.8
+rm -f %{buildroot}%{_mandir}/man8/vzmemcheck.8
+rm -f %{buildroot}%{_mandir}/man8/vzmigrate.8
+rm -f %{buildroot}%{_mandir}/man8/vzpid.8
+rm -f %{buildroot}%{_mandir}/man8/vzsplit.8
%post -p /sbin/ldconfig
@@ -153,8 +152,6 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
%dir %{_distconfdir}
%dir %{_distscriptdir}
%dir %{_vzdir}
-%dir %{_sysconfdir}/vz/conf
-
%{_bashcdir}/*
@@ -185,6 +182,7 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
%{_scriptdir}/vps-rst
%{_scriptdir}/vps-rst-env
+%{_configdir}/conf
%config %{_sysconfdir}/sysconfig/vz
%config(noreplace) %{_configdir}/vz.conf
%config(noreplace) %{_configdir}/osrelease.conf
@@ -205,7 +203,6 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
%config %{_vpsconfdir}/ve-vswap-2g.conf-sample
%config %{_vpsconfdir}/ve-vswap-4g.conf-sample
-
%changelog
* Fri Jun 7 2013 Andrey Vagin <avagin at gmail.com> - 4.3.1-3
- Fix compilation on architectures without support for VZ (rhbz 971821)
More information about the scm-commits
mailing list