From 5449adc9e5fa0607b27caacd0f7aafc18c100975 Mon Sep 17 00:00:00 2001
From: Arpit Agarwal <arp@apache.org>
Date: Tue, 7 Apr 2015 18:06:05 -0700
Subject: [PATCH] HADOOP-11801. Update BUILDING.txt for Ubuntu. (Contributed by
 Gabor Liptak)

---
 BUILDING.txt                                    | 10 ++--------
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index f3b685357d..3ca9faee6d 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -28,14 +28,8 @@ Installing required packages for clean install of Ubuntu 14.04 LTS Desktop:
   $ sudo apt-get -y install maven
 * Native libraries
   $ sudo apt-get -y install build-essential autoconf automake libtool cmake zlib1g-dev pkg-config libssl-dev
-* ProtocolBuffer 2.5.0
-  $ wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz
-  $ tar -zxvf protobuf-2.5.0.tar.gz
-  $ cd protobuf-2.5.0.tar.gz
-  $ ./configure
-  $ make
-  $ sudo make install
-  $ sudo ldconfig
+* ProtocolBuffer 2.5.0 (required)
+  $ sudo apt-get -y install libprotobuf-dev protobuf-compiler
 
 Optional packages:
 
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 67050e7207..412bad7dff 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -747,6 +747,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-10670. Allow AuthenticationFilters to load secret from signature
     secret files. (Kai Zheng via wheat9)
 
+    HADOOP-11801. Update BUILDING.txt for Ubuntu. (Gabor Liptak via
+    Arpit Agarwal)
+
   OPTIMIZATIONS
 
     HADOOP-11323. WritableComparator#compare keeps reference to byte array.