From f08d39bf5571c487304433f13df072bd62f5fffb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 1 Aug 2019 22:41:34 -0400 Subject: [PATCH] import GConf2-3.2.6-22.el8 --- .GConf2.metadata | 1 + .gitignore | 1 + SOURCES/GConf-gettext.patch | 360 ++++++++++++ SOURCES/drop-spew.patch | 98 ++++ SOURCES/gconf-3.2.6-python3.patch | 173 ++++++ SOURCES/macros.gconf2 | 86 +++ SOURCES/pkill-hack.patch | 14 + SOURCES/workaround-crash.patch | 46 ++ SPECS/GConf2.spec | 930 ++++++++++++++++++++++++++++++ 9 files changed, 1709 insertions(+) create mode 100644 .GConf2.metadata create mode 100644 .gitignore create mode 100644 SOURCES/GConf-gettext.patch create mode 100644 SOURCES/drop-spew.patch create mode 100644 SOURCES/gconf-3.2.6-python3.patch create mode 100644 SOURCES/macros.gconf2 create mode 100644 SOURCES/pkill-hack.patch create mode 100644 SOURCES/workaround-crash.patch create mode 100644 SPECS/GConf2.spec diff --git a/.GConf2.metadata b/.GConf2.metadata new file mode 100644 index 0000000..f9180d1 --- /dev/null +++ b/.GConf2.metadata @@ -0,0 +1 @@ +a90d3ac08dc454f927c8d3024f52d4d57e3ff613 SOURCES/GConf-3.2.6.tar.xz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7a5a0a6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/GConf-3.2.6.tar.xz diff --git a/SOURCES/GConf-gettext.patch b/SOURCES/GConf-gettext.patch new file mode 100644 index 0000000..638e8ae --- /dev/null +++ b/SOURCES/GConf-gettext.patch @@ -0,0 +1,360 @@ +diff -up GConf-2.26.0/backends/markup-tree.c.gettext GConf-2.26.0/backends/markup-tree.c +--- GConf-2.26.0/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400 ++++ GConf-2.26.0/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400 +@@ -52,6 +52,7 @@ struct _MarkupEntry + char *schema_name; + char *mod_user; + GTime mod_time; ++ const char *gettext_domain; + }; + + static LocalSchemaInfo* local_schema_info_new (void); +@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry + gconf_schema_get_type (schema)); + gconf_schema_set_owner (current_schema, + gconf_schema_get_owner (schema)); ++ gconf_schema_set_gettext_domain (current_schema, ++ gconf_schema_get_gettext_domain (schema)); + } + + /* Update mod time */ +@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent + else if (c_local_schema && c_local_schema->long_desc) + gconf_schema_set_long_desc (schema, c_local_schema->long_desc); + ++ gconf_schema_set_gettext_domain (schema, entry->gettext_domain); ++ + return retval; + } + } +@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext + const char *ltype; + const char *list_type; + const char *owner; ++ + GConfValueType vtype; +- const char *dummy1, *dummy2, *dummy3, *dummy4; ++ const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5; + + #if 0 + g_assert (ELEMENT_IS ("entry") || +@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext + "muser", &dummy2, + "mtime", &dummy3, + "schema", &dummy4, ++ "gettext_domain", &dummy5, + + NULL)) + return; +@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext + const char *mtime; + const char *schema; + const char *type; ++ const char *gettext_domain; + const char *dummy1, *dummy2, *dummy3, *dummy4; + const char *dummy5, *dummy6, *dummy7; + GConfValue *value; +@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext + mtime = NULL; + schema = NULL; + type = NULL; ++ gettext_domain = NULL; + + if (!locate_attributes (context, element_name, attribute_names, attribute_values, + error, +@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext + "mtime", &mtime, + "schema", &schema, + "type", &type, ++ "gettext_domain", &gettext_domain, + + /* These are allowed but we don't use them until + * parse_value_element +@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext + */ + if (schema) + entry->schema_name = g_strdup (schema); ++ ++ if (gettext_domain) ++ entry->gettext_domain = g_intern_string (gettext_domain); + } + else + { +@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value, + GConfSchema *schema; + GConfValueType stype; + const char *owner; ++ const char *gettext_domain; + + schema = gconf_value_get_schema (value); + +@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value, + + g_free (s); + } ++ ++ gettext_domain = gconf_schema_get_gettext_domain (schema); ++ ++ if (gettext_domain) ++ { ++ char *s; ++ ++ s = g_markup_escape_text (gettext_domain, -1); ++ ++ if (fprintf (f, " gettext_domain=\"%s\"", s) < 0) ++ { ++ g_free (s); ++ return FALSE; ++ } ++ ++ g_free (s); ++ } + + if (stype == GCONF_VALUE_LIST) + { +diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd +--- GConf-2.26.0/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400 ++++ GConf-2.26.0/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400 +@@ -7,7 +7,7 @@ + +- ++ + + + +diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c +--- GConf-2.26.0/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400 ++++ GConf-2.26.0/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400 +@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem + cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : ""); + cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : ""); + cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : ""); ++ cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : ""); + + { + gchar* encoded; +@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con + gconf_schema_set_owner(sc, cs->owner); + } + ++ if (*cs->gettext_domain != '\0') ++ { ++ if (!g_utf8_validate (cs->gettext_domain, -1, NULL)) ++ gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema")); ++ else ++ gconf_schema_set_gettext_domain(sc, cs->gettext_domain); ++ } ++ + { + GConfValue* val; + +diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c +--- GConf-2.26.0/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400 ++++ GConf-2.26.0/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400 +@@ -32,9 +32,10 @@ typedef struct { + GConfValueType car_type; /* Pair car type of the described entry */ + GConfValueType cdr_type; /* Pair cdr type of the described entry */ + gchar* locale; /* Schema locale */ +- gchar* owner; /* Name of creating application */ ++ const gchar* owner; /* Name of creating application */ + gchar* short_desc; /* 40 char or less description, no newlines */ + gchar* long_desc; /* could be a paragraph or so */ ++ const gchar* gettext_domain; /* description gettext domain */ + GConfValue* default_value; /* Default value of the key */ + } GConfRealSchema; + +@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc) + g_free (real->locale); + g_free (real->short_desc); + g_free (real->long_desc); +- g_free (real->owner); + + if (real->default_value) + gconf_value_free (real->default_value); +@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc + + dest->long_desc = g_strdup (real->long_desc); + +- dest->owner = g_strdup (real->owner); ++ dest->gettext_domain = real->gettext_domain; ++ ++ dest->owner = real->owner; + + dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL; + +@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc + REAL_SCHEMA (sc)->locale = NULL; + } + ++void ++gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain) ++{ ++ g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL)); ++ ++ if (domain) ++ REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain); ++ else ++ REAL_SCHEMA (sc)->gettext_domain = NULL; ++} ++ + void + gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc) + { +@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc, + { + g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL)); + +- if (REAL_SCHEMA (sc)->owner) +- g_free (REAL_SCHEMA (sc)->owner); +- + if (owner) +- REAL_SCHEMA (sc)->owner = g_strdup (owner); ++ REAL_SCHEMA (sc)->owner = g_intern_string (owner); + else + REAL_SCHEMA (sc)->owner = NULL; + } +@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema + return FALSE; + } + ++ if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL)) ++ { ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_FAILED, ++ _("Schema contains invalid UTF-8")); ++ return FALSE; ++ } ++ + if (real->owner && !g_utf8_validate (real->owner, -1, NULL)) + { + g_set_error (err, GCONF_ERROR, +@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche + } + + const char* ++gconf_schema_get_gettext_domain (const GConfSchema *schema) ++{ ++ g_return_val_if_fail (schema != NULL, NULL); ++ ++ return REAL_SCHEMA (schema)->gettext_domain; ++} ++ ++static inline const char * ++schema_translate (const GConfSchema *schema, ++ const char *string) ++{ ++ if (REAL_SCHEMA (schema)->gettext_domain) ++ { ++ bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8"); ++ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string); ++ } ++ else ++ return string; ++} ++ ++const char* + gconf_schema_get_short_desc (const GConfSchema *schema) + { + g_return_val_if_fail (schema != NULL, NULL); + +- return REAL_SCHEMA (schema)->short_desc; ++ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc); + } + + const char* +@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS + { + g_return_val_if_fail (schema != NULL, NULL); + +- return REAL_SCHEMA (schema)->long_desc; ++ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc); + } + + const char* +diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h +--- GConf-2.26.0/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400 ++++ GConf-2.26.0/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400 +@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type + GConfValueType type); + void gconf_schema_set_locale (GConfSchema *sc, + const gchar *locale); ++void gconf_schema_set_gettext_domain (GConfSchema *sc, ++ const gchar *domain); + void gconf_schema_set_short_desc (GConfSchema *sc, + const gchar *desc); + void gconf_schema_set_long_desc (GConfSchema *sc, +@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ + GConfValueType gconf_schema_get_car_type (const GConfSchema *schema); + GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema); + const char* gconf_schema_get_locale (const GConfSchema *schema); ++const char* gconf_schema_get_gettext_domain(const GConfSchema *schema); + const char* gconf_schema_get_short_desc (const GConfSchema *schema); + const char* gconf_schema_get_long_desc (const GConfSchema *schema); + const char* gconf_schema_get_owner (const GConfSchema *schema); +diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c +--- GConf-2.26.0/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400 ++++ GConf-2.26.0/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400 +@@ -3295,6 +3295,7 @@ struct _SchemaInfo { + GConfValueType cdr_type; + GConfValue* global_default; + GHashTable* hash; ++ gchar* gettext_domain; + }; + + static int +@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node, + else + g_printerr (_("WARNING: empty node")); + } ++ else if (strcmp((char *)iter->name, "gettext_domain") == 0) ++ { ++ tmp = (char *)xmlNodeGetContent(iter); ++ if (tmp) ++ { ++ info->gettext_domain = g_strdup(tmp); ++ xmlFree(tmp); ++ } ++ } + else + g_printerr (_("WARNING: node <%s> not understood below \n"), + iter->name); +@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch + if (info->owner != NULL) + gconf_schema_set_owner(schema, info->owner); + ++ if (info->gettext_domain != NULL) ++ gconf_schema_set_gettext_domain(schema, info->gettext_domain); ++ + xmlFree(name); + + /* Locale-specific info */ +@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch + info.apply_to = NULL; + info.owner = NULL; + info.global_default = NULL; ++ info.gettext_domain = NULL; + info.hash = g_hash_table_new(g_str_hash, g_str_equal); + + extract_global_info(node, &info); +@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch + ; /* nothing */ + else if (strcmp((char *)iter->name, "applyto") == 0) + ; /* nothing */ ++ else if (strcmp((char *)iter->name, "gettext_domain") == 0) ++ ; /* nothing */ + else if (strcmp((char *)iter->name, "locale") == 0) + { + process_locale_info(iter, &info); +diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl +--- GConf-2.26.0/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400 ++++ GConf-2.26.0/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400 +@@ -16,6 +16,7 @@ struct ConfigSchema { + string short_desc; + string long_desc; + string owner; ++ string gettext_domain; + // Work around lack of recursive data types + string encoded_default_value; + }; diff --git a/SOURCES/drop-spew.patch b/SOURCES/drop-spew.patch new file mode 100644 index 0000000..b5c899b --- /dev/null +++ b/SOURCES/drop-spew.patch @@ -0,0 +1,98 @@ +From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Mon, 15 Apr 2013 09:57:34 -0400 +Subject: [PATCH] dbus: Don't spew to console when unable to connect to dbus + daemon + +Instead pass the error up for the caller to decide what to do. + +This prevent untrappable warning messages from showing up at the +console if gconftool --makefile-install-rule is called. +--- + gconf/gconf-dbus.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c +index 5610fcf..048e3ea 100644 +--- a/gconf/gconf-dbus.c ++++ b/gconf/gconf-dbus.c +@@ -104,9 +104,9 @@ static GConfEngine *default_engine = NULL; + static GHashTable *engines_by_db = NULL; + static GHashTable *engines_by_address = NULL; + static gboolean dbus_disconnected = FALSE; + +-static gboolean ensure_dbus_connection (void); ++static gboolean ensure_dbus_connection (GError **error); + static gboolean ensure_service (gboolean start_if_not_found, + GError **err); + static gboolean ensure_database (GConfEngine *conf, + gboolean start_if_not_found, +@@ -382,18 +382,20 @@ gconf_engine_detach (GConfEngine *conf) + } + } + + static gboolean +-ensure_dbus_connection (void) ++ensure_dbus_connection (GError **err) + { + DBusError error; + + if (global_conn != NULL) + return TRUE; + + if (dbus_disconnected) + { +- g_warning ("The connection to DBus was broken. Can't reinitialize it."); ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_NO_SERVER, ++ "The connection to DBus was broken. Can't reinitialize it."); + return FALSE; + } + + dbus_error_init (&error); +@@ -401,9 +403,12 @@ ensure_dbus_connection (void) + global_conn = dbus_bus_get_private (DBUS_BUS_SESSION, &error); + + if (!global_conn) + { +- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message); ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_NO_SERVER, ++ "Client failed to connect to the D-BUS daemon:\n%s", ++ error.message); + + dbus_error_free (&error); + return FALSE; + } +@@ -430,15 +435,10 @@ ensure_service (gboolean start_if_not_found, + DBusError error; + + if (global_conn == NULL) + { +- if (!ensure_dbus_connection ()) +- { +- g_set_error (err, GCONF_ERROR, +- GCONF_ERROR_NO_SERVER, +- _("No D-BUS daemon running\n")); +- return FALSE; +- } ++ if (!ensure_dbus_connection (err)) ++ return FALSE; + + g_assert (global_conn != NULL); + } + +@@ -2511,9 +2511,9 @@ gboolean + gconf_ping_daemon (void) + { + if (global_conn == NULL) + { +- if (!ensure_dbus_connection ()) ++ if (!ensure_dbus_connection (NULL)) + { + return FALSE; + } + g_assert (global_conn != NULL); +-- +1.8.1.4 + diff --git a/SOURCES/gconf-3.2.6-python3.patch b/SOURCES/gconf-3.2.6-python3.patch new file mode 100644 index 0000000..3aee183 --- /dev/null +++ b/SOURCES/gconf-3.2.6-python3.patch @@ -0,0 +1,173 @@ +From dbd4f1bc1992c2942538980e76a50c8b8a758d70 Mon Sep 17 00:00:00 2001 +From: Takao Fujiwara +Date: Fri, 11 Dec 2015 18:29:49 +0900 +Subject: [PATCH] gsettings-schema-convert: Support python3 + +Modified by Marek Kasik (use io instead of codecs and +explicit usage of /usr/bin/python3). + +https://bugzilla.gnome.org/show_bug.cgi?id=759334 +--- + gsettings/gsettings-schema-convert | 43 ++++++++++++++++++++------------------ + 1 file changed, 23 insertions(+), 20 deletions(-) + +diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert +index 913cc83..6ccf8c5 100755 +--- a/gsettings/gsettings-schema-convert ++++ b/gsettings/gsettings-schema-convert +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # vim: set ts=4 sw=4 et: coding=UTF-8 + # + # Copyright (c) 2010, Novell, Inc. +@@ -25,6 +25,9 @@ + # TODO: we don't support migrating a pair from a gconf schema. It has yet to be + # seen in real-world usage, though. + ++from __future__ import print_function ++ ++import io + import os + import sys + +@@ -398,7 +401,7 @@ class SimpleSchemaParser: + + def _word_to_token(self, word): + lower = word.lower() +- if lower and lower in self.allowed_tokens.keys(): ++ if lower and lower in list(self.allowed_tokens.keys()): + return lower + raise GSettingsSchemaConvertException('\'%s\' is not a valid token.' % lower) + +@@ -594,7 +597,7 @@ class SimpleSchemaParser: + self.object_stack.append(new_object) + + def parse(self): +- f = open(self.file, 'r') ++ f = io.open(self.file, 'r', encoding='utf-8') + lines = [ line[:-1] for line in f.readlines() ] + f.close() + +@@ -603,7 +606,7 @@ class SimpleSchemaParser: + for line in lines: + current_line_nb += 1 + self.parse_line(line) +- except GSettingsSchemaConvertException, e: ++ except GSettingsSchemaConvertException as e: + raise GSettingsSchemaConvertException('%s:%s: %s' % (os.path.basename(self.file), current_line_nb, e)) + + return self.root +@@ -711,7 +714,7 @@ class XMLSchemaParser: + schema = self._parse_schema(schema_node) + + for (child_schema, child_name) in schema._children: +- if parent.has_key(child_schema): ++ if child_schema in parent: + raise GSettingsSchemaConvertException('Child \'%s\' is declared by two different schemas: \'%s\' and \'%s\'.' % (child_schema, parent[child_schema], schema.id)) + parent[child_schema] = schema + +@@ -719,7 +722,7 @@ class XMLSchemaParser: + + # now let's move all schemas where they should leave + for schema in schemas: +- if parent.has_key(schema.id): ++ if schema.id in parent: + parent_schema = parent[schema.id] + + # check that the paths of parent and child are supported by +@@ -1054,31 +1057,31 @@ def main(args): + (options, args) = parser.parse_args() + + if len(args) < 1: +- print >> sys.stderr, 'Need a filename to work on.' ++ print('Need a filename to work on.', file=sys.stderr) + return 1 + elif len(args) > 1: +- print >> sys.stderr, 'Too many arguments.' ++ print('Too many arguments.', file=sys.stderr) + return 1 + + if options.simple and options.xml: +- print >> sys.stderr, 'Too many output formats requested.' ++ print('Too many output formats requested.', file=sys.stderr) + return 1 + + if not options.gconf and options.gettext_domain: +- print >> sys.stderr, 'Default gettext domain can only be specified when converting a gconf schema.' ++ print('Default gettext domain can only be specified when converting a gconf schema.', file=sys.stderr) + return 1 + + if not options.gconf and options.schema_id: +- print >> sys.stderr, 'Default schema ID can only be specified when converting a gconf schema.' ++ print('Default schema ID can only be specified when converting a gconf schema.', file=sys.stderr) + return 1 + + if not options.gconf and options.keep_underscores: +- print >> sys.stderr, 'The --keep-underscores option can only be specified when converting a gconf schema.' ++ print('The --keep-underscores option can only be specified when converting a gconf schema.', file=sys.stderr) + return 1 + + argfile = os.path.expanduser(args[0]) + if not os.path.exists(argfile): +- print >> sys.stderr, '\'%s\' does not exist.' % argfile ++ print('\'%s\' does not exist.' % argfile, file=sys.stderr) + return 1 + + if options.output: +@@ -1095,7 +1098,7 @@ def main(args): + try: + parser = GConfSchemaParser(argfile, options.gettext_domain, options.schema_id, options.keep_underscores) + schema_root = parser.parse() +- except SyntaxError, e: ++ except SyntaxError as e: + raise GSettingsSchemaConvertException('\'%s\' does not look like a valid gconf schema file: %s' % (argfile, e)) + else: + # autodetect if file is XML or not +@@ -1104,7 +1107,7 @@ def main(args): + schema_root = parser.parse() + if not options.simple and not options.xml: + options.simple = True +- except SyntaxError, e: ++ except SyntaxError as e: + parser = SimpleSchemaParser(argfile) + schema_root = parser.parse() + if not options.simple and not options.xml: +@@ -1113,10 +1116,10 @@ def main(args): + if options.xml: + node = schema_root.get_xml_node() + try: +- output = ET.tostring(node, pretty_print = True) ++ output = ET.tostring(node, pretty_print = True).decode(encoding='utf-8') + except TypeError: + # pretty_print only works with lxml +- output = ET.tostring(node) ++ output = ET.tostring(node).decode(encoding='utf-8') + else: + output = schema_root.get_simple_string() + +@@ -1124,17 +1127,17 @@ def main(args): + sys.stdout.write(output) + else: + try: +- fout = open(options.output, 'w') ++ fout = io.open(options.output, 'w', encoding='utf-8') + fout.write(output) + fout.close() +- except GSettingsSchemaConvertException, e: ++ except GSettingsSchemaConvertException as e: + fout.close() + if os.path.exists(options.output): + os.unlink(options.output) + raise e + +- except GSettingsSchemaConvertException, e: +- print >> sys.stderr, '%s' % e ++ except GSettingsSchemaConvertException as e: ++ print('%s' % e, file=sys.stderr) + return 1 + + return 0 +-- +2.4.3 + diff --git a/SOURCES/macros.gconf2 b/SOURCES/macros.gconf2 new file mode 100644 index 0000000..928ec70 --- /dev/null +++ b/SOURCES/macros.gconf2 @@ -0,0 +1,86 @@ +# +# RPM macros for gconf applications. +# +# (c) 2006-2007 SUSE LINUX +# Author: Stanislav Brabec +# (c) 2009 Red Hat, Inc +# Author: Toshio Kuratomi +# +# License: LGPLv2+ +# +# Usage: +# +# Preamble: +# Requires(pre): GConf2 +# Requires(preun): GConf2 +# Requires(post): GConf2 +# +# schemas names are without path and suffix +# +# +# %pre +# %gconf_schema_obsolete schema1 +# %gconf_schema_prepare schema2 schema3 +# +# %preun +# %gconf_schema_remove schema2 schema3 +# +# %post +# %gconf_schema_upgrade schema2 schema3 +# +# %files +# %{_sysconfdir}/gconf/schemas/schema2.schemas +# %{_sysconfdir}/gconf/schemas/schema3.schemas + +# Copy schemas from old package for later uninstall on upgrade +%gconf_schema_prepare() \ +if [ "$1" -gt 1 ] ; then \ + rm -rf %{_localstatedir}/lib/rpm-state/gconf/* \ + for schema in %{*} ; do \ + if test -f %{_sysconfdir}/gconf/schemas/"$schema".schemas ; then \ + cp -p %{_sysconfdir}/gconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/gconf/ || : \ + fi \ + done \ +fi \ +%{nil} + +# Macro to remove schemas. Not meant to be used publically +%_do_gconf_schema_remove() \ + if test -f %{_sysconfdir}/gconf/schemas/"$schema".schemas ; then \ + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/"$schema".schemas > /dev/null || : \ + fi \ +%{nil} + +# Remove schemas unconditionally +%gconf_schema_obsolete() \ +for schema in %{*} ; do \ + %_do_gconf_schema_remove \ +done \ +%{nil} + +# Remove schemas on package removal (not upgrade) +%gconf_schema_remove() \ +if [ "$1" -eq 0 ] ; then \ + for schema in %{*} ; do \ + %_do_gconf_schema_remove \ + done \ +fi \ +%{nil} + +%gconf_schema_upgrade() \ +for schema in %{*} ; do \ + if test -f %{_localstatedir}/lib/rpm-state/gconf/"$schema".schemas ; then \ + cmp --quiet %{_sysconfdir}/gconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/gconf/"$schema".schemas \ + if test $? != 0; then\ + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ + gconftool-2 --makefile-uninstall-rule %{_localstatedir}/lib/rpm-state/gconf/"$schema".schemas > /dev/null || : \ + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/"$schema".schemas > /dev/null || : \ + fi \ + rm -f %{_localstatedir}/lib/rpm-state/gconf/"$schema".schemas \ + else \ + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/"$schema".schemas > /dev/null || : \ + fi \ +done \ +%{nil} diff --git a/SOURCES/pkill-hack.patch b/SOURCES/pkill-hack.patch new file mode 100644 index 0000000..b0936ce --- /dev/null +++ b/SOURCES/pkill-hack.patch @@ -0,0 +1,14 @@ +diff -up GConf-3.2.6/gconf/gconftool.c.pkill-hack GConf-3.2.6/gconf/gconftool.c +--- GConf-3.2.6/gconf/gconftool.c.pkill-hack 2013-04-17 10:46:13.225426329 -0400 ++++ GConf-3.2.6/gconf/gconftool.c 2013-04-17 10:48:25.963508300 -0400 +@@ -916,8 +916,8 @@ main (int argc, char** argv) + + use_local_source = TRUE; + +- /* shut down daemon, this is a race condition, but will usually work. */ +- gconf_shutdown_daemon (NULL); ++ g_spawn_command_line_sync ("/usr/bin/pkill -HUP -f /usr/libexec/gconfd-2", ++ NULL, NULL, NULL, NULL); + } + + if (config_source == NULL) diff --git a/SOURCES/workaround-crash.patch b/SOURCES/workaround-crash.patch new file mode 100644 index 0000000..50ce7a2 --- /dev/null +++ b/SOURCES/workaround-crash.patch @@ -0,0 +1,46 @@ +diff -up GConf-3.2.6/gconf/gconfd.c.workaround-crash GConf-3.2.6/gconf/gconfd.c +--- GConf-3.2.6/gconf/gconfd.c.workaround-crash 2013-04-15 10:12:54.480753142 -0400 ++++ GConf-3.2.6/gconf/gconfd.c 2013-04-15 10:12:53.457736847 -0400 +@@ -1076,17 +1076,6 @@ periodic_cleanup_timeout(gpointer data) + #endif + drop_old_databases (); + +-#ifdef HAVE_DBUS +- if (no_databases_in_use () && gconfd_dbus_client_count () == 0) +-#else +- if (no_databases_in_use () && client_count () == 0) +-#endif +- { +- gconf_log (GCL_INFO, _("GConf server is not in use, shutting down.")); +- gconfd_main_quit (); +- return FALSE; +- } +- + /* expire old locale cache entries */ + gconfd_locale_cache_expire (); + +@@ -1105,7 +1094,6 @@ periodic_cleanup_timeout(gpointer data) + + return TRUE; + } +- + void + gconfd_need_log_cleanup (void) + { +@@ -1131,14 +1119,14 @@ gconf_main(void) + } + + main_loops = g_slist_prepend(main_loops, loop); ++ main_loops = g_slist_prepend(main_loops, loop); + + g_main_loop_run (loop); + + main_loops = g_slist_remove(main_loops, loop); + +- if (main_loops == NULL) ++ if (main_loops == NULL && timeout_id != 0) + { +- g_assert(timeout_id != 0); + g_source_remove(timeout_id); + timeout_id = 0; + } diff --git a/SPECS/GConf2.spec b/SPECS/GConf2.spec new file mode 100644 index 0000000..01624e3 --- /dev/null +++ b/SPECS/GConf2.spec @@ -0,0 +1,930 @@ +%define libxml2_version 2.4.12 +%define glib2_version 2.25.9 +%define dbus_version 1.0.1 +%define dbus_glib_version 0.74 + +Summary: A process-transparent configuration system +Name: GConf2 +Version: 3.2.6 +Release: 22%{?dist} +License: LGPLv2+ and GPLv2+ +Group: System Environment/Base +#VCS: git:git://git.gnome.org/gconf +Source0: http://download.gnome.org/sources/GConf/3.2/GConf-%{version}.tar.xz +Source1: macros.gconf2 +URL: http://projects.gnome.org/gconf/ + +# http://bugzilla.gnome.org/show_bug.cgi?id=568845 +Patch0: GConf-gettext.patch + +# https://bugzilla.gnome.org/show_bug.cgi?id=671490 +Patch1: drop-spew.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1580646 +# https://bugzilla.redhat.com/show_bug.cgi?id=1567087 +Patch2: gconf-3.2.6-python3.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=755992 +Patch99: workaround-crash.patch +Patch100: pkill-hack.patch + +BuildRequires: libxml2-devel >= %{libxml2_version} +BuildRequires: libxslt-devel +BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: gtk-doc >= 0.9 +BuildRequires: pkgconfig >= 0.14 +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: polkit-devel >= 0.92 +BuildRequires: dbus-glib-devel >= 0.8 +BuildRequires: gobject-introspection-devel >= 0.6.7 +BuildRequires: autoconf automake libtool +Requires: dbus +# for patch0 +Requires: /usr/bin/killall +Conflicts: GConf2-dbus + +Provides: GConf2-gtk = 3.2.6-6 +Obsoletes: GConf2-gtk < 3.2.6-6 + +%description +GConf is a process-transparent configuration database API used to +store user preferences. It has pluggable backends and features to +support workgroup administration. + +%package devel +Summary: Headers and libraries for GConf development +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: libxml2-devel >= %{libxml2_version} +Requires: glib2-devel >= %{glib2_version} +# we install a pc file +Requires: pkgconfig +# we install an automake macro +Requires: automake +Conflicts: GConf2-dbus-devel + +%description devel +GConf development package. Contains files needed for doing +development using GConf. + +%prep +%setup -q -n GConf-%{version} +%patch0 -p1 -b .gettext +%patch1 -p1 -b .drop-spew +%patch2 -p1 -b .python3 + +%patch99 -p1 -b .workaround-crash +%patch100 -p1 -b .pkill-hack + +autoreconf -i -f + +%build +%configure --disable-static --enable-defaults-service --disable-orbit --with-gtk=3.0 + +# drop unneeded direct library deps with --as-needed +# libtool doesn't make this easy, so we do it the hard way +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + +make + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.system +mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/ +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/rpm-state/gconf +mkdir -p $RPM_BUILD_ROOT%{_datadir}/GConf/gsettings + +install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/ + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/GConf/2/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/GConf/gsettings + +%find_lang %name + +%post +/sbin/ldconfig + +if [ $1 -gt 1 ]; then + if ! fgrep -q gconf.xml.system %{_sysconfdir}/gconf/2/path; then + sed -i -e 's@xml:readwrite:$(HOME)/.gconf@&\n\n# Location for system-wide settings.\nxml:readonly:/etc/gconf/gconf.xml.system@' %{_sysconfdir}/gconf/2/path + fi +fi + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc NEWS README +%config(noreplace) %{_sysconfdir}/gconf/2/path +%dir %{_sysconfdir}/gconf +%dir %{_sysconfdir}/gconf/2 +%dir %{_sysconfdir}/gconf/gconf.xml.defaults +%dir %{_sysconfdir}/gconf/gconf.xml.mandatory +%dir %{_sysconfdir}/gconf/gconf.xml.system +%dir %{_sysconfdir}/gconf/schemas +%{_bindir}/gconf-merge-tree +%{_bindir}/gconftool-2 +%doc %{_mandir}/man1/gconftool-2.1* +%{_bindir}/gsettings-data-convert +%doc %{_mandir}/man1/gsettings-data-convert.1* +%{_sysconfdir}/xdg/autostart/gsettings-data-convert.desktop +%{_libexecdir}/gconfd-2 +%{_libdir}/*.so.* +%{_libdir}/GConf/2/*.so +%dir %{_datadir}/sgml +%{_datadir}/sgml/gconf +%{_datadir}/GConf +%dir %{_libdir}/GConf +%dir %{_libdir}/GConf/2 +%{_rpmconfigdir}/macros.d/macros.gconf2 +%{_sysconfdir}/dbus-1/system.d/org.gnome.GConf.Defaults.conf +%{_libexecdir}/gconf-defaults-mechanism +%{_datadir}/polkit-1/actions/org.gnome.gconf.defaults.policy +%{_datadir}/dbus-1/system-services/org.gnome.GConf.Defaults.service +%{_datadir}/dbus-1/services/org.gnome.GConf.service +%{_localstatedir}/lib/rpm-state/gconf/ +%{_libdir}/gio/modules/libgsettingsgconfbackend.so +%{_libdir}/girepository-1.0 + +%files devel +%{_libdir}/*.so +%{_includedir}/gconf +%{_datadir}/aclocal/*.m4 +%{_datadir}/gtk-doc/html/gconf +%{_libdir}/pkgconfig/* +%{_datadir}/gir-1.0 +%{_bindir}/gsettings-schema-convert +%doc %{_mandir}/man1/gsettings-schema-convert.1* + +%changelog +* Wed Jul 25 2018 Marek Kasik - 3.2.6-22 +- Improve python3 support by Takao Fujiwara's patch +- Resolves: #1567087 + +* Tue May 22 2018 Marek Kasik - 3.2.6-21 +- Convert gsettings-schema-convert to python3 +- Resolves: #1580646 + +* Wed Feb 07 2018 Fedora Release Engineering - 3.2.6-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 3.2.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.2.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.2.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 3.2.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Jun 27 2015 Ville Skyttä - 3.2.6-15 +- Fix source URL and switch to xz tarball (the only one available) +- Do not own %%{_localstatedir}/lib/rpm-state (#907618) +- Ship gsettings-schema-convert manpage only in -devel (#893767) +- Install COPYING as %%license where available +- Fix bogus dates in %%changelog + +* Tue Jun 16 2015 Fedora Release Engineering - 3.2.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Mar 4 2015 Ville Skyttä - 3.2.6-13 +- Install macros file to %%{_rpmconfigdir}/macros.d (#1074275) + +* Sat Feb 21 2015 Till Maas - 3.2.6-12 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Fri Aug 15 2014 Fedora Release Engineering - 3.2.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 3.2.6-10 +- Rebuilt for gobject-introspection 1.41.4 + +* Fri Jun 06 2014 Fedora Release Engineering - 3.2.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jun 05 2014 Karsten Hopp 3.2.6-8 +- rebuild in F21 to sync versions between ppc64 and ppc64-le + +* Fri Aug 02 2013 Fedora Release Engineering - 3.2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Apr 26 2013 Kalev Lember 3.2.6-6 +- Update the GConf2-gtk versioned obsoletes + +* Wed Apr 17 2013 Ray Strode 3.2.6-5 +- Make --makefile-install-rule work even in packages that don't use the macros + +* Mon Apr 15 2013 Ray Strode 3.2.6-4 +- Make pkill -HUP -f gconfd-2 work again +- Make --makefile-install-rull less noisy + +* Fri Apr 12 2013 Ray Strode 3.2.6-3 +- Update GConf upgrade macros (Patch from Michael Schwendt) + Resolves: #920615 + +* Wed Feb 13 2013 Fedora Release Engineering - 3.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Jan 21 2013 Matthias Clasen 3.2.6-1 +- Update to 3.2.6 +- Drop the gtk subpackage + +* Fri Nov 16 2012 Marek Kasik 3.2.5-4 +- Update License field +- Remove unused patches +- Add bug reference to one patch + +* Mon Sep 24 2012 Ray Strode 3.2.5-3 +- More crasher workarounds + Resolves: #858348 + +* Thu Sep 13 2012 Ray Strode 3.2.5-2 +- Work around crasher bug + Resolves: #755992 + +* Wed Jul 18 2012 Fedora Release Engineering - 3.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 15 2012 Matthias Clasen - 3.2.5-1 +- Update to 3.2.5 + +* Fri Mar 9 2012 Matthias Clasen - 3.2.4-1 +- Update to 3.2.4 + +* Mon Feb 13 2012 Ray Strode 3.2.3-4 +- Potentially fix crasher bug + Resolves: #756245 + +* Thu Jan 19 2012 Matthias Clasen - 3.2.3-3 +- Don't build the openldap backend +- Deal gracefully with missing schemas in gsettings-data-convert + +* Thu Jan 12 2012 Fedora Release Engineering - 3.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 2 2011 Matthias Clasen - 3.2.3-1 +- Update to 3.2.3 + +* Tue Sep 20 2011 Matthias Clasen - 3.1.92-1 +- Update to 3.1.92 + +* Mon Jul 25 2011 Matthew Barnes 3.1.4-1 +- Update to 3.1.4 + +* Tue Jul 05 2011 Ray Strode 3.1.3-2 +- Add back one of the non-upstream patches, since + it introduced a non-backward compatible change + to the file format and it's going to be upstreamed soon + anyway + Related GNOME: #653922 + +* Fri Jul 01 2011 Ray Strode 3.1.3-1 +- Update to 3.1.3 +- Remove orbit dependency +- drop unupstreamed patches judiciously + +* Fri Jun 17 2011 Tomas Bzatek - 2.32.4-1 +- Update to 2.32.4 + +* Mon Apr 25 2011 Matthias Clasen 2.32.3-1 +- Update to 2.32.3 + +* Mon Apr 4 2011 Matthias Clasen 2.32.2-1 +- Update to 2.32.2 + +* Thu Feb 10 2011 Matthias Clasen 2.32.1-8 +- Rebuild against newer gtk3 + +* Mon Feb 07 2011 Fedora Release Engineering - 2.32.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 2 2011 Matthias Clasen - 2.32.1-5 +- Rebuild against newer gtk3 + +* Sun Jan 16 2011 Matthias Clasen - 2.32.1-4 +- Co-own /usr/share/sgml + +* Sun Jan 9 2011 Matthias Clasen - 2.32.1-3 +- Rebuild against newer gtk3 + +* Fri Dec 3 2010 Matthias Clasen - 2.32.1-2 +- Rebuild against new gtk + +* Thu Nov 11 2010 Matthias Clasen - 2.32.1-1 +- Update to 2.32.1 + +* Tue Sep 28 2010 Matthias Clasen - 2.32.0-1 +- Update to 2.32.0 + +* Tue Sep 21 2010 Matthias Clasen - 2.31.91-2 +- Rebuild against newer gobject-introspection + +* Tue Aug 31 2010 Matthias Clasen - 2.31.91-1 +- Update to 2.31.91 + +* Fri Aug 13 2010 Matthias Clasen - 2.31.7-2 +- Strip x permissions from rpm macros file. (#600635) + +* Thu Aug 5 2010 Matthias Clasen - 2.31.7-1 +- Update to 2.31.7 + +* Thu Jul 15 2010 Colin Walters - 2.31.6-2 +- Rebuild with new gobject-introspection + +* Mon Jul 12 2010 Matthias Clasen - 2.31.6-1 +- Update to 2.31.6 + +* Tue Jun 29 2010 Matthew Garrett - 2.31.5-2 +- Fix crasher in gsettings-data-convert caused by wrong realloc size + +* Tue Jun 29 2010 Matthias Clasen - 2.31.5-1 +- Update to 2.31.5 + +* Mon Jun 21 2010 Matthias Clasen - 2.31.4-1 +- Update to 2.31.4 + +* Thu May 27 2010 Mamoru Tasaka - 2.31.3-2 +- Rebuild for pkgconfig deps (ref: #596433) + +* Tue May 25 2010 Matthias Clasen - 2.31.3-1 +- Update to 2.31.3 + +* Fri May 21 2010 Matthias Clasen - 2.31.2-4 +- Install an autostart file for gsettings-data-convert + +* Wed May 19 2010 Matthias Clasen - 2.31.2-3 +- Rebuild against newer glib + +* Sun May 16 2010 Matthias Clasen - 2.31.2-2 +- Rebuild against newer glib + +* Fri Apr 23 2010 Matthias Clasen - 2.31.2-1 +- Update to 2.31.2 + +* Mon Apr 19 2010 Matthias Clasen - 2.23.1-1 +- Update to 2.31.1 +- Include introspection data + +* Tue Mar 30 2010 Matthias Clasen - 2.28.1-1 +- Update to 2.28.1 + +* Thu Mar 18 2010 Tom "spot" Callaway 2.28.0-10 +- own /var/lib/rpm-state/ too + +* Wed Mar 03 2010 Tom "spot" Callaway 2.28.0-9 +- add macros.gconf2 +- own /var/lib/rpm-state/gconf + +* Mon Feb 01 2010 Colin Walters 2.28.0-8 +- Add defaults patch from f-12 branch + +* Mon Feb 01 2010 Colin Walters 2.28.0-6 +- Do not catch segv etc. let abrt catch them + +* Thu Jan 28 2010 Ray Strode 2.28.0-5 +- Add defattr directive to gtk subpackage files section + +* Tue Jan 19 2010 Matthias Clasen - 2.28.0-4 +- Make the defaults mechanism use the right polkit actions + +* Mon Dec 14 2009 Matthias Clasen - 2.28.0-3 +- Avoid a crash when gconftool-2 can't read the db (#547238) + +* Wed Oct 7 2009 Matthias Clasen - 2.28.0-2 +- Fix a problem with schema translations + +* Wed Sep 23 2009 Matthias Clasen - 2.28.0-1 +- Update to 2.28.0 + +* Tue Aug 25 2009 Matthias Clasen - 2.27.0-1 +- Update to 2.27.0 + +* Mon Aug 10 2009 Ville Skyttä - 2.26.2-6 +- Convert specfile to UTF-8. + +* Fri Jul 24 2009 Fedora Release Engineering - 2.26.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Jun 14 2009 Matthias Clasen - 2.26.2-4 +- Minor directory ownership cleanup + +* Tue Jun 9 2009 Matthias Clasen - 2.26.2-3 +- Improve the port + +* Tue Jun 9 2009 Matthias Clasen - 2.26.2-2 +- Port to PolicyKit 1 + +* Fri May 15 2009 Matthias Clasen - 2.26.2-1 +- Update to 2.26.2 +- See http://download.gnome.org/sources/GConf/2.26/GConf-2.26.1.news +- See http://download.gnome.org/sources/GConf/2.26/GConf-2.26.2.news + +* Mon Apr 27 2009 Matthias Clasen - 2.26.0-3 +- Support client-side translations + +* Mon Apr 13 2009 Adam Jackson 2.26.0-2 +- Explicit Conflicts: GConf2-dbus (#492636) + +* Mon Mar 16 2009 Ray Strode - 2.26.0-1 +- update to 2.26.0 + +* Tue Mar 3 2009 Matthias Clasen - 2.25.2-2 +- Avoid some gratitious extra work in the markup backend + +* Mon Feb 23 2009 Fedora Release Engineering - 2.25.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 17 2009 Matthias Clasen - 2.25.2-1 +- Update to 2.25.2 + +* Sun Feb 15 2009 Matthias Clasen - 2.25.1-1 +- Update to 2.25.1 + +* Sat Jan 10 2009 Matthias Clasen - 2.25.0-1 +- Update to 2.25.0 + +* Tue Dec 16 2008 Matthias Clasen - 2.24.0-3 +- Rebuild for pkg-config requires + +* Fri Nov 21 2008 Matthias Clasen - 2.24.0-2 +- Better URL + +* Mon Sep 22 2008 Matthias Clasen - 2.24.0-1 +- Update to 2.24.0 +- Drop obsolete timeout patch + +* Fri Aug 22 2008 Matthias Clasen - 2.23.2-1 +- Update to 2.23.2 +- Drop upstreamed patches + +* Wed Jun 4 2008 Matthias Clasen - 2.23.1-1 +- Upodate to 2.23.1 + +* Mon Jun 2 2008 Matthias Clasen - 2.22.0-10 +- Make gconfd notice defaults changes + +* Wed May 21 2008 Ray Strode - 2.22.0-9 +- Don't ever try to autolaunch a bus if DISPLAY is unset + +* Wed May 21 2008 Ray Strode - 2.22.0-8 +- If the session bus isn't running, assume local client side + access to the database (bug 446703) + +* Wed May 14 2008 Ray Strode - 2.22.0-7 +- update add_seconds patch to not remove timeouts that aren't + created anymore + +* Mon May 12 2008 Ray Strode - 2.22.0-6 +- If the session bus isn't running, don't autolaunch it unless + we also want to autostart gconfd. + +* Thu May 8 2008 Ray Strode - 2.22.0-5 +- Tie gconf to session bus. This means it will exit when the session + exits and won't leave /tmp/gconf-$USER DoS possibilities + +* Sun May 4 2008 Matthias Clasen - 2.22.0-4 +- Apply some patches: + - Don't spam syslog + - Handle unsetting mandatory keys without critical warnings + +* Fri May 2 2008 Matthias Clasen - 2.22.0-3 +- Add a dbus service to set defaults + +* Fri May 2 2008 Matthias Clasen - 2.22.0-2 +- Use g_timeout_add_seconds for long timeouts + +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + +* Tue Feb 19 2008 Fedora Release Engineering - 2.21.90-2 +- Autorebuild for GCC 4.3 + +* Tue Jan 29 2008 Matthias Clasen - 2.21.90-1 +- Update to 2.21.90 + +* Mon Jan 21 2008 Matthias Clasen - 2.21.2-1 +- Update to 2.21.2 + +* Wed Jan 9 2008 Caolan McNamara - 2.21.1-2 +- fix .pc so I can build + +* Tue Jan 8 2008 Matthias Clasen - 2.21.1-1 +- Update to 2.21.1 +- Drop upstreamed patches + +* Mon Dec 3 2007 Matthias Clasen - 2.20.1-4 +- Rebuild against new openldap + +* Fri Nov 16 2007 Ray Strode - 2.20.1-3 +- Add the system-wide settings location in post to be more + upgrade friendly (config file is noreplace) + +* Sat Nov 3 2007 Matthias Clasen - 2.20.1-2 +- Add a location for system-wide settings + +* Mon Oct 15 2007 Matthias Clasen - 2.20.1-1 +- 2.20.1 (translation and documentation updates) + +* Sat Sep 22 2007 Matthias Clasen - 2.20.0-2 +- Require /usr/bin/killall, since gconftool uses it + +* Wed Sep 19 2007 Matthias Clasen - 2.20.0-1 +- Update to 2.20.0 + +* Tue Sep 11 2007 Matthias Clasen - 2.19.1-5 +- Some more leak fixes + +* Tue Sep 11 2007 Matthias Clasen - 2.19.1-4 +- Fix memory leaks + +* Thu Aug 23 2007 Adam Jackson - 2.19.1-3 +- Rebuild for ppc toolchain bug + +* Mon Aug 6 2007 Matthias Clasen - 2.19.1-2 +- Update license field + +* Mon Jun 25 2007 Matthias Clasen - 2.19.1-1 +- Update to 2.19.1 + +* Sun Mar 25 2007 Matthias Clasen - 2.18.0.1-2 +- Fix a directory ownership issue. (#233756) + +* Tue Mar 13 2007 Matthias Clasen - 2.18.0.1-1 +- Update to 2.18.0.1 + +* Tue Feb 27 2007 Matthias Clasen - 2.16.1-1 +- Update to 2.16.1 + +* Mon Feb 5 2007 Matthias Clasen - 2.16.0-6 +- Split off a -gtk subpackage to reduce dependencies + +* Sat Feb 3 2007 Matthias Clasen - 2.16.0-5 +- Minor cleanups from package review + +* Mon Jan 22 2007 Matthias Clasen - 2.16.0-4 +- Own the /etc/gconf/schemas directory +- Misc cleanups + +* Sun Oct 29 2006 Ray Strode - 2.16.0-3 +- run autoreconf, so that configure gets updated before + it generates libtool (so it doesn't just regenerate + the original, broken libtool) (again bug 203813) + +* Tue Oct 24 2006 Ray Strode - 2.16.0-2 +- regenerate packaged libtool from RHEL version of libtool so + that rpath's don't get added to plugin DSOs (bug 203813). + +* Fri Oct 20 2006 Matthias Clasen - 2.16.0-1 +- 2.16.0 +- Update reload patch + +* Thu Oct 12 2006 Matthias Clasen - 2.14.0-5 +- Require a new enough glib2 to fix upgrade issues (#203813) + +* Fri Oct 6 2006 Matthias Clasen - 2.14.0-4 +- Fix an issue with error reporting (#202549) +- Don't ship static libraries +- Require pkgconfig for the -devel package + +* Mon Sep 18 2006 Matthias Clasen - 2.14.0-3 +- Make sure that gconfd dies shortly after the session ends + +* Wed Jul 12 2006 Jesse Keating - 2.14.0-2.1 +- rebuild + +* Tue Jun 6 2006 Adam Jackson 2.14.0-2 +- Rebuild. + +* Sun Mar 19 2006 Ray Strode 2.14.0-1 +- Update to 2.14.0 + +* Mon Mar 6 2006 Ray Strode 2.13.5-5 +- Only sync the database once when installing multiple + schema files. Patch by Josselin Mouette . + (upstream bug 333353) + +* Wed Feb 15 2006 Christopher Aillon 2.13.5-4 +- Send SIGTERM instead of SIGHUP to gconfd + +* Mon Feb 13 2006 Jesse Keating 2.13.5-3.2.1 +- rebump for build order issues during double-long bump + +* Fri Feb 10 2006 Jesse Keating 2.13.5-3.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating 2.13.5-3.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Thu Feb 2 2006 Christopher Aillon 2.13.5-3 +- Use the correct patch ;-) + +* Wed Feb 1 2006 Christopher Aillon 2.13.5-2 +- Add patch from Mandriva to reload GConf2 every time a schema is + added or removed (solves bug 173869) + +* Mon Jan 16 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Dec 7 2005 Dan Williams 2.12.1-2 +- Fix segfault in gconf_unescape_key(). GNOME #323479 + +* Thu Nov 3 2005 Alexander Larsson - 2.12.1-1 +- Update to 2.12.1 + +* Thu Sep 8 2005 Matthias Clasen 2.12.0-1 +- Update to 2.12.0 + +* Tue Aug 16 2005 Ray Strode 2.11.90-2 +- rebuild + +* Wed Aug 03 2005 Ray Strode 2.11.90-1 +- Newer upstream version + +* Fri Jul 15 2005 Matthias Clasen 2.11.1-1 +- Newer upstream version +- Drop upstreamed patch + +* Mon May 9 2005 Mark McLoughlin 2.10.0-4 +- Update to upstream evoldap.schema which uses GNOME's OID base + rather than Red Hat's OID. + +* Wed Apr 27 2005 Mark McLoughlin 2.10.0-3 +- Fix undefined symbol in the evoldap backend + +* Mon Apr 18 2005 Mark McLoughlin - 2.10.0-2 +- Add evolution mail accounts backend + +* Thu Mar 17 2005 Ray Strode 2.10.0-1 +- Update to 2.10.0 + +* Mon Feb 7 2005 Mark McLoughlin 2.9.91-1 +- Update to 2.9.91 + +* Fri Jan 28 2005 Matthias Clasen 2.9.2-1 +- Update to 2.9.2 + +* Wed Jan 19 2005 Mark McLoughlin 2.8.1-2 +- Backport some fixes from upstream CVS + +* Tue Oct 12 2004 Mark McLoughlin 2.8.1-1 +- Update to 2.8.1 + +* Tue Sep 21 2004 Mark McLoughlin 2.8.0.1-1 +- Update to 2.8.0.1 + +* Mon Aug 30 2004 Mark McLoughlin 2.7.92-1 +- Update to 2.7.92 + +* Thu Aug 19 2004 Mark McLoughlin 2.7.91.1-1 +- Update to 2.7.91.1 + +* Wed Aug 18 2004 Mark McLoughlin 2.7.91-1 +- Update to 2.7.91 + +* Tue Aug 3 2004 Mark McLoughlin 2.7.90-1 +- Update to 2.7.90 +- Add patch to disable merge files for now + +* Fri Jul 2 2004 Mark McLoughlin 2.6.0-7 +- Add patch to fix problem when using merged files. Mainly + neccessary only to work will with GConf 2.8. + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Apr 16 2004 Colin Walters - 2.6.0-5 +- Apply patch to move temporary directory creation into daemon, + needed for SELinux GConf policy + +* Wed Apr 14 2004 Warren Togami - 2.6.0-4 +- #110724 BR gtk2-devel gettext +- #106283 add versioned ORBit2 minimum +- #112863 own /etc/gconf/2/ +- really kill *.la + +* Mon Apr 5 2004 Mark McLoughlin - 2.6.0-3 +- Remove the dont-dump-schema-default patch + +* Thu Apr 1 2004 Mark McLoughlin - 2.6.0-2 +- Backport some fixes from HEAD for lockdown/deployment type stuff + +* Tue Mar 23 2004 Alex Larsson 2.6.0-1 +- update to 2.6.0 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Tue Feb 24 2004 Mark McLoughlin 2.5.90-1 +- Update to 2.5.90 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 16 2004 Jonathan Blandford 2.5.1-1 +- new version + +* Tue Sep 9 2003 Alexander Larsson 2.4.0-1 +- 2.4.0 + +* Thu Aug 7 2003 Jonathan Blandford +- begin the move to GNOME-2.4 +- locking patch appears to be upstream. Removing. + +* Tue Aug 5 2003 Elliot Lee 2.2.1-3 +- Fix libtool + +* Mon Jul 14 2003 Havoc Pennington +- automated rebuild + +* Mon Jul 7 2003 Havoc Pennington 2.2.1-1 +- upgrade to 2.2.1 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Apr 8 2003 Matt Wilson 2.2.0-2 +- use system libtool (#88338) + +* Tue Feb 4 2003 Havoc Pennington 2.2.0-1 +- 2.2.0 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Sun Jan 12 2003 Havoc Pennington +- 2.1.90 + +* Fri Jan 10 2003 Havoc Pennington +- rebuild as libc seems to have changed or something + +* Fri Nov 8 2002 Havoc Pennington +- rebuild +- standardize spec file name + +* Fri Aug 30 2002 Havoc Pennington +- add GCONF_LOCAL_LOCKS mode, and syslog encoding patch from tagoh + +* Wed Aug 21 2002 Havoc Pennington +- add dialog to offer to delete gconf locks + +* Tue Aug 6 2002 Havoc Pennington +- 1.2.1 +- include libexecdir stuff + +* Wed Jul 31 2002 Havoc Pennington +- move .pc fle to -devel package + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun Jun 16 2002 Havoc Pennington +- fix warning on gnome-panel install + +* Sun Jun 16 2002 Havoc Pennington +- 1.2.0 +- own libdir/GConf/2 directory +- include gtk-doc docs +- don't include static lib for backend modules + +* Thu Jun 06 2002 Havoc Pennington +- rebuild in different environment + +* Tue Jun 4 2002 Havoc Pennington +- 1.1.11 +- remove AUTHORS for rpmlint + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Mon May 20 2002 Havoc Pennington +- rebuild in different environment + +* Fri May 17 2002 Havoc Pennington +- rebuild in different environment + +* Thu May 2 2002 Havoc Pennington +- 1.1.10 + +* Thu Apr 4 2002 Jeremy Katz +- 1.1.9 + +* Thu Feb 14 2002 Havoc Pennington +- 1.1.8 +- remove .la files + +* Wed Jan 30 2002 Owen Taylor +- Version 1.1.6 +- Rebuild for dependencies + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Jan 4 2002 Havoc Pennington +- 1.1.5.93 snap with important bugfix so gconf actually works + +* Thu Jan 3 2002 Havoc Pennington +- 1.1.5.92 snap with GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + +* Thu Jan 3 2002 Havoc Pennington +- 1.1.5.91 snap with gconf.m4 fix for libgnome + +* Wed Jan 2 2002 Havoc Pennington +- since every other build seems to avoid libglib-1.3.so.11, + rebuild and hope + +* Wed Jan 2 2002 Havoc Pennington +- cvs snap 1.1.5.90 + +* Mon Nov 26 2001 Havoc Pennington +- GConf 1.1.5, glib 1.3.11 + +* Sat Oct 27 2001 Havoc Pennington +- rebuild for glib 1.3.10 + +* Sun Oct 14 2001 Havoc Pennington +- 1.1.3 + +* Fri Oct 5 2001 Havoc Pennington +- cvs snap, remove bonobo-activation deps + +* Fri Sep 21 2001 Havoc Pennington +- update to new CVS snap, rebuild + +* Mon Sep 17 2001 Havoc Pennington +- create gconf2 rpm based on gconf1, comment out pofiles +- include .pc files + +* Fri Sep 14 2001 Havoc Pennington +- fix description/summary + +* Fri Aug 31 2001 Havoc Pennington +- Add po files from sources.redhat.com + +* Mon Aug 27 2001 Havoc Pennington +- Add po files from sources.redhat.com + +* Wed Aug 15 2001 Havoc Pennington +- upgrade to 1.0.4 release I just made +- fixes #51223, syslog spew + +* Tue Jul 24 2001 Havoc Pennington +- move gconf-config to devel RPM + +* Mon Jul 23 2001 Havoc Pennington +- how many releases of GConf can I make before it works? + +* Sun Jul 22 2001 Havoc Pennington +- Upgrade to 1.0.2 (which contains only bugfixes that + I reviewed and/or wrote myself) + +* Wed Jul 18 2001 Havoc Pennington +- create the /etc/gconf/gconf.xml.defaults directory + +* Fri Jul 6 2001 Alexander Larsson +- Install the .la files in the devel package. + +* Fri Jul 6 2001 Trond Eivind Glomsrød +- Use %%{_tmppath} +- Move the .so files to the devel subpackage +- langify +- Move changelog to the end, where it should be :) +- Don't specify (a bad) doc directory +- Don't define name, version and release and use it in the rpm headers later +- Remove "Packager:" +- s/Copyright/License/ + +* Fri Jun 22 2001 Havoc Pennington +- add --direct option to gconftool to avoid spawning oafd, + then commented out gconftool entirely since it checks + whether gconfd is running and that spawns oafd anyhow. + oafd simply needs to exit when unused. + +* Tue May 15 2001 Havoc Pennington +- Fix post, pointed out by Bill + +* Mon May 14 2001 Havoc Pennington +- Upgrade to 1.0.1 + +* Tue Apr 17 2001 Jonathan Blandford +- Import to Red Hat build system. + +* Sun Jun 11 2000 Eskil Heyn Olsen + +- Created the .spec file