Add requires xapp-symbolic-icons

This reverts commit 39d852f03a.

sources

@@ -1 +1 @@
-SHA512 (xed-1.6.2.tar.gz) = 54b0c87037f892a5857027c323fd92e57cd7d0f6719ed5311e23986059ea56451b2532f55db43a890a6fb0582722841da3ee2c06183146c39090f48c9d0907c0
+SHA512 (xed-3.8.9.tar.gz) = bd72b1b4f41ecd352366cf193ebfbdd49f6bcdd8f0b347adc91c25ad1cc315cff8b13956dee51a43754cd81e508f06b2a592da2276bdb8f2ef43a12c516ea76d

xed.spec

@@ -1,41 +1,45 @@
 # Filter provides from plugins.
 %global __provides_exclude_from ^%{_libdir}/%{name}/plugins/.*$
 
-
 Name:		xed
-Version:	1.6.2
-Release:	3%{?dist}
+Version:	3.8.9
+Release:	4%{?dist}
 Summary:	X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI)
 
-License:	GPLv2+
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:	GPL-2.0-or-later
 URL:		https://github.com/linuxmint/%{name}
-Source0:	%{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:	%url/archive/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:	autoconf
-BuildRequires:	automake
+ExcludeArch:   %{ix86}
+
+BuildRequires:	meson
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gnome-common
+# Required for meson's gnome.generate_gir
+BuildRequires:	gobject-introspection-devel
+BuildRequires:	gtk-doc
 BuildRequires:	intltool
 BuildRequires:	libappstream-glib
-BuildRequires:	pkgconfig(enchant)
 BuildRequires:	pkgconfig(glib-2.0)
+BuildRequires:	pkgconfig(gspell-1)
 BuildRequires:	pkgconfig(gtk+-3.0)
-BuildRequires:	pkgconfig(gtksourceview-3.0)
+BuildRequires:	pkgconfig(gtksourceview-4)
 BuildRequires:	pkgconfig(libpeas-gtk-1.0)
 BuildRequires:	pkgconfig(libxml-2.0)
-BuildRequires:	pkgconfig(iso-codes)
-BuildRequires:	pkgconfig(pygobject-2.0)
-BuildRequires:	pkgconfig(pygtk-2.0)
-BuildRequires:	pkgconfig(pygtksourceview-2.0)
+BuildRequires:	python3-gobject-devel
+BuildRequires:	python3-gobject-base
 BuildRequires:	pkgconfig(sm)
+BuildRequires:	pkgconfig(xapp) >= 1.4.0
 BuildRequires:	python%{python3_pkgversion}-devel
 
 Requires:	iso-codes
-Requires:	libpeas-loader-python%{python3_pkgversion}%{?_isa}
+Requires:	libpeas1-loader-python3%{?_isa}
 Requires:	python%{python3_pkgversion}-gobject%{?_isa}
 Requires:	xapps%{?_isa}
-Requires:	zenity%{?_isa}
+Requires:	xapp-symbolic-icons
+Suggests:	hunspell-en
 
 %description
 Xed is a small, but powerful text editor.  It has most standard text
@@ -47,7 +51,6 @@ Xed is extensible through a plugin system, which currently includes
 support for spell checking, comparing files, viewing CVS ChangeLogs, and
 adjusting indentation levels.
 
-
 %package devel
 Summary:	Files needed to develop plugins for %{name}
 Requires:	%{name}%{?_isa}	== %{version}-%{release}
@@ -55,109 +58,319 @@ Requires:	%{name}%{?_isa}	== %{version}-%{release}
 %description devel
 This package contains files needed to develop plugins for %{name}.
 
-
 %package doc
 Summary:	Documentation files for %{name}
-
 BuildArch:	noarch
-BuildRequires:	gtk-doc
 
 %description doc
 This package contains the documentation files for %{name}.
 
-
 %prep
-%autosetup -p 1
+%setup -q
 
 # Use 'classic'-theme by default.
-%{__sed} -i -e 's!tango!classic!g' data/org.x.editor.gschema.xml.in
+%{__sed} -i -e 's!xed!classic!g' data/org.x.editor.gschema.xml.in
 
 # Make source-files noexec.
 %{_bindir}/find . -type f -name '*.c' | %{_bindir}/xargs %{__chmod} -c 0644
 %{_bindir}/find . -type f -name '*.h' | %{_bindir}/xargs %{__chmod} -c 0644
 
-NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh
-
-
 %build
-export PYTHON=%{__python3}
-%configure							\
-	--disable-silent-rules					\
-	--enable-gtk-doc
-
-%make_build
-
+%meson	\
+	-Ddocs=true	\
+	-Ddeprecated_warnings=false
+%meson_build
 
 %install
-%make_install
+%meson_install
 %{__sed} -i -e '/.*<project_group>.*/d'				\
-	%{buildroot}%{_datadir}/appdata/*.appdata.xml
-%{_bindir}/find %{buildroot} -name '*.a' -print -delete
-%{_bindir}/find %{buildroot} -name '*.la' -print -delete
-%find_lang %{name}
+	%{buildroot}%{_metainfodir}/org.x.editor.metainfo.xml
 
+%if 0%{?fedora} > 42
+# libpeas is broken
+#rm -rf %{buildroot}%{_libdir}/%{name}/plugins/{bracket-complete,joinlines*,open-uri-context-menu,textsize*}
+%endif
+
+%find_lang %{name} --with-gnome
 
 %check
 # Validate desktop-files.
 %{_bindir}/desktop-file-validate				\
-	%{buildroot}%{_datadir}/applications/*.desktop
+	%{buildroot}%{_datadir}/applications/org.x.editor.desktop
 
 # Validate AppData-files.
 %{_bindir}/appstream-util validate-relax --nonet		\
-	%{buildroot}%{_datadir}/appdata/*.appdata.xml
-
-
-%if (0%{?rhel} && 0%{?rhel <= 7})
-%post
-%{_bindir}/update-desktop-database &> /dev/null || :
-
-%postun
-%{_bindir}/update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
-	%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-
-%posttrans
-%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%endif # (0%%{?rhel} && 0%%{?rhel <= 7})
-
+	%{buildroot}%{_metainfodir}/org.x.editor.metainfo.xml
 
 %files -f %{name}.lang
 %license AUTHORS COPYING debian/copyright
-%doc ChangeLog README debian/changelog
+%doc ChangeLog README.md debian/changelog
 %exclude %{_datadir}/%{name}/gir-1.0
 %exclude %{_datadir}/%{name}/gir-1.0/*
 %{_bindir}/%{name}
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/applications/%{name}.desktop
+%{_metainfodir}/org.x.editor.metainfo.xml
+%{_datadir}/applications/org.x.editor.desktop
 %{_datadir}/dbus-1/services/org.x.editor.*service
 %{_datadir}/glib-2.0/schemas/org.x.editor.*gschema.xml
-%{_datadir}/help/*/%{name}
-%{_datadir}/%{name}
-%{_libdir}/%{name}
-%{_libexecdir}/%{name}
+%{_datadir}/gtksourceview-4/styles/xed.xml
+%{_datadir}/%{name}/
+%{_libdir}/%{name}/
 %{_mandir}/man1/%{name}.1*
 
-
 %files devel
 %{_datadir}/%{name}/gir-1.0
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
 %{_libdir}/pkgconfig/%{name}.pc
 
-
 %files doc
 %license %{_datadir}/licenses/%{name}*
 %doc %{_datadir}/doc/%{name}*
-%doc %{_datadir}/gtk-doc
-
+%doc %{_datadir}/gtk-doc/*
 
 %changelog
-* Fri Mar 08 2019 Troy Dawson <tdawson@redhat.com> - 1.6.2-3
-- Rebuilt to change main python from 3.4 to 3.6
+* Wed Aug 26 2026 Leigh Scott <leigh123linux@gmail.com> - 3.8.9-4
+- Add requires xapp-symbolic-icons
 
-* Thu Nov 29 2018 Pat Riehecky <riehecky@fnal.gov> - 1.6.2-2
-- Return to EPEL7
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jan 09 2026 Leigh Scott <leigh123linux@gmail.com> - 3.8.9-1
+- Update to 3.8.9
+
+* Sat Dec 13 2025 Leigh Scott <leigh123linux@gmail.com> - 3.8.7-1
+- Update to 3.8.7
+
+* Fri Dec 12 2025 Leigh Scott <leigh123linux@gmail.com> - 3.8.6-1
+- Update to 3.8.6
+
+* Wed Sep 10 2025 Leigh Scott <leigh123linux@gmail.com> - 3.8.4-2
+- Rebuild for libpeas1 changes
+
+* Sat Sep 06 2025 Leigh Scott <leigh123linux@gmail.com> - 3.8.4-1
+- Update to 3.8.4
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Jan 06 2025 Leigh Scott <leigh123linux@gmail.com> - 3.8.2-1
+- Update to 3.8.2
+
+* Fri Dec 20 2024 Leigh Scott <leigh123linux@gmail.com> - 3.8.1-1
+- Update to 3.8.1
+
+* Fri Dec 06 2024 Leigh Scott <leigh123linux@gmail.com> - 3.8.0-1
+- Update to 3.8.0
+
+* Mon Dec 02 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.9-1
+- Update to 3.6.9
+
+* Mon Nov 25 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.7-1
+- Update to 3.6.7
+
+* Mon Aug 26 2024 David King <amigadave@amigadave.com> - 3.6.6-2
+- Rebuild against gspell
+
+* Tue Aug 20 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.6-1
+- Update to 3.6.6
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 3.6.5-2
+- convert license to SPDX
+
+* Sat Jul 20 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.5-1
+- Update to 3.6.5
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jul 04 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.4-2
+- Restore classic theme default
+
+* Thu Jul 04 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.4-1
+- Update to 3.6.4
+
+* Tue Jun 18 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.3-1
+- Update to 3.6.3
+
+* Tue Jun 11 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.2-1
+- Update to 3.6.2
+
+* Wed Jun 05 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.1-1
+- Update to 3.6.1
+
+* Tue Jun 04 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.0-1
+- Update to 3.6.0
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 04 2024 Leigh Scott <leigh123linux@gmail.com> - 3.4.5-1
+- Update to 3.4.5 release
+
+* Tue Dec 05 2023 Leigh Scott <leigh123linux@gmail.com> - 3.4.4-1
+- Update to 3.4.4 release
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 27 2023 Leigh Scott <leigh123linux@gmail.com> - 3.4.2-1
+- Update to 3.4.2 release
+
+* Thu Jun 08 2023 Leigh Scott <leigh123linux@gmail.com> - 3.4.1-1
+- Update to 3.4.1 release
+
+* Fri Jun 02 2023 Leigh Scott <leigh123linux@gmail.com> - 3.4.0-1
+- Update to 3.4.0 release
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Dec 16 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.8-1
+- Update to 3.2.8 release
+
+* Sun Jul 24 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.7-1
+- Update to 3.2.7 release
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jul 17 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.5-1
+- Update to 3.2.5 release
+
+* Sun Jul 17 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.4-1
+- Update to 3.2.4 release
+
+* Sun Jun 19 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.3-1
+- Update to 3.2.3 release
+
+* Sun Feb 13 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.2-4
+- Fix last commit
+
+* Sun Feb 13 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.2-3
+- Fix (rhbz#2053951)
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Jan 01 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.2-1
+- Update to 3.2.2 release
+
+* Mon Dec 06 2021 Leigh Scott <leigh123linux@gmail.com> - 3.2.1-1
+- Update to 3.2.1 release
+
+* Wed Nov 24 2021 Leigh Scott <leigh123linux@gmail.com> - 3.2.0-1
+- Update to 3.2.0 release
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 25 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.2-1
+- Update to 3.0.2 release
+
+* Thu Jun 10 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.1-1
+- Update to 3.0.1 release
+
+* Tue Jun 01 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.0-1
+- Update to 3.0.0 release
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Jan  2 2021 Leigh Scott <leigh123linux@gmail.com> - 2.8.4-1
+- Update to 2.8.4 release
+
+* Thu Dec 10 2020 Leigh Scott <leigh123linux@gmail.com> - 2.8.2-1
+- Update to 2.8.2 release
+
+* Tue Dec  8 2020 Leigh Scott <leigh123linux@gmail.com> - 2.8.1-1
+- Update to 2.8.1 release
+
+* Mon Nov 30 2020 Leigh Scott <leigh123linux@gmail.com> - 2.8.0-1
+- Update to 2.8.0 release
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 14 2020 Leigh Scott <leigh123linux@gmail.com> - 2.6.2-1
+- Update to 2.6.2 release
+
+* Tue May 12 2020 Leigh Scott <leigh123linux@gmail.com> - 2.6.0-1
+- Update to 2.6.0 release
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Dec 11 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.4.2-1
+- Update to 2.4.2 release
+
+* Tue Nov 26 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.4.1-1
+- Update to 2.4.1 release
+
+* Fri Nov 22 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.4.0-1
+- Update to 2.4.0 release
+
+* Wed Jul 31 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.2.3-1
+- Update to 2.2.3 release
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jul 14 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.2.1-1
+- Update to 2.2.1 release
+
+* Sat Jun 29 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.2.0-1
+- Update to 2.2.0 release
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+post.
+* Sun Dec 16 2018 Leigh Scott <leigh123linux@googlemail.com> - 2.0.2-1
+- Update to 2.0.2 release
+
+* Wed Nov 28 2018 Leigh Scott <leigh123linux@googlemail.com> - 2.0.1-1
+- Update to 2.0.1 release
+
+* Mon Nov 19 2018 Leigh Scott <leigh123linux@googlemail.com> - 2.0.0-1
+- Update to 2.0.0 release
+
+* Wed Aug 15 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.8.3-1
+- Update to 1.8.3 release
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.8.1-2
+- Rebuilt for Python 3.7
+
+* Sat Jun 02 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.8.1-1
+- Update to 1.8.1 release
+
+* Sun May 06 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.8.0-1
+- Update to 1.8.0 release
+
+* Sun Mar 11 2018 Kalev Lember <klember@redhat.com> - 1.6.4-0.2.20180309git3733860
+- Rebuilt for gspell 1.8
+
+* Fri Mar 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.6.4-0.1.20180309git3733860
+- Update to git snapshot
+
+* Thu Feb 22 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.6.3-4
+- Update patch
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Dec 29 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.6.3-2
+- Update upstream pull requests
+
+* Sat Nov 25 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.6.3-1
+- Update to 1.6.3
+- Add upstream pull requests
 
 * Fri Nov 17 2017 Björn Esser <besser82@fedoraproject.org> - 1.6.2-1
 - Update to 1.6.2 release (rhbz#1513985)