[gphotoframe/f15/master] Try 1.3 b1

[Mamoru Tasaka]

commit be63c7fdfbb2a319963caf779b77dba33e375991
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Thu Mar 24 17:17:36 2011 +0900

    Try 1.3 b1

 .gitignore       |    2 ++
 gphotoframe.spec |   17 +++++++++++++----
 sources          |    3 ++-
 3 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98c2165..42a6ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ gphotoframe-1.0.tar.gz
 /gphotoframe-1.2-b6.tar.gz
 /gphotoframe-1.2-rc1.tar.gz
 /gphotoframe-1.2.tar.gz
+/gphotoframe-1.3-b1.tar.gz
+/gphotoframe-1.3-b1-missing-files.tar.gz
diff --git a/gphotoframe.spec b/gphotoframe.spec
index 3f8efa2..1e7f72b 100644
--- a/gphotoframe.spec
+++ b/gphotoframe.spec
@@ -1,12 +1,15 @@
 # Please check again if someone wants to import
 # this also to EPEL.
 
+# Upstream uses hg for SCM
+# hg clone https://gphotoframe.googlecode.com/hg/ gphotoframe
+
 %if ! (0%{?fedora} > 12)
 %{!?python_sitelib:		%global python_sitelib	%(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %endif
 
-%global	mainver	1.2
-#%%global	minorver	-rc1
+%global	mainver	1.3
+%global	minorver	-b1
 
 %global	mainrel	1
 
@@ -15,7 +18,7 @@
 
 Name:		gphotoframe
 Version:	%{mainver}
-Release:	%{fedorarel}%{?dist}.1
+Release:	%{fedorarel}%{?dist}
 Summary:	Photo Frame Gadget for the GNOME Desktop
 
 Group:		Amusements/Graphics
@@ -24,6 +27,8 @@ 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
+# Some files are missing in 1.3 b1 tarball, pulled from upstream hg SCM
+Source1:	gphotoframe-1.3-b1-missing-files.tar.gz
 
 BuildRequires:	GConf2
 BuildRequires:	desktop-file-utils
@@ -73,7 +78,7 @@ This package contains scripts and desktop files of %{name}
 for gnome-screensaver compatibility.
 
 %prep
-%setup -q -n %{name}-%{mainver}%{?minorver}
+%setup -q -n %{name}-%{mainver}%{?minorver} -a 1
 
 # Remove unneeded shebangs
 grep -rl '^#![ \t]*%{_bindir}' lib/ | \
@@ -184,6 +189,7 @@ exit 0
 %{_datadir}/%{name}/*.ui
 %{_datadir}/%{name}/*.png
 #%%{_datadir}/%{name}/*.svg
+%{_datadir}/%{name}/extra/
 %{_datadir}/%{name}/history/
 
 %{_datadir}/gnome/help/%{name}/
@@ -199,6 +205,9 @@ exit 0
 %{_datadir}/applications/screensavers/%{name}-screensaver.desktop
 
 %changelog
+* Thu Mar 24 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.3-0.1.b1
+- Try 1.3 b1
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 1ebcacf..dee09c6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-b1a5ec45281a5398b0e6102f2d51c953  gphotoframe-1.2.tar.gz
+4592dac4d074a0863d1b3e947b2458b6  gphotoframe-1.3-b1.tar.gz
+bd1ceadb273a346056e9f935269a384a  gphotoframe-1.3-b1-missing-files.tar.gz