[dmtcp/el6: 3/3] Merge branch 'master' into el6

[Kapil Arya]

commit 0b90143664eb613fbbf26f6477bc63a8d1c1037e
Merge: 427b512 2441ced
Author: Kapil Arya <kapil at ccs.neu.edu>
Date:   Fri Mar 14 01:15:33 2014 -0400

    Merge branch 'master' into el6

 .gitignore                              |    1 +
 0001-Remove-rpath-for-libdmtcp.so.patch |  128 -------------------------------
 dmtcp.spec                              |   53 +++----------
 sources                                 |    2 +-
 4 files changed, 14 insertions(+), 170 deletions(-)
---
diff --cc dmtcp.spec
index ac5554c,61a4c5c..be4889e
--- a/dmtcp.spec
+++ b/dmtcp.spec
@@@ -8,13 -8,7 +8,11 @@@ Group:		Applications/Syste
  License:	LGPLv3+
  URL:		http://dmtcp.sourceforge.net
  Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
- Patch0:		0001-Remove-rpath-for-libdmtcp.so.patch
- Requires:	libmtcp%{?_isa} = %{version}-%{release}
  BuildRequires:	python
 +Obsoletes:      lidmtcpaware < 2.1
 +Obsoletes:      lidmtcpaware-devel < 2.1
 +Obsoletes:      lidmtcpaware-doc < 2.1
 +Obsoletes:      lidmtcpaware-static < 2.1
  
  # This package is functional only on i386 and x86_64 architectures.
  ExclusiveArch:	%ix86 x86_64