build in a pure X or wayland

Change-Id: I7874fb9df20c4793d549cac557f5346332ecf47b
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/packaging/filesystem.spec b/packaging/filesystem.spec
index 0dfee2e..8f14f71 100644 (file)
--- a/packaging/filesystem.spec
+++ b/packaging/filesystem.spec
@@ -1,3 +1,5 @@
+%bcond_with wayland
+%bcond_with x
 %define disable_docs_package 1
 %define debug_package %{nil}
 Name:           filesystem
@@ -44,9 +46,13 @@ function create_dir () {
 cd %{buildroot}
 
 mkdir -p boot dev \
-        etc/{X11/{applnk,fontpath.d},xdg/autostart,ld.so.conf.d,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \
-        home media mnt opt/home/{app,developer} proc root run/lock srv sys tmp \
-        usr/{bin,etc,games,include,%{_lib}/{pkgconfig,games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{help/C,aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug} \
+%if %{with x}
+        etc/X11/{applnk,fontpath.d} \
+       usr/share/{xsessions,X11} \
+%endif
+       etc/{xdg/autostart,ld.so.conf.d,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \
+       home media mnt opt/home/{app,developer} proc root run/lock srv sys tmp \
+        usr/{bin,etc,games,include,%{_lib}/{pkgconfig,games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{help/C,aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes},src,src/kernels,src/debug} \
         var/{adm,empty,gopher,lib/{empty,games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp} \
         opt/{dbspace,usr/dbspace} \
         opt/usr/{media,share} \
@@ -69,7 +75,7 @@ done < %{SOURCE2}
 while read LANG ; do
   create_dir 0755 root root /usr/share/man/$LANG
   for sec in 1 2 3 4 5 6 7 8 9 n; do
-    create_dir 0755 root root /usr/share/man/$LANG/man$sec 
+    create_dir 0755 root root /usr/share/man/$LANG/man$sec
 ##"%lang(${LANG}) %ghost %config(missingok)"
   done
 done < %{SOURCE3}
@@ -112,7 +118,9 @@ posix.symlink("/opt/home/developer", "/home/developer")
 %attr(555,root,root) /boot
 /dev
 %dir /etc
+%if %{with x}
 %{_sysconfdir}/X11
+%endif
 %{_sysconfdir}/xdg
 %{_sysconfdir}/opt
 %attr(700,app,app) /opt/home/app
@@ -179,8 +187,10 @@ posix.symlink("/opt/home/developer", "/home/developer")
 /usr/share/pixmaps
 /usr/share/sounds
 /usr/share/themes
+%if %{with x}
 /usr/share/xsessions
 /usr/share/X11
+%endif
 /usr/src
 /usr/tmp
 %dir /var