rpms/f-spot/F-8 f-spot-0.4.3-link-system-mono-addins.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 f-spot.spec, 1.54, 1.55 sources, 1.15, 1.16
Nigel Jones (nigelj)
fedora-extras-commits at redhat.com
Tue Jul 15 10:05:12 UTC 2008
Author: nigelj
Update of /cvs/pkgs/rpms/f-spot/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12683
Modified Files:
.cvsignore f-spot.spec sources
Added Files:
f-spot-0.4.3-link-system-mono-addins.patch
Log Message:
Backporting f-spot's spec file from F9 - update to 0.4.3.1
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-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 4 Aug 2007 04:54:17 -0000 1.15
+++ .cvsignore 15 Jul 2008 10:04:23 -0000 1.16
@@ -1 +1 @@
-f-spot-0.4.0.tar.bz2
+f-spot-0.4.3.1.tar.bz2
Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-8/f-spot.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- f-spot.spec 2 Oct 2007 14:16:52 -0000 1.54
+++ f-spot.spec 15 Jul 2008 10:04:23 -0000 1.55
@@ -1,33 +1,36 @@
Name: f-spot
-Version: 0.4.0
-Release: 3%{?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.3-link-system-mono-addins.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch3: f-spot-0.3.5-screensaver.patch
-
BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel
BuildRequires: libexif-devel gphoto2-devel >= 2.1.4
BuildRequires: gtk-sharp2-devel >= 2.7 libgnome-devel libgnomeui-devel
BuildRequires: gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
BuildRequires: gnome-sharp-devel
BuildRequires: gettext
-BuildRequires: dbus-sharp-devel
BuildRequires: autoconf
BuildRequires: perl(XML::Parser)
BuildRequires: gnome-doc-utils
+BuildRequires: ndesk-dbus-glib-devel
+BuildRequires: mono-addins-devel
Requires: sqlite >= 3.3.1
Requires: lcms
+Requires: dcraw
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
# Mono only available on these: (s390x disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 #s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
# Some compiler segfault on ia64:
ExcludeArch: ia64
@@ -42,12 +45,20 @@
%prep
%setup -q
-%patch3 -p1 -b .screensaver
+
+# preserve timestamps
+touch -r configure.in configure.in.stamp
+
+%patch0 -p1 -b .x-content
+%patch1 -p1 -b .link-system-mono-addins
+
+# restore timestamps
+touch -r configure.in.stamp configure.in
%build
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
%configure --disable-scrollkeeper
-make %{?_smp_mflags}
+make
%install
@@ -98,6 +109,33 @@
%{_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 (backporting spec file from Fedora 9)
+
+* 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)
+
+* Sat Mar 1 2008 Christopher Aillon <caillon at redhat.com> - 0.4.2-4
+- Require dcraw
+
+* Fri Feb 29 2008 Christopher Aillon <caillon at redhat.com> - 0.4.2-3
+- Fix the build
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.2-2
+- Autorebuild for GCC 4.3
+
+* Thu Feb 14 2008 Matthias Clasen <mclasen at redhat.com> - 0.4.2-1
+- Update to 0.4.2
+
+* Fri Jan 18 2008 Matthias Clasen <mclasen at redhat.com> - 0.4.1-2
+- Add support for content-types
+
+* Thu Dec 6 2007 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1
+- Update to 0.4.1
+
+* Sat Nov 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.4.0-4
+- Remove comments from ExclusiveArch line (#388581)
+
* Tue Oct 2 2007 Matthias Clasen <mclasen at redhat.com> - 0.4.0-3
- Add alpha to ExclusiveArch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 4 Aug 2007 04:54:17 -0000 1.15
+++ sources 15 Jul 2008 10:04:23 -0000 1.16
@@ -1 +1 @@
-0f21ff56d310329185cc17a2fadda5fe f-spot-0.4.0.tar.bz2
+8aa207e58f9187a762d3e14a46370268 f-spot-0.4.3.1.tar.bz2
More information about the fedora-extras-commits
mailing list