[rpc2/el5/master: 18/18] Merge branch 'el6' into el5
Adam Goode
agoode at fedoraproject.org
Fri Jul 30 16:06:39 UTC 2010
commit b40ce950c5cef13eff581fd198246e7617e3adce
Merge: c031204 f485b81
Author: Adam Goode <adam at spicenitz.org>
Date: Fri Jul 30 12:06:22 2010 -0400
Merge branch 'el6' into el5
Conflicts:
.gitignore
.gitignore | 2 +-
rpc2.spec | 18 ++++++++++++++++--
sources | 2 +-
3 files changed, 18 insertions(+), 4 deletions(-)
---
diff --cc rpc2.spec
index d56bd6c,38da172..0cb5d86
--- a/rpc2.spec
+++ b/rpc2.spec
@@@ -6,9 -6,9 +6,10 @@@ Group: System Environment/Libr
License: LGPLv2
URL: http://www.coda.cs.cmu.edu/
Source0: ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: lwp-devel lua-devel flex bison
+
%description
The RPC2 library.
More information about the scm-commits
mailing list