diff --git a/.gitignore b/.gitignore index b4958f8..5671a30 100644 --- a/.gitignore +++ b/.gitignore @@ -21,38 +21,4 @@ /dconf-editor-3.21.90.tar.xz /dconf-editor-3.21.92.tar.xz /dconf-editor-3.22.1.tar.xz -/dconf-editor-3.23.4.tar.xz -/dconf-editor-3.26.1.tar.xz -/dconf-editor-3.26.2.tar.xz -/dconf-editor-3.27.91.tar.xz -/dconf-editor-3.27.92.tar.xz -/dconf-editor-3.28.0.tar.xz -/dconf-editor-3.29.90.tar.xz -/dconf-editor-3.30.0.tar.xz -/dconf-editor-3.30.2.tar.xz -/dconf-editor-3.31.4.tar.xz -/dconf-editor-3.31.90.tar.xz -/dconf-editor-3.31.91.tar.xz -/dconf-editor-3.32.0.tar.xz -/dconf-editor-3.33.4.tar.xz -/dconf-editor-3.33.90.tar.xz -/dconf-editor-3.33.91.tar.xz -/dconf-editor-3.34.1.tar.xz -/dconf-editor-3.34.2.tar.xz -/dconf-editor-3.34.3.tar.xz -/dconf-editor-3.35.90.tar.xz -/dconf-editor-3.35.91.tar.xz -/dconf-editor-3.36.0.tar.xz -/dconf-editor-3.36.2.tar.xz -/dconf-editor-3.36.4.tar.xz -/dconf-editor-3.37.91.tar.xz -/dconf-editor-3.38.0.tar.xz -/dconf-editor-3.38.2.tar.xz -/dconf-editor-3.38.3.tar.xz -/dconf-editor-43.alpha.tar.xz -/dconf-editor-43.beta.tar.xz -/dconf-editor-43.0.tar.xz -/dconf-editor-45.0.tar.xz -/dconf-editor-45.0.1.tar.xz -/dconf-editor-49.rc.tar.xz -/dconf-editor-49.0.tar.xz +/dconf-editor-3.22.3.tar.xz diff --git a/changelog b/changelog deleted file mode 100644 index 6700d12..0000000 --- a/changelog +++ /dev/null @@ -1,253 +0,0 @@ -* Wed Jul 23 2025 Fedora Release Engineering - 45.0.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 45.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 45.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 6 2024 Marek Kasik - 45.0.1-4 -- Migrated to SPDX license - -* Wed Jan 24 2024 Fedora Release Engineering - 45.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 45.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Sep 20 2023 Kalev Lember - 45.0.1-1 -- Update to 45.0.1 - -* Wed Sep 20 2023 Kalev Lember - 45.0-1 -- Update to 45.0 - -* Wed Jul 19 2023 Fedora Release Engineering - 43.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 43.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Sep 20 2022 Kalev Lember - 43.0-1 -- Update to 43.0 - -* Tue Aug 09 2022 Kalev Lember - 43~beta-1 -- Update to 43.beta - -* Thu Jul 21 2022 Fedora Release Engineering - 43~alpha-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Kalev Lember - 43~alpha-1 -- Update to 43.alpha - -* Thu Jan 20 2022 Fedora Release Engineering - 3.38.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 3.38.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 23 2021 Kalev Lember - 3.38.3-1 -- Update to 3.38.3 -- Remove old conflicts with dconf package - -* Tue Jan 26 2021 Fedora Release Engineering - 3.38.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Nov 25 2020 Kalev Lember - 3.38.2-1 -- Update to 3.38.2 - -* Sat Sep 12 2020 Kalev Lember - 3.38.0-1 -- Update to 3.38.0 - -* Sat Aug 29 2020 Kalev Lember - 3.37.91-1 -- Update to 3.37.91 - -* Mon Jul 27 2020 Fedora Release Engineering - 3.36.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 20 2020 Kalev Lember - 3.36.4-1 -- Update to 3.36.4 - -* Sat Apr 25 2020 Kalev Lember - 3.36.2-1 -- Update to 3.36.2 - -* Tue Mar 10 2020 Kalev Lember - 3.36.0-1 -- Update to 3.36.0 - -* Mon Feb 17 2020 Kalev Lember - 3.35.91-1 -- Update to 3.35.91 - -* Sun Feb 02 2020 Kalev Lember - 3.35.90-1 -- Update to 3.35.90 - -* Tue Jan 28 2020 Fedora Release Engineering - 3.34.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 07 2020 Kalev Lember - 3.34.3-1 -- Update to 3.34.3 - -* Mon Oct 07 2019 Kalev Lember - 3.34.2-1 -- Update to 3.34.2 - -* Tue Sep 10 2019 Kalev Lember - 3.34.1-1 -- Update to 3.34.1 - -* Mon Aug 19 2019 Kalev Lember - 3.33.91-1 -- Update to 3.33.91 - -* Mon Aug 12 2019 Kalev Lember - 3.33.90-1 -- Update to 3.33.90 - -* Wed Jul 24 2019 Fedora Release Engineering - 3.33.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jul 16 2019 Kalev Lember - 3.33.4-1 -- Update to 3.33.4 - -* Tue Mar 12 2019 Kalev Lember - 3.32.0-1 -- Update to 3.32.0 - -* Wed Feb 20 2019 Kalev Lember - 3.31.91-1 -- Update to 3.31.91 - -* Tue Feb 05 2019 Kalev Lember - 3.31.90-1 -- Update to 3.31.90 - -* Thu Jan 31 2019 Fedora Release Engineering - 3.31.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 07 2019 Kalev Lember - 3.31.4-1 -- Update to 3.31.4 - -* Wed Sep 26 2018 Kalev Lember - 3.30.2-1 -- Update to 3.30.2 - -* Thu Sep 06 2018 Kalev Lember - 3.30.0-1 -- Update to 3.30.0 - -* Mon Aug 13 2018 Kalev Lember - 3.29.90-1 -- Update to 3.29.90 - -* Thu Jul 12 2018 Fedora Release Engineering - 3.28.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon May 21 2018 Kalev Lember - 3.28.0-2 -- Add versioned library deps -- Update license tag - -* Tue Mar 13 2018 Kalev Lember - 3.28.0-1 -- Update to 3.28.0 - -* Sun Mar 11 2018 Kalev Lember - 3.27.92-1 -- Update to 3.27.92 - -* Tue Mar 06 2018 Kalev Lember - 3.27.91-1 -- Update to 3.27.91 -- Switch to the meson build system - -* Wed Feb 07 2018 Fedora Release Engineering - 3.26.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 05 2018 Igor Gnatenko - 3.26.2-2 -- Remove obsolete scriptlets - -* Wed Nov 01 2017 Kalev Lember - 3.26.2-1 -- Update to 3.26.2 - -* Sun Oct 08 2017 Kalev Lember - 3.26.1-1 -- Update to 3.26.1 - -* Wed Aug 02 2017 Fedora Release Engineering - 3.23.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.23.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.23.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jan 14 2017 Kalev Lember - 3.23.4-1 -- Update to 3.23.4 - -* Wed Oct 12 2016 Kalev Lember - 3.22.1-1 -- Update to 3.22.1 - -* Fri Sep 16 2016 Kalev Lember - 3.21.92-1 -- Update to 3.21.92 - -* Thu Aug 18 2016 Kalev Lember - 3.21.90-1 -- Update to 3.21.90 - -* Wed Jul 20 2016 Richard Hughes - 3.21.4-1 -- Update to 3.21.4 - -* Tue May 03 2016 Kalev Lember - 3.21.1-1 -- Update to 3.21.1 - -* Thu Apr 14 2016 Kalev Lember - 3.20.1-1 -- Update to 3.20.1 - -* Tue Mar 22 2016 Kalev Lember - 3.20.0-1 -- Update to 3.20.0 - -* Tue Mar 15 2016 Richard Hughes - 3.19.92-1 -- Update to 3.19.92 - -* Tue Mar 01 2016 Richard Hughes - 3.19.91-1 -- Update to 3.19.91 - -* Tue Feb 16 2016 Richard Hughes - 3.19.90-1 -- Update to 3.19.90 - -* Wed Feb 03 2016 Fedora Release Engineering - 3.19.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Dec 15 2015 Kalev Lember - 3.19.3-1 -- Update to 3.19.3 - -* Tue Nov 24 2015 Kalev Lember - 3.19.2-1 -- Update to 3.19.2 - -* Fri Nov 13 2015 Kalev Lember - 3.18.2-1 -- Update to 3.18.2 - -* Mon Oct 12 2015 Kalev Lember - 3.18.1-1 -- Update to 3.18.1 - -* Mon Sep 21 2015 Kalev Lember - 3.18.0-1 -- Update to 3.18.0 - -* Tue Sep 15 2015 Kalev Lember - 3.17.92-1 -- Update to 3.17.92 - -* Tue Sep 01 2015 Kalev Lember - 3.17.91-1 -- Update to 3.17.91 - -* Wed Aug 19 2015 Kalev Lember - 3.17.90-1 -- Update to 3.17.90 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.17.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 01 2015 Kalev Lember - 3.17.1-1 -- Update to 3.17.1 - -* Tue Apr 14 2015 Kalev Lember - 3.16.1-1 -- Update to 3.16.1 - -* Mon Mar 23 2015 Kalev Lember - 3.16.0-1 -- Update to 3.16.0 - -* Tue Mar 17 2015 Kalev Lember - 3.15.92-1 -- Update to 3.15.92 -- Ship the man page - -* Tue Mar 03 2015 Kalev Lember - 3.15.91-3 -- Fix unowned HighContrast icon theme directories (#1197898) - -* Tue Mar 03 2015 Kalev Lember - 3.15.91-2 -- Fix appdata screenshot URL -- Validate appdata during %%check - -* Mon Mar 02 2015 Kalev Lember - 3.15.91-1 -- Initial Fedora packaging diff --git a/dconf-editor.spec b/dconf-editor.spec index d9a1416..06668e4 100644 --- a/dconf-editor.spec +++ b/dconf-editor.spec @@ -1,75 +1,149 @@ -%global dconf_version 0.26.1 -%global glib2_version 2.56.0 -%global gtk3_version 3.22.27 - -%global tarball_version %%(echo %{version} | tr '~' '.') - Name: dconf-editor -Version: 49.0 -Release: %autorelease +Version: 3.22.3 +Release: 1%{?dist} Summary: Configuration editor for dconf -License: GPL-3.0-or-later AND CC0-1.0 +License: LGPLv2+ URL: https://wiki.gnome.org/Projects/dconf -Source0: https://download.gnome.org/sources/dconf-editor/49/dconf-editor-%{tarball_version}.tar.xz -Source1: https://raw.githubusercontent.com/flathub/ca.desrt.dconf-editor/master/start-dconf-editor.sh +Source0: https://download.gnome.org/sources/dconf-editor/3.22/dconf-editor-%{version}.tar.xz 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: intltool +BuildRequires: pkgconfig(dconf) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} -BuildRequires: pkgconfig(libhandy-1) +BuildRequires: pkgconfig(gtk+-3.0) 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 -%autosetup -p1 -n %{name}-%{tarball_version} +%setup -q %build -%meson -%meson_build +%configure +make %{?_smp_mflags} %install -%meson_install +%make_install -%if 0%{?flatpak} -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/start-dconf-editor -%endif - -%find_lang dconf-editor +%find_lang dconf %check -appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/ca.desrt.dconf-editor.metainfo.xml +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/ca.desrt.dconf-editor.appdata.xml desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ca.desrt.dconf-editor.desktop -%files -f dconf-editor.lang +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + +%files -f dconf.lang %license COPYING %{_bindir}/dconf-editor -%if 0%{?flatpak} -%{_bindir}/start-dconf-editor -%endif +%{_datadir}/appdata/ca.desrt.dconf-editor.appdata.xml %{_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/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.metainfo.xml +%{_datadir}/icons/hicolor/*/apps/dconf-editor.png +%{_datadir}/icons/hicolor/scalable/apps/dconf-editor-symbolic.svg %{_mandir}/man1/dconf-editor.1* %changelog -%autochangelog +* Sat Jan 14 2017 Kalev Lember - 3.22.3-1 +- Update to 3.22.3 + +* Wed Oct 12 2016 Kalev Lember - 3.22.1-1 +- Update to 3.22.1 + +* Fri Sep 16 2016 Kalev Lember - 3.21.92-1 +- Update to 3.21.92 + +* Thu Aug 18 2016 Kalev Lember - 3.21.90-1 +- Update to 3.21.90 + +* Wed Jul 20 2016 Richard Hughes - 3.21.4-1 +- Update to 3.21.4 + +* Tue May 03 2016 Kalev Lember - 3.21.1-1 +- Update to 3.21.1 + +* Thu Apr 14 2016 Kalev Lember - 3.20.1-1 +- Update to 3.20.1 + +* Tue Mar 22 2016 Kalev Lember - 3.20.0-1 +- Update to 3.20.0 + +* Tue Mar 15 2016 Richard Hughes - 3.19.92-1 +- Update to 3.19.92 + +* Tue Mar 01 2016 Richard Hughes - 3.19.91-1 +- Update to 3.19.91 + +* Tue Feb 16 2016 Richard Hughes - 3.19.90-1 +- Update to 3.19.90 + +* Wed Feb 03 2016 Fedora Release Engineering - 3.19.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Dec 15 2015 Kalev Lember - 3.19.3-1 +- Update to 3.19.3 + +* Tue Nov 24 2015 Kalev Lember - 3.19.2-1 +- Update to 3.19.2 + +* Fri Nov 13 2015 Kalev Lember - 3.18.2-1 +- Update to 3.18.2 + +* Mon Oct 12 2015 Kalev Lember - 3.18.1-1 +- Update to 3.18.1 + +* Mon Sep 21 2015 Kalev Lember - 3.18.0-1 +- Update to 3.18.0 + +* Tue Sep 15 2015 Kalev Lember - 3.17.92-1 +- Update to 3.17.92 + +* Tue Sep 01 2015 Kalev Lember - 3.17.91-1 +- Update to 3.17.91 + +* Wed Aug 19 2015 Kalev Lember - 3.17.90-1 +- Update to 3.17.90 + +* Wed Jun 17 2015 Fedora Release Engineering - 3.17.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri May 01 2015 Kalev Lember - 3.17.1-1 +- Update to 3.17.1 + +* Tue Apr 14 2015 Kalev Lember - 3.16.1-1 +- Update to 3.16.1 + +* Mon Mar 23 2015 Kalev Lember - 3.16.0-1 +- Update to 3.16.0 + +* Tue Mar 17 2015 Kalev Lember - 3.15.92-1 +- Update to 3.15.92 +- Ship the man page + +* Tue Mar 03 2015 Kalev Lember - 3.15.91-3 +- Fix unowned HighContrast icon theme directories (#1197898) + +* Tue Mar 03 2015 Kalev Lember - 3.15.91-2 +- Fix appdata screenshot URL +- Validate appdata during %%check + +* Mon Mar 02 2015 Kalev Lember - 3.15.91-1 +- Initial Fedora packaging diff --git a/sources b/sources index bb03d27..f482040 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dconf-editor-49.0.tar.xz) = 8f5fe673e327b4e56209cba79b1277cee2043655afe19717617896c2196e4fc05d3e50a09c333c95db7b386e2cce1f660a849acba994a25feedd06f8a2b10de1 +SHA512 (dconf-editor-3.22.3.tar.xz) = 0e1ddce6e970ea23329c6233ed87e6d4541b6f1e991e3159bda44c43b8092a4d983acbca18bbedb88304ac1afb541a15073a261dab9ffe94c94cfd06e3e412dc diff --git a/start-dconf-editor.sh b/start-dconf-editor.sh deleted file mode 100644 index 8b6d2f8..0000000 --- a/start-dconf-editor.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/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 "$@"