[gphotoframe/f17] 2.0-a2
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Mar 15 10:55:43 UTC 2012
commit 9f5975148e3e0ed9cd47fb376b9d119ef84a6d47
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Thu Mar 15 19:55:40 2012 +0900
2.0-a2
.gitignore | 1 +
gphotoframe.spec | 54 +++++++++++++++++++++++++++++-------------------------
sources | 2 +-
3 files changed, 31 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3722de..ce9149e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ gphotoframe-1.0.tar.gz
/gphotoframe-1.5-rc1.tar.gz
/gphotoframe-1.5.tar.gz
/gphotoframe-1.5.1.tar.gz
+/gphotoframe-2.0-a2.tar.gz
diff --git a/gphotoframe.spec b/gphotoframe.spec
index 214f9f9..640e53d 100644
--- a/gphotoframe.spec
+++ b/gphotoframe.spec
@@ -8,8 +8,8 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%endif
-%global mainver 1.5.1
-#%%undefine minorver
+%global mainver 2.0
+%define minorver -a2
%global mainrel 1
@@ -24,7 +24,8 @@ Summary: Photo Frame Gadget for the GNOME Desktop
Group: Amusements/Graphics
# GPLv3 seems safer than GPLv3+
# Some image files are under GPLv2+
-License: GPLv3 and GPLv2+
+# Documents under help/ directory are under GFDL
+License: GPLv3 and GPLv2+ and GFDL
URL: http://code.google.com/p/gphotoframe/
Source0: http://gphotoframe.googlecode.com/files/%{name}-%{mainver}%{?minorver}.tar.gz
@@ -40,25 +41,26 @@ BuildRequires: python-exif
BuildRequires: pyxdg
# Mandatory
-Requires: pygtk2
+Requires: pygobject3
Requires: python-exif
Requires: python-twisted-web
Requires: pyxdg
-# Perhaps Mandatory
-# From 1.2-b4
-Requires: dbus-python
+
+# girepository
+Requires: gtk3
+Requires: webkitgtk3
# Optional
Requires: libproxy-python
-Requires: gnome-python2-gnomekeyring
# For now kill two below
# Does not seem to work with clutter-gtk
#Requires: pyclutter
#Requires: pyclutter-gtk
Requires: python-feedparser
+# girepository
+Requires: libchamplain-gtk
# Scriptlets
+
Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
BuildArch: noarch
@@ -112,13 +114,11 @@ ln -sf %{python_sitelib}/EXIF.py \
%{buildroot}%{python_sitelib}/%{name}/utils/EXIF.py
%endif
-# GConf schemas
-mkdir -p %{buildroot}%{_sysconfdir}/gconf/schemas
-mv \
- %{buildroot}%{_datadir}/gconf/schemas/%{name}.schemas \
- %{buildroot}%{_sysconfdir}/gconf/schemas/
-rmdir %{buildroot}%{_datadir}/gconf/schemas/
-rmdir %{buildroot}%{_datadir}/gconf/
+# Gsettings Schemas
+mkdir -p %{buildroot}%{_datadir}/glib-2.0/schemas
+install -cpm 0644 \
+ share/com.googlecode.gphotoframe.gschema.xml.in \
+ %{buildroot}%{_datadir}/glib-2.0/schemas/com.googlecode.gphotoframe.gschema.xml
# Desktop
desktop-file-validate \
@@ -150,27 +150,24 @@ mv %{buildroot}%{_prefix}/lib/gnome-screensaver/gnome-screensaver/gphotoframe-sc
%endif
%pre
-%gconf_schema_prepare %{name}
+%gconf_schema_obsolete %{name}
exit 0
%post
touch --no-create %{_datadir}/icons/hicolor >/dev/null
-%gconf_schema_upgrade %{name}
-exit 0
-
-%preun
-%gconf_schema_remove %{name}
exit 0
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor >/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas > /dev/null
fi
exit 0
-%postrrans
+%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null
+glib-compile-schemas %{_datadir}/glib-2.0/schemas > /dev/null
exit 0
@@ -195,7 +192,8 @@ exit 0
%{_datadir}/gnome/help/%{name}/
%{_datadir}/omf/%{name}/
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
+#%%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_datadir}/glib-2.0/schemas/com.googlecode.%{name}.gschema.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/*
@@ -205,6 +203,12 @@ exit 0
%{_datadir}/applications/screensavers/%{name}-screensaver.desktop
%changelog
+* Thu Mar 15 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.0-0.1.a2
+- 2.0-a2
+
+* Thu Mar 15 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.5.1-2
+- Fix scriptlet type name
+
* Mon Mar 5 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.5.1-1
- 1.5.1
diff --git a/sources b/sources
index 51cb637..2c93933 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ca8376856d847b6e95ae0d96eb3d353 gphotoframe-1.5.1.tar.gz
+70416eb0734841af8a1d5acb1ed50828 gphotoframe-2.0-a2.tar.gz
More information about the scm-commits
mailing list