-install -d $RPM_BUILD_ROOT/{bin,boot,etc/X11,home/users,lib/mosules}
-install -d $RPM_BUILD_ROOT/{mnt/floppy,proc,root,sbin,tmp}
-install -d $RPM_BUILD_ROOT/usr/{X11R6/{bin,include,lib,man},bin,dict}
-install -d $RPM_BUILD_ROOT/usr/{bin,dict,doc,etc,games,include,info,sbin,share}
-ln -sf ../X11R6/bin $RPM_BUILD_ROOT/usr/bin/X11
-ln -sf ../var/tmp $RPM_BUILD_ROOT/usr/tmp
+install -d \
+ $RPM_BUILD_ROOT/{initrd,selinux,sys} \
+ $RPM_BUILD_ROOT/etc/{X11/xinit/xinitrc.d,certs,security,sysconfig/wmstyle,xdg/autostart} \
+ $RPM_BUILD_ROOT/home/{users,services} \
+ $RPM_BUILD_ROOT/lib/{firmware,security} \
+ $RPM_BUILD_ROOT/usr/include/security \
+ $RPM_BUILD_ROOT/usr/lib/{cgi-bin,browser-plugins,pkgconfig} \
+ $RPM_BUILD_ROOT/usr/share/{gnome/help,man/man{n,l},man/pl/mann,pkgconfig,sounds,themes/Default,wallpapers,wm-properties,xsessions} \
+ $RPM_BUILD_ROOT/usr/src/examples \
+ $RPM_BUILD_ROOT/var/lock/subsys \
+ $RPM_BUILD_ROOT{%{_aclocaldir},%{_desktopdir}/docklets,%{_iconsdir},%{_pixmapsdir}} \
+ $RPM_BUILD_ROOT%{_fontsdir}/{{100,75}dpi,OTF,Speedo,Type1/{afm,pfm},TTF,cyrillic,local,misc} \
+ $RPM_BUILD_ROOT{%{_idldir},%{_privsepdir}}
+
+%if "%{_lib}" == "lib64"
+install -d \
+ $RPM_BUILD_ROOT/lib64/security \
+ $RPM_BUILD_ROOT/usr/lib64/pkgconfig \
+ $RPM_BUILD_ROOT/usr/lib64/browser-plugins
+%endif
+
+%if %{with debuginfo}
+install -d \
+ $RPM_BUILD_ROOT/usr/lib/debug/%{_lib} \
+ $RPM_BUILD_ROOT/usr/lib/debug%{_libdir} \
+ $RPM_BUILD_ROOT/usr/lib/debug/{bin,sbin} \
+ $RPM_BUILD_ROOT/usr/lib/debug/usr/{bin,sbin} \
+ $RPM_BUILD_ROOT/usr/lib/debug/lib/security \
+ $RPM_BUILD_ROOT/usr/src/debug
+
+%if "%{_lib}" == "lib64"
+install -d \
+ $RPM_BUILD_ROOT/usr/lib/debug/lib64/security
+%endif
+
+find $RPM_BUILD_ROOT/usr/lib/debug -type d | while read line; do
+ echo ${line#$RPM_BUILD_ROOT}
+done > $RPM_BUILD_ROOT/usr/src/debug/%{name}-debuginfo.files
+%endif
+
+# create this for %clean
+tar -cf checkfiles.tar -C $RPM_BUILD_ROOT .