diff --git a/abiword-3.0.2-explicit-python2.patch b/abiword-3.0.2-explicit-python.patch similarity index 100% rename from abiword-3.0.2-explicit-python2.patch rename to abiword-3.0.2-explicit-python.patch diff --git a/abiword.spec b/abiword.spec index 77a09f4..40de642 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,18 +1,16 @@ -%define majorversion 3 -%define minorversion 0 -%define microversion 4 -%define svnver 0 +%define bigversion 3.0 +%define docsversion 3.0.1 -Summary: Word processing program Name: abiword -Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 3%{?dist} +Version: 3.0.4 +Release: 4%{?dist} Epoch: 1 +Summary: Word processing program License: GPLv2+ URL: http://www.abisource.com/ Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz -Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-3.0.2.tar.gz +Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{docsversion}.tar.gz Source11: abiword.mime Source12: abiword.keys Source13: abiword.xml @@ -21,11 +19,9 @@ Patch0: abiword-2.6.0-windowshelppaths.patch Patch1: abiword-2.8.3-desktop.patch Patch2: abiword-2.6.0-boolean.patch Patch3: abiword-3.0.0-librevenge.patch -Patch4: abiword-3.0.2-explicit-python2.patch +Patch4: abiword-3.0.2-explicit-python.patch Patch5: abiword-3.0.4-pygobject.patch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: aiksaurus-devel BuildRequires: aiksaurus-gtk-devel BuildRequires: asio-devel @@ -42,6 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: goffice-devel BuildRequires: gtk3-devel +# Probably because it's gtk2 based #BuildRequires: gtkmathview-devel BuildRequires: libgsf-devel BuildRequires: libpng-devel @@ -108,35 +105,34 @@ Python bindings for developing with libabiword %patch1 -p1 -b .desktop %patch2 -p1 -b .boolean %patch3 -p0 -b .librevenge -%patch4 -p1 -b .explicit_python2 +%patch4 -p1 -b .explicit_python %patch5 -p1 -b .pygo # setup abiword documentation -cd abiword-docs-3.0.1 +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 -# build libabiword and abiword -cd $RPM_BUILD_DIR/abiword-%{version} - %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection %{make_build} V=1 # build the documentation -cd abiword-docs-3.0.1 +pushd abiword-docs-%{docsversion} ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh +popd %install -cd $RPM_BUILD_DIR/abiword-%{version} %{make_install} # install the documentation -cd abiword-docs-3.0.1 -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help -cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ -# some of the help dirs have bad perms (#109261) -find $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ -type d -exec chmod -c o+rx {} \; +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 @@ -158,30 +154,33 @@ find %{buildroot} -name '*.a' -delete %{_datadir}/icons/hicolor/*/apps/abiword.png %{_datadir}/icons/hicolor/scalable/apps/abiword.svg # Abiword help -%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord +%{_datadir}/%{name}-%{bigversion}/AbiWord %{_mandir}/man1/abiword.1.gz %files -n libabiword -%doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT -%{_libdir}/libabiword-%{majorversion}.%{minorversion}.so +%license COPYING COPYRIGHT.TXT +%{_libdir}/libabiword-%{bigversion}.so %{_libdir}/libAiksaurusGtk3* -%{_libdir}/%{name}-%{majorversion}.%{minorversion} +%{_libdir}/%{name}-%{bigversion} %{_libdir}/girepository-1.0/Abi-3.0.typelib -%{_datadir}/%{name}-%{majorversion}.%{minorversion} +%{_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}-%{majorversion}.%{minorversion}/AbiWord +%exclude %{_datadir}/%{name}-%{bigversion}/AbiWord %files -n libabiword-devel -%{_includedir}/%{name}-%{majorversion}.%{minorversion} -%{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc +%{_includedir}/%{name}-%{bigversion} +%{_libdir}/pkgconfig/%{name}-%{bigversion}.pc %{_datadir}/gir-1.0/Abi-3.0.gir %files -n python3-abiword %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Sun Feb 2 2020 Peter Robinson 1:3.0.4-4 +- More packaging cleanups and fixes + * Wed Jan 29 2020 Peter Robinson 1:3.0.4-3 - Packaging cleanups and fixes @@ -339,108 +338,3 @@ find %{buildroot} -name '*.a' -delete * Mon Oct 14 2013 Peter Robinson 1:3.0.0-1 - Update to 3.0.0 stable - -* Sat Aug 03 2013 Fedora Release Engineering - 1:2.8.6-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 1:2.8.6-23 -- Rebuild for boost 1.54.0 - -* Sun Feb 17 2013 Christoph Wickert - 1:2.8.6-22 -- Make desktop file --vendor conditional -- Remove obsolete category 'Applications" from desktop file - -* Sat Feb 09 2013 Rahul Sundaram - 1:2.8.6-21 -- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 -- clean up spec to follow current guidelines -- remove obsolete and unapplied boolean patch - -* Fri Jan 18 2013 Adam Tkac - 1:2.8.6-20 -- rebuild due to "jpeg8-ABI" feature drop - -* Fri Dec 21 2012 Adam Tkac - 1:2.8.6-19 -- rebuild against new libjpeg - -* Wed Jul 18 2012 Fedora Release Engineering - 1:2.8.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Feb 27 2012 Tom Callaway - 1:2.8.6-17 -- fix build against modern glib, libpng - -* Thu Jan 12 2012 Fedora Release Engineering - 1:2.8.6-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 1:2.8.6-15 -- Rebuild for new libpng - -* Tue Aug 9 2011 Peter Robinson - 1:2.8.6-14 -- rebuild with link-grammar now its back - -* Tue Aug 2 2011 Peter Robinson - 1:2.8.6-13 -- rebuild for new asio -- drop obsolete OLPC and ARM includes - -* Tue Aug 02 2011 Marc Maurer - 1:2.8.6-12 -- Fix a typo in the previous patch - -* Tue Aug 02 2011 Marc Maurer - 1:2.8.6-11 -- Fix BZ 716005: --no-undefined is a linker flag, not a g++ flag - -* Tue Aug 02 2011 Marc Maurer - 1:2.8.6-10 -- Mixed up the microversion and the release - -* Tue Aug 02 2011 Marc Maurer - 1:2.8.6-9 -- Remove link-grammar from the BR and R until it is revived - -* Thu May 05 2011 Chris Tyler - 1:2.8.6-8 -- Excluded asio-devel from ARM builds - -* Mon Feb 07 2011 Fedora Release Engineering - 1:2.8.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 30 2010 Peter Robinson - 1:2.8.6-6 -- Rebuild for library soname bumps - -* Wed Dec 8 2010 Caolán McNamara - 1:2.8.6-5 -- Rebuild for libwpd 0.9 - -* Wed Dec 8 2010 Peter Robinson - 1:2.8.6-4 -- Rebuild for library soname bumps - -* Wed Sep 29 2010 jkeating - 1:2.8.6-3 -- Rebuilt for gcc bug 634757 - -* Wed Sep 22 2010 Peter Robinson - 1:2.8.6-2 -- Move abiword gui help from the library to the app. Fixes 578596 - -* Sat Aug 14 2010 Marc Maurer - 1:2.8.6-1 -- New upstream release - -* Sat Jun 05 2010 Marc Maurer - 1:2.8.5-1 -- New upstream release - -* Fri Apr 16 2010 Marc Maurer - 1:2.8.4-1 -- New upstream release - -* Thu Apr 08 2010 Marc Maurer - 1:2.8.3-2 -- Update .desktop patch - -* Thu Apr 08 2010 Marc Maurer - 1:2.8.3-1 -- New upstream release - -* Tue Mar 02 2010 Marc Maurer - 1:2.8.2-1 -- New upstream release -- Package the man page - -* Wed Dec 23 2009 Rahul Sundaram -1:2.8.1-4 -- Rebuild again since the wv soname bump was accidental -- Remove superflous BuildRoot definitions and removals - -* Mon Dec 21 2009 Peter Robinson - 1:2.8.1-3 -- Rebuild against new libwv - -* Sun Nov 01 2009 Marc Maurer - 1:2.8.1-2 -- Rebuild - -* Sun Nov 01 2009 Marc Maurer - 1:2.8.1-1 -- New upstream release diff --git a/sources b/sources index 93895ad..440cebf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (abiword-3.0.4.tar.gz) = 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4 -SHA512 (abiword-docs-3.0.2.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5 +SHA512 (abiword-docs-3.0.1.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5