diff --git a/dconf-editor-3.38.3.tar.xz b/dconf-editor-3.38.3.tar.xz deleted file mode 100644 index ba6907f..0000000 Binary files a/dconf-editor-3.38.3.tar.xz and /dev/null differ diff --git a/dconf-editor-43.0.tar.xz b/dconf-editor-43.0.tar.xz new file mode 100644 index 0000000..0e08093 Binary files /dev/null and b/dconf-editor-43.0.tar.xz differ diff --git a/dconf-editor.spec b/dconf-editor.spec index 6b079d5..4a2e399 100644 --- a/dconf-editor.spec +++ b/dconf-editor.spec @@ -1,27 +1,33 @@ %global dconf_version 0.26.1 -%global glib2_version 2.55.1 +%global glib2_version 2.56.0 %global gtk3_version 3.22.27 Name: dconf-editor -Version: 3.38.3 -Release: 2 -Summary: Graphical editor for dconf - -License: GPLv3 +Version: 43.0 +Release: 1 +Summary: Configuration editor for dconf +License: GPLv3+ URL: https://wiki.gnome.org/Projects/dconf -Source0: https://download.gnome.org/sources/dconf-editor/3.38/dconf-editor-%{version}.tar.xz -#refer: https://github.com/GNOME/dconf-editor/commit/d67ce9bee411658082700a22f4692c8c9a790ea6 -Patch0000: fix-meson-0.61-errors.patch +Source0: https://download.gnome.org/sources/dconf-editor/43/dconf-editor-%{version}.tar.xz -BuildRequires: /usr/bin/appstream-util desktop-file-utils gettext meson vala -BuildRequires: pkgconfig(dconf) >= %{dconf_version} pkgconfig(glib-2.0) >= %{glib2_version} -BuildRequires: pkgconfig(gmodule-2.0) pkgconfig(gtk+-3.0) >= %{gtk3_version} pkgconfig(libxml-2.0) +BuildRequires: /usr/bin/appstream-util +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: meson +BuildRequires: pkgconfig(dconf) >= %{dconf_version} +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(libhandy-1) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: vala -Requires: dconf >= %{dconf_version} glib2 >= %{glib2_version} gtk3 >= %{gtk3_version} -Conflicts: dconf <= 0.23.1 +Requires: dconf%{?_isa} >= %{dconf_version} +Requires: glib2%{?_isa} >= %{glib2_version} +Requires: gtk3%{?_isa} >= %{gtk3_version} %description -This package provides a graphical tool for editing the dconf database. +Graphical tool for editing the dconf configuration database. %package_help @@ -38,8 +44,8 @@ This package provides a graphical tool for editing the dconf database. %find_lang dconf-editor %check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/ca.desrt.dconf-editor.appdata.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor.desktop +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/ca.desrt.dconf-editor.appdata.xml +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ca.desrt.dconf-editor.desktop %files -f dconf-editor.lang %license COPYING @@ -48,16 +54,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor %{_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/apps/ca.desrt.dconf-editor-symbolic.svg -%{_datadir}/metainfo/ca.desrt.dconf-editor.appdata.xml -%{_datadir}/icons/hicolor/scalable/actions/ca.desrt.dconf-editor.small-rows-symbolic.svg %{_datadir}/icons/hicolor/scalable/actions/ca.desrt.dconf-editor.big-rows-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/ca.desrt.dconf-editor.small-rows-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/ca.desrt.dconf-editor.Devel.svg +%{_datadir}/icons/hicolor/scalable/apps/ca.desrt.dconf-editor.svg +%{_datadir}/icons/hicolor/symbolic/apps/ca.desrt.dconf-editor-symbolic.svg +%{_datadir}/metainfo/ca.desrt.dconf-editor.appdata.xml %files help %{_mandir}/man1/dconf-editor.1* %changelog +* Mon Jan 02 2023 lin zhang - 43.0-1 +- Update to 43.0 + * Mon Jun 20 2022 caodongxia - 3.38.3-2 - Fix the build failure caused by meson 0.61 diff --git a/fix-meson-0.61-errors.patch b/fix-meson-0.61-errors.patch deleted file mode 100644 index 327e531..0000000 --- a/fix-meson-0.61-errors.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 21 Jan 2022 22:22:58 +0100 -Subject: [PATCH] editor/meson.build: fix meson 0.61 errors - -Signed-off-by: Alexander Kanavin ---- - editor/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/editor/meson.build b/editor/meson.build -index 4c89ab99..0eb3bb1a 100644 ---- a/editor/meson.build -+++ b/editor/meson.build -@@ -1,7 +1,6 @@ - desktop = dconf_editor_namespace + '.desktop' - - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop + '.in', - output: desktop, -@@ -26,7 +25,6 @@ configure_file( - appdata = dconf_editor_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, - \ No newline at end of file