[gphotoframe/f14/master] - Update to 1.2b6

[Mamoru Tasaka]

commit 9ebeddfb4a88511f013237f0409370e007c272df
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Jan 18 03:55:20 2011 +0900

    - Update to 1.2b6

 .gitignore       |    1 +
 gphotoframe.spec |   21 +++++++++++----------
 sources          |    2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe49b68..70ead86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gphotoframe-1.0.tar.gz
 /gphotoframe-1.1.tar.gz
 /gphotoframe-1.2-b4.tar.gz
+/gphotoframe-1.2-b6.tar.gz
diff --git a/gphotoframe.spec b/gphotoframe.spec
index 2271bb6..75fe0ad 100644
--- a/gphotoframe.spec
+++ b/gphotoframe.spec
@@ -6,9 +6,9 @@
 %endif
 
 %global	mainver	1.2
-%global	minorver	-b4
+%global	minorver	-b6
 
-%global	mainrel	1
+%global	mainrel	2
 
 %global	rpmminorver	%(echo "%minorver" | sed -e 's|^-||' | sed -e 's|\\\.||')
 %global	fedorarel	%{?minorver:0.}%{mainrel}%{?minorver:.%rpmminorver}
@@ -24,8 +24,6 @@ Group:		Amusements/Graphics
 License:	GPLv3 and GPLv2+
 URL:		http://code.google.com/p/gphotoframe/
 Source0:	http://gphotoframe.googlecode.com/files/%{name}-%{mainver}%{?minorver}.tar.gz
-# Patch from hg head: mainly for dbus related error (without gnome-screensaver)
-Patch0:		gphotoframe-1.2-b4-dbuserror+some_fix.patch
 
 BuildRequires:	GConf2
 BuildRequires:	desktop-file-utils
@@ -72,7 +70,6 @@ for gnome-screensaver compatibility.
 
 %prep
 %setup -q -n %{name}-%{mainver}%{?minorver}
-%patch0 -p1
 
 # Remove unneeded shebangs
 grep -rl '^#![ \t]*%{_bindir}' lib/ | \
@@ -85,10 +82,7 @@ grep -rl 'import clutter' lib/ | \
 %endif
 
 # Use system-wide EXIF
-rm lib/utils/EXIF.py
-sed -i -e 's|from ..utils.EXIF|from EXIF|' \
-	lib/plugins/base.py
-
+ln -sf %{python_sitelib}/EXIF.py lib/utils/EXIF.py
 
 %build
 # Do nothing
@@ -104,6 +98,10 @@ mkdir -p %{buildroot}
 %endif
 	--root %{buildroot}
 
+# And again use system-wide EXIF.py
+ln -sf %{python_sitelib}/EXIF.py \
+	%{buildroot}%{python_sitelib}/%{name}/utils/EXIF.py
+
 # GConf schemas
 mkdir -p %{buildroot}%{_sysconfdir}/gconf/schemas
 mv \
@@ -171,7 +169,7 @@ exit 0
 %dir	%{_datadir}/%{name}/
 %{_datadir}/%{name}/*.ui
 %{_datadir}/%{name}/*.png
-%{_datadir}/%{name}/*.svg
+#%%{_datadir}/%{name}/*.svg
 %{_datadir}/%{name}/history/
 
 %{_datadir}/gnome/help/%{name}/
@@ -187,6 +185,9 @@ exit 0
 %{_datadir}/applications/screensavers/%{name}-screensaver.desktop
 
 %changelog
+* Tue Jan 18 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2-0.2.b6
+- Update to 1.2b6
+
 * Mon Dec 27 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2-0.1.b4
 - Update to 1.2b4
 - And pull patch from hg head to fix gnome-screensaver related dbus error
diff --git a/sources b/sources
index 60cdc7b..5b2a0fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0bd597384204f60b6a2fe45396a7a2ec  gphotoframe-1.2-b4.tar.gz
+f7340d0923a6e8ef1a19bc6fe1675aad  gphotoframe-1.2-b6.tar.gz