packages: fish/fish.spec, fish/fish-link.patch, fish/fish-ac.patch (REMOVED...

[evil]

Author: evil                         Date: Sun Jun 12 00:39:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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)

---- Files affected:
packages/fish:
   fish.spec (1.14 -> 1.15) , fish-link.patch (1.3 -> 1.4) , fish-ac.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/fish/fish.spec
diff -u packages/fish/fish.spec:1.14 packages/fish/fish.spec:1.15
--- packages/fish/fish.spec:1.14	Sun Aug 17 16:34:41 2008
+++ packages/fish/fish.spec	Sun Jun 12 02:39:41 2011
@@ -2,16 +2,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
@@ -34,23 +33,22 @@
 %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}
 
@@ -59,7 +57,7 @@
 
 %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
@@ -76,6 +74,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/06/12 00:39:41  evil
+- 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)
+
 Revision 1.14  2008/08/17 14:34:41  adamg
 - -ac.patch and -includes.patch -- buildfixes
 

================================================================
Index: packages/fish/fish-link.patch
diff -u packages/fish/fish-link.patch:1.3 packages/fish/fish-link.patch:1.4
--- packages/fish/fish-link.patch:1.3	Wed Jan 23 21:18:31 2008
+++ packages/fish/fish-link.patch	Sun Jun 12 02:39:42 2011
@@ -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
- 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fish/fish.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fish/fish-link.patch?r1=1.3&r2=1.4&f=u