rpms/f-spot/F-9 f-spot-0.4.3-link-system-mono-addins.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 f-spot.spec, 1.66, 1.67 sources, 1.17, 1.18
Nigel Jones (nigelj)
fedora-extras-commits at redhat.com
Mon Jul 14 10:15:34 UTC 2008
- Previous message (by thread): rpms/sagator/EL-4 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/totem-pl-parser/devel totem-pl-parser.spec,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nigelj
Update of /cvs/pkgs/rpms/f-spot/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17255
Modified Files:
.cvsignore f-spot.spec sources
Added Files:
f-spot-0.4.3-link-system-mono-addins.patch
Log Message:
Update to 0.4.3.1 for F-9
f-spot-0.4.3-link-system-mono-addins.patch:
--- NEW FILE f-spot-0.4.3-link-system-mono-addins.patch ---
diff -urNad f-spot~/Makefile.am f-spot/Makefile.am
--- f-spot~/Makefile.am 2008-04-16 22:08:41.000000000 +0100
+++ f-spot/Makefile.am 2008-04-16 22:08:42.000000000 +0100
@@ -11,7 +11,6 @@
libgphoto2-sharp \
semweb \
Tao \
- mono-addins \
tools \
po \
src \
@@ -30,7 +29,6 @@
libgphoto2-sharp \
semweb \
Tao \
- mono-addins \
tools \
po \
src \
diff -urNad f-spot~/Makefile.include f-spot/Makefile.include
--- f-spot~/Makefile.include 2008-04-16 22:07:51.000000000 +0100
+++ f-spot/Makefile.include 2008-04-16 22:08:42.000000000 +0100
@@ -27,10 +27,10 @@
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 -urNad f-spot~/configure.in f-spot/configure.in
--- f-spot~/configure.in 2008-04-16 22:08:41.000000000 +0100
+++ f-spot/configure.in 2008-04-16 22:09:09.000000000 +0100
@@ -283,10 +283,6 @@
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 -u -r f-spot-0.4.2.orig/dbus-sharp/Makefile.in f-spot-0.4.2/dbus-sharp/Makefile.in
--- f-spot-0.4.2.orig/dbus-sharp/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/dbus-sharp/Makefile.in 2008-04-15 05:33:44.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/dbus-sharp-glib/Makefile.in f-spot-0.4.2/dbus-sharp-glib/Makefile.in
--- f-spot-0.4.2.orig/dbus-sharp-glib/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/dbus-sharp-glib/Makefile.in 2008-04-15 05:33:44.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/CDExport/Makefile.in f-spot-0.4.2/extensions/CDExport/Makefile.in
--- f-spot-0.4.2.orig/extensions/CDExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/extensions/CDExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/DefaultExporters/Makefile.in f-spot-0.4.2/extensions/DefaultExporters/Makefile.in
--- f-spot-0.4.2.orig/extensions/DefaultExporters/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/extensions/DefaultExporters/Makefile.in 2008-04-15 05:33:44.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/FlickrExport/FlickrNet/Makefile.in f-spot-0.4.2/extensions/FlickrExport/FlickrNet/Makefile.in
--- f-spot-0.4.2.orig/extensions/FlickrExport/FlickrNet/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-15 05:33:44.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/FlickrExport/Makefile.in f-spot-0.4.2/extensions/FlickrExport/Makefile.in
--- f-spot-0.4.2.orig/extensions/FlickrExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/extensions/FlickrExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700
@@ -300,9 +298,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/FolderExport/Makefile.in f-spot-0.4.2/extensions/FolderExport/Makefile.in
--- f-spot-0.4.2.orig/extensions/FolderExport/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/extensions/FolderExport/Makefile.in 2008-04-15 05:33:44.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/GalleryExport/Makefile.in f-spot-0.4.2/extensions/GalleryExport/Makefile.in
--- f-spot-0.4.2.orig/extensions/GalleryExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700
+++ f-spot-0.4.2/extensions/GalleryExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot-0.4.2/extensions/PicasaWebExport/google-sharp/Makefile.in
--- f-spot-0.4.2.orig/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-02-14 15:27:19.000000000 -0700
+++ f-spot-0.4.2/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-15 05:33:45.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/PicasaWebExport/Makefile.in f-spot-0.4.2/extensions/PicasaWebExport/Makefile.in
--- f-spot-0.4.2.orig/extensions/PicasaWebExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700
+++ f-spot-0.4.2/extensions/PicasaWebExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700
@@ -300,9 +298,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/SmugMugExport/Makefile.in f-spot-0.4.2/extensions/SmugMugExport/Makefile.in
--- f-spot-0.4.2.orig/extensions/SmugMugExport/Makefile.in 2008-02-14 15:27:19.000000000 -0700
+++ f-spot-0.4.2/extensions/SmugMugExport/Makefile.in 2008-04-15 05:33:45.000000000 -0700
@@ -300,9 +298,9 @@
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 -u -r f-spot-0.4.2.orig/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot-0.4.2/extensions/SmugMugExport/SmugMugNet/Makefile.in
--- f-spot-0.4.2.orig/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-02-14 15:27:19.000000000 -0700
+++ f-spot-0.4.2/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-15 05:33:45.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/glitz-sharp/src/Makefile.in f-spot-0.4.2/glitz-sharp/src/Makefile.in
--- f-spot-0.4.2.orig/glitz-sharp/src/Makefile.in 2008-02-14 15:27:20.000000000 -0700
+++ f-spot-0.4.2/glitz-sharp/src/Makefile.in 2008-04-15 05:33:45.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/gnome-keyring-sharp/Makefile.in f-spot-0.4.2/gnome-keyring-sharp/Makefile.in
--- f-spot-0.4.2.orig/gnome-keyring-sharp/Makefile.in 2008-02-14 15:27:20.000000000 -0700
+++ f-spot-0.4.2/gnome-keyring-sharp/Makefile.in 2008-04-15 05:33:45.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/libgphoto2-sharp/Makefile.in f-spot-0.4.2/libgphoto2-sharp/Makefile.in
--- f-spot-0.4.2.orig/libgphoto2-sharp/Makefile.in 2008-02-14 15:27:20.000000000 -0700
+++ f-spot-0.4.2/libgphoto2-sharp/Makefile.in 2008-04-15 05:33:46.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/Makefile.in f-spot-0.4.2/Makefile.in
--- f-spot-0.4.2.orig/Makefile.in 2008-02-14 15:27:22.000000000 -0700
+++ f-spot-0.4.2/Makefile.in 2008-04-15 05:33:47.000000000 -0700
@@ -311,7 +309,6 @@
libgphoto2-sharp \
semweb \
Tao \
- mono-addins \
tools \
po \
src \
@@ -330,7 +327,6 @@
libgphoto2-sharp \
semweb \
Tao \
- mono-addins \
tools \
po \
src \
diff -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins/Makefile.in
--- f-spot-0.4.2.orig/mono-addins/Mono.Addins/Makefile.in 2008-02-14 15:27:21.000000000 -0700
+++ f-spot-0.4.2/mono-addins/Mono.Addins/Makefile.in 2008-04-15 05:33:47.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins.Gui/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.in
--- f-spot-0.4.2.orig/mono-addins/Mono.Addins.Gui/Makefile.in 2008-02-14 15:27:21.000000000 -0700
+++ f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-15 05:33:46.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/mono-addins/Mono.Addins.Setup/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.in
--- f-spot-0.4.2.orig/mono-addins/Mono.Addins.Setup/Makefile.in 2008-02-14 15:27:21.000000000 -0700
+++ f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-15 05:33:46.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/semweb/Makefile.in f-spot-0.4.2/semweb/Makefile.in
--- f-spot-0.4.2.orig/semweb/Makefile.in 2008-02-14 15:27:21.000000000 -0700
+++ f-spot-0.4.2/semweb/Makefile.in 2008-04-15 05:33:47.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/src/Makefile.in f-spot-0.4.2/src/Makefile.in
--- f-spot-0.4.2.orig/src/Makefile.in 2008-02-14 15:27:21.000000000 -0700
+++ f-spot-0.4.2/src/Makefile.in 2008-04-15 05:33:47.000000000 -0700
@@ -292,9 +290,9 @@
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 -u -r f-spot-0.4.2.orig/Tao/Tao.GlPostProcess/Makefile.in f-spot-0.4.2/Tao/Tao.GlPostProcess/Makefile.in
--- f-spot-0.4.2.orig/Tao/Tao.GlPostProcess/Makefile.in 2008-02-14 15:27:17.000000000 -0700
+++ f-spot-0.4.2/Tao/Tao.GlPostProcess/Makefile.in 2008-04-15 05:33:43.000000000 -0700
@@ -278,9 +276,9 @@
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 -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl/Makefile.in
--- f-spot-0.4.2.orig/Tao/Tao.OpenGl/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/Tao/Tao.OpenGl/Makefile.in 2008-04-15 05:33:44.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
--- f-spot-0.4.2.orig/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-02-14 15:27:17.000000000 -0700
+++ f-spot-0.4.2/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-15 05:33:43.000000000 -0700
@@ -288,9 +286,9 @@
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 -u -r f-spot-0.4.2.orig/Tao/Tao.OpenGl.Glu/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl.Glu/Makefile.in
--- f-spot-0.4.2.orig/Tao/Tao.OpenGl.Glu/Makefile.in 2008-02-14 15:27:18.000000000 -0700
+++ f-spot-0.4.2/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-15 05:33:43.000000000 -0700
@@ -288,9 +286,9 @@
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 15 Feb 2008 00:30:30 -0000 1.17
+++ .cvsignore 14 Jul 2008 10:14:46 -0000 1.18
@@ -1 +1 @@
-f-spot-0.4.2.tar.bz2
+f-spot-0.4.3.1.tar.bz2
Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-9/f-spot.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- f-spot.spec 15 Apr 2008 12:39:32 -0000 1.66
+++ f-spot.spec 14 Jul 2008 10:14:46 -0000 1.67
@@ -1,16 +1,15 @@
Name: f-spot
-Version: 0.4.2
-Release: 5%{?dist}
+Version: 0.4.3.1
+Release: 1%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
License: GPL
URL: http://www.gnome.org/projects/f-spot/
-Source0: f-spot-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/f-spot/0.4/f-spot-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=510325
Patch0: x-content.patch
-Patch1: f-spot-0.4.2-GalleryExport.patch
-Patch2: f-spot-0.4.2-link_system_libs.patch
+Patch1: f-spot-0.4.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
@@ -51,8 +50,7 @@
touch -r configure.in configure.in.stamp
%patch0 -p1 -b .x-content
-%patch1 -p1 -b .GalleryExport
-%patch2 -p1 -b .link_system_libs
+%patch1 -p1 -b .link-system-mono-addins
# restore timestamps
touch -r configure.in.stamp configure.in
@@ -111,6 +109,9 @@
%{_datadir}/omf/f-spot
%changelog
+* Sun Jul 13 2008 Nigel Jones <dev at nigelj.com> - 0.4.3.1-1
+- Update to 0.4.3.1
+
* Tue Apr 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.4.2-5
- Add patch from Debian to use system mono-addins (from #442343)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 15 Feb 2008 00:30:30 -0000 1.17
+++ sources 14 Jul 2008 10:14:46 -0000 1.18
@@ -1 +1 @@
-970b8c9de9acf97c90e3d9608827606d f-spot-0.4.2.tar.bz2
+8aa207e58f9187a762d3e14a46370268 f-spot-0.4.3.1.tar.bz2
- Previous message (by thread): rpms/sagator/EL-4 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sagator.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/totem-pl-parser/devel totem-pl-parser.spec,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list