rpms/f-spot/F-10 f-spot-0.5.0.3-link-system-mono-addins.patch, NONE, 1.1 f-spot.spec, 1.82, 1.83 f-spot-0.4.4-link-system-mono-addins.patch, 1.1, NONE

chkr chkr at fedoraproject.org
Fri Jul 31 15:26:37 UTC 2009


Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15036

Modified Files:
	f-spot.spec 
Added Files:
	f-spot-0.5.0.3-link-system-mono-addins.patch 
Removed Files:
	f-spot-0.4.4-link-system-mono-addins.patch 
Log Message:
* Fri Jul 31 2009 Christian Krause <chkr at fedoraproject.org> - 0.5.0.3-5
- Re-add patch to use system mono-addins (BZ #484996)


f-spot-0.5.0.3-link-system-mono-addins.patch:
 Makefile.am                                                   |    2 --
 Makefile.in                                                   |    2 --
 Makefile.include                                              |    8 ++++----
 Tao/Tao.GlPostProcess/Makefile.in                             |    6 +++---
 Tao/Tao.OpenGl.ExtensionLoader/Makefile.in                    |    6 +++---
 Tao/Tao.OpenGl.Glu/Makefile.in                                |    6 +++---
 Tao/Tao.OpenGl/Makefile.in                                    |    6 +++---
 configure.in                                                  |    4 ----
 dbus-sharp-glib/Makefile.in                                   |    6 +++---
 dbus-sharp/Makefile.in                                        |    6 +++---
 extensions/Exporters/CDExport/Makefile.in                     |    6 +++---
 extensions/Exporters/DefaultExporters/Makefile.in             |    6 +++---
 extensions/Exporters/FacebookExport/Makefile.in               |    9 +++------
 extensions/Exporters/FlickrExport/FlickrNet/Makefile.in       |    6 +++---
 extensions/Exporters/FlickrExport/Makefile.in                 |    6 +++---
 extensions/Exporters/FolderExport/Makefile.in                 |    6 +++---
 extensions/Exporters/GalleryExport/Makefile.in                |    6 +++---
 extensions/Exporters/PicasaWebExport/Makefile.in              |    6 +++---
 extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in |    6 +++---
 extensions/Exporters/SmugMugExport/Makefile.in                |    6 +++---
 extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in     |    6 +++---
 extensions/Exporters/TabbloExport/Makefile.in                 |    9 +++------
 extensions/Exporters/ZipExport/Makefile.in                    |    9 +++------
 extensions/Services/BeagleService/Makefile.in                 |    9 +++------
 extensions/Services/DBusService/Makefile.in                   |    9 +++------
 extensions/Tools/ChangePhotoPath/Makefile.in                  |    9 +++------
 extensions/Tools/DevelopInUFraw/Makefile.in                   |   10 +++-------
 extensions/Tools/HashJob/Makefile.in                          |    9 +++------
 extensions/Tools/MergeDb/Makefile.in                          |    9 +++------
 extensions/Tools/RawPlusJpeg/Makefile.in                      |    9 +++------
 glitz-sharp/src/Makefile.in                                   |    6 +++---
 gnome-keyring-sharp/Makefile.in                               |    6 +++---
 libgphoto2-sharp/Makefile.in                                  |    6 +++---
 mono-addins/Mono.Addins.Gui/Makefile.in                       |    6 +++---
 mono-addins/Mono.Addins.Setup/Makefile.in                     |    6 +++---
 mono-addins/Mono.Addins/Makefile.in                           |    6 +++---
 semweb/Makefile.in                                            |    6 +++---
 src/Makefile.in                                               |    6 +++---
 38 files changed, 106 insertions(+), 145 deletions(-)

--- NEW FILE f-spot-0.5.0.3-link-system-mono-addins.patch ---
diff -up f-spot-0.5.0.3/configure.in.link-system-mono-addins f-spot-0.5.0.3/configure.in
--- f-spot-0.5.0.3/configure.in.link-system-mono-addins	2008-10-17 14:54:15.000000000 -0400
+++ f-spot-0.5.0.3/configure.in	2008-10-17 14:54:15.000000000 -0400
@@ -346,10 +346,6 @@ libeog/cursors/Makefile
 libjpegtran/Makefile
 libfspot/Makefile
 libgphoto2-sharp/Makefile
-mono-addins/Makefile
-mono-addins/Mono.Addins/Makefile
-mono-addins/Mono.Addins.Gui/Makefile
-mono-addins/Mono.Addins.Setup/Makefile
 semweb/Makefile
 tools/Makefile
 po/Makefile.in
diff -up f-spot-0.5.0.3/dbus-sharp-glib/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/dbus-sharp-glib/Makefile.in
--- f-spot-0.5.0.3/dbus-sharp-glib/Makefile.in.link-system-mono-addins	2008-10-18 07:48:07.000000000 -0400
+++ f-spot-0.5.0.3/dbus-sharp-glib/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/dbus-sharp/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/dbus-sharp/Makefile.in
--- f-spot-0.5.0.3/dbus-sharp/Makefile.in.link-system-mono-addins	2008-10-18 07:48:07.000000000 -0400
+++ f-spot-0.5.0.3/dbus-sharp/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/CDExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/CDExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/CDExport/Makefile.in.link-system-mono-addins	2008-10-18 07:48:08.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/CDExport/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/DefaultExporters/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/DefaultExporters/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/DefaultExporters/Makefile.in.link-system-mono-addins	2008-10-18 07:48:09.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/DefaultExporters/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/FacebookExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/FacebookExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/FacebookExport/Makefile.in.link-system-mono-addins	2008-12-04 14:26:06.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Exporters/FacebookExport/Makefile.in	2008-12-04 14:26:31.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,9 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in.link-system-mono-addins	2008-10-18 07:48:09.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/FlickrExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/FlickrExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/FlickrExport/Makefile.in.link-system-mono-addins	2008-10-18 07:48:09.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/FlickrExport/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -302,9 +302,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/FolderExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/FolderExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/FolderExport/Makefile.in.link-system-mono-addins	2008-10-18 07:48:09.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/FolderExport/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/GalleryExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/GalleryExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/GalleryExport/Makefile.in.link-system-mono-addins	2008-10-18 07:48:09.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/GalleryExport/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in.link-system-mono-addins	2008-10-18 07:48:10.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/PicasaWebExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/PicasaWebExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/PicasaWebExport/Makefile.in.link-system-mono-addins	2008-10-18 07:48:10.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/PicasaWebExport/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -302,9 +302,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/SmugMugExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/SmugMugExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/SmugMugExport/Makefile.in.link-system-mono-addins	2008-10-18 07:48:10.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/SmugMugExport/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -302,9 +302,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in.link-system-mono-addins	2008-10-18 07:48:10.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/TabbloExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/TabbloExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/TabbloExport/Makefile.in.link-system-mono-addins	2008-12-04 14:26:54.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Exporters/TabbloExport/Makefile.in	2008-12-04 14:27:19.000000000 -0500
@@ -280,9 +280,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -302,9 +299,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Exporters/ZipExport/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Exporters/ZipExport/Makefile.in
--- f-spot-0.5.0.3/extensions/Exporters/ZipExport/Makefile.in.link-system-mono-addins	2008-10-18 07:48:10.000000000 -0400
+++ f-spot-0.5.0.3/extensions/Exporters/ZipExport/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,9 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins \
+	-pkg:mono-addins-setup \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Services/BeagleService/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Services/BeagleService/Makefile.in
--- f-spot-0.5.0.3/extensions/Services/BeagleService/Makefile.in.link-system-mono-addins	2008-12-04 14:27:31.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Services/BeagleService/Makefile.in	2008-12-04 14:27:49.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,9 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Services/DBusService/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Services/DBusService/Makefile.in
--- f-spot-0.5.0.3/extensions/Services/DBusService/Makefile.in.link-system-mono-addins	2008-12-04 14:27:55.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Services/DBusService/Makefile.in	2008-12-04 14:28:14.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,9 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Tools/ChangePhotoPath/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Tools/ChangePhotoPath/Makefile.in
--- f-spot-0.5.0.3/extensions/Tools/ChangePhotoPath/Makefile.in.link-system-mono-addins	2008-12-04 14:28:23.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Tools/ChangePhotoPath/Makefile.in	2008-12-04 14:28:42.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,9 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Tools/DevelopInUFraw/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Tools/DevelopInUFraw/Makefile.in
--- f-spot-0.5.0.3/extensions/Tools/DevelopInUFraw/Makefile.in.link-system-mono-addins	2008-12-04 14:23:47.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Tools/DevelopInUFraw/Makefile.in	2008-12-04 14:24:50.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,10 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
-
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
diff -up f-spot-0.5.0.3/extensions/Tools/HashJob/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Tools/HashJob/Makefile.in
--- f-spot-0.5.0.3/extensions/Tools/HashJob/Makefile.in.link-system-mono-addins	2008-12-04 14:28:57.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Tools/HashJob/Makefile.in	2008-12-04 14:29:16.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,9 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Tools/MergeDb/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Tools/MergeDb/Makefile.in
--- f-spot-0.5.0.3/extensions/Tools/MergeDb/Makefile.in.link-system-mono-addins	2008-12-04 14:29:22.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Tools/MergeDb/Makefile.in	2008-12-04 14:29:38.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,9 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/extensions/Tools/RawPlusJpeg/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/extensions/Tools/RawPlusJpeg/Makefile.in
--- f-spot-0.5.0.3/extensions/Tools/RawPlusJpeg/Makefile.in.link-system-mono-addins	2008-12-04 14:29:43.000000000 -0500
+++ f-spot-0.5.0.3/extensions/Tools/RawPlusJpeg/Makefile.in	2008-12-04 14:29:57.000000000 -0500
@@ -268,9 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-DIR_ADDINS_ADDINS = $(top_builddir)/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/glitz-sharp/src
@@ -290,9 +287,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins                \
+	-pkg:mono-addins-setup          \
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/glitz-sharp/src/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/glitz-sharp/src/Makefile.in
--- f-spot-0.5.0.3/glitz-sharp/src/Makefile.in.link-system-mono-addins	2008-10-18 07:48:12.000000000 -0400
+++ f-spot-0.5.0.3/glitz-sharp/src/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/gnome-keyring-sharp/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/gnome-keyring-sharp/Makefile.in
--- f-spot-0.5.0.3/gnome-keyring-sharp/Makefile.in.link-system-mono-addins	2008-10-18 07:48:12.000000000 -0400
+++ f-spot-0.5.0.3/gnome-keyring-sharp/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/libgphoto2-sharp/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/libgphoto2-sharp/Makefile.in
--- f-spot-0.5.0.3/libgphoto2-sharp/Makefile.in.link-system-mono-addins	2008-10-18 07:48:13.000000000 -0400
+++ f-spot-0.5.0.3/libgphoto2-sharp/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/Makefile.am.link-system-mono-addins f-spot-0.5.0.3/Makefile.am
--- f-spot-0.5.0.3/Makefile.am.link-system-mono-addins	2008-09-26 04:27:39.000000000 -0400
+++ f-spot-0.5.0.3/Makefile.am	2008-12-04 14:20:57.000000000 -0500
@@ -12,7 +12,6 @@ SUBDIRS = 		\
 	libfspot	\
 	libgphoto2-sharp \
 	Tao		\
-	mono-addins	\
 	tools		\
 	po		\
 	src		\
@@ -33,7 +32,6 @@ DIST_SUBDIRS = 		\
 	libfspot	\
 	libgphoto2-sharp \
 	Tao		\
-	mono-addins	\
 	tools		\
 	po		\
 	src		\
diff -up f-spot-0.5.0.3/Makefile.include.link-system-mono-addins f-spot-0.5.0.3/Makefile.include
--- f-spot-0.5.0.3/Makefile.include.link-system-mono-addins	2008-07-08 07:01:42.000000000 -0400
+++ f-spot-0.5.0.3/Makefile.include	2008-12-04 14:20:57.000000000 -0500
@@ -27,10 +27,10 @@ DIR_TAO_GLPOSTPROCESS = $(top_builddir)/
 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_MONO_ADDINS =			\
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = 								\
 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
diff -up f-spot-0.5.0.3/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/Makefile.in
--- f-spot-0.5.0.3/Makefile.in.link-system-mono-addins	2008-10-18 07:48:14.000000000 -0400
+++ f-spot-0.5.0.3/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -316,7 +316,6 @@ SUBDIRS = \
 	libfspot	\
 	libgphoto2-sharp \
 	Tao		\
-	mono-addins	\
 	tools		\
 	po		\
 	src		\
@@ -337,7 +336,6 @@ DIST_SUBDIRS = \
 	libfspot	\
 	libgphoto2-sharp \
 	Tao		\
-	mono-addins	\
 	tools		\
 	po		\
 	src		\
diff -up f-spot-0.5.0.3/mono-addins/Mono.Addins.Gui/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/mono-addins/Mono.Addins.Gui/Makefile.in
--- f-spot-0.5.0.3/mono-addins/Mono.Addins.Gui/Makefile.in.link-system-mono-addins	2008-10-18 07:48:13.000000000 -0400
+++ f-spot-0.5.0.3/mono-addins/Mono.Addins.Gui/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/mono-addins/Mono.Addins/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/mono-addins/Mono.Addins/Makefile.in
--- f-spot-0.5.0.3/mono-addins/Mono.Addins/Makefile.in.link-system-mono-addins	2008-10-18 07:48:13.000000000 -0400
+++ f-spot-0.5.0.3/mono-addins/Mono.Addins/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/mono-addins/Mono.Addins.Setup/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/mono-addins/Mono.Addins.Setup/Makefile.in
--- f-spot-0.5.0.3/mono-addins/Mono.Addins.Setup/Makefile.in.link-system-mono-addins	2008-10-18 07:48:13.000000000 -0400
+++ f-spot-0.5.0.3/mono-addins/Mono.Addins.Setup/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/semweb/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/semweb/Makefile.in
--- f-spot-0.5.0.3/semweb/Makefile.in.link-system-mono-addins	2008-10-18 07:48:13.000000000 -0400
+++ f-spot-0.5.0.3/semweb/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/src/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/src/Makefile.in
--- f-spot-0.5.0.3/src/Makefile.in.link-system-mono-addins	2008-10-18 07:48:13.000000000 -0400
+++ f-spot-0.5.0.3/src/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -296,9 +296,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/Tao/Tao.GlPostProcess/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/Tao/Tao.GlPostProcess/Makefile.in
--- f-spot-0.5.0.3/Tao/Tao.GlPostProcess/Makefile.in.link-system-mono-addins	2008-10-18 07:48:07.000000000 -0400
+++ f-spot-0.5.0.3/Tao/Tao.GlPostProcess/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -280,9 +280,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
--- f-spot-0.5.0.3/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in.link-system-mono-addins	2008-10-18 07:48:07.000000000 -0400
+++ f-spot-0.5.0.3/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/Tao/Tao.OpenGl.Glu/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/Tao/Tao.OpenGl.Glu/Makefile.in
--- f-spot-0.5.0.3/Tao/Tao.OpenGl.Glu/Makefile.in.link-system-mono-addins	2008-10-18 07:48:07.000000000 -0400
+++ f-spot-0.5.0.3/Tao/Tao.OpenGl.Glu/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \
diff -up f-spot-0.5.0.3/Tao/Tao.OpenGl/Makefile.in.link-system-mono-addins f-spot-0.5.0.3/Tao/Tao.OpenGl/Makefile.in
--- f-spot-0.5.0.3/Tao/Tao.OpenGl/Makefile.in.link-system-mono-addins	2008-10-18 07:48:07.000000000 -0400
+++ f-spot-0.5.0.3/Tao/Tao.OpenGl/Makefile.in	2008-12-04 14:20:57.000000000 -0500
@@ -290,9 +290,9 @@ LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-k
 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
+	-pkg:mono-addins		\
+	-pkg:mono-addins-setup		\
+	-pkg:mono-addins-gui
 
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = \


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- f-spot.spec	25 Jul 2009 19:51:25 -0000	1.82
+++ f-spot.spec	31 Jul 2009 15:26:37 -0000	1.83
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.5.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -13,6 +13,9 @@ Patch1:		f-spot-0.4.4-gtk-deprecated.pat
 Patch2:		missing-icon.patch
 # unmount cameras before importing
 Patch3:		gvfs-gphoto.patch
+# Use system mono-addins
+Patch4:         f-spot-0.5.0.3-link-system-mono-addins.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -56,6 +59,8 @@ touch -r configure.in configure.in.stamp
 %patch1 -p1 -b .gtk-deprecated
 %patch2 -p1 -b .missing-icon
 %patch3 -p1 -b .gvfs-gphoto
+%patch4 -p1 -b .link-system-mono-addins
+
 
 # restore timestamps
 touch -r configure.in.stamp configure.in
@@ -123,6 +128,9 @@ fi
 %{_libdir}/gio-sharp-unstable
 
 %changelog
+* Fri Jul 31 2009 Christian Krause <chkr at fedoraproject.org> - 0.5.0.3-5
+- Re-add patch to use system mono-addins (BZ #484996)
+
 * Sat Jul 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.5.0.3-4
 - Avoid showing f-spot twice for photo imports
 - Make f-spot-import work with gvfs (BZ #485037)


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




More information about the fedora-extras-commits mailing list