rpms/icecream/devel icecream-0.9.3-fix-gcc44-ftbfs.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 icecream.spec, 1.14, 1.15 sources, 1.4, 1.5 icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch, 1.2, NONE icecream-0.9.2-create-env-improve-check-for-specs.patch, 1.2, NONE icecream-0.9.2-fix-gcc44-ftbfs.patch, 1.2, NONE

[Michal Schmidt]

Author: michich

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

Modified Files:
	.cvsignore icecream.spec sources 
Added Files:
	icecream-0.9.3-fix-gcc44-ftbfs.patch 
Removed Files:
	icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch 
	icecream-0.9.2-create-env-improve-check-for-specs.patch 
	icecream-0.9.2-fix-gcc44-ftbfs.patch 
Log Message:
* Mon Feb 16 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-1
- new upstream release
- Dropped merged patches.
- Added an upstream patch to fix compilation with gcc 4.4.


icecream-0.9.3-fix-gcc44-ftbfs.patch:

--- NEW FILE icecream-0.9.3-fix-gcc44-ftbfs.patch ---
With gcc 4.4 this fixes not just a warning, but an error. -- Michal


commit f1ed14e4062869f583472f74a1b51b9c5ad42cde
Author: coolo <coolo at 283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date:   Mon Feb 16 11:09:03 2009 +0000

    fix compilation warnings
    
    
    git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/icecream@926812 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/daemon/load.cpp b/daemon/load.cpp
index 5cb1685..08e6f70 100644
--- a/daemon/load.cpp
+++ b/daemon/load.cpp
@@ -203,7 +203,7 @@ static void updateCPULoad( CPULoadInfo* load )
 #ifndef USE_SYSCTL
 static unsigned long int scan_one( const char* buff, const char *key )
 {
-  char *b = strstr( buff, key );
+  const char *b = strstr( buff, key );
   if ( !b )
       return 0;
   unsigned long int val = 0;
diff --git a/daemon/main.cpp b/daemon/main.cpp
index f7be369..ee9c0f3 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -619,7 +619,7 @@ bool Daemon::maybe_stats(bool send_ping)
 #ifdef HAVE_SYS_VFS_H
         struct statfs buf;
         int ret = statfs(envbasedir.c_str(), &buf);
-        if (!ret && buf.f_bavail < (max_kids + 1 - current_kids) * 4 * 1024 * 1024 / buf.f_bsize)
+        if (!ret && long(buf.f_bavail) < long(max_kids + 1 - current_kids) * 4 * 1024 * 1024 / buf.f_bsize)
             msg.load = 1000;
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Nov 2008 14:58:57 -0000	1.4
+++ .cvsignore	16 Feb 2009 12:22:04 -0000	1.5
@@ -1,2 +1,2 @@
-icecc-0.9.2.tar.bz2
+icecc-0.9.3.tar.bz2
 icecream-manpages.tar.bz2


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- icecream.spec	7 Feb 2009 18:34:39 -0000	1.14
+++ icecream.spec	16 Feb 2009 12:22:04 -0000	1.15
@@ -10,8 +10,8 @@
 
 
 Name:		icecream
-Version:	0.9.2
-Release:	4%{?dist}
+Version:	0.9.3
+Release:	1%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -29,9 +29,7 @@
 Source8:	%{name}-manpages.tar.bz2
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
-Patch2:		%{name}-0.9.2-create-env-improve-check-for-specs.patch
-Patch3:		%{name}-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch
-Patch4:		%{name}-0.9.2-fix-gcc44-ftbfs.patch
+Patch2:		%{name}-0.9.3-fix-gcc44-ftbfs.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,8 +78,6 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -237,6 +233,11 @@
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Mon Feb 16 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.3-1
+- new upstream release
+- Dropped merged patches.
+- Added an upstream patch to fix compilation with gcc 4.4.
+
 * Sat Feb 07 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-4
 - one more fix for gcc 4.4.
 - updated the scheduler renaming patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Nov 2008 14:58:58 -0000	1.4
+++ sources	16 Feb 2009 12:22:04 -0000	1.5
@@ -1,2 +1,2 @@
-2765f37805b5a3e86a77aefae64a150c  icecc-0.9.2.tar.bz2
+34bb950331ef5256299a2de4cf402ea6  icecc-0.9.3.tar.bz2
 a3829775870d5b2b60b750a88ee835b7  icecream-manpages.tar.bz2


--- icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch DELETED ---


--- icecream-0.9.2-create-env-improve-check-for-specs.patch DELETED ---


--- icecream-0.9.2-fix-gcc44-ftbfs.patch DELETED ---