From 3a0024b3ff276f838d1317cb0176d37f32fb7d72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:28:39 +0000 Subject: [PATCH 1/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 9c0c74f..11576d5 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -199,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1:3.0.5-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Oct 22 2024 Gwyn Ciesla - 1:3.0.5-17 - Fix desktop filename From 88fa0e8b2751a26f0f9a266e029e4d78e9caad40 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:28:23 +0200 Subject: [PATCH 2/7] Rebuilt for Python 3.14 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 11576d5..8e7e31b 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -199,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Tue Jun 03 2025 Python Maint - 1:3.0.5-19 +- Rebuilt for Python 3.14 + * Thu Jan 16 2025 Fedora Release Engineering - 1:3.0.5-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1f8f7dd406e4c710b6c1d54ad66e37528b6b7de1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:42:18 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 8e7e31b..fff7242 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -199,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1:3.0.5-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 1:3.0.5-19 - Rebuilt for Python 3.14 From aab3747109ebdb1ef70e2ec56a062ac0dd2bc9ed Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:37:41 +0200 Subject: [PATCH 4/7] Rebuilt for Python 3.14.0rc2 bytecode --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index fff7242..0918f96 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -199,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Fri Aug 15 2025 Python Maint - 1:3.0.5-21 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 1:3.0.5-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 95e1c47100854b3c36fdc3c8d76589a54070b114 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Sep 2025 13:34:54 -0500 Subject: [PATCH 5/7] 3.0.7 --- .gitignore | 1 + abiword.spec | 52 +++++++++++++++++---------------------------------- sources | 3 +-- xml-inc.patch | 10 ---------- 4 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 xml-inc.patch diff --git a/.gitignore b/.gitignore index a5f0a51..1f0fb78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /abiword-3.*.tar.gz /abiword-docs-3.*.tar.gz +/AbiWord-release-3.0.7.tar.bz2 diff --git a/abiword.spec b/abiword.spec index 0918f96..881f2ee 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,16 +1,19 @@ %define bigversion 3.0 -%define docsversion 3.0.1 + +%global forgeurl https://gitlab.gnome.org/World/AbiWord Name: abiword -Version: 3.0.5 -Release: 21%{?dist} +Version: 3.0.7 +Release: 1%{?dist} +%global tag release-%{version} +%forgemeta + Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later -URL: http://www.abisource.com/ +URL: %{forgeurl} -Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz -Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{docsversion}.tar.gz +Source0: %{forgesource} Source11: abiword.mime Source12: abiword.keys Source13: abiword.xml @@ -23,13 +26,12 @@ Patch2: abiword-2.6.0-boolean.patch Patch3: abiword-3.0.0-librevenge.patch Patch4: abiword-3.0.2-explicit-python.patch Patch5: abiword-3.0.4-pygobject.patch -Patch6: xml-inc.patch BuildRequires: aiksaurus-devel BuildRequires: aiksaurus-gtk-devel BuildRequires: asio-devel # Needed while explicit-python.patch touches gi-overrides/Makefile.am -BuildRequires: automake +BuildRequires: automake autoconf libtool autoconf-archive BuildRequires: bison BuildRequires: boost-devel BuildRequires: bzip2-devel @@ -107,7 +109,7 @@ Python bindings for developing with libabiword %prep # setup abiword -%setup -q -a 1 +%setup -qn AbiWord-release-%{version} # patch abiword %patch -P 1 -p1 -b .desktop @@ -115,40 +117,21 @@ Python bindings for developing with libabiword %patch -P 3 -p0 -b .librevenge %patch -P 4 -p1 -b .explicit_python %patch -P 5 -p1 -b .pygo -%patch -P 6 -p0 -b .xml - -# setup abiword documentation -pushd abiword-docs-%{docsversion} -%patch -P 0 -p1 -b .windowshelppaths -# some of the help dirs have bad perms (#109261) -find . -type d -exec chmod -c o+rx {} \; -popd %build # Needed while explicit-python.patch touches gi-overrides/Makefile.am -aclocal -automake +./autogen.sh export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS -DASIO_ENABLE_BOOST" %configure \ --enable-plugins --enable-clipart --enable-templates --enable-introspection \ - --with-gir-dir=%{_datadir}/gir-1.0 --with-typelib-dir=%{_libdir}/girepository-1.0 + --with-gir-dir=%{_datadir}/gir-1.0 --with-typelib-dir=%{_libdir}/girepository-1.0 \ + --enable-maintainer-mode %{make_build} V=1 -# build the documentation -pushd abiword-docs-%{docsversion} -ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh -popd - %install %{make_install} overridesdir=%{python3_sitelib}/gi/overrides -# install the documentation -pushd abiword-docs-%{docsversion} -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{bigversion}/AbiWord/help -cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{bigversion}/AbiWord/help/ -popd - install -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime install -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml @@ -174,8 +157,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %{_datadir}/mime/packages/abiword.xml %{_datadir}/icons/hicolor/*/apps/abiword.png %{_datadir}/icons/hicolor/scalable/apps/abiword.svg -# Abiword help -%{_datadir}/%{name}-%{bigversion}/AbiWord %{_mandir}/man1/abiword.1* %files -n libabiword @@ -187,8 +168,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %{_datadir}/%{name}-%{bigversion} %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service %{_datadir}/telepathy/clients/AbiCollab.client -# Abiword help - included in GUI app -%exclude %{_datadir}/%{name}-%{bigversion}/AbiWord %files -n libabiword-devel %{_includedir}/%{name}-%{bigversion} @@ -199,6 +178,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Wed Sep 03 2025 Gwyn Ciesla - 1:3.0.7-1 +- 3.0.7 + * Fri Aug 15 2025 Python Maint - 1:3.0.5-21 - Rebuilt for Python 3.14.0rc2 bytecode diff --git a/sources b/sources index 0b0f5a3..5450106 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (abiword-3.0.5.tar.gz) = a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6 -SHA512 (abiword-docs-3.0.1.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5 +SHA512 (AbiWord-release-3.0.7.tar.bz2) = 8cd75bcef936e8db1f859a8685e44c60b6f23a61a3bd702f320fa931dd645c85e9c2e671f870b7873ed57f37f75de71888f8a261cc6c97a58edf7af2114c26b7 diff --git a/xml-inc.patch b/xml-inc.patch deleted file mode 100644 index 549740f..0000000 --- a/xml-inc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/af/util/xp/ut_stringbuf.cpp~ 2021-07-03 10:46:07.000000000 -0500 -+++ src/af/util/xp/ut_stringbuf.cpp 2024-01-31 14:56:13.075934064 -0600 -@@ -26,6 +26,7 @@ - #include - - #include -+#include - - #include - From 24a516c8f1670006514d456bbb574ba458849e08 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:06:15 +0200 Subject: [PATCH 6/7] Rebuilt for Python 3.14.0rc3 bytecode --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 881f2ee..41c5053 100644 --- a/abiword.spec +++ b/abiword.spec @@ -4,7 +4,7 @@ Name: abiword Version: 3.0.7 -Release: 1%{?dist} +Release: 2%{?dist} %global tag release-%{version} %forgemeta @@ -178,6 +178,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Fri Sep 19 2025 Python Maint - 1:3.0.7-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Wed Sep 03 2025 Gwyn Ciesla - 1:3.0.7-1 - 3.0.7 From d39127196a948478191666aaa62521df4e96b7ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:23:39 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 41c5053..58de5d6 100644 --- a/abiword.spec +++ b/abiword.spec @@ -4,7 +4,7 @@ Name: abiword Version: 3.0.7 -Release: 2%{?dist} +Release: 3%{?dist} %global tag release-%{version} %forgemeta @@ -178,6 +178,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1:3.0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 1:3.0.7-2 - Rebuilt for Python 3.14.0rc3 bytecode