From 15cc44a67bed824df8d532fa0eac7d1a94d0f773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 20 Mar 2010 22:40:00 +0200
Subject: [PATCH] Don't install mock completion by default, it's in upstream
 mock > 1.1.0.

---
 CHANGES                 | 1 +
 Makefile.am             | 4 ++--
 contrib/{mock => _mock} | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename contrib/{mock => _mock} (96%)

diff --git a/CHANGES b/CHANGES
index dee82cf2..38451581 100644
--- a/CHANGES
+++ b/CHANGES
@@ -56,6 +56,7 @@ bash-completion (2.x)
   * Do basic HTML file completion with Firefox and Chrome and friends,
     and Epiphany.
   * Do basic diff/patch completion with cdiff and kompare.
+  * Don't install mock completion by default, it's in upstream mock > 1.1.0.
 
   [ Freddy Vulto ]
   * Added _get_pword() helper function, thanks to Sung Pae (Alioth: #312030)
diff --git a/Makefile.am b/Makefile.am
index 23f5b01d..0af9e08f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,6 @@ bashcomp_DATA = contrib/abook \
 		contrib/mdadm \
 		contrib/minicom \
 		contrib/mkinitrd \
-		contrib/mock \
 		contrib/monodevelop \
 		contrib/mount \
 		contrib/mplayer \
@@ -165,4 +164,5 @@ bash_completion.sh: bash_completion.sh.in Makefile
 CLEANFILES = bash_completion.sh
 
 EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) bash_completion.sh.in \
-	contrib/_modules contrib/_subversion contrib/_yum contrib/_yum-utils
+	contrib/_mock contrib/_modules contrib/_subversion contrib/_yum \
+	contrib/_yum-utils
diff --git a/contrib/mock b/contrib/_mock
similarity index 96%
rename from contrib/mock
rename to contrib/_mock
index 60a099f0..76ecb8a1 100644
--- a/contrib/mock
+++ b/contrib/_mock
@@ -1,3 +1,6 @@
+# Use of this file is deprecated.  Upstream completion is available in
+# mock > 1.1.0, use that instead.
+
 # bash completion for mock
 
 have mock &&