rpms/f-spot/F-13 0001-remove-empty-default-tags-from-schemas-file.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 0003-use-system-Gnome.Keyring-if-available.patch, 1.1, 1.2 f-spot.spec, 1.99, 1.100 sources, 1.25, 1.26 0001-use-system-Mono.Addins-if-available.patch, 1.2, NONE
chkr
chkr at fedoraproject.org
Wed Jun 2 21:24:46 UTC 2010
Author: chkr
Update of /cvs/pkgs/rpms/f-spot/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20300
Modified Files:
.cvsignore 0003-use-system-Gnome.Keyring-if-available.patch
f-spot.spec sources
Added Files:
0001-remove-empty-default-tags-from-schemas-file.patch
Removed Files:
0001-use-system-Mono.Addins-if-available.patch
Log Message:
* Wed Jun 02 2010 Christian Krause <chkr at fedoraproject.org> - 0.6.2-1
- Update to 0.6.2 (BZ 592895)
- Remove patch to use system mono-addins (fixed upstream)
- Update patch to use system keyring-sharp library
- Add scriptlets for schemas file
- Fix warning when installing schemas file
- Add unique(-devel) as (Build)Requires
- Add missing dependencies
0001-remove-empty-default-tags-from-schemas-file.patch:
f-spot.schemas.in | 5 -----
1 file changed, 5 deletions(-)
--- NEW FILE 0001-remove-empty-default-tags-from-schemas-file.patch ---
>From c8350486af10937b94c498d0107ce540518d6613 Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Mon, 24 May 2010 19:32:32 +0200
Subject: [PATCH] remove empty default tags from schemas file
- gconftool-2 complains about empty default tags in f-spot.schemas
for entries of the type integer
- this patch removes these empty default tags of all integer entries
---
f-spot.schemas.in | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/f-spot.schemas.in b/f-spot.schemas.in
index d5f91de..551d5d3 100644
--- a/f-spot.schemas.in
+++ b/f-spot.schemas.in
@@ -53,7 +53,6 @@
<key>/schemas/desktop/gnome/f-spot/ui/main_window_x</key>
<applyto>/desktop/gnome/f-spot/ui/main_window_x</applyto>
<type>int</type>
- <default></default>
<locale name="C">
<short>X position of the main window.</short>
<long>The X position to use for the main window.</long>
@@ -64,7 +63,6 @@
<key>/schemas/desktop/gnome/f-spot/ui/main_window_y</key>
<applyto>/desktop/gnome/f-spot/ui/main_window_y</applyto>
<type>int</type>
- <default></default>
<locale name="C">
<short>Y position of the main window.</short>
<long>The Y position to use for the main window.</long>
@@ -253,7 +251,6 @@
<key>/schemas/desktop/gnome/f-spot/ui/viewer_x</key>
<applyto>/desktop/gnome/f-spot/ui/viewer_x</applyto>
<type>int</type>
- <default></default>
<locale name="C">
<short>X position of the photo viewer window.</short>
<long>The X position to use for the photo viewer window.</long>
@@ -264,7 +261,6 @@
<key>/schemas/desktop/gnome/f-spot/ui/viewer_y</key>
<applyto>/desktop/gnome/f-spot/ui/viewer_y</applyto>
<type>int</type>
- <default></default>
<locale name="C">
<short>Y position of the photo viewer window.</short>
<long>The Y position to use for the photo viewer window.</long>
--
1.6.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-13/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore 8 Nov 2009 17:43:40 -0000 1.25
+++ .cvsignore 2 Jun 2010 21:24:45 -0000 1.26
@@ -1 +1 @@
-f-spot-0.6.1.5.tar.bz2
+f-spot-0.6.2.tar.bz2
0003-use-system-Gnome.Keyring-if-available.patch:
Makefile.include | 2 --
configure.ac | 19 ++++++++++++++++++-
lib/Makefile.am | 1 -
3 files changed, 18 insertions(+), 4 deletions(-)
Index: 0003-use-system-Gnome.Keyring-if-available.patch
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-13/0003-use-system-Gnome.Keyring-if-available.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0003-use-system-Gnome.Keyring-if-available.patch 8 Nov 2009 17:43:40 -0000 1.1
+++ 0003-use-system-Gnome.Keyring-if-available.patch 2 Jun 2010 21:24:45 -0000 1.2
@@ -1,49 +1,17 @@
-From c9686697f9f46e3e1e795a8e0942f80057a40b1c Mon Sep 17 00:00:00 2001
-From: Christian Krause <chkr at plauener.de>
-Date: Sun, 8 Nov 2009 16:08:25 +0100
-Subject: [PATCH 3/3] use system gnome-keyring if available
-
----
- Makefile.include | 2 --
- configure.ac | 19 +++++++++++++++++++
- lib/Makefile.am | 3 ++-
- 3 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.include b/Makefile.include
-index 43e748f..5afad6a 100644
---- a/Makefile.include
-+++ b/Makefile.include
-@@ -9,7 +9,6 @@ DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
- DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
- DIR_ICONS = $(top_builddir)/icons
- DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
--DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
- DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
- DIR_SEMWEB = $(top_builddir)/lib/semweb
- DIR_SRC = $(top_builddir)/src
-@@ -18,7 +17,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
-
- ## Links
-
--LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
- LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-diff --git a/configure.ac b/configure.ac
-index 99c6e36..544d90d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -69,6 +69,7 @@ BEAGLE_REQUIRED=0.3.0
- NDESK_DBUS_REQUIRED=0.4.2
- NDESK_DBUS_GLIB_REQUIRED=0.3.0
- MONO_ADDINS_REQUIRED=0.3.0
+diff -uNr f-spot-0.6.2.old/configure.ac f-spot-0.6.2/configure.ac
+--- f-spot-0.6.2.old/configure.ac 2010-05-14 20:38:21.000000000 +0200
++++ f-spot-0.6.2/configure.ac 2010-05-24 16:33:04.000000000 +0200
+@@ -150,6 +150,7 @@
+ LCMS_REQUIRED=1.12
+ LIBGPHOTO2_REQUIRED=2.4
+ MONOADDINS_REQUIRED=0.3
+KEYRING_REQUIRED=1.0.0.0
- MONO_CAIRO_REQUIRED=1.2.4
- CAIRO_REQUIRED=1.4.0
- dnl -- this check is
-@@ -174,6 +175,24 @@ AC_SUBST(DIR_ADDINS_SETUP)
- AC_SUBST(DIR_ADDINS_GUI)
- AC_SUBST(LINK_MONO_ADDINS)
+
+ PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED)
+ AC_SUBST(F_CFLAGS)
+@@ -199,6 +200,23 @@
+ PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
+ AC_SUBST(NDESK_DBUS_LIBS)
+dnl -- mono-addins link or bundle ?
+PKG_CHECK_MODULES(GNOME_KEYRING,
@@ -62,37 +30,44 @@ index 99c6e36..544d90d 100644
+AC_SUBST(DIR_GNOME_KEYRING)
+AC_SUBST(LINK_KEYRING)
+
-+
dnl -- nunit
PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED,
do_tests="yes", do_tests="no")
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index ea888d8..7e7bc4e 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -5,7 +5,6 @@ UNCONDITIONAL_SUBDIRS = \
+@@ -344,7 +362,6 @@
+ lib/gio-sharp/Makefile
+ lib/gio-sharp/gio/Makefile
+ lib/gio-sharp/generator/Makefile
+-lib/gnome-keyring-sharp/Makefile
+ lib/gtk-sharp-beans/Makefile
+ lib/libfspot/Makefile
+ lib/libgphoto2-sharp/Makefile
+diff -uNr f-spot-0.6.2.old/lib/Makefile.am f-spot-0.6.2/lib/Makefile.am
+--- f-spot-0.6.2.old/lib/Makefile.am 2010-02-16 15:39:27.000000000 +0100
++++ f-spot-0.6.2/lib/Makefile.am 2010-05-24 16:32:18.000000000 +0200
+@@ -4,7 +4,6 @@
+ UNCONDITIONAL_SUBDIRS = \
GKeyFile \
gio-sharp \
- glitz-sharp \
- gnome-keyring-sharp \
gtk-sharp-beans \
libjpegtran \
libfspot \
-@@ -20,6 +19,7 @@ SUBDIRS = \
- $(DIR_DBUS) \
- $(DIR_DBUS_GLIB) \
- $(DIR_ADDINS) \
-+ $(DIR_GNOME_KEYRING) \
- $(UNCONDITIONAL_SUBDIRS)
+diff -uNr f-spot-0.6.2.old/Makefile.include f-spot-0.6.2/Makefile.include
+--- f-spot-0.6.2.old/Makefile.include 2010-02-16 15:39:27.000000000 +0100
++++ f-spot-0.6.2/Makefile.include 2010-05-24 16:29:38.000000000 +0200
+@@ -8,7 +8,6 @@
+ DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
+ DIR_ICONS = $(top_builddir)/icons
+ DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
+-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
+ DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
+ DIR_SEMWEB = $(top_builddir)/lib/semweb
+ DIR_SRC = $(top_builddir)/src
+@@ -18,7 +17,6 @@
- DIST_SUBDIRS = \
-@@ -27,5 +27,6 @@ DIST_SUBDIRS = \
- dbus-sharp-glib \
- dpap-sharp \
- mono-addins \
-+ gnome-keyring-sharp \
- $(UNCONDITIONAL_SUBDIRS)
+ ## Links
---
-1.6.2.5
-
+-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-13/f-spot.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- f-spot.spec 5 Mar 2010 20:38:34 -0000 1.99
+++ f-spot.spec 2 Jun 2010 21:24:45 -0000 1.100
@@ -1,14 +1,14 @@
Name: f-spot
-Version: 0.6.1.5
-Release: 3%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
License: GPLv2+ and LGPLv2+ and CPL and MIT
URL: http://f-spot.org/
Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# Use system mono-addins
-Patch2: 0001-use-system-Mono.Addins-if-available.patch
+# Fix schemas file: http://gitorious.org/f-spot/mainline/merge_requests/2161
+Patch1: 0001-remove-empty-default-tags-from-schemas-file.patch
# unmount cameras before importing
Patch3: 0002-enhance-the-f-spot-import-script.patch
# Use system gnome-keyring
@@ -29,6 +29,8 @@ BuildRequires: ndesk-dbus-glib-devel
BuildRequires: mono-addins-devel
BuildRequires: desktop-file-utils
BuildRequires: gnome-keyring-sharp-devel
+BuildRequires: GConf2
+BuildRequires: unique-devel
Requires: sqlite >= 3.3.1
Requires: lcms-libs
Requires: dcraw
@@ -36,8 +38,12 @@ Requires: hicolor-icon-theme
Requires: yelp
Requires: libgphoto2
Requires: gtk2, gnome-vfs2, libgnomeui, libGL, libXcomposite
+Requires: unique
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun):GConf2
# no mono available
ExcludeArch: sparc64
@@ -66,15 +72,15 @@ photo collection in a slideshow as a scr
%prep
%setup -q
-%patch2 -p1 -F 2 -b .link-system-mono-addins
+%patch1 -p1 -b .schemas-fix
%patch3 -p1 -b .gvfs-gphoto
%patch4 -p1 -b .link-system-keyring
%build
-autoreconf -f -i
+autoreconf -f -i -I build/m4/shamrock -I build/m4/shave
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
%configure --disable-scrollkeeper
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
%install
@@ -101,9 +107,16 @@ done
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+%gconf_schema_prepare f-spot
+
%post
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+%gconf_schema_upgrade f-spot
+
+%preun
+%gconf_schema_remove f-spot
%postun
update-desktop-database &> /dev/null ||:
@@ -118,6 +131,7 @@ gtk-update-icon-cache %{_datadir}/icons/
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS
+%{_sysconfdir}/gconf/schemas/*
%{_datadir}/applications/*.desktop
%{_datadir}/gnome/help/f-spot/
%{_datadir}/icons/hicolor/*/*/*.png
@@ -144,6 +158,15 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
%changelog
+* Wed Jun 02 2010 Christian Krause <chkr at fedoraproject.org> - 0.6.2-1
+- Update to 0.6.2 (BZ 592895)
+- Remove patch to use system mono-addins (fixed upstream)
+- Update patch to use system keyring-sharp library
+- Add scriptlets for schemas file
+- Fix warning when installing schemas file
+- Add unique(-devel) as (Build)Requires
+- Add missing dependencies
+
* Fri Mar 05 2010 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-3
- Add missing dependencies
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-13/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources 8 Nov 2009 17:43:40 -0000 1.25
+++ sources 2 Jun 2010 21:24:45 -0000 1.26
@@ -1 +1 @@
-411bac8266a60d9a728218d19dd5e735 f-spot-0.6.1.5.tar.bz2
+82d281eb6c5c6b10e75313a897250444 f-spot-0.6.2.tar.bz2
--- 0001-use-system-Mono.Addins-if-available.patch DELETED ---
More information about the scm-commits
mailing list