From b7fbd031d69b968b775b21960d3462daec16535a Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@fedoraproject.org>
Date: Jan 14 2008 09:05:18 +0000
Subject: - Update to fix #208780

- Remove openfix patch, included upstream now

---

diff --git a/.cvsignore b/.cvsignore
index 0e75e1c..9ba8a6a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fish-1.22.3.tar.bz2
+fish-1.23.0.tar.bz2
diff --git a/fish-1.22.3-openfix.patch b/fish-1.22.3-openfix.patch
deleted file mode 100644
index c0e2aa6..0000000
--- a/fish-1.22.3-openfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up fish-1.22.3/common.c.openfix fish-1.22.3/common.c
---- fish-1.22.3/common.c.openfix	2007-02-08 18:38:57.000000000 +0100
-+++ fish-1.22.3/common.c	2007-10-31 09:33:46.000000000 +0100
-@@ -1483,7 +1483,7 @@ int acquire_lock_file( const char *lockf
- 		goto done;
- 	}
- 	(void)unlink( linkfile );
--	if( ( fd = open( linkfile, O_CREAT|O_RDONLY ) ) == -1 )
-+	if( ( fd = (open)( linkfile, O_CREAT|O_RDONLY, 644 ) ) == -1 )
- 	{
- 		debug( 1, L"acquire_lock_file: open: %s", strerror( errno ) );
- 		goto done;
diff --git a/fish.spec b/fish.spec
index a562072..b4aaa1e 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,15 +1,14 @@
 Summary:                A friendly interactive shell
 Name:                   fish
 
-Version:                1.22.3
-Release:                5%{?dist}
+Version:                1.23.0
+Release:                1%{?dist}
 
 License:                GPL
 Group:                  System Environment/Shells
 URL:                    http://fishshell.org/
 
 Source0:                http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2
-Patch0:			fish-1.22.3-openfix.patch
 
 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:          ncurses-devel gettext groff doxygen
@@ -61,9 +60,6 @@ is simple but incompatible with other shell languages.
 
 %prep
 %setup -q
-%patch0 -p1 -b .openfix
-
-
 
 
 %build
@@ -121,15 +117,42 @@ fi
 
 # man files
 %_mandir/man1/*.1*
+%exclude %_mandir/man1/count*
+%exclude %_mandir/man1/alias*
+%exclude %_mandir/man1/bg*
+%exclude %_mandir/man1/bind*
+%exclude %_mandir/man1/break*
+%exclude %_mandir/man1/builtin*
+%exclude %_mandir/man1/cd*
+%exclude %_mandir/man1/command*
+%exclude %_mandir/man1/complete*
+%exclude %_mandir/man1/continue*
+%exclude %_mandir/man1/dirs*
+%exclude %_mandir/man1/eval*
+%exclude %_mandir/man1/exec*
+%exclude %_mandir/man1/exit*
+%exclude %_mandir/man1/fg*
+%exclude %_mandir/man1/help*
+%exclude %_mandir/man1/jobs*
+%exclude %_mandir/man1/popd*
+%exclude %_mandir/man1/pushd*
+%exclude %_mandir/man1/read*
+%exclude %_mandir/man1/return*
+%exclude %_mandir/man1/set*
+%exclude %_mandir/man1/source*
+%exclude %_mandir/man1/trap*
+%exclude %_mandir/man1/type*
+%exclude %_mandir/man1/ulimit*
+%exclude %_mandir/man1/umask*
 
 # The program binaries
 %attr(0755,root,root) %_bindir/fish
 %attr(0755,root,root) %_bindir/fishd
 %attr(0755,root,root) %_bindir/fish_pager
+%attr(0755,root,root) %_bindir/fish_indent
 %attr(0755,root,root) %_bindir/xsel
 %attr(0755,root,root) %_bindir/set_color
 %attr(0755,root,root) %_bindir/mimedb
-%attr(0755,root,root) %_bindir/count
 
 # Configuration files
 %config %_sysconfdir/fish
@@ -151,6 +174,10 @@ fi
 
 
 %changelog
+* Mon Jan 14 2008 Oliver Falk <oliver@linux-kernel.at>	- 1.23.0-1
+- Update to fix #208780
+- Remove openfix patch, included upstream now
+
 * Wed Oct 31 2007 Oliver Falk <oliver@linux-kernel.at>	- 1.22.3-5
 - Fix glibc's open check, by providing mode, instead of working
   around...
diff --git a/sources b/sources
index dcf9bac..879cb97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-016a5944861ea48e363521c240834415  fish-1.22.3.tar.bz2
+aa2f09bb54652b16bf4f7708848a7416  fish-1.23.0.tar.bz2