rpms/ccache/devel ccache-2.4-noHOME-315441.patch, NONE, 1.1 ccache.spec, 1.19, 1.20

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/ccache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20381

Modified Files:
	ccache.spec 
Added Files:
	ccache-2.4-noHOME-315441.patch 
Log Message:
* Tue Oct  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-11
- Apply upstream fix for problems when $HOME is not set (#315441).


ccache-2.4-noHOME-315441.patch:

--- NEW FILE ccache-2.4-noHOME-315441.patch ---
Index: config.h.in
===================================================================
RCS file: /cvsroot/ccache/config.h.in,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -r1.5 -r1.7
--- config.h.in	7 Mar 2003 12:09:19 -0000	1.5
+++ config.h.in	25 Jul 2005 07:05:46 -0000	1.7
@@ -19,6 +19,9 @@
 /* Define to 1 if you have the `gethostname' function. */
 #undef HAVE_GETHOSTNAME
 
+/* Define to 1 if you have the `getpwuid' function. */
+#undef HAVE_GETPWUID
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -31,6 +34,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
 /* Define to 1 if you have the `realpath' function. */
 #undef HAVE_REALPATH
 
Index: util.c
===================================================================
RCS file: /cvsroot/ccache/util.c,v
retrieving revision 1.34
retrieving revision 1.37
diff -u -r1.34 -r1.37
--- util.c	6 Sep 2004 12:59:12 -0000	1.34
+++ util.c	17 Jul 2006 03:41:12 -0000	1.37
@@ -448,7 +444,7 @@
 		}
 	}
 #endif
-	fatal("Unable to determine home directory");
+	fprintf(stderr, "ccache: Unable to determine home directory");
 	return NULL;
 }
 


Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ccache.spec	22 Aug 2007 05:30:17 -0000	1.19
+++ ccache.spec	2 Oct 2007 16:50:35 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -18,6 +18,7 @@
 Patch0:         %{name}-html-links.patch
 Patch1:         %{name}-2.4-coverage-231462.patch
 Patch2:         %{name}-2.4-hardlink-doc.patch
+Patch3:         %{name}-2.4-noHOME-315441.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -36,6 +37,7 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -98,6 +100,9 @@
 
 
 %changelog
+* Tue Oct  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-11
+- Apply upstream fix for problems when $HOME is not set (#315441).
+
 * Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Fix URL to upstream tarball.