.dconf-editor.metadata

@@ -1 +1 @@
-ac5b3a2084fe8a27a83afd0a26643793b1689265 SOURCES/dconf-editor-3.28.0.tar.xz
+d4b4031817dff86c32fe4dc3a90f7058938f3d06 SOURCES/dconf-editor-3.38.3.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/dconf-editor-3.28.0.tar.xz
+SOURCES/dconf-editor-3.38.3.tar.xz

SOURCES/start-dconf-editor.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/bash
+
+IFS=: read -ra host_data_dirs < <(flatpak-spawn --host sh -c 'echo $XDG_DATA_DIRS')
+
+# To avoid potentially muddying up $XDG_DATA_DIRS too much, we link the schema paths
+# into a temporary directory.
+bridge_dir=$XDG_RUNTIME_DIR/dconf-bridge
+mkdir -p "$bridge_dir"
+
+for dir in "${host_data_dirs[@]}"; do
+  if [[ "$dir" == /usr/* ]]; then
+    dir=/run/host/"$dir"
+  fi
+
+  schemas="$dir/glib-2.0/schemas"
+  if [[ -d "$schemas" ]]; then
+    bridged=$(mktemp -d XXXXXXXXXX -p "$bridge_dir")
+    mkdir -p "$bridged"/glib-2.0
+    ln -s "$schemas" "$bridged"/glib-2.0
+    XDG_DATA_DIRS=$XDG_DATA_DIRS:"$bridged"
+  fi
+done
+
+export XDG_DATA_DIRS
+exec dconf-editor "$@"

SPECS/dconf-editor.spec

@@ -1,28 +1,37 @@
+%global dconf_version 0.26.1
+%global glib2_version 2.56.0
+%global gtk3_version 3.22.27
+
 Name:           dconf-editor
-Version:        3.28.0
-Release:        1%{?dist}
+Version:        3.38.3
+Release:        3%{?dist}
 Summary:        Configuration editor for dconf
 
-License:        LGPLv2+
+License:        GPLv3+ and CC0
 URL:            https://wiki.gnome.org/Projects/dconf
-Source0:        https://download.gnome.org/sources/dconf-editor/3.28/dconf-editor-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/dconf-editor/3.38/dconf-editor-%{version}.tar.xz
+Source1:        https://raw.githubusercontent.com/flathub/ca.desrt.dconf-editor/master/start-dconf-editor.sh
 
 BuildRequires:  /usr/bin/appstream-util
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  meson
-BuildRequires:  pkgconfig(dconf)
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(dconf) >= %{dconf_version}
+BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(gmodule-2.0)
-BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gtk+-3.0) >= %{gtk3_version}
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  vala
 
+Requires:       dconf%{?_isa} >= %{dconf_version}
+Requires:       glib2%{?_isa} >= %{glib2_version}
+Requires:       gtk3%{?_isa} >= %{gtk3_version}
+
 %description
 Graphical tool for editing the dconf configuration database.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %meson
@@ -31,6 +40,10 @@ Graphical tool for editing the dconf configuration database.
 %install
 %meson_install
 
+%if 0%{?flatpak}
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/start-dconf-editor
+%endif
+
 %find_lang dconf-editor
 
 %check
@@ -40,16 +53,116 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ca.desrt.dconf-edi
 %files -f dconf-editor.lang
 %license COPYING
 %{_bindir}/dconf-editor
+%if 0%{?flatpak}
+%{_bindir}/start-dconf-editor
+%endif
 %{_datadir}/applications/ca.desrt.dconf-editor.desktop
 %{_datadir}/bash-completion/
 %{_datadir}/dbus-1/services/ca.desrt.dconf-editor.service
 %{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/ca.desrt.dconf-editor.png
+%{_datadir}/icons/hicolor/scalable/actions/ca.desrt.dconf-editor.*-symbolic.svg
 %{_datadir}/icons/hicolor/scalable/apps/ca.desrt.dconf-editor-symbolic.svg
 %{_datadir}/metainfo/ca.desrt.dconf-editor.appdata.xml
 %{_mandir}/man1/dconf-editor.1*
 
 %changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.38.3-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.38.3-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Mar 23 2021 Kalev Lember <klember@redhat.com> - 3.38.3-1
+- Update to 3.38.3
+- Remove old conflicts with dconf package
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Nov 25 2020 Kalev Lember <klember@redhat.com> - 3.38.2-1
+- Update to 3.38.2
+
+* Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
+- Update to 3.38.0
+
+* Sat Aug 29 2020 Kalev Lember <klember@redhat.com> - 3.37.91-1
+- Update to 3.37.91
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Kalev Lember <klember@redhat.com> - 3.36.4-1
+- Update to 3.36.4
+
+* Sat Apr 25 2020 Kalev Lember <klember@redhat.com> - 3.36.2-1
+- Update to 3.36.2
+
+* Tue Mar 10 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
+- Update to 3.36.0
+
+* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 3.35.91-1
+- Update to 3.35.91
+
+* Sun Feb 02 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
+- Update to 3.35.90
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 07 2020 Kalev Lember <klember@redhat.com> - 3.34.3-1
+- Update to 3.34.3
+
+* Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 3.34.2-1
+- Update to 3.34.2
+
+* Tue Sep 10 2019 Kalev Lember <klember@redhat.com> - 3.34.1-1
+- Update to 3.34.1
+
+* Mon Aug 19 2019 Kalev Lember <klember@redhat.com> - 3.33.91-1
+- Update to 3.33.91
+
+* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 3.33.90-1
+- Update to 3.33.90
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.33.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 16 2019 Kalev Lember <klember@redhat.com> - 3.33.4-1
+- Update to 3.33.4
+
+* Tue Mar 12 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
+- Update to 3.32.0
+
+* Wed Feb 20 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
+- Update to 3.31.91
+
+* Tue Feb 05 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
+- Update to 3.31.90
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 07 2019 Kalev Lember <klember@redhat.com> - 3.31.4-1
+- Update to 3.31.4
+
+* Wed Sep 26 2018 Kalev Lember <klember@redhat.com> - 3.30.2-1
+- Update to 3.30.2
+
+* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 3.30.0-1
+- Update to 3.30.0
+
+* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 3.29.90-1
+- Update to 3.29.90
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon May 21 2018 Kalev Lember <klember@redhat.com> - 3.28.0-2
+- Add versioned library deps
+- Update license tag
+
 * Tue Mar 13 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
 - Update to 3.28.0