From 812aec5e6910d213517cc8ca82c018f3dea9a2ea Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@fedoraproject.org>
Date: Aug 07 2007 13:56:46 +0000
Subject: Update, as request per #236868


---

diff --git a/.cvsignore b/.cvsignore
index 328d840..0e75e1c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fish-1.21.12.tar.bz2
+fish-1.22.3.tar.bz2
diff --git a/fish.spec b/fish.spec
index 5b86d45..4dcc417 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,7 +1,7 @@
 Summary:                A friendly interactive shell
 Name:                   fish
 
-Version:                1.21.12
+Version:                1.22.3
 Release:                1%{?dist}
 
 License:                GPL
@@ -11,7 +11,7 @@ URL:                    http://roo.no-ip.org/fish/
 Source0:                http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:          ncurses-devel gettext groff 
+BuildRequires:          ncurses-devel gettext groff doxygen
 
 
 # Locate correct build time-dependencies for providing X headers
@@ -80,6 +80,8 @@ make install DESTDIR="$RPM_BUILD_ROOT"
 # Find translation files
 %find_lang %{name}.\*
 
+# In case...
+mv $RPM_BUILD_ROOT%_datadir/fish/man/*.1 $RPM_BUILD_ROOT%_mandir/man1/
 
 
 %clean
@@ -115,13 +117,7 @@ fi
 %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/*.1*
 
 # The program binaries
 %attr(0755,root,root) %_bindir/fish
@@ -134,13 +130,13 @@ fi
 
 # Configuration files
 %config %_sysconfdir/fish
-%config %_sysconfdir/fish_inputrc
-%dir %_sysconfdir/fish.d
-%config %_sysconfdir/fish.d/fish_*.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
+%_datadir/fish/config*.fish
 
 # Program specific tab-completions
 %dir %_datadir/fish/completions
@@ -151,10 +147,11 @@ fi
 %_datadir/fish/functions/*.fish
 
 
-
-
-
 %changelog
+* Tue Aug 07 2007 Oliver Falk <oliver@linux-kernel.at>	- 1.22.3-1
+- Update; Bug #236868
+- Add missing doxygen BR
+
 * Fri Aug 4 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-4
 - Add better translation finding code from fedora spec to main spec. Thank you to Michael Schwendt.
 - Add missing dependency libXext-devel.
diff --git a/sources b/sources
index 5761d8b..dcf9bac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77fb4fd2ff5043acf6935f079250ba60  fish-1.21.12.tar.bz2
+016a5944861ea48e363521c240834415  fish-1.22.3.tar.bz2