.GConf2.metadata

@@ -1 +1 @@
-a90d3ac08dc454f927c8d3024f52d4d57e3ff613  SOURCES/GConf-3.2.6.tar.xz
+a90d3ac08dc454f927c8d3024f52d4d57e3ff613 SOURCES/GConf-3.2.6.tar.xz

SOURCES/gconf-3.2.6-gconf-engine_key_is_writable.patch

@@ -1,47 +0,0 @@
-From 7fc5106b58e9270e0d92b4c054a120628320b410 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 21 Feb 2012 15:26:47 +0100
-Subject: [PATCH] gconf-dbus: Add gconf_engine_key_is_writable()
-
-This went missing in the dbus port, and so we broke ABI.
-It's really the same code as in the corba code.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668948
----
- gconf/gconf-dbus.c |   23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
-
-Index: GConf-3.2.6/gconf/gconf-dbus.c
-===================================================================
---- GConf-3.2.6.orig/gconf/gconf-dbus.c	2013-06-06 02:39:13.243932775 +0200
-+++ GConf-3.2.6/gconf/gconf-dbus.c	2013-06-06 02:39:13.239932729 +0200
-@@ -2195,6 +2195,29 @@
-     }
- }
- 
-+gboolean
-+gconf_engine_key_is_writable (GConfEngine *conf,
-+                              const gchar *key,
-+                              GError     **err)
-+{
-+  gboolean is_writable = TRUE;
-+  GConfValue *val;
-+
-+  CHECK_OWNER_USE (conf);
-+
-+  /* FIXME implement IDL to allow getting only writability
-+   * (not that urgent since GConfClient caches this crap
-+   * anyway)
-+   */
-+
-+  val = gconf_engine_get_full(conf, key, NULL, TRUE,
-+                              NULL, &is_writable, err);
-+
-+  gconf_value_free (val);
-+
-+  return is_writable;
-+}
-+
- static void
- cnxn_get_all_func (gpointer key,
- 		   gpointer value,

SOURCES/gconf-3.2.6-python3.patch

@@ -0,0 +1,173 @@
+From dbd4f1bc1992c2942538980e76a50c8b8a758d70 Mon Sep 17 00:00:00 2001
+From: Takao Fujiwara <tfujiwar@redhat.com>
+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
+

SPECS/GConf2.spec

@@ -3,19 +3,16 @@
 %define dbus_version 1.0.1
 %define dbus_glib_version 0.74
 
-%if !0%{?flatpak}
-%define defaults_service 1
-%endif
-
-Name:    GConf2
-Version: 3.2.6
-Release: 34%{?dist}
 Summary: A process-transparent configuration system
-
+Name: GConf2
+Version: 3.2.6
+Release: 22%{?dist}
 License: LGPLv2+ and GPLv2+
-URL:     https://gitlab.gnome.org/Archive/gconf/
+Group: System Environment/Base
-Source0: https://download.gnome.org/sources/GConf/3.2/GConf-%{version}.tar.xz
+#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
@@ -23,33 +20,28 @@ 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=1197773
+# https://bugzilla.redhat.com/show_bug.cgi?id=1580646
-Patch2: gconf-3.2.6-gconf-engine_key_is_writable.patch
+# 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: gettext
+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: make
+BuildRequires: polkit-devel >= 0.92
-BuildRequires: pkgconfig(dbus-glib-1) >= 0.8
+BuildRequires: dbus-glib-devel >= 0.8
-BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
+BuildRequires: gobject-introspection-devel >= 0.6.7
-BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.6.7
-BuildRequires: pkgconfig(libxml-2.0) >= %{libxml2_version}
-%if 0%{?defaults_service}
-BuildRequires: pkgconfig(polkit-gobject-1) >= 0.92
-%endif
 BuildRequires: autoconf automake libtool
-# we need to do python shebang mangling using pathfix.py
-BuildRequires: python3-devel
-
-%if 0%{?defaults_service}
 Requires: dbus
-%endif
+# for patch0
-# for patch100
+Requires: /usr/bin/killall
-Requires: /usr/bin/pkill
 Conflicts: GConf2-dbus
 
 Provides: GConf2-gtk = 3.2.6-6
@@ -62,7 +54,14 @@ support workgroup administration.
 
 %package devel
 Summary: Headers and libraries for GConf development
-Requires: %{name}%{?_isa} = %{version}-%{release}
+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
@@ -70,44 +69,46 @@ GConf development package. Contains files needed for doing
 development using GConf.
 
 %prep
-%autosetup -p1 -n GConf-%{version}
+%setup -q -n GConf-%{version}
+%patch0 -p1 -b .gettext
+%patch1 -p1 -b .drop-spew
+%patch2 -p1 -b .python3
 
-autoreconf --force --install
+%patch99 -p1 -b .workaround-crash
+%patch100 -p1 -b .pkill-hack
 
-2to3 --write --nobackup gsettings/gsettings-schema-convert
+autoreconf -i -f
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . gsettings/gsettings-schema-convert
 
 %build
-%configure --disable-static \
+%configure --disable-static --enable-defaults-service --disable-orbit --with-gtk=3.0
-      %{?defaults_service:--enable-defaults-service} \
-      %{!?defaults_service:--disable-defaults-service} \
-      --disable-orbit --without-openldap
 
 # 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_build
+make
 
 %install
-%make_install
+make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p %{buildroot}%{_sysconfdir}/gconf/schemas
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
-mkdir -p %{buildroot}%{_sysconfdir}/gconf/gconf.xml.system
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.system
-mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
+mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/
-mkdir -p %{buildroot}%{_localstatedir}/lib/rpm-state/gconf
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/rpm-state/gconf
-mkdir -p %{buildroot}%{_datadir}/GConf/gsettings
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/GConf/gsettings
 
-install -p -m 644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/
 
-find %{buildroot} -name "*.la" -type f -delete
+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 %{buildroot}%{_datadir}/GConf/gsettings
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/GConf/gsettings
 
 %find_lang %name
 
 %post
-%{?ldconfig}
+/sbin/ldconfig
 
 if [ $1 -gt 1 ]; then
     if ! fgrep -q gconf.xml.system %{_sysconfdir}/gconf/2/path; then
@@ -115,9 +116,10 @@ if [ $1 -gt 1 ]; then
     fi
 fi
 
-%ldconfig_postun
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
+%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc NEWS README
 %config(noreplace) %{_sysconfdir}/gconf/2/path
@@ -129,7 +131,9 @@ fi
 %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.*
@@ -137,17 +141,13 @@ fi
 %dir %{_datadir}/sgml
 %{_datadir}/sgml/gconf
 %{_datadir}/GConf
-%{_mandir}/man1/*
-%exclude %{_mandir}/man1/gsettings-schema-convert.1*
 %dir %{_libdir}/GConf
 %dir %{_libdir}/GConf/2
 %{_rpmconfigdir}/macros.d/macros.gconf2
-%if 0%{?defaults_service}
 %{_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
-%endif
 %{_datadir}/dbus-1/services/org.gnome.GConf.service
 %{_localstatedir}/lib/rpm-state/gconf/
 %{_libdir}/gio/modules/libgsettingsgconfbackend.so
@@ -161,57 +161,16 @@ fi
 %{_libdir}/pkgconfig/*
 %{_datadir}/gir-1.0
 %{_bindir}/gsettings-schema-convert
-%{_mandir}/man1/gsettings-schema-convert.1*
+%doc %{_mandir}/man1/gsettings-schema-convert.1*
 
 %changelog
-* Thu Nov 09 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.2.6-34
+* Wed Jul 25 2018 Marek Kasik <mkasik@redhat.com> - 3.2.6-22
-- Rebuilt for MSVSphere 9.2
+- Improve python3 support by Takao Fujiwara's patch
-
+- Resolves: #1567087
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jan 07 2022 Miro Hrončok <mhroncok@redhat.com> - 3.2.6-33
-- Fix broken requirement on GConf2{?_isa}
-
-* Fri Jan 07 2022 David King <amigadave@amigadave.com> - 3.2.6-32
-- Update URL (#2036776)
-- Use pkgconfig for BuildRequires
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 03 2019 David King <amigadave@amigadave.com> - 3.2.6-26
-- Fix accidental ABI break (#1197773)
-
-* Mon Feb 18 2019 Parag Nemade <pnemade@redhat.com> - 3.2.6-25
-- Fix python shebang to python3 environment
-- used 2to3 to convert gsettings-schema-convert to run under python3
-- also fix "File listed twice: /usr/share/man/man1/gsettings-data-convert.1.gz"
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jan 11 2019 fedora-toolbox <otaylor@redhat.com> - 3.2.6-23
-- Update old dependency on /usr/bin/killall
-
-* Thu Oct  4 2018 Owen Taylor <otaylor@redhat.com> - 3.2.6-22
-- Disable the defaults service when building for Flatpak inclusion
-- Explicitly disable openldap support
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-21
+* Tue May 22 2018 Marek Kasik <mkasik@redhat.com> - 3.2.6-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Convert gsettings-schema-convert to python3
+- Resolves: #1580646
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild