[gpaste/f16] - Update to 1.5 - Remove gpaste-1.3-remove_applet_refs.patch patch (there is no more reference to

[Mohamed ElMorabity]

commit 21b6e622ecf9d0796d93f547e029a9fb8b0a09ce
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Wed Sep 14 11:06:34 2011 +0200

    - Update to 1.5
    - Remove gpaste-1.3-remove_applet_refs.patch patch (there is no more reference
      to the GNOME 2 applet in documentation and completion files)
    - Add gpaste-1.5-DSO.patch to fix DSO linking

 .gitignore                           |    1 +
 gpaste-0.99-remove_applet_refs.patch |   82 ----------------------------------
 gpaste-1.5-DSO.patch                 |   13 +++++
 gpaste.spec                          |   26 ++++++++---
 sources                              |    2 +-
 5 files changed, 34 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d7dd3c..c3452eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gpaste-17dd47.tar.xz
 /gpaste-1.2.tar.xz
+/gpaste-1.5.tar.xz
diff --git a/gpaste-1.5-DSO.patch b/gpaste-1.5-DSO.patch
new file mode 100644
index 0000000..a08c8f1
--- /dev/null
+++ b/gpaste-1.5-DSO.patch
@@ -0,0 +1,13 @@
+diff -up gpaste-1.5/Makefile.am.orig gpaste-1.5/Makefile.am
+--- gpaste-1.5/Makefile.am.orig	2011-09-08 20:31:49.000000000 +0200
++++ gpaste-1.5/Makefile.am	2011-09-14 09:38:20.782415617 +0200
+@@ -42,7 +42,8 @@ CLEANFILES += \
+ gpasted_LDADD = \
+ 	$(GTK_LIBS) \
+ 	$(GIO_LIBS) \
+-	$(GLIB_LIBS)
++	$(GLIB_LIBS) \
++	-lX11
+ 
+ gpaste_SOURCES = \
+ 	src/gpaste.vala
diff --git a/gpaste.spec b/gpaste.spec
index 44b92b6..63a2eb5 100644
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,8 +1,7 @@
-%global commit 17dd47
 %global alt_name GPaste
 
 Name:           gpaste
-Version:        1.2
+Version:        1.5
 Release:        1%{?dist}
 Summary:        Clipboard management system
 
@@ -10,11 +9,12 @@ Group:          User Interface/Desktops
 License:        GPLv3+
 URL:            https://github.com/Keruspe/GPaste
 Source0:        https://github.com/downloads/Keruspe/%{alt_name}/%{name}-%{version}.tar.xz
-Patch0:         %{name}-0.99-remove_applet_refs.patch
+# Fix DSO linking
+Patch0:         %{name}-1.5-DSO.patch
 
+BuildRequires:  desktop-file-utils
 BuildRequires:  gtk3-devel
 BuildRequires:  intltool
-BuildRequires:  vala
 
 %description
 gpasted is a clipboard management daemon with DBus interface. gpaste is its CLI
@@ -34,7 +34,7 @@ BuildArch:      noarch
 
 %prep
 %setup -q
-%patch0 -p1 -b .disable_applet_refs
+%patch0 -p1 -b .DSO
 
 
 %build
@@ -53,6 +53,8 @@ install -pm 0644 completions/%{name} -t $RPM_BUILD_ROOT%{_sysconfdir}/bash_compl
 install -d $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/
 install -pm 0644 completions/_%{name} -t $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/
 
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-settings.desktop
+
 %find_lang %{alt_name}
 
 
@@ -70,18 +72,28 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}/
+%{_datadir}/applications/%{name}-settings.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/zsh/
 %{_mandir}/man1/%{name}.1.*
-%{_sysconfdir}/bash_completion.d
+%{_sysconfdir}/bash_completion.d/
 
 
 %files -n gnome-shell-extension-%{name}
-%{_datadir}/gnome-shell/extensions/GPaste at gnome.org/
+%{_datadir}/gnome-shell/extensions/GPaste at gnome-shell-extensions.gnome.org/
 
 
 %changelog
+* Wed Sep 14 2011 Mohamed El Morabity <melmorabity at fedorapeople.org> - 1.5-1
+- Update to 1.5
+- Remove gpaste-1.3-remove_applet_refs.patch patch (there is no more reference
+  to the GNOME 2 applet in documentation and completion files)
+- Add gpaste-1.5-DSO.patch to fix DSO linking
+
+* Sat Sep 03 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.3-1
+- Update to 1.3
+
 * Sun Jul 10 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.2-1
 - Update to 1.2
 
diff --git a/sources b/sources
index 31b3006..a038a75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-155532ac19f0444f66c544b5ef8f1827  gpaste-1.2.tar.xz
+7052e1a672af894344f50edd12feb0d6  gpaste-1.5.tar.xz