Hello community,
here is the log from the commit of package libfm for openSUSE:11.3
checked in at Thu Aug 11 20:58:41 CEST 2011.
--------
--- old-versions/11.3/UPDATES/all/libfm/libfm.changes 2010-10-20 11:36:59.000000000 +0200
+++ 11.3/libfm/libfm.changes 2011-08-10 02:37:22.000000000 +0200
@@ -1,0 +2,31 @@
+Wed Aug 10 00:37:31 UTC 2011 - andrea@opensuse.org
+
+- new upstream version 0.1.16 rc3
+ detailed changelog at: http://blog.lxde.org/?p=908
+- removed all patches now in upstream code
+
+-------------------------------------------------------------------
+Sun Aug 7 13:26:36 UTC 2011 - andrea@opensuse.org
+
+- added libfm-0.1.14-fix_bnc710881.patch to fix bnc 710881 bug
+ that causes data loss if catting and paste a folder into a place
+ without writing permission
+
+-------------------------------------------------------------------
+Tue Jun 21 09:56:23 UTC 2011 - coolo@novell.com
+
+- add prerequires for the rpm scripts
+
+-------------------------------------------------------------------
+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 11.3-i586
Old:
----
libfm-0.1.14-fix_sf3089624.patch
libfm-0.1.14-remove_rpath.patch
libfm-0.1.14.tar.bz2
New:
----
libfm-0.1.16-fix_build_older_gtk.patch
libfm-0.1.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libfm.spec ++++++
--- /var/tmp/diff_new_pack.0s55ox/_old 2011-08-11 20:58:16.000000000 +0200
+++ /var/tmp/diff_new_pack.0s55ox/_new 2011-08-11 20:58:16.000000000 +0200
@@ -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
@@ -20,17 +20,15 @@
Name: libfm
Summary: A glib/gio-based lib used to develop file managers
-Version: 0.1.14_rc2
-Release: 2.<RELEASE1>
+Version: 0.1.16_rc3
+Release: 0.<RELEASE2>
License: GPLv2
Group: Development/Libraries/C and C++
Url: http://www.lxde.org/
-Source0: %name-0.1.14.tar.bz2
+Source0: %name-0.1.16.tar.bz2
Source1: %name-rpmlintrc
Patch0: %name-default-config.patch
-Patch1: %name-0.1.14-remove_rpath.patch
-# PATCH-FIX-UPSTREAM libfm-0.1.14-fix_sf3089624.patch - fixed "Filenames with spaces not supported in copy/paste"
-Patch2: %name-0.1.14-fix_sf3089624.patch
+Patch1: %name-0.1.16-fix_build_older_gtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: gtk2-devel
@@ -41,33 +39,35 @@
BuildRequires: update-desktop-files
BuildRequires: fdupes
BuildRequires: autoconf
+PreReq: desktop-file-utils
+PreReq: shared-mime-info
%description
A glib/gio-based lib used to develop file managers providing some
file management utilities and related-widgets missing in gtk+/glib.
-%package -n libfm0
+%package -n libfm1
License: GPLv2
Group: System/Libraries
Summary: Libfm libraries
-%description -n libfm0
+%description -n libfm1
libfm libraries for development
-%package -n libfm-gtk0
+%package -n libfm-gtk1
License: GPLv2
Group: System/Libraries
Summary: GTK libfm libraries
-%description -n libfm-gtk0
+%description -n libfm-gtk1
GTK libfm libraries for development
%package devel
License: GPLv2
Group: Development/Libraries/C and C++
Summary: Devel files for libfm
-Requires: libfm0 = %version
-Requires: libfm-gtk0 = %version
+Requires: libfm1 = %version
+Requires: libfm-gtk1 = %version
Requires: %name = %version
Requires: gtk2-devel
Requires: glib2-devel
@@ -87,31 +87,35 @@
libfm developers documentation
%prep
-%setup -q -n %name-0.1.14
+%setup -q -n %name-0.1.16
%patch0 -p1
%patch1 -p1
-%patch2 -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
@@ -123,34 +127,36 @@
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
/usr/bin/update-desktop-database
-%post -n libfm-gtk0 -p /sbin/ldconfig
+%post -n libfm-gtk1 -p /sbin/ldconfig
-%postun -n libfm-gtk0 -p /sbin/ldconfig
+%postun -n libfm-gtk1 -p /sbin/ldconfig
-%post -n libfm0 -p /sbin/ldconfig
+%post -n libfm1 -p /sbin/ldconfig
-%postun -n libfm0 -p /sbin/ldconfig
+%postun -n libfm1 -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
%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
+%files -n libfm1
%defattr(-,root,root)
%{_libdir}/libfm.so.*
+%if 0%{?suse_version} < 1140
%{_libdir}/gio/modules/libgiofm.so
+%endif
-%files -n libfm-gtk0
+%files -n libfm-gtk1
%defattr(-,root,root)
%{_libdir}/libfm-gtk.so.*
%dir %{_datadir}/%name
++++++ libfm-0.1.16-fix_build_older_gtk.patch ++++++
From 79285e8837cd1815ff62e4c9138d6464a091cf41 Mon Sep 17 00:00:00 2001
From: Hong Jen Yee (PCMan)
Date: Thu, 11 Aug 2011 14:41:18 +0800
Subject: [PATCH] Add some compatibility headers and files used with min-lib-ver.py for future gtk3 migration.
---
checks/README | 6 ++++++
checks/skip_files | 8 ++++++++
checks/skip_symbols | 1 +
src/Makefile.am | 16 ++++++++++++++++
src/glib-compat.c | 22 ++++++++++++++++++++++
src/glib-compat.h | 30 ++++++++++++++++++++++++++++++
src/gtk-compat.c | 22 ++++++++++++++++++++++
src/gtk-compat.h | 41 +++++++++++++++++++++++++++++++++++++++++
src/gtk/fm-dir-tree-view.c | 1 +
src/gtk/fm-file-menu.c | 7 ++++---
10 files changed, 151 insertions(+), 3 deletions(-)
create mode 100644 checks/README
create mode 100644 checks/skip_files
create mode 100644 checks/skip_symbols
create mode 100644 src/glib-compat.c
create mode 100644 src/glib-compat.h
create mode 100644 src/gtk-compat.c
create mode 100644 src/gtk-compat.h
diff --git a/checks/README b/checks/README
new file mode 100644
index 0000000..b6a2eaf
--- /dev/null
+++ b/checks/README
@@ -0,0 +1,6 @@
+This directory contains files or tools used to check the source code.
+The files inside this directory should not be included in any distributed tarballs.
+
+Files skip_files and skip_symbols are used with min-lib-ver.py in lxde/devtools.
+It's a tool used to check minimal required gtk+ version.
+Usage: min-lib-ver.py -F skip_files -S skip_symbols ../src
diff --git a/checks/skip_files b/checks/skip_files
new file mode 100644
index 0000000..9081ab3
--- /dev/null
+++ b/checks/skip_files
@@ -0,0 +1,8 @@
+base/fm-marshal.c
+base/fm-marshal.h
+gtk/fm-gtk-marshal.c
+gtk/fm-gtk-marshal.h
+gtk-compat.h
+gtk-compat.c
+glib-compat.h
+glib-compat.c
diff --git a/checks/skip_symbols b/checks/skip_symbols
new file mode 100644
index 0000000..960525e
--- /dev/null
+++ b/checks/skip_symbols
@@ -0,0 +1 @@
+gdk_display_get_app_launch_context
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c35443..f95628e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,17 @@ AM_CPPFLAGS = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
$(NULL)
+glib_compat_SOURCES= \
+ glib-compat.c \
+ glib-compat.h \
+ $(NULL)
+
+gtk_compat_SOURCES= \
+ $(glib_compat_SOURCES) \
+ gtk-compat.c \
+ gtk-compat.h \
+ $(NULL)
+
if ENABLE_UDISKS
udisks_SOURCES= \
udisks/fm-udisks.c \
@@ -72,6 +83,7 @@ job_SOURCES = \
libfm_SOURCES = \
fm.c \
+ $(glib_compat_SOURCES) \
$(base_SOURCES) \
$(job_SOURCES) \
$(udisks_SOURCES) \
@@ -92,6 +104,7 @@ exo_SOURCES = \
libfm_gtk_SOURCES = \
fm-gtk.c \
+ $(gtk_compat_SOURCES) \
$(exo_SOURCES) \
gtk/fm-folder-view.c \
gtk/fm-folder-model.c \
@@ -247,6 +260,7 @@ libfm_gtk_la_LDFLAGS = \
bin_PROGRAMS = libfm-pref-apps
libfm_pref_apps_SOURCES = \
+ $(gtk_compat_SOURCES) \
tools/libfm-pref-apps.c \
$(NULL)
@@ -269,6 +283,7 @@ libfm_pref_apps_LDADD = \
if ENABLE_DEMO
bin_PROGRAMS += libfm-demo
libfm_demo_SOURCES = \
+ $(gtk_compat_SOURCES) \
demo/libfm-demo.c \
demo/main-win.c demo/main-win.h \
$(NULL)
@@ -297,6 +312,7 @@ if !HAVE_SCHEME_HANDLER
giomodules_LTLIBRARIES = libgiofm.la
libgiofm_la_SOURCES= \
+ $(glib_compat_SOURCES) \
gio/module.c \
gio/fm-app-lookup.c \
gio/fm-app-lookup.h \
diff --git a/src/glib-compat.c b/src/glib-compat.c
new file mode 100644
index 0000000..7f3f6d1
--- /dev/null
+++ b/src/glib-compat.c
@@ -0,0 +1,22 @@
+/*
+ * glib-compat.c
+ *
+ * Copyright 2011 Hong Jen Yee (PCMan)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "glib-compat.h"
diff --git a/src/glib-compat.h b/src/glib-compat.h
new file mode 100644
index 0000000..40ce3bf
--- /dev/null
+++ b/src/glib-compat.h
@@ -0,0 +1,30 @@
+/*
+ * glib-compat.h
+ *
+ * Copyright 2011 Hong Jen Yee (PCMan)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef __GLIB_COMPAT_H__
+#define __GLIB_COMPAT_H__
+#include
+
+G_BEGIN_DECLS
+
+G_END_DECLS
+
+#endif
diff --git a/src/gtk-compat.c b/src/gtk-compat.c
new file mode 100644
index 0000000..5c56439
--- /dev/null
+++ b/src/gtk-compat.c
@@ -0,0 +1,22 @@
+/*
+ * gtk-compat.c
+ *
+ * Copyright 2011 Hong Jen Yee (PCMan)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "gtk-compat.h"
diff --git a/src/gtk-compat.h b/src/gtk-compat.h
new file mode 100644
index 0000000..1b30289
--- /dev/null
+++ b/src/gtk-compat.h
@@ -0,0 +1,41 @@
+/*
+ * gtk-compat.h
+ *
+ * Copyright 2011 Hong Jen Yee (PCMan)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef __GTK_COMPAT_H__
+#define __GTK_COMPAT_H__
+#include
+#include "glib-compat.h"
+
+G_BEGIN_DECLS
+
+/* for gtk+ 3.0 migration */
+#if !GTK_CHECK_VERSION(3, 0, 0)
+ #define gdk_display_get_app_launch_context(dpy) gdk_app_launch_context_new()
+#endif
+
+#if GTK_CHECK_VERSION(2, 20, 1)
+ #define GDK_KEY_Left GDK_Left
+ #define GDK_KEY_Right GDK_Right
+#endif
+
+G_END_DECLS
+
+#endif
diff --git a/src/gtk/fm-dir-tree-view.c b/src/gtk/fm-dir-tree-view.c
index 5b1e934..f3e5ec1 100644
--- a/src/gtk/fm-dir-tree-view.c
+++ b/src/gtk/fm-dir-tree-view.c
@@ -19,6 +19,7 @@
#include "fm-dir-tree-view.h"
#include "fm-dir-tree-model.h"
+#include "../gtk-compat.h"
#include
#include
diff --git a/src/gtk/fm-file-menu.c b/src/gtk/fm-file-menu.c
index 4eace51..113cae0 100644
--- a/src/gtk/fm-file-menu.c
+++ b/src/gtk/fm-file-menu.c
@@ -24,6 +24,7 @@
#endif
#include
+#include "../gtk-compat.h"
#include "fm.h"
#include "fm-config.h"
@@ -450,7 +451,7 @@ void on_compress(GtkAction* action, gpointer user_data)
FmArchiver* archiver = fm_archiver_get_default();
if(archiver)
{
- GAppLaunchContext* ctx = gdk_app_launch_context_new();
+ GAppLaunchContext* ctx = gdk_display_get_app_launch_context(gdk_display_get_default());
files = fm_path_list_new_from_file_info_list(data->file_infos);
fm_archiver_create_archive(archiver, ctx, files);
fm_list_unref(files);
@@ -465,7 +466,7 @@ void on_extract_here(GtkAction* action, gpointer user_data)
FmArchiver* archiver = fm_archiver_get_default();
if(archiver)
{
- GAppLaunchContext* ctx = gdk_app_launch_context_new();
+ GAppLaunchContext* ctx = gdk_display_get_app_launch_context(gdk_display_get_default());
files = fm_path_list_new_from_file_info_list(data->file_infos);
fm_archiver_extract_archives_to(archiver, ctx, files, data->cwd);
fm_list_unref(files);
@@ -480,7 +481,7 @@ void on_extract_to(GtkAction* action, gpointer user_data)
FmArchiver* archiver = fm_archiver_get_default();
if(archiver)
{
- GAppLaunchContext* ctx = gdk_app_launch_context_new();
+ GAppLaunchContext* ctx = gdk_display_get_app_launch_context(gdk_display_get_default());
files = fm_path_list_new_from_file_info_list(data->file_infos);
fm_archiver_extract_archives(archiver, ctx, files);
fm_list_unref(files);
--
1.7.0.1
++++++ libfm-0.1.14.tar.bz2 -> libfm-0.1.16.tar.bz2 ++++++
++++ 81571 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org