rpms/f-spot/devel f-spot-0.4.4-Makefile-destdir.patch, NONE, 1.1 f-spot-0.4.4-gtk-deprecated.patch, NONE, 1.1 f-spot-0.4.4-link-system-mono-addins.patch, NONE, 1.1 f-spot.spec, 1.73, 1.74
Nigel Jones (nigelj)
fedora-extras-commits at redhat.com
Mon Jul 14 10:58:04 UTC 2008
- Previous message (by thread): rpms/mono-tools/devel import.log,1.2,1.3 mono-tools.spec,1.5,1.6
- Next message (by thread): rpms/php/devel php-5.2.5-systzdata.patch, 1.1, 1.2 php.ini, 1.7, 1.8 php.spec, 1.156, 1.157 sources, 1.35, 1.36 php-4.3.9-metaphone.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nigelj
Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21343
Modified Files:
f-spot.spec
Added Files:
f-spot-0.4.4-Makefile-destdir.patch
f-spot-0.4.4-gtk-deprecated.patch
f-spot-0.4.4-link-system-mono-addins.patch
Log Message:
* Mon Jul 14 2008 Nigel Jones <dev at nigelj.com> - 0.4.4-4
- Remove Tom's patch in -2, there is a gtk-sharp 2.12.1, just nobody bothered
packaging it.
- Patch Makefile{.in,am} to use DESTDIR for the gio-sharp.dll, this is
effectively a backport of r4010 Upstream.
- Patch libfspot/Makefile{.in,am} to remove -DGTK_DISABLE_DEPRECATED per
recommendation of upstream.
- Re-add patch to use system mono-addins
- Include GIO stuff for now (until it appears in gtk-sharp)
f-spot-0.4.4-Makefile-destdir.patch:
--- NEW FILE f-spot-0.4.4-Makefile-destdir.patch ---
diff -ru f-spot-0.4.4.old/Makefile.am f-spot-0.4.4/Makefile.am
--- f-spot-0.4.4.old/Makefile.am 2008-07-13 20:29:31.000000000 +1200
+++ f-spot-0.4.4/Makefile.am 2008-07-13 22:01:09.000000000 +1200
@@ -89,12 +89,12 @@
install-data-hook:
$(UPDATE_DESKTOP)
if [ "x$(DIR_GIO)" != "x" ] ; then \
- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(libdir)/f-spot/; \
- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/; \
+ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/; \
+ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(DESTDIR)$(libdir)/f-spot/; \
fi
uninstall-hook:
$(UPDATE_DESKTOP)
if [ "x$(DIR_GIO)" != "x" ] ; then \
- rm -f $(libdir)/f-spot/gio-sharp.dll $(libdir)/f-spot/gio-sharp.dll.config; \
+ rm -f $(libdir)/f-spot/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll.config; \
fi
diff -ru f-spot-0.4.4.old/Makefile.in f-spot-0.4.4/Makefile.in
--- f-spot-0.4.4.old/Makefile.in 2008-07-13 20:29:27.000000000 +1200
+++ f-spot-0.4.4/Makefile.in 2008-07-13 22:02:46.000000000 +1200
@@ -892,14 +892,14 @@
install-data-hook:
$(UPDATE_DESKTOP)
if [ "x$(DIR_GIO)" != "x" ] ; then \
- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(libdir)/f-spot/; \
- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/; \
+ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/; \
+ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(DESTDIR)$(libdir)/f-spot/; \
fi
uninstall-hook:
$(UPDATE_DESKTOP)
if [ "x$(DIR_GIO)" != "x" ] ; then \
- rm -f $(libdir)/f-spot/gio-sharp.dll $(libdir)/f-spot/gio-sharp.dll.config; \
+ rm -f $(libdir)/f-spot/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll.config; \
fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
f-spot-0.4.4-gtk-deprecated.patch:
--- NEW FILE f-spot-0.4.4-gtk-deprecated.patch ---
diff -ru f-spot-0.4.4.old/libfspot/Makefile.am f-spot-0.4.4/libfspot/Makefile.am
--- f-spot-0.4.4.old/libfspot/Makefile.am 2008-07-13 20:29:28.000000000 +1200
+++ f-spot-0.4.4/libfspot/Makefile.am 2008-07-13 20:30:13.000000000 +1200
@@ -2,7 +2,7 @@
-I $(top_srcdir) \
-DLIBEOG_ETTORE_CHANGES=1 \
-DG_LOG_DOMAIN=\"libf\" \
- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
$(F_CFLAGS) \
$(EXIF_CFLAGS) \
diff -ru f-spot-0.4.4.old/libfspot/Makefile.in f-spot-0.4.4/libfspot/Makefile.in
--- f-spot-0.4.4.old/libfspot/Makefile.in 2008-07-13 20:29:28.000000000 +1200
+++ f-spot-0.4.4/libfspot/Makefile.in 2008-07-13 20:52:22.000000000 +1200
@@ -294,7 +294,7 @@
-I $(top_srcdir) \
-DLIBEOG_ETTORE_CHANGES=1 \
-DG_LOG_DOMAIN=\"libf\" \
- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
$(F_CFLAGS) \
$(EXIF_CFLAGS) \
f-spot-0.4.4-link-system-mono-addins.patch:
--- NEW FILE f-spot-0.4.4-link-system-mono-addins.patch ---
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 @@
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
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 @@
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 = \
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 @@
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 = \
Only in f-spot-0.4.4/dbus-sharp-glib: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/CDExport/Makefile.in f-spot-0.4.4/extensions/CDExport/Makefile.in
--- f-spot-0.4.4.old/extensions/CDExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200
+++ f-spot-0.4.4/extensions/CDExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -291,9 +291,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 = \
Only in f-spot-0.4.4/extensions/CDExport: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/DefaultExporters/Makefile.in f-spot-0.4.4/extensions/DefaultExporters/Makefile.in
--- f-spot-0.4.4.old/extensions/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 @@
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 = \
Only in f-spot-0.4.4/extensions/DefaultExporters: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/FlickrExport/FlickrNet/Makefile.in f-spot-0.4.4/extensions/FlickrExport/FlickrNet/Makefile.in
--- f-spot-0.4.4.old/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-28 18:43:55.000000000 +1200
+++ f-spot-0.4.4/extensions/FlickrExport/FlickrNet/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -291,9 +291,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 = \
Only in f-spot-0.4.4/extensions/FlickrExport/FlickrNet: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/FlickrExport/Makefile.in f-spot-0.4.4/extensions/FlickrExport/Makefile.in
--- f-spot-0.4.4.old/extensions/FlickrExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200
+++ f-spot-0.4.4/extensions/FlickrExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -303,9 +303,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 = \
Only in f-spot-0.4.4/extensions/FlickrExport: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/FolderExport/Makefile.in f-spot-0.4.4/extensions/FolderExport/Makefile.in
--- f-spot-0.4.4.old/extensions/FolderExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200
+++ f-spot-0.4.4/extensions/FolderExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -291,9 +291,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 = \
Only in f-spot-0.4.4/extensions/FolderExport: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/GalleryExport/Makefile.in f-spot-0.4.4/extensions/GalleryExport/Makefile.in
--- f-spot-0.4.4.old/extensions/GalleryExport/Makefile.in 2008-05-28 18:43:55.000000000 +1200
+++ f-spot-0.4.4/extensions/GalleryExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -291,9 +291,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 = \
Only in f-spot-0.4.4/extensions/GalleryExport: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot-0.4.4/extensions/PicasaWebExport/google-sharp/Makefile.in
--- f-spot-0.4.4.old/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-05-28 18:43:56.000000000 +1200
+++ f-spot-0.4.4/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -291,9 +291,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 = \
Only in f-spot-0.4.4/extensions/PicasaWebExport/google-sharp: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/PicasaWebExport/Makefile.in f-spot-0.4.4/extensions/PicasaWebExport/Makefile.in
--- f-spot-0.4.4.old/extensions/PicasaWebExport/Makefile.in 2008-05-28 18:43:56.000000000 +1200
+++ f-spot-0.4.4/extensions/PicasaWebExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -303,9 +303,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 = \
Only in f-spot-0.4.4/extensions/PicasaWebExport: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/SmugMugExport/Makefile.in f-spot-0.4.4/extensions/SmugMugExport/Makefile.in
--- f-spot-0.4.4.old/extensions/SmugMugExport/Makefile.in 2008-05-28 18:43:56.000000000 +1200
+++ f-spot-0.4.4/extensions/SmugMugExport/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -303,9 +303,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 = \
Only in f-spot-0.4.4/extensions/SmugMugExport: Makefile.in.orig
diff -ur f-spot-0.4.4.old/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot-0.4.4/extensions/SmugMugExport/SmugMugNet/Makefile.in
--- f-spot-0.4.4.old/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-05-28 18:43:56.000000000 +1200
+++ f-spot-0.4.4/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-07-14 01:15:05.000000000 +1200
@@ -291,9 +291,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 = \
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 @@
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 = \
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 @@
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 = \
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 @@
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 = \
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 @@
libfspot \
libgphoto2-sharp \
Tao \
- mono-addins \
tools \
po \
src \
@@ -337,7 +336,6 @@
libfspot \
libgphoto2-sharp \
Tao \
- mono-addins \
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 @@
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 \
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 @@
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 = \
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 @@
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 = \
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 @@
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 = \
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 @@
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 = \
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 @@
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 = \
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 @@
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 = \
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 @@
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 = \
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 @@
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 = \
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 @@
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 = \
Only in f-spot-0.4.4/Tao/Tao.OpenGl.Glu: Makefile.in.orig
Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- f-spot.spec 5 Jul 2008 20:50:59 -0000 1.73
+++ f-spot.spec 14 Jul 2008 10:57:13 -0000 1.74
@@ -1,6 +1,6 @@
Name: f-spot
Version: 0.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
@@ -9,9 +9,12 @@
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
-# glib-sharp-2.12.1 doesnt't exist yet?
-# Can safely drop this patch when it does.
-Patch1: f-spot-0.4.4-glib-sharp-2.12.0.patch
+# I'm told this is fixed in SVN
+Patch1: f-spot-0.4.4-gtk-deprecated.patch
+# This is fixed in current SVN
+Patch2: f-spot-0.4.4-Makefile-destdir.patch
+# Use system mono-addins
+Patch3: f-spot-0.4.4-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
@@ -52,7 +55,9 @@
touch -r configure.in configure.in.stamp
%patch0 -p1 -b .x-content
-%patch1 -p1 -b .glib-sharp-2.12.0
+%patch1 -p1 -b .gtk-deprecated
+%patch2 -p1 -b .Makefile-destdir
+%patch3 -p1 -b .link-system-mono-addins
# restore timestamps
touch -r configure.in.stamp configure.in
@@ -71,6 +76,8 @@
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
+# Will need to be removed at some point...
+rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gio-sharp-unstable.pc
chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.dll
@@ -109,8 +116,20 @@
%{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
%{_datadir}/omf/f-spot
+# GIO is currently provided in f-spot only, so this'll need to be removed sometime in the future
+%{_libdir}/gio-sharp-unstable
%changelog
+* Mon Jul 14 2008 Nigel Jones <dev at nigelj.com> - 0.4.4-4
+- Remove Tom's patch in -2, there is a gtk-sharp 2.12.1, just nobody bothered
+ packaging it.
+- Patch Makefile{.in,am} to use DESTDIR for the gio-sharp.dll, this is
+ effectively a backport of r4010 Upstream.
+- Patch libfspot/Makefile{.in,am} to remove -DGTK_DISABLE_DEPRECATED per
+ recommendation of upstream.
+- Re-add patch to use system mono-addins
+- Include GIO stuff for now (until it appears in gtk-sharp)
+
* Wed Jul 5 2008 Alex Lancaster <alexlan[AT] fedoraproject org> - 0.4.4-3
- gtkhtml dependency now provided by gnome-desktop-sharp-devel
rather than gnome-sharp-devel, so add as BuildRequires
- Previous message (by thread): rpms/mono-tools/devel import.log,1.2,1.3 mono-tools.spec,1.5,1.6
- Next message (by thread): rpms/php/devel php-5.2.5-systzdata.patch, 1.1, 1.2 php.ini, 1.7, 1.8 php.spec, 1.156, 1.157 sources, 1.35, 1.36 php-4.3.9-metaphone.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list