diff --git a/.gitignore b/.gitignore index 1f0fb78..a5f0a51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /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 58de5d6..1b5f4b4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,19 +1,16 @@ %define bigversion 3.0 - -%global forgeurl https://gitlab.gnome.org/World/AbiWord +%define docsversion 3.0.1 Name: abiword -Version: 3.0.7 -Release: 3%{?dist} -%global tag release-%{version} -%forgemeta - +Version: 3.0.5 +Release: 9%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later -URL: %{forgeurl} +URL: http://www.abisource.com/ -Source0: %{forgesource} +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 Source11: abiword.mime Source12: abiword.keys Source13: abiword.xml @@ -31,7 +28,7 @@ BuildRequires: aiksaurus-devel BuildRequires: aiksaurus-gtk-devel BuildRequires: asio-devel # Needed while explicit-python.patch touches gi-overrides/Makefile.am -BuildRequires: automake autoconf libtool autoconf-archive +BuildRequires: automake BuildRequires: bison BuildRequires: boost-devel BuildRequires: bzip2-devel @@ -73,7 +70,6 @@ BuildRequires: telepathy-glib-devel BuildRequires: wv-devel BuildRequires: zlib-devel BuildRequires: make -BuildRequires: libappstream-glib Requires: libabiword = %{epoch}:%{version}-%{release} Requires: python3-gobject-base @@ -109,29 +105,47 @@ Python bindings for developing with libabiword %prep # setup abiword -%setup -qn AbiWord-release-%{version} +%setup -q -a 1 # patch abiword -%patch -P 1 -p1 -b .desktop -%patch -P 2 -p1 -b .boolean -%patch -P 3 -p0 -b .librevenge -%patch -P 4 -p1 -b .explicit_python -%patch -P 5 -p1 -b .pygo +%patch1 -p1 -b .desktop +%patch2 -p1 -b .boolean +%patch3 -p0 -b .librevenge +%patch4 -p1 -b .explicit_python +%patch5 -p1 -b .pygo + +# setup abiword documentation +pushd abiword-docs-%{docsversion} +%patch0 -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 -./autogen.sh +aclocal +automake 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 \ - --enable-maintainer-mode + --with-gir-dir=%{_datadir}/gir-1.0 --with-typelib-dir=%{_libdir}/girepository-1.0 %{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 @@ -140,23 +154,19 @@ install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiwo find %{buildroot} -name '*.la' -delete find %{buildroot} -name '*.a' -delete -mv %{buildroot}%{_datadir}/applications/abiword.desktop %{buildroot}%{_datadir}/applications/com.abisource.AbiWord.desktop - -mkdir -p %{buildroot}%{_metainfodir}/ -mv %{buildroot}%{_datadir}/appdata/abiword.appdata.xml %{buildroot}%{_metainfodir}/ -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdata.xml - %ldconfig_scriptlets -n libabiword %files %{_bindir}/abiword -%{_metainfodir}/abiword.appdata.xml +%{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/mime-info/abiword.mime %{_datadir}/mime-info/abiword.keys %{_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 @@ -168,6 +178,8 @@ 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} @@ -178,51 +190,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* Tue Sep 24 2024 Gwyn Ciesla - 1:3.0.5-16 -- Fix metainfo - -* Sun Sep 08 2024 Alexander Ploumistos - 1:3.0.5-15 -- Rebuilt for goffice-0.10.57 - -* Wed Jul 17 2024 Fedora Release Engineering - 1:3.0.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jun 08 2024 Python Maint - 1:3.0.5-13 -- Rebuilt for Python 3.13 - -* Wed Jan 31 2024 Gwyn Ciesla - 1:3.0.5-12 -- Add missing include - -* Mon Jan 22 2024 Fedora Release Engineering - 1:3.0.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1:3.0.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Sat Nov 04 2023 Gwyn Ciesla 1:3.0.5-9 - Drop i386 on f40+ diff --git a/sources b/sources index 5450106..0b0f5a3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (AbiWord-release-3.0.7.tar.bz2) = 8cd75bcef936e8db1f859a8685e44c60b6f23a61a3bd702f320fa931dd645c85e9c2e671f870b7873ed57f37f75de71888f8a261cc6c97a58edf7af2114c26b7 +SHA512 (abiword-3.0.5.tar.gz) = a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6 +SHA512 (abiword-docs-3.0.1.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5