[gpaste/f20] Update to 3.10

[Mohamed ElMorabity]

commit e4c4f2d6b1b8d209df98c302367d4a232ea396bb
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Tue Mar 25 20:01:36 2014 +0100

    Update to 3.10

 .gitignore  |    1 +
 gpaste.spec |   34 ++++++++++++++++++++++------------
 sources     |    2 +-
 3 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3820f35..3a954b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /gpaste-3.5.tar.xz
 /gpaste-3.6.tar.xz
 /gpaste-3.8.tar.xz
+/gpaste-3.10.tar.xz
diff --git a/gpaste.spec b/gpaste.spec
index 972adc6..b539aa0 100644
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,7 +1,7 @@
 %global alt_name GPaste
 
 Name:           gpaste
-Version:        3.8
+Version:        3.10
 Release:        1%{?dist}
 Summary:        Clipboard management system
 
@@ -10,24 +10,25 @@ License:        GPLv3+
 URL:            https://github.com/Keruspe/GPaste
 Source0:        http://www.imagination-land.org/files/%{name}/%{name}-%{version}.tar.xz
 
+BuildRequires:  appdata-tools
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
+BuildRequires:  pkgconfig(clutter-1.0)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(gdk-3.0)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
+BuildRequires:  pkgconfig(gdk-x11-3.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnome-keybindings)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xi)
-BuildRequires:  pkgconfig(xtst)
 BuildRequires:  vala-tools
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       control-center-filesystem
@@ -84,6 +85,7 @@ Requires:       %{name} = %{version}-%{release}
 %configure \
   --disable-schemas-compile \
   --disable-silent-rules \
+  --disable-unity \
   --enable-applet \
   --enable-systemd \
   --enable-vala
@@ -101,22 +103,23 @@ install -pm 0644 data/completions/%{name} -t $RPM_BUILD_ROOT%{_datadir}/bash-com
 install -d $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/
 install -pm 0644 data/completions/_%{name} -t $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/
 
-# Move gpaste-applet desktop file to /etc/xdg/autostart
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
-mv $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-applet.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
 
 %find_lang %{alt_name}
 
-# Removing Rpath
+# Remove Rpath
 chrpath --delete \
   $RPM_BUILD_ROOT%{_bindir}/* \
   $RPM_BUILD_ROOT%{_libdir}/*.so.* \
   $RPM_BUILD_ROOT%{_libexecdir}/%{name}/*
 
+# Drop useless AppData file for GPaste AppIndicator
+rm $RPM_BUILD_ROOT%{_datadir}/appdata/org.gnome.GPaste.AppIndicator.appdata.xml
+
 
 %check
-desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gpaste-applet.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-settings.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.GPaste.Settings.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.GPaste.Applet.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/org.gnome.GPaste.Applet.desktop
 
 
 %post libs -p /sbin/ldconfig
@@ -139,7 +142,9 @@ fi
 %doc AUTHORS COPYING NEWS README.md THANKS TODO
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}/
-%{_datadir}/applications/%{name}-settings.desktop
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/org.gnome.GPaste.Settings.appdata.xml
+%{_datadir}/applications/org.gnome.GPaste.Settings.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/gnome-control-center/keybindings/*.xml
@@ -164,8 +169,10 @@ fi
 
 %files applet
 %{_libexecdir}/%{name}/%{name}-applet
+%{_datadir}/appdata/org.gnome.GPaste.Applet.appdata.xml
+%{_datadir}/applications/org.gnome.GPaste.Applet.desktop
 %{_mandir}/man1/%{name}-applet.1.*
-%{_sysconfdir}/xdg/autostart/%{name}-applet.desktop
+%{_sysconfdir}/xdg/autostart/org.gnome.GPaste.Applet.desktop
 
 
 %files -n gnome-shell-extension-%{name}
@@ -173,6 +180,9 @@ fi
 
 
 %changelog
+* Tue Mar 25 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.10-1
+- Update to 3.10
+
 * Wed Feb 12 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.8-1
 - Update to 3.8
 
diff --git a/sources b/sources
index d00cf70..0e7f211 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1544bb3f16d054df39dd245e44fa2fb  gpaste-3.8.tar.xz
+c07c89d14925508fde98eac4b069324f  gpaste-3.10.tar.xz