rpms/f-spot/devel f-spot-0.4.2-link_system_libs.patch, NONE, 1.1 f-spot.spec, 1.65, 1.66
Alex Lancaster (alexlan)
fedora-extras-commits at redhat.com
Tue Apr 15 12:40:12 UTC 2008
Author: alexlan
Update of /cvs/extras/rpms/f-spot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv793
Modified Files:
f-spot.spec
Added Files:
f-spot-0.4.2-link_system_libs.patch
Log Message:
* 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)
f-spot-0.4.2-link_system_libs.patch:
--- NEW FILE f-spot-0.4.2-link_system_libs.patch ---
diff -u -r f-spot-0.4.2.orig/aclocal.m4 f-spot-0.4.2/aclocal.m4
--- f-spot-0.4.2.orig/aclocal.m4 2008-02-14 15:27:14.000000000 -0700
+++ f-spot-0.4.2/aclocal.m4 2008-04-15 05:33:39.000000000 -0700
@@ -60,8 +60,8 @@
# Owen Taylor 1997-2001
dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-dnl gthread, or gio is specified in MODULES, pass to pkg-config
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
+dnl gthread is specified in MODULES, pass to pkg-config
dnl
AC_DEFUN([AM_PATH_GLIB_2_0],
[dnl
@@ -86,9 +86,6 @@
gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
- gio*)
- pkg_config_args="$pkg_config_args $module-2.0"
- ;;
esac
done
@@ -371,7 +368,8 @@
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [USE_NLS=yes
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -623,6 +621,18 @@
fi
fi
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+
dnl Generate list of files to be processed by xgettext which will
dnl be included in po/Makefile.
test -d po || mkdir po
@@ -882,7 +892,7 @@
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
+# serial 36 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
@@ -895,7 +905,7 @@
esac
if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
+ AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
@@ -924,6 +934,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -943,6 +954,7 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
@@ -965,19 +977,16 @@
fi
fi
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
@@ -1018,10 +1027,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
@@ -1036,9 +1041,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
])
@@ -1639,6 +1642,7 @@
esac
;;
*64-bit*)
+ libsuff=64
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
@@ -2697,11 +2701,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -7798,7 +7804,7 @@
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff -u -r f-spot-0.4.2.orig/configure f-spot-0.4.2/configure
--- f-spot-0.4.2.orig/configure 2008-02-14 15:27:23.000000000 -0700
+++ f-spot-0.4.2/configure 2008-04-15 05:33:42.000000000 -0700
@@ -847,14 +847,11 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
+INTLTOOL_POLICY_RULE
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
INTLTOOL_PERL
-INTLTOOL_ICONV
-INTLTOOL_MSGFMT
-INTLTOOL_MSGMERGE
-INTLTOOL_XGETTEXT
ALL_LINGUAS
CC
CFLAGS
@@ -982,6 +979,7 @@
PO_IN_DATADIR_FALSE
POFILES
POSUB
+MKINSTALLDIRS
LIBJPEG
CSC
expanded_libdir
@@ -3862,6 +3860,8 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
[...2469 lines suppressed...]
@@ -166,6 +163,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
@@ -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
@@ -135,14 +135,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -154,7 +152,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
@@ -176,6 +173,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
@@ -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
@@ -135,14 +135,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -154,7 +152,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
@@ -176,6 +173,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
@@ -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
@@ -135,14 +135,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -154,7 +152,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
@@ -176,6 +173,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
@@ -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/tools/Makefile.in f-spot-0.4.2/tools/Makefile.in
--- f-spot-0.4.2.orig/tools/Makefile.in 2008-02-14 15:27:22.000000000 -0700
+++ f-spot-0.4.2/tools/Makefile.in 2008-04-15 05:33:47.000000000 -0700
@@ -139,14 +139,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -158,7 +156,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
@@ -180,6 +177,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MONO = @MONO@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
Index: f-spot.spec
===================================================================
RCS file: /cvs/extras/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- f-spot.spec 1 Mar 2008 20:58:10 -0000 1.65
+++ f-spot.spec 15 Apr 2008 12:39:32 -0000 1.66
@@ -1,6 +1,6 @@
Name: f-spot
Version: 0.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
@@ -10,6 +10,7 @@
# 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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -22,6 +23,7 @@
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
@@ -44,8 +46,16 @@
%prep
%setup -q
+
+# preserve timestamps
+touch -r configure.in configure.in.stamp
+
%patch0 -p1 -b .x-content
%patch1 -p1 -b .GalleryExport
+%patch2 -p1 -b .link_system_libs
+
+# restore timestamps
+touch -r configure.in.stamp configure.in
%build
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -101,6 +111,9 @@
%{_datadir}/omf/f-spot
%changelog
+* 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
More information about the fedora-extras-commits
mailing list