[gpaste] Update to 2.9

Sun Sep 30 15:22:45 UTC 2012

commit d30e21fc90be4d75322d9a2d0b4fd8fae1c9a187
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Sun Sep 30 17:22:32 2012 +0200

    Update to 2.9

 .gitignore           |    1 +
 gpaste-2.9-gir.patch |   24 ++++++++++++++++++++++++
 gpaste.spec          |   50 +++++++++++++++++++++++++++++++++++++++++---------
 sources              |    2 +-
 4 files changed, 67 insertions(+), 10 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 84ef341..2e17fb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /gpaste-2.5.tar.xz
 /gpaste-2.8.tar.xz
 /gpaste-2.8.1.tar.xz
+/gpaste-2.9.tar.xz
diff --git a/gpaste-2.9-gir.patch b/gpaste-2.9-gir.patch
new file mode 100644
index 0000000..e178b18
--- /dev/null
+++ b/gpaste-2.9-gir.patch
@@ -0,0 +1,24 @@
+diff -up gpaste-2.9/bindings/gi.mk.orig gpaste-2.9/bindings/gi.mk
+--- gpaste-2.9/bindings/gi.mk.orig	2012-09-29 15:06:18.000000000 +0200
++++ gpaste-2.9/bindings/gi.mk	2012-09-30 16:30:14.677185179 +0200
+@@ -50,7 +50,7 @@ bindings_gi_GPaste_1_0_gir_EXPORT_PACKAG
+ 	libgpaste-daemon \
+ 	libgpaste-client \
+ 	$(NULL)
+-bindings_gi_GPaste_1_0_gir_SCANNERFLAGS = --warn-all --warn-error
++bindings_gi_GPaste_1_0_gir_SCANNERFLAGS = --warn-all
+ bindings_gi_GPaste_1_0_gir_INCLUDES = \
+ 	GdkPixbuf-2.0 \
+ 	Gio-2.0 \
+diff -up gpaste-2.9/Makefile.in.orig gpaste-2.9/Makefile.in
+--- gpaste-2.9/Makefile.in.orig	2012-09-29 15:14:01.000000000 +0200
++++ gpaste-2.9/Makefile.in	2012-09-30 16:30:28.623596000 +0200
+@@ -1282,7 +1282,7 @@ bindings_gi_GPaste_1_0_gir_EXPORT_PACKAG
+ 	libgpaste-client \
+ 	$(NULL)
+ 
+-bindings_gi_GPaste_1_0_gir_SCANNERFLAGS = --warn-all --warn-error
++bindings_gi_GPaste_1_0_gir_SCANNERFLAGS = --warn-all
+ bindings_gi_GPaste_1_0_gir_INCLUDES = \
+ 	GdkPixbuf-2.0 \
+ 	Gio-2.0 \
diff --git a/gpaste.spec b/gpaste.spec
index 4b99c1b..6685405 100644
--- a/gpaste.spec
+++ b/gpaste.spec
@@ -1,14 +1,16 @@
 %global alt_name GPaste
 
 Name:           gpaste
-Version:        2.8.1
-Release:        2%{?dist}
+Version:        2.9
+Release:        1%{?dist}
 Summary:        Clipboard management system
 
 Group:          User Interface/Desktops
 License:        GPLv3+
 URL:            https://github.com/Keruspe/GPaste
 Source0:        https://github.com/downloads/Keruspe/%{alt_name}/%{name}-%{version}.tar.xz
+# Disable GIR warnings as error, only for Fedora 17
+Patch0:         %{name}-2.9-gir.patch
 
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
@@ -62,15 +64,27 @@ BuildArch:      noarch
 %{summary}.
 
 
+%package applet
+Summary:        GNOME Fallback mode applet for GPaste
+Group:          User Interface/Desktops
+Requires:       %{name} = %{version}-%{release}
+
+%description applet
+%{summary}.
+
+
 %prep
 %setup -q
+%if 0%{?fedora} <= 17
+%patch0 -p1 -b .gio
+%endif
 
 
 %build
-# Applet disabled since it is unusable in GNOME 3
 %configure \
-  --disable-applet \
-  --disable-schemas-compile
+  --disable-schemas-compile \
+  --disable-silent-rules \
+  --enable-applet
 make %{?_smp_mflags}
 
 
@@ -80,8 +94,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Fix Rpath issues
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/%{name}/gpasted
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/%{name}/gpaste-settings
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/*
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
+chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/%{name}/*
 
 # Install bash/zsh completion support
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
@@ -89,6 +104,12 @@ install -pm 0644 data/completions/%{name} -t $RPM_BUILD_ROOT%{_sysconfdir}/bash_
 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/
+
+# Skip validation because of AutostartCondition key
+# desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-applet.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-settings.desktop
 
 %find_lang %{alt_name}
@@ -113,11 +134,11 @@ fi
 %files -f %{alt_name}.lang
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/%{name}
-%{_libexecdir}/%{name}/
+%{_libexecdir}/%{name}/gpaste-settings
+%{_libexecdir}/%{name}/gpasted
 %{_datadir}/applications/%{name}-settings.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/vala/vapi/*
 %{_datadir}/zsh/
 %{_mandir}/man1/%{name}.1.*
 %{_sysconfdir}/bash_completion.d/
@@ -130,16 +151,27 @@ fi
 
 %files devel
 %{_datadir}/gir-1.0/*.gir
+%{_datadir}/vala/vapi/*
 %{_includedir}/%{name}/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 
+%files applet
+%{_libexecdir}/%{name}/%{name}-applet
+%{_mandir}/man1/%{name}-applet.1.*
+%{_sysconfdir}/xdg/autostart/%{name}-applet.desktop
+
+
 %files -n gnome-shell-extension-%{name}
 %{_datadir}/gnome-shell/extensions/GPaste at gnome-shell-extensions.gnome.org/
 
 
 %changelog
+* Sun Sep 30 2012 Mohamed El Morabity <melmorabity at fedorapeople.org> - 2.9-1
+- Update to 2.9
+- Enable GNOME fallback applet
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a461c6f..44e1148 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0ec1aa65d15de21a8abd0ee390b43ae  gpaste-2.8.1.tar.xz
+b2dc8a3138f050480cfd9d8229c0569f  gpaste-2.9.tar.xz
