rpms/scponly/devel scponly-4.8-elif-gcc44.patch, NONE, 1.1 scponly.spec, 1.12, 1.13

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/scponly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10171

Modified Files:
	scponly.spec 
Added Files:
	scponly-4.8-elif-gcc44.patch 
Log Message:
Fix gcc-4.4 build due to broken #elif


scponly-4.8-elif-gcc44.patch:

--- NEW FILE scponly-4.8-elif-gcc44.patch ---
diff -urN scponly-4.8.orig/helper.c scponly-4.8/helper.c
--- scponly-4.8.orig/helper.c	2008-01-15 01:26:13.000000000 -0500
+++ scponly-4.8/helper.c	2009-02-27 13:53:27.000000000 -0500
@@ -230,7 +230,7 @@
 						return 1;
 					}
 				}
-#elif
+#else
 				/*
 				 * make sure that processing doesn't continue if we can't validate a rsync check
 				 * and if the getopt flag is set.


Index: scponly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scponly/devel/scponly.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scponly.spec	25 Feb 2009 23:27:15 -0000	1.12
+++ scponly.spec	27 Feb 2009 18:57:35 -0000	1.13
@@ -1,12 +1,13 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
 Version: 4.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://downloads.sf.net/scponly/scponly-%{version}.tgz
 Patch0: scponly-install.patch
+Patch1: scponly-4.8-elif-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-scp-compat --enable-winscp-compat --enable-chrooted-binary
@@ -56,6 +58,9 @@
 %config(noreplace) %{_sysconfdir}/scponly/*
 
 %changelog
+* Fri Feb 27 2009 Warren Togami <wtogami at redhat.com> - 4.8-3
+- Fix gcc-4.4 build due to broken #elif
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild