From 44ba4b7569cc944c960cbe9bfbabc44768497187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 7 Feb 2011 14:04:24 +0100
Subject: [PATCH] 4.11 bump

Do not install gnulib-tool header files.
---
 .gitignore     |  1 +
 sharutils.spec | 14 ++++++++------
 sources        |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1e9447..3122c3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 sharutils-4.9.tar.bz2
 /sharutils-4.10.tar.bz2
+/sharutils-4.11.tar.bz2
diff --git a/sharutils.spec b/sharutils.spec
index 1c07965..cee8251 100644
--- a/sharutils.spec
+++ b/sharutils.spec
@@ -1,6 +1,6 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives
 Name: sharutils
-Version: 4.10
+Version: 4.11
 Release: 1%{?dist}
 License: GPLv3+ and LGPLv2+ and Public Domain
 Group: Applications/Archiving
@@ -9,7 +9,6 @@ URL: http://www.gnu.org/software/%{name}/
 BuildRequires: gettext
 Requires(post): info
 Requires(preun): info
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The sharutils package contains the GNU shar utilities, a set of tools
@@ -38,9 +37,10 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=${RPM_BUILD_ROOT} INSTALL='install -p' install
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+# gnulib-tool installs compat header files mistakenly
+rm -rf ${RPM_BUILD_ROOT}%{_includedir}
 chmod 644 AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 
 %check
@@ -56,9 +56,6 @@ if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||:
 fi
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
@@ -68,6 +65,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man5/*
 
 %changelog
+* Mon Feb 07 2011 Petr Pisar <ppisar@redhat.com> - 4.11-1
+- 4.11 bump
+- Do not install header files injected by gnulib-tool
+- Remove BuildRoot stuff
+
 * Mon Aug 30 2010 Petr Pisar <ppisar@redhat.com> - 4.10-1
 - 4.10 bump (bug #628304)
 
diff --git a/sources b/sources
index 1a5040b..b2a2a55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f918859228238d69e1ce78ccbec8f9e0  sharutils-4.10.tar.bz2
+502a15ed46d8bf988bcee982d6926e11  sharutils-4.11.tar.bz2