rpms/fish/F-7 fish-1.22.3-openfix.patch, NONE, 1.1 fish.spec, 1.15, 1.16 sources, 1.7, 1.8

[Oliver Falk (oliver)]

Author: oliver

Update of /cvs/extras/rpms/fish/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9732

Modified Files:
	fish.spec sources 
Added Files:
	fish-1.22.3-openfix.patch 
Log Message:
* Bring in sync with devel branch

fish-1.22.3-openfix.patch:

--- NEW FILE fish-1.22.3-openfix.patch ---
--- fish-1.22.3/common.c.openfix	2007-08-16 10:56:06.000000000 +0200
+++ fish-1.22.3/common.c	2007-08-16 10:55:55.000000000 +0200
@@ -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 ) ) == -1 )
 	{
 		debug( 1, L"acquire_lock_file: open: %s", strerror( errno ) );
 		goto done;


Index: fish.spec
===================================================================
RCS file: /cvs/extras/rpms/fish/F-7/fish.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fish.spec	8 Sep 2006 09:27:46 -0000	1.15
+++ fish.spec	31 Oct 2007 07:50:37 -0000	1.16
@@ -1,17 +1,19 @@
 Summary:                A friendly interactive shell
 Name:                   fish
 
-Version:                1.21.12
-Release:                1%{?dist}
+Version:                1.22.3
+Release:                4%{?dist}
 
 License:                GPL
 Group:                  System Environment/Shells
-URL:                    http://roo.no-ip.org/fish/
+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 
+BuildRequires:          ncurses-devel gettext groff doxygen
+BuildRequires:          autoconf
 
 
 # Locate correct build time-dependencies for providing X headers
@@ -59,6 +61,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .openfix
 
 
 
@@ -80,6 +83,8 @@
 # Find translation files
 %find_lang %{name}.\*
 
+# In case...
+mv $RPM_BUILD_ROOT%_datadir/fish/man/*.1 $RPM_BUILD_ROOT%_mandir/man1/
 
 
 %clean
@@ -115,13 +120,7 @@
 %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 +133,13 @@
 
 # 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 +150,21 @@
 %_datadir/fish/functions/*.fish
 
 
+%changelog
+* Wed Oct 31 2007 Oliver Falk <oliver at linux-kernel.at>	- 1.22.3-4
+- Update URL; Fixes bz#359451
 
+* Thu Aug 16 2007 Oliver Falk <oliver at linux-kernel.at>	- 1.22.3-3
+- Workaround glibc's open check
+- Problem reported upstream; Should be fixed there
+
+* Tue Aug 07 2007 Oliver Falk <oliver at linux-kernel.at>	- 1.22.3-2
+- Fix BR autoconf
+
+* Tue Aug 07 2007 Oliver Falk <oliver at linux-kernel.at>	- 1.22.3-1
+- Update; Bug #236868
+- Add missing doxygen BR
 
-
-%changelog
 * Fri Aug 4 2006 Axel Liljencrantz<axel at 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fish/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Sep 2006 14:21:13 -0000	1.7
+++ sources	31 Oct 2007 07:50:37 -0000	1.8
@@ -1 +1 @@
-77fb4fd2ff5043acf6935f079250ba60  fish-1.21.12.tar.bz2
+016a5944861ea48e363521c240834415  fish-1.22.3.tar.bz2