[protobuf/el6/master: 10/11] merging from head

[derks]

commit 9226d4e10721b14406f9f7f3b0ff5e9f058bfae9
Merge: 68936ff 8367076
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Thu Jan 20 15:28:23 2011 -0600

    merging from head

 protobuf.spec |   97 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 57 insertions(+), 40 deletions(-)
---
diff --cc protobuf.spec
index 69e3a5b,ee270fb..6c918ce
--- a/protobuf.spec
+++ b/protobuf.spec
@@@ -18,8 -17,8 +17,8 @@@ License:        BS
  Group:          Development/Libraries
  Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
  Source1:        ftdetect-proto.vim
--Patch1:		protobuf-2.3.0-fedora-gtest.patch
--Patch2:		protobuf-java-fixes.patch
++Patch1:	        protobuf-2.3.0-fedora-gtest.patch
++Patch2:         protobuf-java-fixes.patch
  URL:            http://code.google.com/p/protobuf/
  BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  BuildRequires:  automake autoconf libtool pkgconfig