[gpaste/f19] Cherry pick from master

[Mohamed ElMorabity]

commit 882deb1b5ddc3cafd506e200278abb6a530073e6
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Mon Apr 8 00:34:27 2013 +0200

    Cherry pick from master

 gpaste.spec |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/gpaste.spec b/gpaste.spec
index 1b10e10..719b7fe 100644
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,14 +1,22 @@
+%global commit c93a4ac
+%global commit_date 20130331
+
 %global alt_name GPaste
 
 Name:           gpaste
 Version:        2.99.2
-Release:        1%{?dist}
+Release:        3.%{commit_date}git%{commit}%{?dist}
 Summary:        Clipboard management system
 
 Group:          User Interface/Desktops
 License:        GPLv3+
 URL:            https://github.com/Keruspe/GPaste
-Source0:        http://www.imagination-land.org/files/%{name}-%{version}.tar.xz
+# The source for this package was pulled from upstream's VCS. Use the following
+# commands to generate the tarball:
+# $ git clone https://github.com/Keruspe/GPaste.git
+# $ cd GPaste
+# $ git archive --format=tar --prefix=%{name}-%{commit}/ %{commit} | xz > ../%{name}-%{commit}.tar.xz
+Source0:        %{name}-%{commit}.tar.xz
 
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
@@ -19,6 +27,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 +37,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
@@ -73,10 +83,11 @@ Requires:       %{name} = %{version}-%{release}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{commit}
 
 
 %build
+[ -f autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
 %configure \
   --disable-schemas-compile \
   --disable-silent-rules \
@@ -92,8 +103,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/completion/
+install -pm 0644 data/completions/%{name} -t $RPM_BUILD_ROOT%{_datadir}/bash-completion/completion/
 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 +145,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 +175,13 @@ fi
 
 
 %changelog
+* 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