Sun Aug 9 14:43:24 UTC 2009

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29869

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	0001-use-system-Mono.Addins-if-available.patch 
	0001-use-the-correct-stock-icon.patch 
	0002-enhance-the-f-spot-import-script.patch 
Removed Files:
	f-spot-0.1.11-libdir.patch f-spot-0.1.3-single.patch 
	f-spot-0.2.0-libgphoto2-port.patch f-spot-0.3.2-libdir.patch 
	f-spot-0.3.5-desktop-file-validate.patch 
	f-spot-0.3.5-screensaver.patch 
	f-spot-0.4.2-GalleryExport.patch 
	f-spot-0.4.2-link_system_libs.patch 
	f-spot-0.4.4-Makefile-destdir.patch f-spot-0.4.4-desktop.patch 
	f-spot-0.4.4-glib-sharp-2.12.0.patch 
	f-spot-0.4.4-gtk-deprecated.patch 
	f-spot-0.4.4-link-system-mono-addins.patch gvfs-gphoto.patch 
	missing-icon.patch x-content.patch 
Log Message:
* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
- Update to new upstream version 0.6.0.0
- Cleanup spec file


0001-use-system-Mono.Addins-if-available.patch:
 Makefile.include |    7 -------
 configure.ac     |   28 ++++++++++++++++++++++++++++
 lib/Makefile.am  |    4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE 0001-use-system-Mono.Addins-if-available.patch ---

diff --git a/Makefile.include b/Makefile.include
index efd6d72..4be9a8b 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -3,9 +3,6 @@
 
 ## Directories
 
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
@@ -28,10 +25,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 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_MONO_ADDINS =					\
-	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
-	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
-	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = 								\
 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
diff --git a/configure.ac b/configure.ac
index e31bd27..1acaaa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ GTK_REQUIRED=2.14
 BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
+MONO_ADDINS_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
@@ -127,6 +128,33 @@ AC_SUBST(LINK_BEAGLE)
 
 AC_SUBST(CSC_DEFINES)
 
+dnl -- mono-addins link or bundle ?
+PKG_CHECK_MODULES(MONO_ADDINS, 
+		  mono-addins >= $MONO_ADDINS_REQUIRED
+		  mono-addins-setup >= $MONO_ADDINS_REQUIRED
+		  mono-addins-gui >= $MONO_ADDINS_REQUIRED,
+[
+	DIR_ADDINS=""
+	DIR_ADDINS_ADDINS=""
+	DIR_ADDINS_SETUP=""
+	DIR_ADDINS_GUI=""
+	LINK_MONO_ADDINS="-pkg:mono-addins -pkg:mono-addins-setup -pkg:mono-addins-gui"
+],
+[
+	DIR_ADDINS="mono-addins"
+	DIR_ADDINS_ADDINS='$(top_builddir)/lib/mono-addins/Mono.Addins'
+	DIR_ADDINS_SETUP='$(top_builddir)/lib/mono-addins/Mono.Addins.Setup'
+	DIR_ADDINS_GUI='$(top_builddir)/lib/mono-addins/Mono.Addins.Gui'
+	LINK_MONO_ADDINS='-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll         \
+			  -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll    \
+			  -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll'
+])
+AC_SUBST(DIR_ADDINS)
+AC_SUBST(DIR_ADDINS_ADDINS)
+AC_SUBST(DIR_ADDINS_SETUP)
+AC_SUBST(DIR_ADDINS_GUI)
+AC_SUBST(LINK_MONO_ADDINS)
+
 dnl -- dbus-sharp: link or bundle ?
 PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
 [
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6d69f9..d0b9a6c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,7 +10,6 @@ UNCONDITIONAL_SUBDIRS = \
 	libjpegtran			\
 	libfspot			\
 	libgphoto2-sharp	\
-	mono-addins			\
 	semweb				\
 	Tao
 
@@ -21,11 +20,13 @@ UNCONDITIONAL_SUBDIRS = \
 SUBDIRS = 				\
 	$(DIR_DBUS)			\
 	$(DIR_DBUS_GLIB)	\
+	$(DIR_ADDINS)	\
 	$(UNCONDITIONAL_SUBDIRS)
 
 DIST_SUBDIRS = 			\
 	dbus-sharp			\
 	dbus-sharp-glib		\
+	mono-addins		\
 	dpap-sharp			\
 	$(UNCONDITIONAL_SUBDIRS)
 
-- 
1.6.0.6


0001-use-the-correct-stock-icon.patch:
 ImportCommand.cs |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-use-the-correct-stock-icon.patch ---
diff --git a/src/ImportCommand.cs b/src/ImportCommand.cs
index d4a9e23..a47015e 100644
--- a/src/ImportCommand.cs
+++ b/src/ImportCommand.cs
@@ -256,7 +256,7 @@ public class ImportCommand : GladeDialog
 				}
 			} else {
 				ImportSource source = new BrowseSource (Catalog.GetString ("(No Cameras Detected)"),
-									"emblem-camera");
+									"camera-photo");
 				item = new SourceItem (source);
 				item.Activated += HandleActivated;
 				item.Sensitive = false;
