diff --git a/.cvsignore b/.cvsignore index 8eef5ff..b74e7de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -icecc-0.9.2.tar.bz2 +icecc-0.9.3.tar.bz2 icecream-manpages.tar.bz2 diff --git a/icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch b/icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch deleted file mode 100644 index ea07d21..0000000 --- a/icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -# Patch sent to upstream developer on 2009-02-01 - -icecc-create-env: handle relative paths in ld.so.conf includes - -From: Michal Schmidt - -In Fedora ld.so.conf contains an include directive with a relative path. -ldconfig does not accept relative include paths when using -r. -Instead of copying ld.so.conf verbatim, make a modified copy of it where -relative paths are replaced with absolute to make ldconfig happy. - -Another improvement would be to add the included config files to the -environment too, but I do not have a need for it in practice and haven't -implemented it yet. ---- - - client/icecc-create-env | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - - -diff --git a/client/icecc-create-env b/client/icecc-create-env -index 860b10c..a605c0e 100755 ---- a/client/icecc-create-env -+++ b/client/icecc-create-env -@@ -117,7 +117,17 @@ specfile=`$added_gcc -print-file-name=specs` - if test -n "$specfile" && test "$specfile" != "specs" && test -e "$specfile"; then - add_file "$specfile" - fi --add_file /etc/ld.so.conf -+ -+# for ldconfig -r to work, ld.so.conf must not contain relative paths -+# in include directives. Make them absolute. -+tmp_ld_so_conf=`mktemp /tmp/icecc_ld_so_confXXXXXX` -+while read directive path; do -+ if [ "$directive" = "include" -a "${path:0:1}" != "/" ]; then -+ path="/etc/$path" -+ fi -+ echo "$directive $path" -+done $tmp_ld_so_conf -+add_file $tmp_ld_so_conf /etc/ld.so.conf - - tempdir=`mktemp -d /tmp/iceccenvXXXXXX` - # special case for weird multilib setups -@@ -175,3 +185,4 @@ tar -czhf "$mydir/$md5".tar.gz $target_files || { - } - cd .. - rm -rf $tempdir -+rm -f $tmp_ld_so_conf diff --git a/icecream-0.9.2-create-env-improve-check-for-specs.patch b/icecream-0.9.2-create-env-improve-check-for-specs.patch deleted file mode 100644 index 81e332b..0000000 --- a/icecream-0.9.2-create-env-improve-check-for-specs.patch +++ /dev/null @@ -1,31 +0,0 @@ -# Patch sent to upstream developer on 2009-02-01 - -icecc-create-env: improve check for "specs" - -From: Michal Schmidt - -The check for "specs" would get confused if there was a file -called "specs" in the current directory. -Notice that gcc -print-file-name just prints the given file name in case it -does not have anything useful to give to give: - $ gcc -print-file-name=specs - specs ---- - - client/icecc-create-env | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - - -diff --git a/client/icecc-create-env b/client/icecc-create-env -index fb8afeb..860b10c 100755 ---- a/client/icecc-create-env -+++ b/client/icecc-create-env -@@ -114,7 +114,7 @@ fi - add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1 - add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus - specfile=`$added_gcc -print-file-name=specs` --if test -n "$specfile" && test -e "$specfile"; then -+if test -n "$specfile" && test "$specfile" != "specs" && test -e "$specfile"; then - add_file "$specfile" - fi - add_file /etc/ld.so.conf diff --git a/icecream-0.9.2-fix-gcc44-ftbfs.patch b/icecream-0.9.2-fix-gcc44-ftbfs.patch deleted file mode 100644 index ce9fabb..0000000 --- a/icecream-0.9.2-fix-gcc44-ftbfs.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit 1671c698f695a34bc33d2350563c3e220b957221 -Author: fabo -Date: Wed Nov 12 10:34:03 2008 +0000 - - Fix FTBFS with GCC 4.4 - - - git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/icecream@883138 283d02a7-25f6-0310-bc7c-ecb5cbfe19da - -diff --git a/client/local.cpp b/client/local.cpp -index 0df255e..2d29a8a 100644 ---- a/client/local.cpp -+++ b/client/local.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef HAVE_SIGNAL_H - - -commit 938fd86c096cfb82510e8d5c218c722f78170bc8 -Author: Michal Schmidt -Date: Sat Feb 7 16:26:08 2009 +0100 - - fix invalid conversion from const pointer - -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/icecream-0.9.3-fix-gcc44-ftbfs.patch b/icecream-0.9.3-fix-gcc44-ftbfs.patch new file mode 100644 index 0000000..9d935b8 --- /dev/null +++ b/icecream-0.9.3-fix-gcc44-ftbfs.patch @@ -0,0 +1,38 @@ +With gcc 4.4 this fixes not just a warning, but an error. -- Michal + + +commit f1ed14e4062869f583472f74a1b51b9c5ad42cde +Author: coolo +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 + diff --git a/icecream.spec b/icecream.spec index 3d88a67..f3ebe25 100644 --- a/icecream.spec +++ b/icecream.spec @@ -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 @@ Source7: initscript-scheduler 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 @@ This package contains development files for %{name}. %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 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/icecc.pc %changelog +* Mon Feb 16 2009 Michal Schmidt - 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 - 0.9.2-4 - one more fix for gcc 4.4. - updated the scheduler renaming patch. diff --git a/sources b/sources index 740a81a..70d5d77 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2765f37805b5a3e86a77aefae64a150c icecc-0.9.2.tar.bz2 +34bb950331ef5256299a2de4cf402ea6 icecc-0.9.3.tar.bz2 a3829775870d5b2b60b750a88ee835b7 icecream-manpages.tar.bz2