[gpaste/f18] Cherry pick from master

[Mohamed ElMorabity]

commit ace2383e161f8a3fbfbcdbfa5e928b4116c8247a
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Sat May 11 00:22:08 2013 +0200

    Cherry pick from master

 .gitignore  |    1 +
 gpaste.spec |   28 ++++++++++++++++++++++------
 sources     |    2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 85cbaa6..a5e3a17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /gpaste-2.9.1.tar.xz
 /v2.99.1.tar.gz
 /gpaste-2.99.2.tar.xz
+/gpaste-3.0.1.tar.xz
diff --git a/gpaste.spec b/gpaste.spec
index 1b10e10..ada5890 100644
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,8 +1,8 @@
 %global alt_name GPaste
 
 Name:           gpaste
-Version:        2.99.2
-Release:        1%{?dist}
+Version:        3.0.1
+Release:        2%{?dist}
 Summary:        Clipboard management system
 
 Group:          User Interface/Desktops
@@ -19,6 +19,7 @@ BuildRequires:  pkgconfig(gdk-3.0)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gnome-keybindings)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -28,6 +29,7 @@ BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  vala-tools
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       control-center-filesystem
 
 %description
 gpasted is a clipboard management daemon with DBus interface. gpaste is its CLI
@@ -77,6 +79,7 @@ Requires:       %{name} = %{version}-%{release}
 
 
 %build
+[ -f configure ] || NOCONFIGURE=1 ./autogen.sh
 %configure \
   --disable-schemas-compile \
   --disable-silent-rules \
@@ -92,8 +95,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Install bash/zsh completion support
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
-install -pm 0644 data/completions/%{name} -t $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
+install -d $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/
+install -pm 0644 data/completions/%{name} -t $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/
 install -d $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/
 install -pm 0644 data/completions/_%{name} -t $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/
 
@@ -134,12 +137,12 @@ fi
 %{_datadir}/applications/%{name}-settings.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/glib-2.0/schemas/*.xml
+%{_datadir}/gnome-control-center/keybindings/*.xml
 %{_datadir}/zsh/
 %{_mandir}/man1/%{name}.1.*
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/bash-completion/
 %{_prefix}/lib/systemd/user/gpasted.service
 
-
 %files libs
 %{_libdir}/girepository-1.0/%{alt_name}-1.0.typelib
 %{_libdir}/*.so.*
@@ -164,6 +167,19 @@ fi
 
 
 %changelog
+* Fri May 10 2013 Mohamed El Morabity <pikachu.2014 at gmail.com> - 3.0.1-2
+- Fix bash completion
+
+* Fri May 10 2013 Mohamed El Morabity <pikachu.2014 at gmail.com> - 3.0.1-1
+- Update to 3.0.1
+
+* Sun Apr 07 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.99.2-3.20130331gitc93a4ac
+- Add missing BuildRequires on pkgconfig(gnome-keybindings)
+
+* Sun Apr 07 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.99.2-2.20130331gitc93a4ac
+- Update to a newer snapshot
+- Move bash completion script to /usr/share/bash-completion/completion/
+
 * Mon Jan 28 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.99.2-1
 - Update to 2.99.2
 - Drop patch gpaste-2.99.1-fix_gpaste-settings
diff --git a/sources b/sources
index 57b57ae..a854331 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf739f3d2b44d20b8f55fa790752aa87  gpaste-2.99.2.tar.xz
+eb99d3a5f0bb2ab763f1b3820d4c8e8a  gpaste-3.0.1.tar.xz