[gphotoframe] - Update to 1.1

[Mamoru Tasaka]

commit 9f063a47209e3ee487627a46681ccb43bcf442d6
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sat Oct 23 02:34:42 2010 +0900

    - Update to 1.1

 .gitignore       |    1 +
 gphotoframe.spec |   61 ++++++++++++++++++++++++++++++++++++++---------------
 sources          |    2 +-
 3 files changed, 46 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9c58afe..d70279f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gphotoframe-1.0.tar.gz
+/gphotoframe-1.1.tar.gz
diff --git a/gphotoframe.spec b/gphotoframe.spec
index ca08e44..66fcda3 100644
--- a/gphotoframe.spec
+++ b/gphotoframe.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:		gphotoframe
-Version:	1.0
-Release:	2%{?dist}.1
+Version:	1.1
+Release:	1%{?dist}
 Summary:	Photo Frame Gadget for the GNOME Desktop
 
 Group:		Amusements/Graphics
@@ -65,8 +65,10 @@ grep -rl '^#![ \t]*%{_bindir}' lib/ | \
 	xargs sed -i -e '\@^#![ \t]*%{_bindir}@d'
 
 # Explicitly don't use clutter-gtk for now
+%if 1
 grep -rl 'import clutter' lib/ | \
 	xargs sed -i -e 's|import clutter|import dont_use_clutter|'
+%endif
 
 # Use system-wide EXIF
 rm lib/utils/EXIF.py
@@ -75,36 +77,35 @@ sed -i -e 's|from ..utils.EXIF|from EXIF|' \
 
 
 %build
-%{__python} setup.py build
+# Do nothing
+#%%{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
 
 %{__python} setup.py install \
+%if 0
 	--skip-build \
+%endif
 	--root %{buildroot}
 
 # GConf schemas
 mkdir -p %{buildroot}%{_sysconfdir}/gconf/schemas
-install -cpm 0644 ./build/share/gconf/schemas/%{name}.schemas \
+mv \
+	%{buildroot}%{_datadir}/gconf/schemas/%{name}.schemas \
 	%{buildroot}%{_sysconfdir}/gconf/schemas/
+rmdir %{buildroot}%{_datadir}/gconf/schemas/
+rmdir %{buildroot}%{_datadir}/gconf/
 
-# Install desktop
-mkdir -p \
-	%{buildroot}%{_datadir}/applications
-desktop-file-install \
-	--dir %{buildroot}%{_datadir}/applications \
-	build/share/applications/gphotoframe.desktop
+# Desktop
+desktop-file-validate \
+	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # gnome-screensver related
 # FIXME: I don't use gnome-screensaver...
 mkdir -p \
-	%{buildroot}%{_libexecdir}/gnome-screensaver \
-	%{buildroot}%{_datadir}/applications/screensavers
-install -cpm 0644 \
-	./build/share/applications/screensavers/gphotoframe-screensaver.desktop \
-	%{buildroot}%{_datadir}/applications/screensavers/
+	%{buildroot}%{_libexecdir}/gnome-screensaver
 # ignore failure (if any) for screensaver desktop
 desktop-file-validate \
 	%{buildroot}%{_datadir}/applications/screensavers/gphotoframe-screensaver.desktop || true
@@ -112,6 +113,8 @@ desktop-file-validate \
 mv %{buildroot}%{_prefix}/lib/gnome-screensaver/gnome-screensaver/gphotoframe-screensaver \
 	%{buildroot}%{_libexecdir}/gnome-screensaver/
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -120,6 +123,7 @@ rm -rf %{buildroot}
 exit 0
 
 %post
+touch --no-create %{_datadir}/icons/hicolor >/dev/null
 %gconf_schema_upgrade %{name}
 exit 0
 
@@ -127,7 +131,19 @@ exit 0
 %gconf_schema_remove %{name}
 exit 0
 
-%files
+%postun
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/hicolor >/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null
+fi
+exit 0
+
+%postrrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null
+exit 0
+
+
+%files	-f %{name}.lang
 %defattr(-,root,root,-)
 %doc	COPYING
 %doc	GPL
@@ -137,10 +153,18 @@ exit 0
 %{_bindir}/%{name}
 %{python_sitelib}/%{name}-*.egg-info
 %{python_sitelib}/%{name}/
-%{_datadir}/%{name}/
+
+%dir	%{_datadir}/%{name}/
+%{_datadir}/%{name}/*.ui
+%{_datadir}/%{name}/*.png
+%{_datadir}/%{name}/*.svg
+
+%{_datadir}/gnome/help/%{name}/
+%{_datadir}/omf/%{name}/
 
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/*
 
 %files	gss
 %defattr(-,root,root,-)
@@ -148,6 +172,9 @@ exit 0
 %{_datadir}/applications/screensavers/%{name}-screensaver.desktop
 
 %changelog
+* Sat Oct 23 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1-1
+- Update to 1.1
+
 * Tue Jul 27 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-14: rebuild against python 2.7
 
diff --git a/sources b/sources
index 94d6358..f2d5d38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b4b36d7e5d6d66961178e0117756e53  gphotoframe-1.0.tar.gz
+9f788179bfc5f485b0776f2d2ee92fe6  gphotoframe-1.1.tar.gz