Second try of update to 1.21.1. Fix bug in spec that does not surface on

the local system.

fish.spec

@@ -2,7 +2,7 @@ Summary:                A friendly interactive shell
 Name:                   fish
 
 Version:                1.21.10
-Release:                0%{?dist}
+Release:                1%{?dist}
 
 License:                GPL
 Group:                  System Environment/Shells
@@ -15,9 +15,11 @@ BuildRequires:          ncurses-devel gettext groff
 
 
 # Locate correct build time-dependencies for providing X headers
+%if 0%{?fedora}
+
 %if "%fedora" >= "5"
 
-	# Modern Fedora version, has modular X.org
+# Modern Fedora version, has modular X.org
 BuildRequires:          xorg-x11-proto-devel libX11-devel libXt-devel
 
 %endif
@@ -31,13 +33,13 @@ BuildRequires:          xorg-x11-devel
 %endif
 %endif
 
-%if 0%{?fedora}
 %if "%fedora" < "3"
 
 # Ancient Fedora version, has XFree86
 BuildRequires:          XFree86-devel
 
 %endif
+
 %else
 
 # This is not a Fedora system, try guessing BuildRequires by