rpms/icecream/devel icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch, 1.1, 1.2 icecream-0.9.2-create-env-improve-check-for-specs.patch, 1.1, 1.2

[Michal Schmidt]

Author: michich

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

Modified 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 
Log Message:
replace the patches with the lightly modified versions which were sent upstream


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

Index: icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch	28 Jan 2009 22:50:07 -0000	1.1
+++ icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch	1 Feb 2009 15:29:43 -0000	1.2
@@ -1,15 +1,23 @@
-From 126bacee1c6f9b85ffca02fd3473fd1165f1c5c2 Mon Sep 17 00:00:00 2001
+# Patch sent to upstream developer on 2009-02-01
+
+icecc-create-env: handle relative paths in ld.so.conf includes
+
 From: Michal Schmidt <mschmidt at redhat.com>
-Date: Wed, 28 Jan 2009 23:39:51 +0100
-Subject: [PATCH] icecc-create-env: handle relative paths in ld.so.conf includes
 
 In Fedora ld.so.conf contains an include directive with a relative path.
 ldconfig does not accept relative include paths when using -r.
-Rewrite includes in ld.so.conf to absolute paths.
+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
@@ -38,6 +46,3 @@
  cd ..
  rm -rf $tempdir
 +rm -f $tmp_ld_so_conf
--- 
-1.6.0.6
-

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

Index: icecream-0.9.2-create-env-improve-check-for-specs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream-0.9.2-create-env-improve-check-for-specs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icecream-0.9.2-create-env-improve-check-for-specs.patch	28 Jan 2009 22:50:07 -0000	1.1
+++ icecream-0.9.2-create-env-improve-check-for-specs.patch	1 Feb 2009 15:29:43 -0000	1.2
@@ -1,18 +1,21 @@
-From d82c9a328c11799cfa87f53fd008e27f0cc0ae9b Mon Sep 17 00:00:00 2001
+# Patch sent to upstream developer on 2009-02-01
+
+icecc-create-env: improve check for "specs"
+
 From: Michal Schmidt <mschmidt at redhat.com>
-Date: Wed, 28 Jan 2009 23:34:22 +0100
-Subject: [PATCH] icecc-create-env: improve check for "specs"
 
 The check for "specs" would get confused if there was a file
 called "specs" in the current directory.
-Notice:
-  $ gcc -print-file-name=asdfghjkl
-  asdfghjkl
-i.e. if it does not find anything, it repeats the input name.
+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
@@ -26,6 +29,3 @@
    add_file "$specfile"
  fi
  add_file /etc/ld.so.conf
--- 
-1.6.0.6
-