-- 
1.6.0.6


0002-enhance-the-f-spot-import-script.patch:
 f-spot-import |   31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

--- NEW FILE 0002-enhance-the-f-spot-import-script.patch ---
diff --git a/tools/f-spot-import b/tools/f-spot-import
index 98385b1..34facc0 100755
--- a/tools/f-spot-import
+++ b/tools/f-spot-import
@@ -3,22 +3,46 @@
 udi="$1"
 #xmessage $udi
 
+# check for gvfs mount point using gphoto2
+gvfsuri=`gvfs-ls -c "$udi/"`
+if [ "${gvfsuri:0:10}" = "gphoto2://" ] ; then
+	if [ "${gvfsuri:11:4}" = "usb:" ] ; then
+		# Yield for f-spot since it wants to access the device directly
+		#
+		# Rewrite the uri to something f-spot can handle
+		#
+		bus="${gvfsuri:15:3}"
+		dev="${gvfsuri:19:3}"
+
+		uri="gphoto2:usb:$bus,$dev"
+
+		gvfs-mount --unmount-scheme gphoto2
+		f-spot --import "$uri"
+		exit
+	fi
+	# mounted via gphoto2 not using USB, stay with the plain directory
+	f-spot --import "$udi"
+	exit
+fi
+
 if [ "$udi" != "${udi#gphoto2:}" ]; then
 	# gphoto2, as passed by gvfs/nautilus
 	gvfs-mount -u "$udi" || true
 	f-spot --import "$udi"
 	exit
 fi
