diff --git a/.cvsignore b/.cvsignore index 79a5cb5..7d11cca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fish-1.14.0.tar.bz2 +fish-1.21.10.tar.bz2 diff --git a/fish.spec b/fish.spec index b3d40c1..39069f0 100644 --- a/fish.spec +++ b/fish.spec @@ -1,64 +1,123 @@ Summary: A friendly interactive shell Name: fish -Version: 1.21.2 -Release: 1%{?dist} +Version: 1.21.10 +Release: 0%{?dist} License: GPL Group: System Environment/Shells URL: http://roo.no-ip.org/fish/ Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -Patch0: fish-1.21.2-fallback.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel -BuildRequires: libX11-devel libXt-devel libXext-devel +BuildRequires: ncurses-devel gettext groff + + +# Locate correct build time-dependencies for providing X headers +%if "%fedora" >= "5" + + # Modern Fedora version, has modular X.org +BuildRequires: xorg-x11-proto-devel libX11-devel libXt-devel + +%endif + +%if "%fedora" < "5" +%if "%fedora" >= "3" + +# Semi-old Fedora version, has non-modular X.org +BuildRequires: xorg-x11-devel + +%endif +%endif + +%if 0%{?fedora} + +# Ancient Fedora version, has XFree86 +BuildRequires: XFree86-devel + +%else + +# This 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 + +%endif + %description -fish is a shell geared towards interactive use. It's features are -focused on user friendlieness and discoverability. The language syntax + +fish is a shell geared towards interactive use. Its features are +focused on user friendliness and discoverability. The language syntax is simple but incompatible with other shell languages. + %prep %setup -q -%patch0 -p1 -b .fallback -%build + + +%build +# The docdir argument is to make the name of the cosumantation +# directory 'fish-VERSION', instead of the default, which is simply +# 'fish'. %configure docdir=%_datadir/doc/%{name}-%{version} make %{?_smp_mflags} + + + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" -%find_lang %{name}.\* + + %clean rm -rf $RPM_BUILD_ROOT + + + %post +# Add fish to the list of allowed shells in /etc/shells if ! grep %_bindir/fish %_sysconfdir/shells >/dev/null; then echo %_bindir/fish >>%_sysconfdir/shells fi + + + %postun +# Remove fish from the list of allowed shells in /etc/shells if [ "$1" = 0 ]; then grep -v %_bindir/fish %_sysconfdir/shells >%_sysconfdir/fish.tmp mv %_sysconfdir/fish.tmp %_sysconfdir/shells fi -%files -f %{name}.\*.lang + + + +%files %defattr(-,root,root,-) + +# The documentation directory %doc %_datadir/doc/%{name}-%{version} + +# man files %_mandir/man1/fish.1* %_mandir/man1/xsel.1x* %_mandir/man1/mimedb.1* %_mandir/man1/set_color.1* %_mandir/man1/count.1* -%_mandir/man1/fishd.1.* -%_mandir/man1/fish_pager.1.* +%_mandir/man1/fishd.1* +%_mandir/man1/fish_pager.1* + +# The program binaries %attr(0755,root,root) %_bindir/fish %attr(0755,root,root) %_bindir/fishd %attr(0755,root,root) %_bindir/fish_pager @@ -66,24 +125,41 @@ fi %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/mimedb %attr(0755,root,root) %_bindir/count -%dir %_datadir/fish/completions -%config %_datadir/fish/completions/*.fish -%dir %_datadir/fish/functions -%config %_datadir/fish/functions/*.fish -%_datadir/fish/fish + +# Configuration files %config %_sysconfdir/fish %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish +# Non-configuration initialization files +%dir %_datadir/fish +%_datadir/fish/fish + +# Program specific tab-completions +%dir %_datadir/fish/completions +%_datadir/fish/completions/*.fish + +# Dynamically loaded shellscript functions +%dir %_datadir/fish/functions +%_datadir/fish/functions/*.fish + +# Translations +%_datadir/locale/*/LC_MESSAGES/fish.mo + + + + %changelog -* Mon Mar 13 2006 Oliver Falk - 1.21.2-1 -- Update -- Applied patch provided by Michael Schwendt +* Tue Aug 1 2006 Axel Liljencrantz 1.21.10-1 +- Improved the dependency check for X headers. Thank you to Michael Schwendt for pointers on how to do this + +* Mon Jul 31 2006 Axel Liljencrantz 1.21.10-1 +- Fixed spelling and punctuation as a per patch from Paul Howarth +- Fixed dependencies as per patch from Paul Howarth -* Fri Mar 10 2006 Oliver Falk - 1.14.0-2 -- Fix buildreqs -- Fix wutil.h +* Tue Nov 29 2005 Axel Liljencrantz 1.17.0-0 +- 1.17.0 * Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 - 1.14.0 @@ -112,10 +188,6 @@ fi * Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 - 1.12.0 -* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 -- Added dist macro to the release -- Small spec beautifying - * Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way diff --git a/sources b/sources index df7539d..d86a35f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1a1fd6b6a31e9ff93aa916f910d1692 fish-1.14.0.tar.bz2 +66619c080ab344327e5ce84ec2f5f3a4 fish-1.21.10.tar.bz2