shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

spec: Replace remaining %define by %global

Browse Source
This commit is contained in:
Marian Csontos 2016-09-16 17:30:01 +02:00
parent 7067514c9b
commit 19b65a3d76
2 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/lvm2.spec
View File

@ -14,7 +14,7 @@
# on those systems. # on those systems.
# A macro to pull in an include file from an appropriate location. # 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 %import source.inc

94
spec/macros.inc
View File

@ -14,70 +14,70 @@
%global rhel 0 %global rhel 0
%endif %endif
%define enableif() \ %global enableif() \
%global configure_flags %{?configure_flags} --%(if test %1 -gt 0; then echo enable-%2; else echo disable-%2; fi) %%global configure_flags %%{?configure_flags} --%%(if test %%1 -gt 0; then echo enable-%%2; else echo disable-%%2; fi)
%define with() \ %global with() \
%global configure_flags %(echo -n "%{?configure_flags} " | sed -e "s,--with-%1=[^ ]*,,"; test -n "%{?2}" && echo --with-%1=%2) \ %%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_flags %%(echo -n "%%{?with_flags} " | sed -e "s,%%1,,"; test -n "%%{?2}" && test "%%{?2}" != none && echo %%1)
%global services monitor %global services monitor
%define service() \ %global service() \
%global services %(echo -n "%{?services} " | sed -e s,%1,,; test "%2" = 1 && echo %1) %%global services %%(echo -n "%%{?services} " | sed -e s,%%1,,; test "%%2" = 1 && echo %%1)
%define maybe() \ %global maybe() \
%if %(test -n "%{?2}" && echo 1 || echo 0) \ %%if %%(test -n "%%{?2}" && echo 1 || echo 0) \
%* \ %%* \
%endif %%endif
%define have_with() %(if echo %{with_flags} | 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)
%define have_service() %(if echo %{services} | 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 \ %global daemon_reload \
%if %{enable_systemd} \ %%if %%{enable_systemd} \
systemctl daemon-reload > /dev/null 2>&1 || : \ systemctl daemon-reload > /dev/null 2>&1 || : \
%endif \ %%endif \
: \ : \
%{nil} %%{nil}
%define enable(s:t:) \ %global enable(s:t:) \
%if %{have_service %{-s*}} \ %%if %%{have_service %%{-s*}} \
%if %{enable_systemd} \ %%if %%{enable_systemd} \
if [ $1 = 1 ]; then \ if [ $1 = 1 ]; then \
systemctl preset lvm2-%{-s*}.%{-t*} > /dev/null 2>&1 || : \ systemctl preset lvm2-%%{-s*}.%%{-t*} > /dev/null 2>&1 || : \
fi \ fi \
%else \ %%else \
/sbin/chkconfig --add lvm2-%{-s*} \ /sbin/chkconfig --add lvm2-%%{-s*} \
%endif \ %%endif \
%endif \ %%endif \
: \ : \
%{nil} %%{nil}
%define disable(s:t:) \ %global disable(s:t:) \
%if %{have_service %{-s*}} \ %%if %%{have_service %%{-s*}} \
%if %{enable_systemd} \ %%if %%{enable_systemd} \
if [ $1 = 0 ]; then \ if [ $1 = 0 ]; then \
systemctl --no-reload disable lvm2-%{-s*}.%{-t*} > /dev/null 2>&1 || : \ systemctl --no-reload disable lvm2-%%{-s*}.%%{-t*} > /dev/null 2>&1 || : \
%if %{-t*} == socket \ %%if %%{-t*} == socket \
systemctl --no-reload disable lvm2-%{-s*}.service > /dev/null 2>&1 || : \ systemctl --no-reload disable lvm2-%%{-s*}.service > /dev/null 2>&1 || : \
%endif \ %%endif \
systemctl stop lvm2-%{-s*}.%{-t*} > /dev/null 2>&1 || : \ systemctl stop lvm2-%%{-s*}.%%{-t*} > /dev/null 2>&1 || : \
%if %{-t*} == socket \ %%if %%{-t*} == socket \
systemctl stop lvm2-%{-s*}.service > /dev/null 2>&1 || : \ systemctl stop lvm2-%%{-s*}.service > /dev/null 2>&1 || : \
%endif \ %%endif \
fi \ fi \
%else \ %%else \
/sbin/chkconfig --del lvm2-%{-s*} \ /sbin/chkconfig --del lvm2-%%{-s*} \
%endif \ %%endif \
%endif \ %%endif \
: \ : \
%{nil} %%{nil}
%define try_restart(s:t:) \ %global try_restart(s:t:) \
%if %{have_service %{-s*}} && %{enable_systemd} \ %%if %%{have_service %%{-s*}} && %%{enable_systemd} \
if [ $1 = 1 ]; then \ 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 \ fi \
%endif \ %%endif \
: \ : \
%{nil} %%{nil}