rpms/f-spot/devel f-spot-0.4.4-link-system-mono-addins.patch, 1.2, 1.3 f-spot.spec, 1.81, 1.82
Matthias Clasen
mclasen at fedoraproject.org
Thu Dec 4 19:06:40 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17966
Modified Files:
f-spot-0.4.4-link-system-mono-addins.patch f-spot.spec
Log Message:
try again
f-spot-0.4.4-link-system-mono-addins.patch:
Index: f-spot-0.4.4-link-system-mono-addins.patch
===================================================================
RCS file: /cvs/extras/rpms/f-spot/devel/f-spot-0.4.4-link-system-mono-addins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- f-spot-0.4.4-link-system-mono-addins.patch 4 Dec 2008 17:41:51 -0000 1.2
+++ f-spot-0.4.4-link-system-mono-addins.patch 4 Dec 2008 19:06:39 -0000 1.3
@@ -1,7 +1,7 @@
-diff -ur f-spot-0.4.4.old/configure.in f-spot-0.4.4/configure.in
---- f-spot-0.4.4.old/configure.in 2008-05-28 09:08:19.000000000 +1200
-+++ f-spot-0.4.4/configure.in 2008-07-14 01:15:05.000000000 +1200
-@@ -334,10 +334,6 @@
+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
@@ -12,11 +12,10 @@
semweb/Makefile
tools/Makefile
po/Makefile.in
-Only in f-spot-0.4.4: configure.in.orig
-diff -ur f-spot-0.4.4.old/dbus-sharp/Makefile.in f-spot-0.4.4/dbus-sharp/Makefile.in
---- f-spot-0.4.4.old/dbus-sharp/Makefile.in 2008-05-28 18:43:54.000000000 +1200
-+++ f-spot-0.4.4/dbus-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -29,11 +28,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/dbus-sharp: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/dbus-sharp-glib/Makefile.in f-spot-0.4.4/dbus-sharp-glib/Makefile.in
---- f-spot-0.4.4.old/dbus-sharp-glib/Makefile.in 2008-05-28 18:43:54.000000000 +1200
-+++ f-spot-0.4.4/dbus-sharp-glib/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -46,11 +44,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/dbus-sharp-glib: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/CDExport/Makefile.in f-spot-0.4.4/extensions/CDExport/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/CDExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/CDExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -63,11 +60,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/CDExport: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/DefaultExporters/Makefile.in f-spot-0.4.4/extensions/DefaultExporters/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/DefaultExporters/Makefile.in 2008-05-28 18:43:55.000000000 +1200
-+++ f-spot-0.4.4/extensions/DefaultExporters/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -80,11 +76,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/DefaultExporters: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in f-spot-0.4.4/extensions/FlickrExport/FlickrNet/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in 2008-05-28 18:43:55.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/FlickrExport/FlickrNet/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -97,11 +92,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/FlickrExport/FlickrNet: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/FlickrExport/Makefile.in f-spot-0.4.4/extensions/FlickrExport/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/FlickrExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/FlickrExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -303,9 +303,9 @@
+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 12:38:22.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 = \
@@ -114,11 +108,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/FlickrExport: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/FolderExport/Makefile.in f-spot-0.4.4/extensions/FolderExport/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/FolderExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/FolderExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -131,11 +124,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/FolderExport: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/GalleryExport/Makefile.in f-spot-0.4.4/extensions/GalleryExport/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/GalleryExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/GalleryExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -148,11 +140,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/GalleryExport: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in f-spot-0.4.4/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in 2008-05-28 18:43:56.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/PicasaWebExport/google-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -165,11 +156,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/PicasaWebExport/google-sharp: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/PicasaWebExport/Makefile.in f-spot-0.4.4/extensions/Exporters/PicasaWebExport/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/PicasaWebExport/Makefile.in 2008-05-28 18:43:56.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/PicasaWebExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -303,9 +303,9 @@
+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 12:38:22.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 = \
@@ -182,11 +172,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/PicasaWebExport: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/SmugMugExport/Makefile.in f-spot-0.4.4/extensions/Exporters/SmugMugExport/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/SmugMugExport/Makefile.in 2008-05-28 18:43:56.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/SmugMugExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -303,9 +303,9 @@
+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 12:38:22.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 = \
@@ -199,11 +188,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/SmugMugExport: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in f-spot-0.4.4/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in
---- f-spot-0.4.4.old/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in 2008-05-28 18:43:56.000000000 +1200
-+++ f-spot-0.4.4/extensions/Exporters/SmugMugExport/SmugMugNet/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -216,11 +204,36 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/extensions/SmugMugExport/SmugMugNet: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/glitz-sharp/src/Makefile.in f-spot-0.4.4/glitz-sharp/src/Makefile.in
---- f-spot-0.4.4.old/glitz-sharp/src/Makefile.in 2008-05-28 18:43:56.000000000 +1200
-+++ f-spot-0.4.4/glitz-sharp/src/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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-12-04 14:03:45.000000000 -0500
++++ f-spot-0.5.0.3/extensions/Exporters/ZipExport/Makefile.in 2008-12-04 14:05: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/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 12:38:22.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 = \
@@ -233,11 +246,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/glitz-sharp/src: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/gnome-keyring-sharp/Makefile.in f-spot-0.4.4/gnome-keyring-sharp/Makefile.in
---- f-spot-0.4.4.old/gnome-keyring-sharp/Makefile.in 2008-05-28 18:43:57.000000000 +1200
-+++ f-spot-0.4.4/gnome-keyring-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -250,11 +262,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/gnome-keyring-sharp: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/libgphoto2-sharp/Makefile.in f-spot-0.4.4/libgphoto2-sharp/Makefile.in
---- f-spot-0.4.4.old/libgphoto2-sharp/Makefile.in 2008-05-28 18:43:57.000000000 +1200
-+++ f-spot-0.4.4/libgphoto2-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -267,31 +278,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/libgphoto2-sharp: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/Makefile.am f-spot-0.4.4/Makefile.am
---- f-spot-0.4.4.old/Makefile.am 2008-05-29 07:37:22.000000000 +1200
-+++ f-spot-0.4.4/Makefile.am 2008-07-14 01:15:05.000000000 +1200
-@@ -12,7 +12,6 @@
- libfspot \
- libgphoto2-sharp \
- Tao \
-- mono-addins \
- tools \
- po \
- src \
-@@ -32,7 +31,6 @@
- libfspot \
- libgphoto2-sharp \
- Tao \
-- mono-addins \
- tools \
- po \
- src \
-Only in f-spot-0.4.4: Makefile.am.orig
-diff -ur f-spot-0.4.4.old/Makefile.in f-spot-0.4.4/Makefile.in
---- f-spot-0.4.4.old/Makefile.in 2008-05-29 07:38:03.000000000 +1200
-+++ f-spot-0.4.4/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -317,7 +317,6 @@
+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 12:38:22.000000000 -0500
+@@ -12,7 +12,6 @@ SUBDIRS = \
libfspot \
libgphoto2-sharp \
Tao \
@@ -299,7 +289,7 @@
tools \
po \
src \
-@@ -337,7 +336,6 @@
+@@ -33,7 +32,6 @@ DIST_SUBDIRS = \
libfspot \
libgphoto2-sharp \
Tao \
@@ -307,10 +297,10 @@
tools \
po \
src \
-diff -ur f-spot-0.4.4.old/Makefile.include f-spot-0.4.4/Makefile.include
---- f-spot-0.4.4.old/Makefile.include 2008-05-17 06:52:42.000000000 +1200
-+++ f-spot-0.4.4/Makefile.include 2008-07-14 01:15:05.000000000 +1200
-@@ -27,10 +27,10 @@
+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 12:38:22.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
@@ -325,11 +315,29 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
-Only in f-spot-0.4.4: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/mono-addins/Mono.Addins/Makefile.in f-spot-0.4.4/mono-addins/Mono.Addins/Makefile.in
---- f-spot-0.4.4.old/mono-addins/Mono.Addins/Makefile.in 2008-05-28 18:43:58.000000000 +1200
-+++ f-spot-0.4.4/mono-addins/Mono.Addins/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 12:38:22.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 = \
@@ -342,11 +350,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/mono-addins/Mono.Addins: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/mono-addins/Mono.Addins.Gui/Makefile.in f-spot-0.4.4/mono-addins/Mono.Addins.Gui/Makefile.in
---- f-spot-0.4.4.old/mono-addins/Mono.Addins.Gui/Makefile.in 2008-05-28 18:43:58.000000000 +1200
-+++ f-spot-0.4.4/mono-addins/Mono.Addins.Gui/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -359,11 +366,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/mono-addins/Mono.Addins.Gui: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/mono-addins/Mono.Addins.Setup/Makefile.in f-spot-0.4.4/mono-addins/Mono.Addins.Setup/Makefile.in
---- f-spot-0.4.4.old/mono-addins/Mono.Addins.Setup/Makefile.in 2008-05-28 18:43:58.000000000 +1200
-+++ f-spot-0.4.4/mono-addins/Mono.Addins.Setup/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -376,11 +382,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/mono-addins/Mono.Addins.Setup: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/semweb/Makefile.in f-spot-0.4.4/semweb/Makefile.in
---- f-spot-0.4.4.old/semweb/Makefile.in 2008-05-28 18:43:58.000000000 +1200
-+++ f-spot-0.4.4/semweb/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -393,11 +398,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/semweb: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/src/Makefile.in f-spot-0.4.4/src/Makefile.in
---- f-spot-0.4.4.old/src/Makefile.in 2008-05-28 21:29:41.000000000 +1200
-+++ f-spot-0.4.4/src/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -297,9 +297,9 @@
+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 12:38:22.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 = \
@@ -410,11 +414,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/src: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/Tao/Tao.GlPostProcess/Makefile.in f-spot-0.4.4/Tao/Tao.GlPostProcess/Makefile.in
---- f-spot-0.4.4.old/Tao/Tao.GlPostProcess/Makefile.in 2008-05-28 18:43:54.000000000 +1200
-+++ f-spot-0.4.4/Tao/Tao.GlPostProcess/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -281,9 +281,9 @@
+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 12:38:22.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 = \
@@ -427,11 +430,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/Tao/Tao.GlPostProcess: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/Tao/Tao.OpenGl/Makefile.in f-spot-0.4.4/Tao/Tao.OpenGl/Makefile.in
---- f-spot-0.4.4.old/Tao/Tao.OpenGl/Makefile.in 2008-05-28 18:43:54.000000000 +1200
-+++ f-spot-0.4.4/Tao/Tao.OpenGl/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -444,11 +446,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/Tao/Tao.OpenGl: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot-0.4.4/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
---- f-spot-0.4.4.old/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-05-28 18:43:54.000000000 +1200
-+++ f-spot-0.4.4/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -461,11 +462,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/Tao/Tao.OpenGl.ExtensionLoader: Makefile.in.orig
-diff -ur f-spot-0.4.4.old/Tao/Tao.OpenGl.Glu/Makefile.in f-spot-0.4.4/Tao/Tao.OpenGl.Glu/Makefile.in
---- f-spot-0.4.4.old/Tao/Tao.OpenGl.Glu/Makefile.in 2008-05-28 18:43:54.000000000 +1200
-+++ f-spot-0.4.4/Tao/Tao.OpenGl.Glu/Makefile.in 2008-07-14 01:15:05.000000000 +1200
-@@ -291,9 +291,9 @@
+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 12:38:22.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 = \
@@ -478,4 +478,3 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-Only in f-spot-0.4.4/Tao/Tao.OpenGl.Glu: Makefile.in.orig
Index: f-spot.spec
===================================================================
RCS file: /cvs/extras/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- f-spot.spec 4 Dec 2008 18:27:54 -0000 1.81
+++ f-spot.spec 4 Dec 2008 19:06:39 -0000 1.82
@@ -1,6 +1,6 @@
Name: f-spot
Version: 0.5.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
@@ -123,7 +123,7 @@
%{_libdir}/gio-sharp-unstable
%changelog
-* Thu Dec 4 2008 Matthias Clasen <mclasen at redhat.com> - 0.5.0.3-3
+* Thu Dec 4 2008 Matthias Clasen <mclasen at redhat.com> - 0.5.0.3-4
- Update to 0.5.0.3
* Fri Nov 21 2008 Matthias Clasen <mclasen at redhat.com> - 0.4.4-8
More information about the fedora-extras-commits
mailing list