diff --git a/fix_libxml_include.patch b/fix_libxml_include.patch deleted file mode 100644 index 9ab20b5..0000000 --- a/fix_libxml_include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xed/xed-metadata-manager.c -+++ b/xed/xed-metadata-manager.c -@@ -21,6 +21,7 @@ - * Boston, MA 02110-1301, USA. - */ - -+#include - #include - #include "xed-metadata-manager.h" - #include "xed-debug.h" - diff --git a/sources b/sources index bf26653..fcd6af0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-3.4.5.tar.gz) = d136158ac2bbe52079e050682d74a4a3692a72bdd170d8f2875a329e7da3d21b947be4131e8d49fbca68ef473e9fb5924864e07c610cf6e0cfea1acd9a8f45e4 +SHA512 (xed-3.8.9.tar.gz) = bd72b1b4f41ecd352366cf193ebfbdd49f6bcdd8f0b347adc91c25ad1cc315cff8b13956dee51a43754cd81e508f06b2a592da2276bdb8f2ef43a12c516ea76d diff --git a/xed.spec b/xed.spec index 1fca15a..15e9997 100644 --- a/xed.spec +++ b/xed.spec @@ -1,13 +1,13 @@ # Filter provides from plugins. %global __provides_exclude_from ^%{_libdir}/%{name}/plugins/.*$ - Name: xed -Version: 3.4.5 -Release: 1%{?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}/%{name}-%{version}.tar.gz @@ -17,25 +17,28 @@ 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-4) BuildRequires: pkgconfig(libpeas-gtk-1.0) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(iso-codes) +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: libpeas1-loader-python3%{?_isa} Requires: python%{python3_pkgversion}-gobject%{?_isa} Requires: xapps%{?_isa} +Requires: xapp-symbolic-icons Suggests: hunspell-en %description @@ -48,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} @@ -56,7 +58,6 @@ 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 @@ -64,12 +65,11 @@ BuildArch: noarch %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 @@ -81,24 +81,26 @@ This package contains the documentation files for %{name}. -Ddeprecated_warnings=false %meson_build - %install %meson_install %{__sed} -i -e '/.*.*/d' \ - %{buildroot}%{_metainfodir}/%{name}.appdata.xml + %{buildroot}%{_metainfodir}/org.x.editor.metainfo.xml -%find_lang %{name} --with-gnome +%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/%{name}.desktop + %{buildroot}%{_datadir}/applications/org.x.editor.desktop # Validate AppData-files. %{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_metainfodir}/%{name}.appdata.xml - + %{buildroot}%{_metainfodir}/org.x.editor.metainfo.xml %files -f %{name}.lang %license AUTHORS COPYING debian/copyright @@ -106,28 +108,107 @@ This package contains the documentation files for %{name}. %exclude %{_datadir}/%{name}/gir-1.0 %exclude %{_datadir}/%{name}/gir-1.0/* %{_bindir}/%{name} -%{_metainfodir}/%{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}/gtksourceview-4/styles/xed.xml %{_datadir}/%{name}/ %{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* - %files devel %{_datadir}/%{name}/gir-1.0 %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc - %files doc %license %{_datadir}/licenses/%{name}* %doc %{_datadir}/doc/%{name}* %doc %{_datadir}/gtk-doc/* - %changelog +* Wed Aug 26 2026 Leigh Scott - 3.8.9-4 +- Add requires xapp-symbolic-icons + +* Fri Jul 17 2026 Fedora Release Engineering - 3.8.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 3.8.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jan 09 2026 Leigh Scott - 3.8.9-1 +- Update to 3.8.9 + +* Sat Dec 13 2025 Leigh Scott - 3.8.7-1 +- Update to 3.8.7 + +* Fri Dec 12 2025 Leigh Scott - 3.8.6-1 +- Update to 3.8.6 + +* Wed Sep 10 2025 Leigh Scott - 3.8.4-2 +- Rebuild for libpeas1 changes + +* Sat Sep 06 2025 Leigh Scott - 3.8.4-1 +- Update to 3.8.4 + +* Fri Jul 25 2025 Fedora Release Engineering - 3.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Jan 06 2025 Leigh Scott - 3.8.2-1 +- Update to 3.8.2 + +* Fri Dec 20 2024 Leigh Scott - 3.8.1-1 +- Update to 3.8.1 + +* Fri Dec 06 2024 Leigh Scott - 3.8.0-1 +- Update to 3.8.0 + +* Mon Dec 02 2024 Leigh Scott - 3.6.9-1 +- Update to 3.6.9 + +* Mon Nov 25 2024 Leigh Scott - 3.6.7-1 +- Update to 3.6.7 + +* Mon Aug 26 2024 David King - 3.6.6-2 +- Rebuild against gspell + +* Tue Aug 20 2024 Leigh Scott - 3.6.6-1 +- Update to 3.6.6 + +* Fri Jul 26 2024 Miroslav Suchý - 3.6.5-2 +- convert license to SPDX + +* Sat Jul 20 2024 Leigh Scott - 3.6.5-1 +- Update to 3.6.5 + +* Sat Jul 20 2024 Fedora Release Engineering - 3.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jul 04 2024 Leigh Scott - 3.6.4-2 +- Restore classic theme default + +* Thu Jul 04 2024 Leigh Scott - 3.6.4-1 +- Update to 3.6.4 + +* Tue Jun 18 2024 Leigh Scott - 3.6.3-1 +- Update to 3.6.3 + +* Tue Jun 11 2024 Leigh Scott - 3.6.2-1 +- Update to 3.6.2 + +* Wed Jun 05 2024 Leigh Scott - 3.6.1-1 +- Update to 3.6.1 + +* Tue Jun 04 2024 Leigh Scott - 3.6.0-1 +- Update to 3.6.0 + +* Sat Jan 27 2024 Fedora Release Engineering - 3.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 04 2024 Leigh Scott - 3.4.5-1 - Update to 3.4.5 release