[rpms/icecream] epel10.2: Merge branch 'master' into el6

[rpms/icecream] epel10.2: Merge branch 'master' into el6

[Michal Schmidt]

            A new commit has been pushed.

            Repo   : rpms/icecream
            Branch : epel10.2
            Commit : 4451ba1140c66be1dd99d25b338836e8e2667821
            Author : Michal Schmidt <mschmidt@redhat.com>
            Date   : 2010-08-03T15:39:09+02:00
            Stats  : +23/-59 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/icecream/c/4451ba1140c66be1dd99d25b338836e8e2667821?branch=epel10.2

            Log:
            Merge branch 'master' into el6

Update to 0.9.6.

Conflicts:
	.gitignore
	icecream-rename-scheduler.patch
	icecream.spec
	sources

---
diff --git a/.gitignore b/.gitignore
index a24aadd..9a73c1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-icecc-0.9.5.tar.bz2
+icecc-0.9.6.tar.bz2
 icecream-manpages.tar.bz2

diff --git a/icecream-fix-createenv-when-ldconfig-fails.patch b/icecream-fix-createenv-when-ldconfig-fails.patch
deleted file mode 100644
index d8c5ccf..0000000
--- a/icecream-fix-createenv-when-ldconfig-fails.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Patch sent to Stephan Kulow on 2009-10-12
------------------------------------------
-[PATCH icecream] allow ldconfig to fail when creating the environment
-
-We should only expect ld.so.cache to be created if ldconfig finished
-successfully.
-
-ld.so.cache is not essential for correct functioning of the
-created environment.
-
-ldconfig may fail for example if SELinux enforcing policy prevents
-it from working in the confined domain. That's actually how I
-noticed this. The tar at the end of the script was failing because of
-it. And yes, I will look at fixing the policy too...
-
-Michal
-
-Index: icecc-0.9.4/client/icecc-create-env
-===================================================================
---- icecc-0.9.4.orig/client/icecc-create-env
-+++ icecc-0.9.4/client/icecc-create-env
-@@ -157,8 +157,8 @@ for i in $target_files; do 
- done
- 
- if test -x /sbin/ldconfig; then
--   /sbin/ldconfig -r $tempdir
--   new_target_files="$new_target_files etc/ld.so.cache"
-+   /sbin/ldconfig -r $tempdir && \
-+      new_target_files="$new_target_files etc/ld.so.cache"
- fi
- 
- md5sum=NONE

diff --git a/icecream-rename-scheduler.patch b/icecream-rename-scheduler.patch
index 9ed72dc..5de7738 100644
--- a/icecream-rename-scheduler.patch
+++ b/icecream-rename-scheduler.patch
@@ -1,7 +1,7 @@
-Index: icecc-0.9.5/doc/man-scheduler.1.docbook
+Index: icecc-0.9.6/doc/man-scheduler.1.docbook
 ===================================================================
---- icecc-0.9.5.orig/doc/man-scheduler.1.docbook
-+++ icecc-0.9.5/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>
  
@@ -27,10 +27,10 @@ Index: icecc-0.9.5/doc/man-scheduler.1.docbook
  </refsect1>
  
  <refsect1>
-Index: icecc-0.9.5/services/Makefile.am
+Index: icecc-0.9.6/services/Makefile.am
 ===================================================================
---- icecc-0.9.5.orig/services/Makefile.am
-+++ icecc-0.9.5/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
@@ -44,16 +44,10 @@ Index: icecc-0.9.5/services/Makefile.am
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = icecc.pc
-Index: icecc-0.9.5/services/Makefile.in
+Index: icecc-0.9.6/services/Makefile.in
 ===================================================================
---- icecc-0.9.5.orig/services/Makefile.in
-+++ icecc-0.9.5/services/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- 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@
@@ -87,7 +81,7 @@ Index: icecc-0.9.5/services/Makefile.in
  DATA = $(pkgconfig_DATA)
  HEADERS = $(ice_HEADERS) $(noinst_HEADERS)
  ETAGS = etags
-@@ -241,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC
+@@ -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
@@ -98,14 +92,14 @@ Index: icecc-0.9.5/services/Makefile.in
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = icecc.pc
  all: all-am
-@@ -357,9 +358,9 @@ clean-sbinPROGRAMS:
+@@ -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)
++icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) 
 +	@rm -f icecc-scheduler$(EXEEXT)
 +	$(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS)
  

diff --git a/icecream.spec b/icecream.spec
index 74c6d9c..9e6b73d 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -6,16 +6,14 @@
 %endif
 
 Name:		icecream
-Version:	0.9.5
-Release:	7%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://en.opensuse.org/Icecream
-# tarball extracted from http://download.opensuse.org/repositories/home:/coolo/openSUSE_Factory/src/icecream-0.9.5-3.1.src.rpm:
-Source0:	icecc-%{version}.tar.bz2
-#Source0:	ftp://ftp.suse.com/pub/projects/icecream/icecc-%{version}.tar.bz2
+Source0:	http://ftp.suse.com/pub/projects/icecream/icecc-%{version}.tar.bz2
 Source1:	icecream.sh.in
 Source2:	icecream.csh.in
 Source3:	icecream.fc
@@ -27,7 +25,6 @@ Source7:	initscript-scheduler
 Source8:	%{name}-manpages.tar.bz2
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
-Patch2:		%{name}-fix-createenv-when-ldconfig-fails.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,7 +72,6 @@ This package contains development files for %{name}.
 %setup -q -a 8 -n icecc-%{version}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -270,6 +266,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Tue Aug 03 2010 Michal Schmidt <mschmidt@redhat.com> 0.9.6-1
+- New upstream release. With an official tarball this time.
+- Dropped icecream-fix-createenv-when-ldconfig-fails.patch
+  It was never accepted upstream and it is not necessary with working ldconfig.
+- Refreshed icecream-rename-scheduler.patch
+
 * Thu Jul 08 2010 Michal Schmidt <mschmidt@redhat.com> 0.9.5-7
 - Build without SELinux only on RHEL 5.
 

diff --git a/sources b/sources
index c4662a7..1edccf2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9252d92faeee9fa3b40c6d26bb1ffe65  icecc-0.9.5.tar.bz2
+c6dacb3f28eade45f603a99245cde4fd  icecc-0.9.6.tar.bz2
 a3829775870d5b2b60b750a88ee835b7  icecream-manpages.tar.bz2