diff --git a/.gitignore b/.gitignore index f04c60a..fa55ec0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/xedit-1.2.0.tar.bz2 -/xedit-1.2.1.tar.bz2 -/xedit-1.2.2.tar.bz2 +/xedit-*.tar.xz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..167d00f --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: xedit.spec + +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + + - job: koji_build + trigger: commit + allowed_committers: ['packit','all_admins'] + dist_git_branches: + - fedora-rawhide + diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..dd0af79 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.16.1. diff --git a/changelog b/changelog new file mode 100644 index 0000000..fab04ef --- /dev/null +++ b/changelog @@ -0,0 +1,109 @@ +* Sun Jun 21 2026 Filipe Rosset - 1.2.4-7 +- spec cleanup and modernization + +* Sat Jan 17 2026 Fedora Release Engineering - 1.2.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 1.2.4-3 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 10 2024 pcpa - 1.2.4-1 +- Update to latest upstream release + +* Sat Jan 27 2024 Fedora Release Engineering - 1.2.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Jul 25 2023 pcpa - 1.2.2-19 +- Use hunspell as ispell engine + +* Sat Jul 22 2023 Fedora Release Engineering - 1.2.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 pcpa - 1.2.2-2 +- Update to latest upstream release (#1195020). + +* Wed Jul 16 2014 pcpa - 1.2.1-1 +- Update to latest upstream release. +- Remove patches already in upstream. + +* Sun Jun 08 2014 Fedora Release Engineering - 1.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat May 26 2012 pcpa - 1.2.0-2 +- Patch package to not have BSD 4 clause files. +- Write patch to correct 64 bit overflow tests in a compatible license. +- Update extra patches to use the ones submitted upstream. + +* Mon May 21 2012 pcpa - 1.2.0-1 +- Add proper documentation to package. +- Update to latest upstream release. +- Remove patches already in upstream. + +* Mon Apr 23 2012 pcpa - 1.1.2-1 +- Initial xedit spec. diff --git a/sources b/sources index f5abb72..f98a43d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74ee6db901e81978b087b2026d8f30a0 xedit-1.2.2.tar.bz2 +SHA512 (xedit-1.2.5.tar.xz) = 577d38781a8373e0db415d2b51e7e3158fdbcd720ee3fab3f157004132d6e4644928b922d91c42f46e389f7d7b6a7254f341f1031ec378bbe4640e54e2299d98 diff --git a/xedit-hunspell.patch b/xedit-hunspell.patch new file mode 100644 index 0000000..101c68e --- /dev/null +++ b/xedit-hunspell.patch @@ -0,0 +1,17 @@ +diff -up xedit-1.2.2/app-defaults/Xedit.orig xedit-1.2.2/app-defaults/Xedit +--- xedit-1.2.2/app-defaults/Xedit.orig 2023-07-25 17:48:22.479734767 -0300 ++++ xedit-1.2.2/app-defaults/Xedit 2023-07-25 17:49:34.826200853 -0300 +@@ -259,10 +259,10 @@ cG: cancel-find-file()\n\ + WM_PROTOCOLS: ispell(end) + + ! Sample dictionary, word chars and text mode resources setup +-!*ispell.dictionary: br +-!*ispell.dictionaries: br american americanmed+ english ++*ispell.dictionary: en_US ++*ispell.dictionaries: en_US + !*ispell*br.wordChars: áéíóúçÁÉÍÓÚÇàÀâêôÂÊÔüÜãõÃÕ- +-*ispell.ispellCommand: /usr/bin/aspell -B -m ++*ispell.ispellCommand: /usr/bin/hunspell + *ispell.lookCommand: /bin/egrep + !*ispell*text.skipLines: .# + diff --git a/xedit.spec b/xedit.spec index 474d158..3dc7cd5 100644 --- a/xedit.spec +++ b/xedit.spec @@ -1,17 +1,21 @@ Name: xedit -Version: 1.2.2 -Release: 12%{?dist} +Version: 1.2.5 +Release: %autorelease Summary: Simple text editor for X -URL: http://xorg.freedesktop.org -Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 +URL: https://xorg.freedesktop.org +Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz Source1: %{name}.desktop -License: MIT and BSD +Patch: xedit-hunspell.patch +License: MIT AND BSD-3-Clause +ExcludeArch: %{ix86} BuildRequires: desktop-file-utils +BuildRequires: gcc BuildRequires: libXaw-devel +BuildRequires: meson BuildRequires: xorg-x11-util-macros Requires: xorg-x11-xbitmaps -Requires: aspell -Requires: aspell-en +Requires: hunspell +Requires: hunspell-en Requires: grep Requires: words Requires: ctags @@ -23,21 +27,25 @@ Requires: xorg-x11-fonts-100dpi Xedit provides a simple text editor for X. %prep -%setup -q +%autosetup -p1 +cp lisp/README README.lisp +cp lisp/re/README README.re %build -%configure --with-lispdir=%{_datadir}/X11/%{name} +%meson -Dlispdir=%{_datadir}/X11/%{name} +%meson_build %install -make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" -install -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop -desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop +%meson_install +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %check -make check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +%meson_test %files -%doc AUTHORS ChangeLog COPYING README +%license COPYING +%doc AUTHORS ChangeLog README README.lisp README.re %{_bindir}/%{name} %{_datadir}/X11/%{name} %{_datadir}/X11/app-defaults/Xedit @@ -46,67 +54,4 @@ make check %{_mandir}/man1/xedit.1* %changelog -* Wed Jul 29 2020 Fedora Release Engineering - 1.2.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.2.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.2.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 21 2015 pcpa - 1.2.2-2 -- Update to latest upstream release (#1195020). - -* Wed Jul 16 2014 pcpa - 1.2.1-1 -- Update to latest upstream release. -- Remove patches already in upstream. - -* Sun Jun 08 2014 Fedora Release Engineering - 1.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat May 26 2012 pcpa - 1.2.0-2 -- Patch package to not have BSD 4 clause files. -- Write patch to correct 64 bit overflow tests in a compatible license. -- Update extra patches to use the ones submitted upstream. - -* Mon May 21 2012 pcpa - 1.2.0-1 -- Add proper documentation to package. -- Update to latest upstream release. -- Remove patches already in upstream. - -* Mon Apr 23 2012 pcpa - 1.1.2-1 -- Initial xedit spec. +%autochangelog