rpms/cernlib/devel cernlib.spec,1.12,1.13

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
create dir before making link



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cernlib.spec	20 Dec 2005 22:53:23 -0000	1.12
+++ cernlib.spec	21 Dec 2005 07:23:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}
+Release:       11%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -601,6 +601,11 @@
 %{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
+
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -616,9 +621,6 @@
 %{__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}
@@ -647,6 +649,7 @@
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/lib/*.so.*
 %{_datadir}/cernlib/
 %doc cernlib.README copyright
@@ -676,6 +679,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
@@ -707,7 +711,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11
+* Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11.1
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint