rpms/fish/devel fish.spec,1.10,1.11
Axel Liljencrantz (ascii)
fedora-extras-commits at redhat.com
Fri Aug 4 15:23:51 UTC 2006
Author: ascii
Update of /cvs/extras/rpms/fish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12592
Modified Files:
fish.spec
Log Message:
Third try of update to 1.21.1. Revert accidental switch to wrong method for finding translation files, and add missing build dependency.
Index: fish.spec
===================================================================
RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fish.spec 4 Aug 2006 14:36:19 -0000 1.10
+++ fish.spec 4 Aug 2006 15:23:51 -0000 1.11
@@ -2,7 +2,7 @@
Name: fish
Version: 1.21.10
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: System Environment/Shells
@@ -15,12 +15,10 @@
# Locate correct build time-dependencies for providing X headers
-%if 0%{?fedora}
-
%if "%fedora" >= "5"
# Modern Fedora version, has modular X.org
-BuildRequires: xorg-x11-proto-devel libX11-devel libXt-devel
+BuildRequires: xorg-x11-proto-devel libX11-devel libXt-devel libXext-devel
%endif
@@ -33,17 +31,18 @@
%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
-# looking at the directory structure
+# The %fedora variable has not been correctly defined, or this is is
+# not a Fedora system, try guessing BuildRequires by looking at the
+# directory structure
%define xinclude /usr%(if [ -d /usr/X11R6/include ]; then echo /X11R6; fi)/include
BuildRequires: %{xinclude}/X11/StringDefs.h, %{xinclude}/X11/Xlib.h
BuildRequires: %{xinclude}/X11/Intrinsic.h, %{xinclude}/X11/Xatom.h
@@ -78,6 +77,8 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR="$RPM_BUILD_ROOT"
+# Find translation files
+%find_lang %{name}.\*
@@ -106,7 +107,8 @@
-%files
+%files -f %{name}.\*.lang
+
%defattr(-,root,root,-)
# The documentation directory
@@ -148,8 +150,6 @@
%dir %_datadir/fish/functions
%_datadir/fish/functions/*.fish
-# Translations
-%_datadir/locale/*/LC_MESSAGES/fish.mo
More information about the fedora-extras-commits
mailing list