rpms/cernlib/FC-3 cernlib.spec,1.14,1.15
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Wed Dec 21 07:26:01 UTC 2005
Author: pertusus
Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11809
Modified Files:
cernlib.spec
Log Message:
create dir before making link
Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cernlib.spec 20 Dec 2005 22:50:50 -0000 1.14
+++ cernlib.spec 21 Dec 2005 07:26:00 -0000 1.15
@@ -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.
@@ -598,6 +598,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 -)
@@ -613,9 +618,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}
@@ -644,6 +646,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
@@ -673,6 +676,7 @@
%{_bindir}/paw++
%{_bindir}/paw
%{_bindir}/pawX11
+%dir %{_libdir}/cernlib/%{version}/bin
%{_libdir}/cernlib/%{version}/bin/pawX11
%doc paw.README
@@ -704,7 +708,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
More information about the scm-commits
mailing list