-%{!?_without_athena:%files -n gvim-athena}
-%{!?_without_athena:%defattr(644,root,root,755)}
-%{!?_without_athena:%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.athena}
-%{!?_without_athena:%{_applnkdir}/Development/Editors/gvim-athena.desktop}
-
-%{!?_without_motif:%files -n gvim-motif}
-%{!?_without_motif:%defattr(644,root,root,755)}
-%{!?_without_motif:%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.motif}
-%{!?_without_motif:%{_applnkdir}/Development/Editors/gvim-motif.desktop}
-
-%{!?_without_gtk:%files -n gvim-gtk}
-%{!?_without_gtk:%defattr(644,root,root,755)}
-%{!?_without_gtk:%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.gtk}
-%{!?_without_gtk:%attr(755,root,root) %{_prefix}/X11R6/bin/rgvim}
-%{!?_without_gtk:%attr(755,root,root) %{_prefix}/X11R6/bin/rgview}
-%{!?_without_gtk:%attr(755,root,root) %verify(not link) %{_prefix}/X11R6/bin/gvim}
-%{!?_without_gtk:%{_applnkdir}/Development/Editors/gvim-gtk.desktop}
-
-%{!?_without_gnome:%files -n gvim-gnome}
-%{!?_without_gnome:%defattr(644,root,root,755)}
-%{!?_without_gnome:%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.gnome}
-%{!?_without_gnome:%{_applnkdir}/Development/Editors/gvim-gnome.desktop}
+%if %{!?_without_athena:1}%{?_without_athena:0}
+%files -n gvim-athena
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.athena
+%{_applnkdir}/Development/Editors/gvim-athena.desktop
+%endif
+
+%if %{!?_without_motif:1}%{?_without_motif:0}
+%files -n gvim-motif
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.motif
+%{_applnkdir}/Development/Editors/gvim-motif.desktop
+%endif
+
+%if %{!?_without_gtk:1}%{?_without_gtk:0}
+%files -n gvim-gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.gtk
+%attr(755,root,root) %{_prefix}/X11R6/bin/rgvim
+%attr(755,root,root) %{_prefix}/X11R6/bin/rgview
+%attr(755,root,root) %verify(not link) %{_prefix}/X11R6/bin/gvim
+%{_applnkdir}/Development/Editors/gvim-gtk.desktop
+%endif
+
+%if %{!?_without_gnome:1}%{?_without_gnome:0}
+%files -n gvim-gnome
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_prefix}/X11R6/bin/gvim.gnome
+%{_applnkdir}/Development/Editors/gvim-gnome.desktop
+%endif