packaging: Do not require WITH_... macros to be explicitly defined

Change-Id: I1496d79b626da11085caceec32e1748bb5b16836

diff --git a/packaging/systemd.spec b/packaging/systemd.spec
index 1726464..d183cfe 100644 (file)
--- a/packaging/systemd.spec
+++ b/packaging/systemd.spec
@@ -73,7 +73,7 @@ BuildRequires:  libblkid-devel >= 2.20
 BuildRequires:  libcap-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libkmod-devel >= 14
-%if %{?WITH_DOC}
+%if 0%{?WITH_DOC}
 BuildRequires:  xsltproc
 BuildRequires:  docbook-xsl-stylesheets
 %endif
@@ -179,22 +179,22 @@ cp %{SOURCE9} .
 %define _vpath_builddir %{build_dir}
 %meson \
        -Dkdbus=true \
-%if ! %{?WITH_VIRT}
+%if ! 0%{?WITH_VIRT}
        -Dvirt=false \
 %endif
-%if ! %{?WITH_RANDOMSEED}
+%if ! 0%{?WITH_RANDOMSEED}
        -Drandomseed=false \
 %endif
-%if ! %{?WITH_COREDUMP}
+%if ! 0%{?WITH_COREDUMP}
        -Dcoredump=false \
 %endif
-%if ! %{?WITH_BACKLIGHT}
+%if ! 0%{?WITH_BACKLIGHT}
        -Dbacklight=false \
 %endif
-%if ! %{?WITH_TIMEDATED}
+%if ! 0%{?WITH_TIMEDATED}
        -Dtimedated=false \
 %endif
-%if ! %{?WITH_RFKILL}
+%if ! 0%{?WITH_RFKILL}
        -Drfkill=false \
 %endif
        -Defi=false \
@@ -207,17 +207,17 @@ cp %{SOURCE9} .
        -Dtimesyncd=false \
        -Dresolve=false \
        -Dnetworkd=false \
-%if ! %{?WITH_MACHINED}
+%if ! 0%{?WITH_MACHINED}
        -Dmachined=false \
 %endif
-%if ! %{?WITH_HOSTNAMED}
+%if ! 0%{?WITH_HOSTNAMED}
        -Dhostnamed=false \
 %endif
        -Dimportd=false \
        -Denvironment-d=false \
        -Dnss-systemd=false \
        -Dgcrypt=false \
-%if ! %{?WITH_DOC}
+%if ! 0%{?WITH_DOC}
        -Dman=false \
 %endif
        -Dportabled=false \
@@ -346,10 +346,10 @@ install -D -m 755 %{_builddir}/%{name}-%{version}/send-booting-done %{buildroot}
 install -D -m 755 %{_builddir}/%{name}-%{version}/wait-target-done %{buildroot}%{_prefix}/lib/systemd/
 
 # Shell Completion
-%if ! %{?WITH_BASH_COMPLETION}
+%if ! 0%{?WITH_BASH_COMPLETION}
 rm -rf %{buildroot}/%{_datadir}/bash-completion/*
 %endif
-%if ! %{?WITH_ZSH_COMPLETION}
+%if ! 0%{?WITH_ZSH_COMPLETION}
 rm -rf %{buildroot}/%{_datadir}/zsh/site-functions/*
 %endif
 
@@ -382,7 +382,7 @@ install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysctl.d/
 
 %post
 /usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
-%if %{?WITH_RANDOMSEED}
+%if 0%{?WITH_RANDOMSEED}
 /usr/lib/systemd/systemd-random-seed save > /dev/null 2>&1 || :
 %endif
 /usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
@@ -397,14 +397,14 @@ chsmack %{_bindir}/kernel-install -a "System::Tools"
 chsmack %{_bindir}/machinectl -a "System::Tools"
 %endif
 chsmack %{_bindir}/systemd-run -a "System::Tools"
-%if %{?WITH_HOSTNAMED}
+%if 0%{?WITH_HOSTNAMED}
 chsmack %{_bindir}/hostnamectl -a "System::Tools"
 %endif
 chsmack %{_bindir}/localectl -a "System::Tools"
-%if %{?WITH_COREDUMP}
+%if 0%{?WITH_COREDUMP}
 chsmack %{_bindir}/coredumpctl -a "System::Tools"
 %endif
-%if %{?WITH_TIMEDATED}
+%if 0%{?WITH_TIMEDATED}
 chsmack %{_bindir}/timedatectl -a "System::Tools"
 %endif
 chsmack %{_bindir}/systemd -a "System::Tools"
@@ -429,7 +429,7 @@ chsmack %{_bindir}/udevadm -a "System::Tools"
 chsmack %{_bindir}/systemd-escape -a "System::Tools"
 chsmack %{_bindir}/systemd-path -a "System::Tools"
 chsmack %{_prefix}/lib/systemd/* -a "System::Tools"
-%if %{?WITH_VIRT}
+%if 0%{?WITH_VIRT}
 chsmack %{_bindir}/systemd-detect-virt -a "System::Tools"
 %endif
 
@@ -471,7 +471,7 @@ fi
 %config %{_sysconfdir}/pam.d/systemd-user
 %{_bindir}/busctl
 %{_bindir}/kernel-install
-%if %{?WITH_MACHINED}
+%if 0%{?WITH_MACHINED}
 %{_bindir}/machinectl
 %endif
 %{_bindir}/systemd-run
@@ -480,14 +480,14 @@ fi
 %{_prefix}/lib/kernel/install.d/00-entry-directory.install
 %{_prefix}/lib/kernel/install.d/50-depmod.install
 %{_prefix}/lib/kernel/install.d/90-loaderentry.install
-%if %{?WITH_HOSTNAMED}
+%if 0%{?WITH_HOSTNAMED}
 %{_bindir}/hostnamectl
 %endif
 %{_bindir}/localectl
-%if %{?WITH_COREDUMP}
+%if 0%{?WITH_COREDUMP}
 %{_bindir}/coredumpctl
 %endif
-%if %{?WITH_TIMEDATED}
+%if 0%{?WITH_TIMEDATED}
 %{_bindir}/timedatectl
 %endif
 %dir %{_sysconfdir}/systemd
@@ -497,10 +497,10 @@ fi
 %dir %{_sysconfdir}/sysctl.d
 %dir %{_sysconfdir}/modules-load.d
 %dir %{_sysconfdir}/binfmt.d
-%if %{?WITH_BASH_COMPLETION}
+%if 0%{?WITH_BASH_COMPLETION}
 %{_datadir}/bash-completion/*
 %endif
-%if %{?WITH_ZSH_COMPLETION}
+%if 0%{?WITH_ZSH_COMPLETION}
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/*
 %endif
@@ -522,18 +522,18 @@ fi
 %dir %{_prefix}/lib/firmware/updates
 %dir %{_datadir}/systemd
 %config(noreplace) %{dbuspolicydir}/system.d/org.freedesktop.systemd1.conf
-%if %{?WITH_HOSTNAMED}
+%if 0%{?WITH_HOSTNAMED}
 %config(noreplace) %{dbuspolicydir}/system.d/org.freedesktop.hostname1.conf
 %endif
 %config(noreplace) %{dbuspolicydir}/system.d/org.freedesktop.login1.conf
 %config(noreplace) %{dbuspolicydir}/system.d/org.freedesktop.locale1.conf
-%if %{?WITH_TIMEDATED}
+%if 0%{?WITH_TIMEDATED}
 %config(noreplace) %{dbuspolicydir}/system.d/org.freedesktop.timedate1.conf
 %endif
-%if %{?WITH_MACHINED}
+%if 0%{?WITH_MACHINED}
 %config(noreplace) %{dbuspolicydir}/system.d/org.freedesktop.machine1.conf
 %endif
-%if %{?WITH_COREDUMP}
+%if 0%{?WITH_COREDUMP}
 %config(noreplace) %{_sysconfdir}/systemd/coredump.conf
 %endif
 %config(noreplace) %{_sysconfdir}/systemd/system.conf
@@ -578,7 +578,7 @@ fi
 %{_prefix}/lib/sysctl.d/*.conf
 %{_prefix}/lib/systemd/systemd
 %{_prefix}/lib/systemd/system
-%if %{?WITH_VIRT}
+%if 0%{?WITH_VIRT}
 %{_bindir}/systemd-detect-virt
 %endif
 
@@ -625,7 +625,7 @@ fi
 %{_prefix}/lib/tmpfiles.d/pamconsole-tmp.conf
 %{_prefix}/lib/tmpfiles.d/systemd.conf
 %{_prefix}/lib/tmpfiles.d/systemd-nologin.conf
-%if %{?WITH_MACHINED}
+%if 0%{?WITH_MACHINED}
 %{_prefix}/lib/tmpfiles.d/systemd-nspawn.conf
 %endif
 %{_prefix}/lib/tmpfiles.d/tmp.conf
@@ -646,7 +646,7 @@ fi
 %{_datadir}/systemd/language-fallback-map
 %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
-%if %{?WITH_HOSTNAMED}
+%if 0%{?WITH_HOSTNAMED}
 %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
 %endif
 %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
@@ -654,10 +654,10 @@ fi
 %exclude %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %exclude %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
 %exclude %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
-%if %{?WITH_TIMEDATED}
+%if 0%{?WITH_TIMEDATED}
 %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
 %endif
-%if %{?WITH_MACHINED}
+%if 0%{?WITH_MACHINED}
 %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
 %endif
 %dir %{_datadir}/factory/
@@ -689,7 +689,7 @@ fi
 %{_libdir}/libsystemd.so.*
 %{_libdir}/libudev.so.*
 %{_libdir}/libnss_myhostname.so.2
-%if %{?WITH_MACHINED}
+%if 0%{?WITH_MACHINED}
 %{_libdir}/libnss_mymachines.so.2
 %endif
 
@@ -740,7 +740,7 @@ fi
 %{_prefix}/lib/dbus-tests/runner/systemd-tests
 %{_prefix}/lib/systemd/tests/
 
-%if %{?WITH_DOC}
+%if 0%{?WITH_DOC}
 %docs_package
 %else
 %exclude %{_docdir}