rpms/fish/devel fish.spec,1.9,1.10

[Axel Liljencrantz (ascii)]

Author: ascii

Update of /cvs/extras/rpms/fish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8995

Modified Files:
	fish.spec 
Log Message:
Second try of update to 1.21.1. Fix bug in spec that does not surface on the local system.


Index: fish.spec
===================================================================
RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fish.spec	4 Aug 2006 14:31:06 -0000	1.9
+++ fish.spec	4 Aug 2006 14:36:19 -0000	1.10
@@ -2,7 +2,7 @@
 Name:                   fish
 
 Version:                1.21.10
-Release:                0%{?dist}
+Release:                1%{?dist}
 
 License:                GPL
 Group:                  System Environment/Shells
@@ -15,9 +15,11 @@
 
 
 # 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 @@
 %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