[gphotoframe] 2.0-a3

[Mamoru TASAKA]

commit de8ba3526fb5c6efa59baaa8d614135195f58188
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Wed Nov 13 11:00:15 2013 +0900

    2.0-a3

 .gitignore                                         |    1 +
 gphotoframe-1.2-b4-dbuserror+some_fix.patch        |  156 --------------------
 gphotoframe-2.0a2-fix-gdk-oldsymbol.patch          |   17 --
 ....0a2-fix-traceback-choosing-folder-plugin.patch |   53 -------
 gphotoframe.spec                                   |   27 ++--
 sources                                            |    2 +-
 6 files changed, 14 insertions(+), 242 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ce9149e..2feda16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ gphotoframe-1.0.tar.gz
 /gphotoframe-1.5.tar.gz
 /gphotoframe-1.5.1.tar.gz
 /gphotoframe-2.0-a2.tar.gz
+/gphotoframe-2.0-a3.tar.gz
diff --git a/gphotoframe.spec b/gphotoframe.spec
index 4f24f1e..3a8da45 100644
--- a/gphotoframe.spec
+++ b/gphotoframe.spec
@@ -9,16 +9,16 @@
 %endif
 
 %global	mainver	2.0
-%define	minorver	-a2
+%define	minorver	-a3
 
-%global	mainrel	3
+%global	mainrel	4
 
 %global	rpmminorver	%(echo "%minorver" | sed -e 's|^-||' | sed -e 's|\\\.||')
 %global	fedorarel	%{?minorver:0.}%{mainrel}%{?minorver:.%rpmminorver}
 
 Name:		gphotoframe
 Version:	%{mainver}
-Release:	%{fedorarel}%{?dist}.2
+Release:	%{fedorarel}%{?dist}
 Summary:	Photo Frame Gadget for the GNOME Desktop
 
 Group:		Amusements/Graphics
@@ -29,11 +29,6 @@ License:	GPLv3 and GPLv2+ and GFDL
 URL:		http://code.google.com/p/gphotoframe/
 Source0:	http://gphotoframe.googlecode.com/files/%{name}-%{mainver}%{?minorver}.tar.gz
 
-# Fix traceback when choosing photo source on setting gui:
-# upstream hp commit c6189be818cc
-Patch0:	gphotoframe-2.0a2-fix-gdk-oldsymbol.patch
-# Fix traceback when choosing folder plugin on setting gui
-Patch1:	gphotoframe-2.0a2-fix-traceback-choosing-folder-plugin.patch
 # Handle exif file with zero denominator on geometry information
 # bug 845418
 Patch2:	gphotoframe-2.0a2-parseexif-geom-zerovalue.patch
@@ -57,16 +52,16 @@ Requires:	pygobject3
 Requires:	python-exif
 Requires:	python-twisted-web
 Requires:	pyxdg
+# lib/plugins/tumblr/account.py
+Requires:	python-oauth
 
 # girepository
 Requires:	gtk3
 Requires:	webkitgtk3
 # Optional
 Requires:	libproxy-python
-# For now kill two below
-# Does not seem to work with clutter-gtk
-#Requires:	pyclutter
-#Requires:	pyclutter-gtk
+# girepository
+Requires:	clutter-gtk
 Requires:	python-feedparser
 # girepository
 Requires:	libchamplain-gtk
@@ -92,8 +87,6 @@ for gnome-screensaver compatibility.
 %prep
 %setup -q -n %{name}-%{mainver}%{?minorver}
 
-%patch0 -p1 -b .oldsymbol
-%patch1 -p2 -b .folder
 %patch2 -p2 -b .zeroden
 %patch3 -p1 -b .zeroden2
 
@@ -102,7 +95,8 @@ grep -rl '^#![ \t]*%{_bindir}' lib/ | \
 	xargs sed -i -e '\@^#![ \t]*%{_bindir}@d'
 
 # Explicitly don't use clutter-gtk for now
-%if 1
+# Enable again with 2.0-a3
+%if 0
 grep -rl 'import clutter' lib/ | \
 	xargs sed -i -e 's|import clutter|import dont_use_clutter|'
 %endif
@@ -220,6 +214,9 @@ exit 0
 %{_datadir}/applications/screensavers/%{name}-screensaver.desktop
 
 %changelog
+* Wed Nov 13 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.0-0.4.a3
+- 2.0-a3
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.3.a2.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 2c93933..64a2b75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70416eb0734841af8a1d5acb1ed50828  gphotoframe-2.0-a2.tar.gz
+7fde61994803182c1af93e6b4f4cb5b4  gphotoframe-2.0-a3.tar.gz