icecream: Update to 1.0.0.

The old version does not compile with gcc 4.8.

diff --git a/icecream/icecream.nm b/icecream/icecream.nm
index 9c63e61c5101919011915e3e81a51bffd6dcf407..7a5b4ffe3069dc3e252a3d5c49fcc975acd96673 100644 (file)
--- a/icecream/icecream.nm
+++ b/icecream/icecream.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = icecream
-version    = 0.9.7
-release    = 3
+version    = 1.0.0
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Compilers
@@ -24,9 +24,7 @@ description
 end
 
 source_dl  = ftp://ftp.suse.com/pub/projects/icecream/
-sources    = \
-       icecc-%{version}.tar.bz2 \
-       icecream-manpages.tar.bz2
+sources    = icecc-%{version}.tar.bz2
 
 build
        requires
@@ -39,35 +37,22 @@ build
                --disable-static \
                --enable-shared
 
-       prepare
-               cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/icecc-%{version}.tar.bz2
-               cd %{DIR_APP} && %{MACRO_EXTRACT} %{DIR_DL}/icecream-manpages.tar.bz2
-
-               %{MACRO_PATCHES}
-       end
-
        install_cmds
                mkdir -pv %{BUILDROOT}%{libdir}/icecc/bin
                for i in gcc g++ cc c++; do
-                       ln -svf ../../../bin/icecc %{BUILDROOT}%{libdir}/icecc/bin/${i}
-                       ln -svf ../../../bin/icecc %{BUILDROOT}%{libdir}/icecc/bin/%{DISTRO_BUILDTARGET}-${i}
+                       ln -svf ../../../bin/icecc %{BUILDROOT}%{prefix}/lib/icecc/bin/${i}
+                       ln -svf ../../../bin/icecc %{BUILDROOT}%{prefix}/lib/icecc/bin/%{DISTRO_BUILDTARGET}-${i}
                done
-               sed -e 's|^#!.*|#!/bin/bash|' -i %{BUILDROOT}%{libdir}/icecc/icecc-create-env
+               ln -svf icecc %{BUILDROOT}%{bindir}/icerun
+               sed -e 's|^#!.*|#!/bin/bash|' -i %{BUILDROOT}%{prefix}/lib/icecc/icecc-create-env
 
                mkdir -pv %{BUILDROOT}/etc/profile.d
-               sed -e "s|@LIBDIR@|%{libdir}|g" \
+               sed -e "s|@LIBDIR@|%{prefix}/lib|g" \
                        < %{DIR_SOURCE}/icecream.sh > %{BUILDROOT}/etc/profile.d/icecream.sh
 
                # create default working dir
                mkdir -pv %{BUILDROOT}/var/cache/icecream
 
