Hello community,
here is the log from the commit of package libgsf for openSUSE:Factory
checked in at Thu May 28 02:34:39 CEST 2009.
--------
--- libgsf/libgsf.changes 2009-04-27 10:58:56.000000000 +0200
+++ libgsf/libgsf.changes 2009-05-07 04:58:01.000000000 +0200
@@ -1,0 +2,6 @@
+Thu May 7 04:57:08 CEST 2009 - vuntz@novell.com
+
+- Update to version 1.14.13:
+ + Fix gsf_opendoc_metadata_subtree [bgo#581530]
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libgsf-1.14.12.tar.bz2
New:
----
libgsf-1.14.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgsf.spec ++++++
--- /var/tmp/diff_new_pack.v11580/_old 2009-05-28 02:34:27.000000000 +0200
+++ /var/tmp/diff_new_pack.v11580/_new 2009-05-28 02:34:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libgsf (Version 1.14.12)
+# spec file for package libgsf (Version 1.14.13)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,7 +29,7 @@
BuildRequires: update-desktop-files
License: GPL v2 or later; LGPL v2.1 or later
Group: Development/Libraries/GNOME
-Version: 1.14.12
+Version: 1.14.13
Release: 1
Summary: GNOME Structured File Library
Url: http://www.gnome.org
@@ -190,6 +190,9 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu May 07 2009 vuntz@novell.com
+- Update to version 1.14.13:
+ + Fix gsf_opendoc_metadata_subtree [bgo#581530]
* Mon Apr 27 2009 vuntz@novell.com
- Update to version 1.14.12:
+ Also read user defined OpenDocument metadata
++++++ libgsf-1.14.12.tar.bz2 -> libgsf-1.14.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/ChangeLog new/libgsf-1.14.13/ChangeLog
--- old/libgsf-1.14.12/ChangeLog 2009-04-26 01:39:22.000000000 +0200
+++ new/libgsf-1.14.13/ChangeLog 2009-05-07 01:38:49.000000000 +0200
@@ -1,3 +1,24 @@
+2009-05-06 Morten Welinder
+
+ * Release 1.14.13
+
+2009-05-06 Andreas J. Guelzow
+
+ Fixes #581530
+ * gsf/gsf-opendoc-utils.c (gsf_opendoc_meta_dtd): split into
+ gsf_opendoc_meta_dtd and gsf_opendoc_meta_st_dtd
+ (gsf_opendoc_metadata_subtree_free): free the state not the doc
+ (gsf_opendoc_metadata_subtree): use your own dtd
+ (gsf_opendoc_metadata_subtree_internal): new
+
+2009-04-28 Emmanuel Pacaud
+
+ Add doap file.
+
+2009-04-25 Morten Welinder
+
+ * configure.in : post release bump
+
2009-04-25 Morten Welinder
* Release 1.14.12
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/configure new/libgsf-1.14.13/configure
--- old/libgsf-1.14.12/configure 2009-04-26 01:40:48.000000000 +0200
+++ new/libgsf-1.14.13/configure 2009-05-07 02:00:51.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for libgsf 1.14.12.
+# Generated by GNU Autoconf 2.63 for libgsf 1.14.13.
#
# Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=libgsf.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='libgsf'
PACKAGE_TARNAME='libgsf'
-PACKAGE_VERSION='1.14.12'
-PACKAGE_STRING='libgsf 1.14.12'
+PACKAGE_VERSION='1.14.13'
+PACKAGE_STRING='libgsf 1.14.13'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libgsf'
ac_unique_file="gsf/gsf.h"
@@ -1606,7 +1606,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libgsf 1.14.12 to adapt to many kinds of systems.
+\`configure' configures libgsf 1.14.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1676,7 +1676,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libgsf 1.14.12:";;
+ short | recursive ) echo "Configuration of libgsf 1.14.13:";;
esac
cat <<\_ACEOF
@@ -1816,7 +1816,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libgsf configure 1.14.12
+libgsf configure 1.14.13
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1830,7 +1830,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libgsf $as_me 1.14.12, which was
+It was created by libgsf $as_me 1.14.13, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2207,12 +2207,12 @@
LIBGSF_MINOR_VERSION=14
-LIBGSF_MICRO_VERSION=12
+LIBGSF_MICRO_VERSION=13
-VERSION_INFO=114:12:0
+VERSION_INFO=114:13:0
CURRENT_MINUS_AGE=114
@@ -2565,7 +2565,7 @@
# Define the identity of the package.
PACKAGE='libgsf'
- VERSION='1.14.12'
+ VERSION='1.14.13'
cat >>confdefs.h <<_ACEOF
@@ -18456,7 +18456,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libgsf $as_me 1.14.12, which was
+This file was extended by libgsf $as_me 1.14.13, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18519,7 +18519,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libgsf config.status 1.14.12
+libgsf config.status 1.14.13
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/configure.in new/libgsf-1.14.13/configure.in
--- old/libgsf-1.14.12/configure.in 2009-04-18 00:27:14.000000000 +0200
+++ new/libgsf-1.14.13/configure.in 2009-04-26 01:51:41.000000000 +0200
@@ -4,7 +4,7 @@
m4_define([libgsf_version_major], [1])
m4_define([libgsf_version_minor], [14])
-m4_define([libgsf_version_micro], [12])
+m4_define([libgsf_version_micro], [13])
m4_define([libgsf_version_extra], [])
m4_define([libgsf_full_version],
[libgsf_version_major.libgsf_version_minor.libgsf_version_micro[]libgsf_version_extra])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/doc/tmpl/blobs.sgml.sgml new/libgsf-1.14.13/doc/tmpl/blobs.sgml.sgml
--- old/libgsf-1.14.12/doc/tmpl/blobs.sgml.sgml 2009-04-26 01:43:32.000000000 +0200
+++ new/libgsf-1.14.13/doc/tmpl/blobs.sgml.sgml 2009-05-07 02:06:44.000000000 +0200
@@ -9,13 +9,11 @@
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/doc/tmpl/gio.sgml new/libgsf-1.14.13/doc/tmpl/gio.sgml
--- old/libgsf-1.14.12/doc/tmpl/gio.sgml 2009-04-26 01:43:32.000000000 +0200
+++ new/libgsf-1.14.13/doc/tmpl/gio.sgml 2009-05-07 02:06:44.000000000 +0200
@@ -9,13 +9,11 @@
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/doc/tmpl/gnome-vfs.sgml new/libgsf-1.14.13/doc/tmpl/gnome-vfs.sgml
--- old/libgsf-1.14.12/doc/tmpl/gnome-vfs.sgml 2009-04-26 01:43:32.000000000 +0200
+++ new/libgsf-1.14.13/doc/tmpl/gnome-vfs.sgml 2009-05-07 02:06:44.000000000 +0200
@@ -9,13 +9,11 @@
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/doc/tmpl/open-pkg.sgml new/libgsf-1.14.13/doc/tmpl/open-pkg.sgml
--- old/libgsf-1.14.12/doc/tmpl/open-pkg.sgml 2009-04-26 01:43:32.000000000 +0200
+++ new/libgsf-1.14.13/doc/tmpl/open-pkg.sgml 2009-05-07 02:06:44.000000000 +0200
@@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
-Open Package (ECMA 376)
+Open Package (ECMA 376)
<!-- ##### SECTION Short_Description ##### -->
@@ -9,13 +9,11 @@
</para>
-
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
-
<!-- ##### SECTION Stability_Level ##### -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/gsf/gsf-opendoc-utils.c new/libgsf-1.14.13/gsf/gsf-opendoc-utils.c
--- old/libgsf-1.14.12/gsf/gsf-opendoc-utils.c 2009-04-18 00:27:14.000000000 +0200
+++ new/libgsf-1.14.13/gsf/gsf-opendoc-utils.c 2009-05-07 01:35:36.000000000 +0200
@@ -180,9 +180,8 @@
doc_stats
#endif
-static GsfXMLInNode const gsf_opendoc_meta_dtd[] = {
- GSF_XML_IN_NODE_FULL (START, START, -1, NULL, FALSE, FALSE, TRUE, NULL, NULL, 0),
- GSF_XML_IN_NODE (START, META, OO_NS_OFFICE, "meta", FALSE, NULL, NULL),
+static GsfXMLInNode const gsf_opendoc_meta_st_dtd[] = {
+ GSF_XML_IN_NODE (META, META, OO_NS_OFFICE, "meta", FALSE, NULL, NULL),
/* OpenDocument TAGS */
GSF_XML_IN_NODE (META, META_GENERATOR, OO_NS_META, "generator", TRUE, NULL, &od_meta_generator),
GSF_XML_IN_NODE (META, META_TITLE, OO_NS_DC, "title", TRUE, NULL, &od_meta_title),
@@ -195,17 +194,80 @@
GSF_XML_IN_NODE (META, META_CREATION_DATE, OO_NS_META, "creation-date", TRUE, NULL, &od_meta_date_created),
GSF_XML_IN_NODE (META, META_DATE_MOD, OO_NS_DC, "date", TRUE, NULL, &od_meta_date_modified),
GSF_XML_IN_NODE (META, META_PRINT_DATE, OO_NS_META, "print-date", TRUE, NULL, &od_meta_print_date),
-
GSF_XML_IN_NODE (META, META_TEMPLATE, OO_NS_META, "template", FALSE, NULL, NULL),
GSF_XML_IN_NODE (META, META_AUTO_RELOAD, OO_NS_META, "auto-reload", FALSE, NULL, NULL),
GSF_XML_IN_NODE (META, META_HL_BEHAVIOUR, OO_NS_META, "hyperlink-behaviour", FALSE, NULL, NULL),
GSF_XML_IN_NODE (META, META_DOCUMENT_STATS, OO_NS_META, "document-statistic", FALSE, NULL, NULL),
GSF_XML_IN_NODE (META, META_LANGUAGE, OO_NS_DC, "language", TRUE, NULL, &od_meta_language),
-
GSF_XML_IN_NODE (META, META_EDITING_CYCLES, OO_NS_META, "editing-cycles", TRUE, NULL, &od_meta_editing_cycles),
GSF_XML_IN_NODE (META, META_EDITING_DURATION, OO_NS_META, "editing-duration", TRUE, NULL, &od_meta_editing_duration),
+ GSF_XML_IN_NODE (META, META_USER_DEFINED, OO_NS_META, "user-defined", GSF_XML_CONTENT, &od_meta_user_defined, &od_meta_user_defined_end),
+ GSF_XML_IN_NODE_END
+};
+
+
+static void
+gsf_opendoc_metadata_subtree_free (G_GNUC_UNUSED GsfXMLIn *xin, gpointer old_state)
+{
+ GsfOOMetaIn *state = old_state;
+
+ if (state->keywords) {
+ GValue *val = g_new0 (GValue, 1);
+ g_value_init (val, GSF_DOCPROP_VECTOR_TYPE);
+ g_value_set_object (val, state->keywords);
+ gsf_doc_meta_data_insert (state->md,
+ g_strdup (GSF_META_NAME_KEYWORDS), val);
+ g_object_unref (state->keywords);
+ }
+
+ g_object_unref (G_OBJECT (state->md));
+ g_free (state);
+}
+
+static GsfXMLInDoc *doc_subtree = NULL;
+
+/**
+ * gsf_opendoc_metadata_subtree :
+ * @doc : #GsfXMLInDoc
+ * @md : #GsfDocMetaData
+ *
+ * Extend @xin so that it can parse a subtree in OpenDoc metadata format
+ **/
+void
+gsf_opendoc_metadata_subtree (GsfXMLIn *xin, GsfDocMetaData *md)
+{
+ GsfOOMetaIn *state = NULL;
+
+ g_return_if_fail (md != NULL);
+
+ if (NULL == doc_subtree)
+ doc_subtree = gsf_xml_in_doc_new (gsf_opendoc_meta_st_dtd, gsf_ooo_ns);
- GSF_XML_IN_NODE (META, META_USER_DEFINED, OO_NS_META, "user-defined", GSF_XML_CONTENT, &od_meta_user_defined, &od_meta_user_defined_end),
+ state = g_new0 (GsfOOMetaIn, 1);
+ state->md = md;
+ g_object_ref (G_OBJECT (md));
+ gsf_xml_in_push_state (xin, doc_subtree, state, gsf_opendoc_metadata_subtree_free, NULL);
+}
+
+/**
+ * gsf_opendoc_metadata_subtree_internal :
+ * @doc : #GsfXMLInDoc
+ *
+ * Extend @xin so that it can parse a subtree in OpenDoc metadata format
+ * The current user_state must be a GsfOOMetaIn!
+ **/
+static void
+gsf_opendoc_metadata_subtree_internal (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
+{
+ if (NULL == doc_subtree)
+ doc_subtree = gsf_xml_in_doc_new (gsf_opendoc_meta_st_dtd, gsf_ooo_ns);
+
+ gsf_xml_in_push_state (xin, doc_subtree, NULL, NULL, NULL);
+}
+
+static GsfXMLInNode const gsf_opendoc_meta_dtd[] = {
+ GSF_XML_IN_NODE_FULL (START, START, -1, NULL, FALSE, FALSE, TRUE, NULL, NULL, 0),
+ GSF_XML_IN_NODE (START, META, OO_NS_OFFICE, "meta", FALSE, &gsf_opendoc_metadata_subtree_internal, NULL),
GSF_XML_IN_NODE_END
};
@@ -246,26 +308,6 @@
return state.err;
}
-static void
-gsf_opendoc_metadata_subtree_free (GsfXMLIn *xin, G_GNUC_UNUSED gpointer old_state)
-{
- gsf_xml_in_doc_free (xin->user_state);
-}
-
-/**
- * gsf_opendoc_metadata_subtree :
- * @doc : #GsfXMLInDoc
- * @md : #GsfDocMetaData
- *
- * Extend @xin so that it can parse a subtree in OpenDoc metadata format
- **/
-void
-gsf_opendoc_metadata_subtree (GsfXMLIn *xin, GsfDocMetaData *md)
-{
- GsfXMLInDoc *doc = gsf_xml_in_doc_new (gsf_opendoc_meta_dtd+1, gsf_ooo_ns);
- gsf_xml_in_push_state (xin, doc, md, &gsf_opendoc_metadata_subtree_free,
- NULL);
-}
static char const *
od_map_prop_name (char const *name)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/gsf/version.c new/libgsf-1.14.13/gsf/version.c
--- old/libgsf-1.14.12/gsf/version.c 2009-04-26 01:41:07.000000000 +0200
+++ new/libgsf-1.14.13/gsf/version.c 2009-05-07 02:01:47.000000000 +0200
@@ -1,3 +1,3 @@
int libgsf_major_version = 1; /* The ABI version */
int libgsf_minor_version = 14; /* The API version */
-int libgsf_micro_version = 12; /* bug fixes */
+int libgsf_micro_version = 13; /* bug fixes */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/libgsf-1.spec new/libgsf-1.14.13/libgsf-1.spec
--- old/libgsf-1.14.12/libgsf-1.spec 2009-04-26 01:41:07.000000000 +0200
+++ new/libgsf-1.14.13/libgsf-1.spec 2009-05-07 02:01:48.000000000 +0200
@@ -1,5 +1,5 @@
%define name libgsf
-%define version 1.14.12
+%define version 1.14.13
%define release 1
%define prefix /usr
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/libgsf-gnome-1.spec new/libgsf-1.14.13/libgsf-gnome-1.spec
--- old/libgsf-1.14.12/libgsf-gnome-1.spec 2009-04-26 01:41:07.000000000 +0200
+++ new/libgsf-1.14.13/libgsf-gnome-1.spec 2009-05-07 02:01:48.000000000 +0200
@@ -1,5 +1,5 @@
%define name libgsf-1
-%define version 1.14.12
+%define version 1.14.13
%define release 1
%define prefix /usr
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/NEWS new/libgsf-1.14.13/NEWS
--- old/libgsf-1.14.12/NEWS 2009-04-25 20:14:01.000000000 +0200
+++ new/libgsf-1.14.13/NEWS 2009-05-07 01:35:36.000000000 +0200
@@ -1,3 +1,9 @@
+libgsf 1.14.13
+
+Andreas:
+ * Fix gsf_opendoc_metadata_subtree [#581530]
+
+--------------------------------------------------------------------------
libgsf 1.14.12
Andreas:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/po/ChangeLog new/libgsf-1.14.13/po/ChangeLog
--- old/libgsf-1.14.12/po/ChangeLog 2009-04-26 01:39:22.000000000 +0200
+++ new/libgsf-1.14.13/po/ChangeLog 2009-05-07 01:38:49.000000000 +0200
@@ -1,3 +1,7 @@
+2009-05-06 Morten Welinder
+
+ * Release 1.14.13
+
2009-04-25 Morten Welinder
* Release 1.14.12
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.12/python/ChangeLog new/libgsf-1.14.13/python/ChangeLog
--- old/libgsf-1.14.12/python/ChangeLog 2009-04-26 01:39:22.000000000 +0200
+++ new/libgsf-1.14.13/python/ChangeLog 2009-05-07 01:38:49.000000000 +0200
@@ -1,3 +1,7 @@
+2009-05-06 Morten Welinder
+
+ * Release 1.14.13
+
2009-04-25 Morten Welinder
* Release 1.14.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org