diff --git a/.gitignore b/.gitignore index a865852..0d68ffc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /wordgrinder-0.6.tar.gz /wordgrinder-0.7.1.tar.gz /wordgrinder-0.7.2.tar.gz -/wordgrinder-0.8.tar.gz diff --git a/sources b/sources index abf2ed7..11fe0d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordgrinder-0.8.tar.gz) = 192e21381dc7644ca1682fe2c5984f97675c7727b84971559625c4a30da28699164d62168022f9de76ec3250ecab32e65a720585c19c2105685d79c8c33a4d2b +SHA512 (wordgrinder-0.7.2.tar.gz) = abf3fbeec25e557c780af9b633634d22214e20ae56aebe6574c97ba3d5e8d1adc985329ecf7930370f644d9762d064fb99ac8b64a5c95fa8e5ac6e14627f4d23 diff --git a/wordgrinder.spec b/wordgrinder.spec index 04f29bd..9420aa2 100644 --- a/wordgrinder.spec +++ b/wordgrinder.spec @@ -1,6 +1,6 @@ Name: wordgrinder -Version: 0.8 -Release: 14%{?dist} +Version: 0.7.2 +Release: 2%{?dist} Summary: A command line word processor License: MIT @@ -11,8 +11,9 @@ Source: https://github.com/davidgiven/%{name}/archive/%{name}-%{version} BuildRequires: gcc make ncurses-devel ninja-build BuildRequires: lua-devel lua-libs lua lua-filesystem BuildRequires: zlib-devel libXft-devel -BuildRequires: minizip-devel -Requires: ncurses-libs lua-filesystem +Requires: ncurses lua-filesystem +# luaJIT is not available on all architectures +#ExcludeArch: s390x ppc64 ppc64le %description WordGrinder is a Unicode-aware character cell word processor that runs in a @@ -38,32 +39,13 @@ An X11 version of the WordGrinder word processor. ############################################################################### %build -PREFIX=$RPM_BUILD_ROOT/%{_prefix} OBJDIR=$RPM_BUILD_ROOT/tmp WANT_STRIPPED_BINARIES=no make %{?_smp_mflags} +CFLAGS=-g PREFIX=$RPM_BUILD_ROOT/%{_prefix} OBJDIR=$RPM_BUILD_ROOT/tmp WANT_STRIPPED_BINARIES=no make %{?_smp_mflags} ############################################################################### %install make install PREFIX=$RPM_BUILD_ROOT/%{_prefix} -install -D -m 0644 %{_builddir}/%{name}-%{version}/extras/wordgrinder.desktop %{buildroot}%{_datadir}/applications/wordgrinder.desktop - -############################################################################### -%post x11 -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -touch --no-create %{_datadir}/mime/packages &>/dev/null || : - -%postun x11 -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - update-mime-database %{_datadir}/mime &> /dev/null || : -fi - -%posttrans x11 -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - +#make install ############################################################################### %files @@ -75,68 +57,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files x11 %license licenses/COPYING.WordGrinder %_bindir/xwordgrinder -%_mandir/man1/xwordgrinder.1* -%{_datadir}/applications/wordgrinder.desktop -%{_datadir}/pixmaps/wordgrinder.png -%{_datadir}/mime-info/wordgrinder.mime - ############################################################################### %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.8-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 0.8-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 0.8-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 0.8-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 0.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.8-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 27 2022 Ben Cotton - 0.8-5 -- Stop overwriting CFLAGS, which also fixes a FTBFS - -* Sat Jan 22 2022 Fedora Release Engineering - 0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Oct 27 2020 Ben Cotton - 0.8-1 -- Update to version 0.8 -- Make wordgrinder-x11 package standalone - -* Tue Sep 29 2020 Ben Cotton - 0.7.2-6 -- Change ncurses dependency to be more specific - -* Wed Jul 29 2020 Fedora Release Engineering - 0.7.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.7.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Sun Feb 03 2019 Fedora Release Engineering - 0.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild