[Kimchi-devel] [PATCH V3 31/34] Fix Fedora RPM build issue

Lucio Correia luciojhc at linux.vnet.ibm.com
Wed Jul 8 19:18:03 UTC 2015


Some dirs/files are always listed in %files section, but
they are only created if with_systemd is true, which breaks
RPM build. This patch fixes it by only listing those
directories when with_systemd is true.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
Signed-off-by: Gustavo Y. Ribeiro <gyr at linux.vnet.ibm.com>
---
 contrib/wok.spec.fedora.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index edbe385..30319a9 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -121,16 +121,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/wok/ui/
 %{_datadir}/wok
 %{_sysconfdir}/nginx/conf.d/wok.conf.in
-%{_sysconfdir}/nginx/conf.d/wok.conf
 %{_sysconfdir}/wok/wok.conf
 %{_sysconfdir}/wok/
+%{_mandir}/man8/wokd.8.gz
+
+%if 0%{?with_systemd}
+%{_sysconfdir}/nginx/conf.d/wok.conf
 %{_sharedstatedir}/wok/vnc-tokens/
 %{_sharedstatedir}/wok/
 %{_localstatedir}/log/wok/*
 %{_localstatedir}/log/wok/
-%{_mandir}/man8/wokd.8.gz
-
-%if 0%{?with_systemd}
 %{_unitdir}/wokd.service
 %{_prefix}/lib/firewalld/services/wokd.xml
 %endif
-- 
1.7.1




More information about the Kimchi-devel mailing list