rpms/cernlib/devel cernlib-fedora_script.patch, NONE, 1.1 cernlib.spec, 1.48, 1.49

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26826

Modified Files:
	cernlib.spec 
Added Files:
	cernlib-fedora_script.patch 
Log Message:
* Tue Apr 24 2007 Patrice Dumas <pertusus at free.fr> 2006-7
- use real cernlib lib location in cernlib debian script, don't assume
  that they are in %_prefix, it is not the case on fedora


cernlib-fedora_script.patch:

--- NEW FILE cernlib-fedora_script.patch ---
--- cernlib-2006/cernlib.in.fedora_script	2007-04-21 13:39:02.000000000 +0200
+++ cernlib-2006/cernlib.in	2007-04-24 08:54:58.000000000 +0200
@@ -491,7 +491,7 @@
 }
 
 
-[ -z "$CERN" ] && CERN="@PREFIX@"
+[ -z "$CERN" ] && CERN="@CERN@"
 _ver="$CERN_LEVEL"
 _u="" ; _arch="`sysname`" ; _driver="default"
 _argsdone=false
@@ -524,6 +524,10 @@
 	shift
 done
 
+if [ -z "$_ver" ]; then 
+	_ver="@VERSION@"
+fi
+
 if [ -z "$CERN_ROOT" ] ; then
 	if [ "$CERN" = "@PREFIX@" ] ; then
 		CERN_ROOT="@PREFIX@" 


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cernlib.spec	23 Apr 2007 21:08:10 -0000	1.48
+++ cernlib.spec	24 Apr 2007 08:57:37 -0000	1.49
@@ -16,7 +16,7 @@
 
 Name:          cernlib%{?compiler}
 Version:       2006
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -293,6 +293,9 @@
 Patch1209: cernlib-soname.patch
 # kernnum test error on 64 bit
 Patch1211: cernlib-64test.patch
+# debian cernlib script supposes that libs are in %%_prefix, it is 
+# not the case on fedora
+Patch1212: cernlib-fedora_script.patch
 
 # patchy 4
 # not applied as it has allready been done by the sed one-liner in 
@@ -459,6 +462,11 @@
 %patch -P 100003 -p0
 %patch -P 100004 -p0 
 %patch -P 1207 -p1 -b .fedora_desktop
+
+cp -p cernlib-2006.dfsg/debian/add-ons/bin/cernlib.in .
+
+%patch -P 1212 -p1 -b .fedora_script
+
 cd %{version}
 %patch -P 1100 -p2
 %patch -P 1 -p1
@@ -747,9 +755,11 @@
 mv src/scripts/cernlib src/scripts/cernlib-static
 %{__install} -p -m755 src/scripts/cernlib-static bin/cernlib-static
 sed -e 's:@PREFIX@:%{_prefix}:g' \
-  -e 's:@LIBPREFIX@:%{_libdir}/cernlib/%{verdir}:g' \
+  -e 's:@CERN@:%{_libdir}/cernlib:g' \
+  -e 's:@VERSION@:%{verdir}:g' \
+  -e 's:@LIBPREFIX@:%{_libdir}:g' \
   -e 's/-lg2c//' \
-  ../cernlib-2006.dfsg/debian/add-ons/bin/cernlib.in > src/scripts/cernlib
+  ../cernlib.in > src/scripts/cernlib
 chmod 0755 src/scripts/cernlib
 
 # install mkdirhier which is needed to make directories
@@ -1131,6 +1141,10 @@
 
 
 %changelog
+* Tue Apr 24 2007 Patrice Dumas <pertusus at free.fr> 2006-7
+- use real cernlib lib location in cernlib debian script, don't assume
+  that they are in %%_prefix, it is not the case on fedora
+
 * Mon Apr 23 2007 Patrice Dumas <pertusus at free.fr> 2006-6
 - package compiled with g77 is parallel installable with gfortran 
   compiled package