-               # install manpages
-               mkdir -pv %{BUILDROOT}/usr/share/man/man{1,7,8}
-               mv mans/scheduler.1 mans/icecc-scheduler.1
-               for i in mans/*.1 mans/*.7; do
-                       install -m 644 $i %{BUILDROOT}/usr/share/man/man${i##*.}
-               done
-
                # Remove unwanted symlinks.
                rm -rvf %{BUILDROOT}/usr/bin/c++
                rm -rvf %{BUILDROOT}/usr/bin/cc

diff --git a/icecream/patches/icecream-cleanup-conffile.patch0 b/icecream/patches/icecream-cleanup-conffile.patch0
deleted file mode 100644 (file)
index 7bf7c9d..0000000
--- a/icecream/patches/icecream-cleanup-conffile.patch0
+++ /dev/null
@@ -1,100 +0,0 @@
---- suse/sysconfig.icecream.orig       2007-04-12 10:02:33.000000000 +0200
-+++ suse/sysconfig.icecream    2007-07-17 15:50:39.000000000 +0200
-@@ -1,69 +1,34 @@
- #
--## Type: integer(0:19)
--## Path: Applications/icecream
--## Description: Icecream settings
--## ServiceRestart: icecream
--## Default: 5
--#
- # Nice level of running compilers
- #
- ICECREAM_NICE_LEVEL="5"
- 
- #
--## Type: string
--## Path: Applications/icecream
--## Defaut: /var/log/iceccd
--#
- # icecream daemon log file
- #
- ICECREAM_LOG_FILE="/var/log/iceccd"
- 
- #
--## Type: string
--## Path: Applications/icecream
--## Defaut: no
--#
--# Start also the scheduler?
--#
--ICECREAM_RUN_SCHEDULER="no"
--
--#
--## Type: string
--## Path: Applications/icecream
--## Defaut: /var/log/icecc_scheduler
--#
- # icecream scheduler log file
- #
--ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler"
-+ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecc-scheduler"
- 
- #
--## Type: string
--## Path: Applications/icecream
--## Defaut: ""
--#
--# Identification for the network the scheduler and daemon run on. 
-+# Identification for the network the scheduler and daemon run on.
- # You can have several distinct icecream networks in the same LAN
- # for whatever reason.
- #
- ICECREAM_NETNAME=""
- 
- #
--## Type: string
--## Path: Applications/icecream
--## Defaut: ""
--#
--# If the daemon can't find the scheduler by broadcast (e.g. because 
-+# If the daemon can't find the scheduler by broadcast (e.g. because
- # of a firewall) you can specify it.
- #
- ICECREAM_SCHEDULER_HOST=""
- 
- #
--## Type: integer
--## Path: Applications/icecream
--## Defaut: ""
--# 
- # You can overwrite here the number of jobs to run in parallel. Per
--# default this depends on the number of (virtual) CPUs installed. 
-+# default this depends on the number of (virtual) CPUs installed.
- #
- # Note: a value of "0" is actually interpreted as "1", however it
- # also sets ICECREAM_ALLOW_REMOTE="no".
-@@ -71,22 +36,14 @@ ICECREAM_SCHEDULER_HOST=""
- ICECREAM_MAX_JOBS=""
- 
- #
--## Type: yesno
--## Path: Applications/icecream
--## Defaut: "yes"
--# 
- # Specifies whether jobs submitted by other nodes are allowed to run on
- # this one.
- #
- ICECREAM_ALLOW_REMOTE="yes"
- 
- #
--## Type: string
--## Path: Applications/icecream
--## Default: "/var/cache/icecream"
--#
- # This is the directory where the icecream daemon stores the environments
- # it compiles in. In a big network this can grow quite a bit, so use some
- # path if your /tmp is small - but the user icecream has to write to it.
--# 
-+#
- ICECREAM_BASEDIR="/var/cache/icecream"

diff --git a/icecream/patches/icecream-rename-scheduler.patch b/icecream/patches/icecream-rename-scheduler.patch
deleted file mode 100644 (file)
index 5de7738..0000000
--- a/icecream/patches/icecream-rename-scheduler.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Index: icecc-0.9.6/doc/man-scheduler.1.docbook
-===================================================================
---- icecc-0.9.6.orig/doc/man-scheduler.1.docbook
-+++ icecc-0.9.6/doc/man-scheduler.1.docbook
-@@ -23,13 +23,13 @@
- </refmeta>
- 
- <refnamediv>
--      <refname>scheduler</refname>
-+      <refname>icecc-scheduler</refname>
-       <refpurpose>Icecream scheduler</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
- <cmdsynopsis>
--<command>scheduler</command>
-+<command>icecc-scheduler</command>
- <group>
-   <arg choice="opt">
-     <option>-n</option>
-@@ -151,7 +151,7 @@ need to run the scheduler with root righ
- 
- <refsect1>
- <title>See Also</title>
--<para>icecream, scheduler, iceccd, icemon</para>
-+<para>icecream, icecc-scheduler, iceccd, icemon</para>
- </refsect1>
- 
- <refsect1>
-Index: icecc-0.9.6/services/Makefile.am
-===================================================================
---- icecc-0.9.6.orig/services/Makefile.am
-+++ icecc-0.9.6/services/Makefile.am
-@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h
- noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
- icedir = $(includedir)/icecc
- 
--sbin_PROGRAMS = scheduler
--scheduler_SOURCES = scheduler.cpp
--scheduler_LDADD = libicecc.la
-+sbin_PROGRAMS = icecc-scheduler
-+icecc_scheduler_SOURCES = scheduler.cpp
-+icecc_scheduler_LDADD = libicecc.la
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = icecc.pc
-Index: icecc-0.9.6/services/Makefile.in
-===================================================================
---- icecc-0.9.6.orig/services/Makefile.in
-+++ icecc-0.9.6/services/Makefile.in
-@@ -37,7 +37,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--sbin_PROGRAMS = scheduler$(EXEEXT)
-+sbin_PROGRAMS = icecc-scheduler$(EXEEXT)
- subdir = services
- DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/icecc.pc.in
-@@ -82,9 +82,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX 
-       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libicecc_la_CXXFLAGS) \
-       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- PROGRAMS = $(sbin_PROGRAMS)
--am_scheduler_OBJECTS = scheduler.$(OBJEXT)
--scheduler_OBJECTS = $(am_scheduler_OBJECTS)
--scheduler_DEPENDENCIES = libicecc.la
-+am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT)
-+icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS)
-+icecc_scheduler_DEPENDENCIES = libicecc.la
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -107,8 +107,8 @@ CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
--SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
--DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
-+SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
-+DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
- DATA = $(pkgconfig_DATA)
- HEADERS = $(ice_HEADERS) $(noinst_HEADERS)
- ETAGS = etags
-@@ -242,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC
- ice_HEADERS = job.h comm.h
- noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
- icedir = $(includedir)/icecc
--scheduler_SOURCES = scheduler.cpp
--scheduler_LDADD = libicecc.la
-+icecc_scheduler_SOURCES = scheduler.cpp
-+icecc_scheduler_LDADD = libicecc.la
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = icecc.pc
- all: all-am
-@@ -358,9 +358,9 @@ clean-sbinPROGRAMS:
-       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-       echo " rm -f" $$list; \
-       rm -f $$list
--scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) 
--      @rm -f scheduler$(EXEEXT)
--      $(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
-+icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) 
-+      @rm -f icecc-scheduler$(EXEEXT)
-+      $(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS)
- 
- mostlyclean-compile:
-       -rm -f *.$(OBJEXT)