diff options
author | Marian Csontos <mcsontos@redhat.com> | 2016-09-16 17:30:01 +0200 |
---|---|---|
committer | Marian Csontos <mcsontos@redhat.com> | 2017-03-16 13:03:24 +0100 |
commit | 19b65a3d76e8e316a11c59a690b82bff3203566c (patch) | |
tree | 4ef5d738c62816e1709f6336a24a930d4fd3c04c /spec | |
parent | 7067514c9b3e5af88629799a4bd60614ef776a9d (diff) | |
download | lvm2-19b65a3d76e8e316a11c59a690b82bff3203566c.tar.gz |
spec: Replace remaining %define by %global
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lvm2.spec | 2 | ||||
-rw-r--r-- | spec/macros.inc | 94 |
2 files changed, 48 insertions, 48 deletions
diff --git a/spec/lvm2.spec b/spec/lvm2.spec index c6373bca3..18b1821da 100644 --- a/spec/lvm2.spec +++ b/spec/lvm2.spec @@ -14,7 +14,7 @@ # on those systems. # A macro to pull in an include file from an appropriate location. -%define import() %include %(test -e %{S:%1} && echo %{S:%1} || echo %{_sourcedir}/%1) +%global import() %%include %%(test -e %%{S:%%1} && echo %%{S:%%1} || echo %%{_sourcedir}/%%1) %import source.inc diff --git a/spec/macros.inc b/spec/macros.inc index 4c4e66bc3..99ee9a06a 100644 --- a/spec/macros.inc +++ b/spec/macros.inc @@ -14,70 +14,70 @@ %global rhel 0 %endif -%define enableif() \ -%global configure_flags %{?configure_flags} --%(if test %1 -gt 0; then echo enable-%2; else echo disable-%2; fi) +%global enableif() \ +%%global configure_flags %%{?configure_flags} --%%(if test %%1 -gt 0; then echo enable-%%2; else echo disable-%%2; fi) -%define with() \ -%global configure_flags %(echo -n "%{?configure_flags} " | sed -e "s,--with-%1=[^ ]*,,"; test -n "%{?2}" && echo --with-%1=%2) \ -%global with_flags %(echo -n "%{?with_flags} " | sed -e "s,%1,,"; test -n "%{?2}" && test "%{?2}" != none && echo %1) +%global with() \ +%%global configure_flags %%(echo -n "%%{?configure_flags} " | sed -e "s,--with-%%1=[^ ]*,,"; test -n "%%{?2}" && echo --with-%%1=%%2) \ +%%global with_flags %%(echo -n "%%{?with_flags} " | sed -e "s,%%1,,"; test -n "%%{?2}" && test "%%{?2}" != none && echo %%1) %global services monitor -%define service() \ -%global services %(echo -n "%{?services} " | sed -e s,%1,,; test "%2" = 1 && echo %1) +%global service() \ +%%global services %%(echo -n "%%{?services} " | sed -e s,%%1,,; test "%%2" = 1 && echo %%1) -%define maybe() \ -%if %(test -n "%{?2}" && echo 1 || echo 0) \ -%* \ -%endif +%global maybe() \ +%%if %%(test -n "%%{?2}" && echo 1 || echo 0) \ +%%* \ +%%endif -%define have_with() %(if echo %{with_flags} | grep -q %1; then echo 1; else echo 0; fi) -%define have_service() %(if echo %{services} | grep -q %1; then echo 1; else echo 0; fi) +%global have_with() %%(if echo %%{with_flags} | grep -q %%1; then echo 1; else echo 0; fi) +%global have_service() %%(if echo %%{services} | grep -q %%1; then echo 1; else echo 0; fi) -%define daemon_reload \ -%if %{enable_systemd} \ +%global daemon_reload \ +%%if %%{enable_systemd} \ systemctl daemon-reload > /dev/null 2>&1 || : \ -%endif \ +%%endif \ : \ -%{nil} +%%{nil} -%define enable(s:t:) \ -%if %{have_service %{-s*}} \ -%if %{enable_systemd} \ +%global enable(s:t:) \ +%%if %%{have_service %%{-s*}} \ +%%if %%{enable_systemd} \ if [ $1 = 1 ]; then \ - systemctl preset lvm2-%{-s*}.%{-t*} > /dev/null 2>&1 || : \ + systemctl preset lvm2-%%{-s*}.%%{-t*} > /dev/null 2>&1 || : \ fi \ -%else \ -/sbin/chkconfig --add lvm2-%{-s*} \ -%endif \ -%endif \ +%%else \ +/sbin/chkconfig --add lvm2-%%{-s*} \ +%%endif \ +%%endif \ : \ -%{nil} +%%{nil} -%define disable(s:t:) \ -%if %{have_service %{-s*}} \ -%if %{enable_systemd} \ +%global disable(s:t:) \ +%%if %%{have_service %%{-s*}} \ +%%if %%{enable_systemd} \ if [ $1 = 0 ]; then \ - systemctl --no-reload disable lvm2-%{-s*}.%{-t*} > /dev/null 2>&1 || : \ - %if %{-t*} == socket \ - systemctl --no-reload disable lvm2-%{-s*}.service > /dev/null 2>&1 || : \ - %endif \ - systemctl stop lvm2-%{-s*}.%{-t*} > /dev/null 2>&1 || : \ - %if %{-t*} == socket \ - systemctl stop lvm2-%{-s*}.service > /dev/null 2>&1 || : \ - %endif \ + systemctl --no-reload disable lvm2-%%{-s*}.%%{-t*} > /dev/null 2>&1 || : \ + %%if %%{-t*} == socket \ + systemctl --no-reload disable lvm2-%%{-s*}.service > /dev/null 2>&1 || : \ + %%endif \ + systemctl stop lvm2-%%{-s*}.%%{-t*} > /dev/null 2>&1 || : \ + %%if %%{-t*} == socket \ + systemctl stop lvm2-%%{-s*}.service > /dev/null 2>&1 || : \ + %%endif \ fi \ -%else \ -/sbin/chkconfig --del lvm2-%{-s*} \ -%endif \ -%endif \ +%%else \ +/sbin/chkconfig --del lvm2-%%{-s*} \ +%%endif \ +%%endif \ : \ -%{nil} +%%{nil} -%define try_restart(s:t:) \ -%if %{have_service %{-s*}} && %{enable_systemd} \ +%global try_restart(s:t:) \ +%%if %%{have_service %%{-s*}} && %%{enable_systemd} \ if [ $1 = 1 ]; then \ - systemctl try-restart lvm2-%{-s*}.%{-t*} > /dev/null 2>&1 || : \ + systemctl try-restart lvm2-%%{-s*}.%%{-t*} > /dev/null 2>&1 || : \ fi \ -%endif \ +%%endif \ : \ -%{nil} +%%{nil} |