-mnt=${udi#file://}
-if [ "$udi" != "$mnt" ]; then
+
+if [ "$udi" != "${udi#file://}" ]; then
 	# mount point, as passed by gvfs/nautilus.
 	f-spot --import "$udi"
 	exit
 fi
+
 mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point` || true
 if [ -n "$mount_point" ]; then
 	# USB Mass Storage camera: need to pass f-spot a mount point
 	f-spot --import "$mount_point"
+	exit
 else
 	# Some other camera try GPhoto2
 
@@ -27,4 +51,6 @@ else
 	uri=`printf gphoto2:[usb:%.3d,%.3d] $bus $dev`
 
 	f-spot --import "$uri"
+	exit
 fi
+xmessage "f-spot-import can't handle UDI: \"$udi\""
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Dec 2008 17:49:40 -0000	1.20
+++ .cvsignore	9 Aug 2009 14:43:22 -0000	1.21
@@ -1 +1 @@
-f-spot-0.5.0.3.tar.bz2
+f-spot-0.6.0.0.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- f-spot.spec	25 Jul 2009 20:14:22 -0000	1.87
+++ f-spot.spec	9 Aug 2009 14:43:23 -0000	1.88
@@ -1,18 +1,18 @@
 Name:           f-spot
-Version:        0.5.0.3
-Release:        9%{?dist}
+Version:        0.6.0.0
+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://download.gnome.org/sources/f-spot/0.5/f-spot-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=591223
+Patch1:         0001-use-the-correct-stock-icon.patch
 # Use system mono-addins
-Patch3:         f-spot-0.4.4-link-system-mono-addins.patch
-# fix a missing icon
-Patch4:         missing-icon.patch
+Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
-Patch5:         gvfs-gphoto.patch
+Patch3:         0002-enhance-the-f-spot-import-script.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -30,6 +30,9 @@ BuildRequires:  desktop-file-utils
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 Requires:       dcraw
+Requires:       hicolor-icon-theme 
+Requires:       gnome-screensaver
+Requires:       yelp
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -50,32 +53,26 @@ sorting and tagging of digital images. 
 %prep
 %setup -q
 
-# preserve timestamps
-touch -r configure.in configure.in.stamp
-
-%patch3 -p1 -b .link-system-mono-addins
-%patch4 -p1 -b .missing-icon
-%patch5 -p1 -b .gvfs-gphoto
-
-# restore timestamps
-touch -r configure.in.stamp configure.in
+%patch1 -p1 -b .missing-icon
+%patch2 -p1 -b .link-system-mono-addins
+%patch3 -p1 -b .gvfs-gphoto
 
 %build
+autoreconf -f -i
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --disable-scrollkeeper
-make
+# parallel build broken in 0.6.0.0, try again with next release
+make # %{?_smp_mflags}
 
 
 %install
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 rm -rf $RPM_BUILD_ROOT
+export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
-# Will need to be removed at some point...
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gio-sharp-unstable.pc
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.dll
@@ -92,37 +89,42 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
 %{_datadir}/applications/*.desktop
-%{_datadir}/gnome/help/f-spot
+%{_datadir}/gnome/help/f-spot/
 %{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/icons/hicolor/*/*/*.svg
-%{_datadir}/f-spot
-%{_libdir}/f-spot
+%{_datadir}/f-spot/
+%{_libdir}/f-spot/
 %{_bindir}/f-spot
 %{_bindir}/f-spot-import
 %{_bindir}/f-spot-sqlite-upgrade
 %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
-%{_datadir}/omf/f-spot
-# GIO is currently provided in f-spot only, so this'll need to be removed sometime in the future
-%{_libdir}/gio-sharp-unstable
+%{_datadir}/omf/f-spot/
 
 %changelog
+* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
+- Update to new upstream version 0.6.0.0
+- Cleanup spec file
+
 * Sat Jul 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.5.0.3-9
 - Avoid showing f-spot twice for photo imports
 - Make f-spot-import work with gvfs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Dec 2008 17:49:40 -0000	1.20
+++ sources	9 Aug 2009 14:43:24 -0000	1.21
@@ -1 +1 @@
-52db86f1dc715a3958425aa3d006c900  f-spot-0.5.0.3.tar.bz2
+9115f9df72c5fc1c82eb46b3af01e67d  f-spot-0.6.0.0.tar.bz2


--- f-spot-0.1.11-libdir.patch DELETED ---


--- f-spot-0.1.3-single.patch DELETED ---


--- f-spot-0.2.0-libgphoto2-port.patch DELETED ---


--- f-spot-0.3.2-libdir.patch DELETED ---


--- f-spot-0.3.5-desktop-file-validate.patch DELETED ---


--- f-spot-0.3.5-screensaver.patch DELETED ---


--- f-spot-0.4.2-GalleryExport.patch DELETED ---


--- f-spot-0.4.2-link_system_libs.patch DELETED ---


--- f-spot-0.4.4-Makefile-destdir.patch DELETED ---


--- f-spot-0.4.4-desktop.patch DELETED ---


--- f-spot-0.4.4-glib-sharp-2.12.0.patch DELETED ---


--- f-spot-0.4.4-gtk-deprecated.patch DELETED ---


--- f-spot-0.4.4-link-system-mono-addins.patch DELETED ---


--- gvfs-gphoto.patch DELETED ---


--- missing-icon.patch DELETED ---


--- x-content.patch DELETED ---


