rpms/lam/devel lam.module.in,1.2,1.3 lam.spec,1.44,1.45

[Doug Ledford (dledford)]

Author: dledford

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

Modified Files:
	lam.module.in lam.spec 
Log Message:
* Thu May 17 2007 Doug Ledford <dledford at redhat.com> - 2:7.1.2-10.fc6
- Fix the sed substitutions to be global so they catch all the items
  that need to be substituted
- RESOLVES: rhbz#238288



Index: lam.module.in
===================================================================
RCS file: /cvs/extras/rpms/lam/devel/lam.module.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lam.module.in	12 Oct 2006 15:07:27 -0000	1.2
+++ lam.module.in	17 May 2007 18:13:22 -0000	1.3
@@ -2,6 +2,6 @@
 #
 #  LAM module for use with 'environment-modules' package:
 # 
-prepend-path 		LD_LIBRARY_PATH @LIBDIR@/@NAME@
-setenv			CFLAGS		-I at INCLUDEDIR@/@NAME@
-setenv			LDFLAGS		-L at LIBDIR@/@NAME@
+prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lam
+setenv			CFLAGS		-I at INCLUDEDIR@/lam -I at INCLUDEDIR@/lam/@MODE@
+setenv			LDFLAGS		-L at LIBDIR@/lam


Index: lam.spec
===================================================================
RCS file: /cvs/extras/rpms/lam/devel/lam.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- lam.spec	22 Mar 2007 06:32:45 -0000	1.44
+++ lam.spec	17 May 2007 18:13:22 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -146,8 +146,8 @@
 echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.ld.conf
 # Create the lam.pc pkgconfig file:
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
-sed 's#@VERSION@#'%{version}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#;s#@MODE@#'%{mode}'#' < %SOURCE1 > ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/%{name}.pc
-sed 's#@LIBDIR@#'%{_libdir}'#;s#@NAME@#'%{name}'#;s#@INCLUDEDIR@#'%{_includedir}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.module
+sed 's#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#g;s#@MODE@#'%{mode}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/%{name}.pc
+sed 's#@LIBDIR@#'%{_libdir}'#g;s#@MODE@#'%{mode}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.module
 
 for i in hcc hcp hf77
 do
@@ -194,7 +194,7 @@
 %postun devel -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc LICENSE HISTORY INSTALL README AUTHORS
 %doc doc/user.pdf doc/install.pdf
 %doc share/memory/ptmalloc/ptmalloc-COPYRIGHT share/memory/ptmalloc2/ptmalloc2-COPYRIGHT
@@ -206,7 +206,7 @@
 %{_mandir}/*/*
 
 %files libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/lam.ld.conf
 %{_libdir}/%{name}/*.so.*
@@ -217,7 +217,7 @@
 %endif
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM  romio/doc/romio-users-guide.ps.gz
 %{_bindir}/lamc++-%{mode}
 %{_bindir}/lamcc-%{mode}
@@ -233,6 +233,11 @@
 %config %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu May 17 2007 Doug Ledford <dledford at redhat.com> - 2:7.1.2-10.fc6
+- Fix the sed substitutions to be global so they catch all the items
+  that need to be substituted
+- RESOLVES: rhbz#238288
+
 * Thu Mar 22 2007 Florian La Roche <laroche at redhat.com> - 2:7.1.2-9.fc6
 - add alternatives to some more deps