rpms/fish/devel fish-1.22.3-openfix.patch, NONE, 1.1 fish.spec, 1.17, 1.18 fish-1.14.0-wutil.patch, 1.1, NONE fish-1.21.2-fallback.patch, 1.1, NONE

[Oliver Falk (oliver)]

Author: oliver

Update of /cvs/extras/rpms/fish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31937

Modified Files:
	fish.spec 
Added Files:
	fish-1.22.3-openfix.patch 
Removed Files:
	fish-1.14.0-wutil.patch fish-1.21.2-fallback.patch 
Log Message:

* 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


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/devel/fish.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fish.spec	7 Aug 2007 14:09:53 -0000	1.17
+++ fish.spec	16 Aug 2007 09:07:01 -0000	1.18
@@ -2,13 +2,14 @@
 Name:                   fish
 
 Version:                1.22.3
-Release:                2%{?dist}
+Release:                3%{?dist}
 
 License:                GPL
 Group:                  System Environment/Shells
 URL:                    http://roo.no-ip.org/fish/
 
 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
@@ -60,6 +61,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .openfix
 
 
 
@@ -149,6 +151,10 @@
 
 
 %changelog
+* 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
 


--- fish-1.14.0-wutil.patch DELETED ---


--- fish-1.21.2-fallback.patch DELETED ---