- up to 1.23.1

- s/fishshell.org/fishshell.com/g (I know its ibsolete, but current fishshell.org content is "It works!")
- rework html docs installation (dunno how clean it is, but previous rel caused bad path in fish executable (so 'help' command didnt worked)
- updated fish-link.patch and removed fish-ac.patch(now upstream)

Changed files:
    fish-ac.patch -> 1.2
    fish-link.patch -> 1.4
    fish.spec -> 1.15

diff --git a/fish-ac.patch b/fish-ac.patch
deleted file mode 100644 (file)
index 3fd74e3..0000000
--- a/fish-ac.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- fish-1.23.0/configure.ac~  2008-08-17 16:25:41.084660409 +0200
-+++ fish-1.23.0/configure.ac   2008-08-17 16:26:14.817989948 +0200
-@@ -16,23 +16,22 @@
- # List of output variables produced by this configure script
- #
- 
--AC_SUBST( docdir )
--AC_SUBST( HAVE_GETTEXT )
--AC_SUBST( LDFLAGS_FISH )
--AC_SUBST( LIBS_FISH )
--AC_SUBST( LIBS_FISH_INDENT )
--AC_SUBST( LIBS_FISH_PAGER )
--AC_SUBST( LIBS_FISHD )
--AC_SUBST( LIBS_MIMEDB )
--AC_SUBST( LIBS_SET_COLOR )
--AC_SUBST( localedir )
--AC_SUBST( optbindirs )
--AC_SUBST( prefix )
--AC_SUBST( SEQ_FALLBACK )
--AC_SUBST( XSEL )
--AC_SUBST( XSEL_MAN )
--AC_SUBST( XSEL_MAN_PATH )
--
-+AC_SUBST(docdir)
-+AC_SUBST(HAVE_GETTEXT)
-+AC_SUBST(LDFLAGS_FISH)
-+AC_SUBST(LIBS_FISH)
-+AC_SUBST(LIBS_FISH_INDENT)
-+AC_SUBST(LIBS_FISH_PAGER)
-+AC_SUBST(LIBS_FISHD)
-+AC_SUBST(LIBS_MIMEDB)
-+AC_SUBST(LIBS_SET_COLOR)
-+AC_SUBST(localedir)
-+AC_SUBST(optbindirs)
-+AC_SUBST(prefix)
-+AC_SUBST(SEQ_FALLBACK)
-+AC_SUBST(XSEL)
-+AC_SUBST(XSEL_MAN)
-+AC_SUBST(XSEL_MAN_PATH)
- #
- # If needed, run autoconf to regenerate the configure file
- #

diff --git a/fish-link.patch b/fish-link.patch
index a3cf9708cfd0636212b9540a2e88a67df9806b81..1caef26e1de2696bffd6bddb5af2adce5be55ec4 100644 (file)
--- a/fish-link.patch
+++ b/fish-link.patch
@@ -1,12 +1,11 @@
-diff -Nur fish-1.23.0.orig/configure.ac fish-1.23.0.link/configure.ac
---- fish-1.23.0.orig/configure.ac      2008-01-12 18:47:44.000000000 -0700
-+++ fish-1.23.0.link/configure.ac      2008-01-16 21:27:38.000000000 -0700
+--- fish-1.23.1/configure.ac.orig      2011-06-12 01:33:45.029917874 +0200
++++ fish-1.23.1/configure.ac   2011-06-12 01:34:13.111213245 +0200
 @@ -504,7 +504,7 @@
  LIBS=""
  AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
  AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
 -AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
 +AC_SEARCH_LIBS( setupterm, [tinfo ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
+ AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
  LIBS_SHARED=$LIBS
  LIBS=$LIBS_COMMON
- 

diff --git a/fish.spec b/fish.spec
index d94725f8e4208143c762c5057084bdeea980eef5..6cecc5973df04c1cb216801365290b0db248d268 100644 (file)
--- a/fish.spec
+++ b/fish.spec
@@ -1,16 +1,15 @@
 Summary:       fish - A friendly interactive shell
 Summary(pl.UTF-8):     fish - przyjazna interaktywna powłoka
 Name:          fish
-Version:       1.23.0
+Version:       1.23.1
 Release:       1
 License:       GPL v2
 Group:         Applications/Shells
-Source0:       http://www.fishshell.org/files/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: aa2f09bb54652b16bf4f7708848a7416
+Source0:       http://www.fishshell.com/files/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: ead6b7c6cdb21f35a3d4aa1d5fa596f1
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-ac.patch
-Patch2:                %{name}-includes.patch
-URL:           http://fishshell.org/
+Patch1:                %{name}-includes.patch
+URL:           http://fishshell.com/
 BuildRequires: autoconf >= 2.50
 BuildRequires: doxygen
 BuildRequires: gettext-devel
@@ -33,23 +32,22 @@ nie jest zgodna z innymi językami powłoki.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__autoconf}
 %{__autoheader}
 CPPFLAGS="-I/usr/include/ncurses"
+
 %configure \
-       --docdir=/docs \
+       --docdir=%{_docdir}/%{name}-%{version} \
        --without-xsel
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
-mv -f $RPM_BUILD_ROOT/docs docs
 
 %find_lang %{name}
 
@@ -58,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog README docs/*.{html,css,png}
+%doc ChangeLog README user_doc/html/*.{html,css,png}
 %attr(755,root,root) %{_bindir}/fish*
 %attr(755,root,root) %{_bindir}/mimedb
 %attr(755,root,root) %{_bindir}/set_color