rpms/dclib/devel dclib-0.3.8-cconfig-use-cfile.patch, NONE, 1.1 dclib.spec, 1.10, 1.11

[Luke Macken (lmacken)]

Author: lmacken

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

Modified Files:
	dclib.spec 
Added Files:
	dclib-0.3.8-cconfig-use-cfile.patch 
Log Message:
* Tue Apr 17 2007 Luke Macken <lmacken at redhat.com> 0.3.8-2
- Add dclib-0.3.8-cconfig-use-cfile.patch from Edward Sheldrake to fix
  rawhide build errors


dclib-0.3.8-cconfig-use-cfile.patch:

--- NEW FILE dclib-0.3.8-cconfig-use-cfile.patch ---
diff -Naur dclib-0.3.8.orig/dclib/cconfig.cpp dclib-0.3.8.new/dclib/cconfig.cpp
--- dclib-0.3.8.orig/dclib/cconfig.cpp	2006-11-22 14:23:31.000000000 +0000
+++ dclib-0.3.8.new/dclib/cconfig.cpp	2007-04-17 18:45:25.000000000 +0100
@@ -2946,8 +2946,10 @@
 	{
 		// check that the file exists before trying to delete it
 		// this is so valknut will work when first run
-		if ( access( filename.Data(), F_OK ) == 0 )
+		CFile configfile;
+		if ( configfile.Open(filename, IO_READONLY) == TRUE )
 		{
+			configfile.Close();
 			ret2 = remove(filename.Data());
 			if (ret2 == -1)
 			{


Index: dclib.spec
===================================================================
RCS file: /cvs/extras/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dclib.spec	3 Jan 2007 05:13:56 -0000	1.10
+++ dclib.spec	17 Apr 2007 21:18:13 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           dclib
 Version:        0.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-%{version}-cconfig-use-cfile.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -66,6 +68,10 @@
 
 
 %changelog
+* Tue Apr 17 2007 Luke Macken <lmacken at redhat.com> 0.3.8-2
+- Add dclib-0.3.8-cconfig-use-cfile.patch from Edward Sheldrake to fix
+  rawhide build errors
+
 * Mon Jan  3 2007 Luke Macken <lmacken at redhat.com> 0.3.8-1
 - 0.3.8 from new upstream
 - Remove patches: