rpms/cernlib/FC-4 cernlib-gxint-script.diff, 1.2, 1.3 cernlib.spec, 1.18, 1.19

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27795

Modified Files:
	cernlib-gxint-script.diff cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11
- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
- fix gxint


cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-gxint-script.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-gxint-script.diff	9 Dec 2005 16:09:19 -0000	1.2
+++ cernlib-gxint-script.diff	20 Dec 2005 22:52:11 -0000	1.3
@@ -14,7 +14,7 @@
 -  CERN="/cern" ; export CERN
 -fi
 +# not used after the sed one liner in the spec file 
-+if [ -z "$CERN" ] ; then CERN="/usr"
++if [ -z "$CERN" ] ; then CERN="/usr"; fi
   
  if [ "$drv" = "/GKS" ] ; then
    if [ -z "$GKSR" ] ; then


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cernlib.spec	20 Dec 2005 21:54:01 -0000	1.18
+++ cernlib.spec	20 Dec 2005 22:52:11 -0000	1.19
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       10%{?dist}
+Release:       11%{?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.
@@ -518,8 +518,8 @@
 	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
-# substitute includedir in gxint to conform to FHS
-sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
+# substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
@@ -614,6 +614,9 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -671,6 +674,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
 %files -n geant321
@@ -701,6 +705,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11
+- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
+- fix gxint
+
 * Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-10
 - add file in /etc/ld.so.conf.d required for dynamic linking