Hello community, here is the log from the commit of package libfm for openSUSE:Factory checked in at Tue Jan 25 10:07:33 CET 2011. -------- --- libfm/libfm.changes 2010-10-20 11:36:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/libfm/libfm.changes 2011-01-24 14:48:33.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Jan 22 23:27:41 UTC 2011 - gber@opensuse.org + +- added libfm-0.1.14-disable-gio-extension.patch in order to + disable the GIO extension implementing libfm-specific preferences + for URI scheme handlers for glib > 2.27 where the needed + extension point has been removed; preferred handlers set through + libfm/pref-apps.conf will be ignored and the new default glib + mechanism using x-scheme-handler will be used instead +- enabled gtk-doc generation and disabled parallel make which + breaks it + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libfm-0.1.14-disable-gio-extension.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfm.spec ++++++ --- /var/tmp/diff_new_pack.Lzf45O/_old 2011-01-25 10:06:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Lzf45O/_new 2011-01-25 10:06:30.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libfm (Version 0.1.14_rc2) +# spec file for package libfm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: libfm Summary: A glib/gio-based lib used to develop file managers Version: 0.1.14_rc2 -Release: 2 +Release: 3 License: GPLv2 Group: Development/Libraries/C and C++ Url: http://www.lxde.org/ @@ -31,6 +31,7 @@ Patch1: %name-0.1.14-remove_rpath.patch # PATCH-FIX-UPSTREAM libfm-0.1.14-fix_sf3089624.patch <andrea@opensuse.org>- fixed "Filenames with spaces not supported in copy/paste" Patch2: %name-0.1.14-fix_sf3089624.patch +Patch3: %name-0.1.14-disable-gio-extension.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: gtk2-devel @@ -40,6 +41,8 @@ BuildRequires: desktop-file-utils BuildRequires: update-desktop-files BuildRequires: fdupes +BuildRequires: autoconf +BuildRequires: gtk-doc %description A glib/gio-based lib used to develop file managers providing some @@ -90,26 +93,36 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build +autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" %configure \ --disable-static \ - --enable-debug + --enable-debug \ + --enable-gtk-doc # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?jobs:-j%{jobs}} +%__make %install %makeinstall %__rm -rf %{buildroot}/%{_datadir}/locale/{es_VE,ur_PK} %__rm -f %{buildroot}%{_libdir}/*.la %__rm -f %{buildroot}/%{_libdir}/gio/modules/libgiofm.la +# these settings will have no effect without the gio extension so remove them +%if 0%{?suse_version} >= 1140 +%__rm -f %{buildroot}%{_sysconfdir}/xdg/%name/pref-apps.conf +%__rm -f %{buildroot}%{_bindir}/libfm-pref-apps +%__rm -f %{buildroot}%{_datadir}/applications/libfm-pref-apps.desktop +%else %suse_update_desktop_file libfm-pref-apps +%endif %find_lang %{name} %fdupes -s %{buildroot}/%{_datadir}/locale @@ -134,19 +147,23 @@ %files -f %name.lang %defattr(-,root,root) -%{_bindir}/libfm-pref-apps -%{_datadir}/applications/libfm-pref-apps.desktop %dir %{_sysconfdir}/xdg/%name %config %{_sysconfdir}/xdg/%name/%name.conf -%config %{_sysconfdir}/xdg/%name/pref-apps.conf %{_datadir}/mime/packages/%name.xml %dir %{_libdir}/%name %{_libdir}/%name/gnome-terminal +%if 0%{?suse_version} < 1140 +%config %{_sysconfdir}/xdg/%name/pref-apps.conf +%{_bindir}/libfm-pref-apps +%{_datadir}/applications/libfm-pref-apps.desktop +%endif %files -n libfm0 %defattr(-,root,root) %{_libdir}/libfm.so.* +%if 0%{?suse_version} < 1140 %{_libdir}/gio/modules/libgiofm.so +%endif %files -n libfm-gtk0 %defattr(-,root,root) ++++++ libfm-0.1.14-disable-gio-extension.patch ++++++ diff -ur libfm-0.1.15.orig/configure.ac libfm-0.1.15/configure.ac --- libfm-0.1.15.orig/configure.ac 2010-11-07 12:12:50.000000000 +0100 +++ libfm-0.1.15/configure.ac 2011-01-18 14:46:20.000000000 +0100 @@ -53,6 +53,9 @@ AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) +PKG_CHECK_MODULES(GIO_UNIX_227, [gio-unix-2.0 < 2.27.0], gio_below_227=yes, gio_below_227=no) +AM_CONDITIONAL(BUILD_GIO_EXTENSION, test "$gio_below_227" = "yes") + gmodule_modules="gmodule-2.0" PKG_CHECK_MODULES(GMODULE, [$gmodule_modules]) AC_SUBST(GMODULE_CFLAGS) @@ -106,9 +109,11 @@ CPPFLAGS="$CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" fi +if test "$gio_below_227" = "yes"; then # GIO extension module giomodulesdir=$libdir/gio/modules AC_SUBST(giomodulesdir) +fi GETTEXT_PACKAGE=libfm Only in libfm-0.1.15: libfm-0.1.15-disable-gio-extension.patch diff -ur libfm-0.1.15.orig/src/Makefile.am libfm-0.1.15/src/Makefile.am --- libfm-0.1.15.orig/src/Makefile.am 2010-11-07 12:12:50.000000000 +0100 +++ libfm-0.1.15/src/Makefile.am 2011-01-18 14:26:48.000000000 +0100 @@ -276,6 +276,7 @@ endif +if BUILD_GIO_EXTENSION # GIO module implementing some extension points giomodules_LTLIBRARIES = libgiofm.la @@ -305,6 +306,7 @@ $(GIO_LIBS) \ $(INTLLIBS) \ $(NULL) +endif # GObject marshallers ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org