From 9c79c12df34341cefb4cef557e346058ef79dd80 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 15:35:39 +0000 Subject: [PATCH 01/84] Add an AppData file for the software center --- abiword.spec | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 6a7bfd2..4d840d4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -134,6 +134,51 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh cd $RPM_BUILD_DIR/abiword-%{version} make install DESTDIR=%{buildroot} +# Register as an application to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < + + + + abiword.desktop + CC0-1.0 + +

+ AbiWord is a free word processing program similar to Microsoft® Word. + It is suitable for a wide variety of word processing tasks. +

+

+ AbiWord allows you to collaborate with multiple people on one document at the + same time. + It is tightly integrated with the AbiCollab.net web service, which lets you + store documents online, allows easy document sharing with your friends, and + performs format conversions on the fly. +

+ + + http://www.abisource.com/ + + + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/a.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/b.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/c.png + + + +EOF + # install the documentation cd $RPM_BUILD_DIR/abiword-docs-%{version} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help @@ -169,6 +214,7 @@ fi %files %{_bindir}/abiword +%{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/mime-info/abiword.mime %{_datadir}/mime-info/abiword.keys @@ -200,6 +246,9 @@ fi %{python_sitearch}/* %changelog +* Thu Mar 26 2015 Richard Hughes - 1:3.0.1-3 +- Add an AppData file for the software center + * Tue Jan 27 2015 Petr Machata - 1:3.0.1-2 - Rebuild for boost 1.57.0 From 849cb14c62a591fd87da86150dda64365069cd14 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 11:35:40 +0200 Subject: [PATCH 02/84] Rebuilt for GCC 5 C++11 ABI change --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 4d840d4..9682b84 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -246,6 +246,9 @@ fi %{python_sitearch}/* %changelog +* Sat May 02 2015 Kalev Lember - 1:3.0.1-4 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Mar 26 2015 Richard Hughes - 1:3.0.1-3 - Add an AppData file for the software center From b1d60faabef21bdc1b7ec58d775ea9b84ec33e46 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 6 Jun 2015 18:44:28 +0200 Subject: [PATCH 03/84] fix libwp? detection --- abiword-3.0.0-libwp.patch | 36 ++++++++++++++++++++++++++++++++++++ abiword.spec | 7 +++++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 abiword-3.0.0-libwp.patch diff --git a/abiword-3.0.0-libwp.patch b/abiword-3.0.0-libwp.patch new file mode 100644 index 0000000..9f269bd --- /dev/null +++ b/abiword-3.0.0-libwp.patch @@ -0,0 +1,36 @@ +From 9734c2cc2638b16cc9b9c33adb2fbe5b793226f5 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sat, 6 Jun 2015 18:43:14 +0200 +Subject: [PATCH] fix libwp? detection + +--- + plugin-configure.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugin-configure.m4 b/plugin-configure.m4 +index 54998fb..92e4ec2 100644 +--- a/plugin-configure.m4 ++++ b/plugin-configure.m4 +@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS]) + AC_SUBST([BMP_LIBS]) + + +-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" ++wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS]) + AC_SUBST([AIKSAURUS_LIBS]) + + +-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.3' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +-- +2.4.2 + diff --git a/abiword.spec b/abiword.spec index 9682b84..daa6890 100644 --- a/abiword.spec +++ b/abiword.spec @@ -23,6 +23,7 @@ Patch2: abiword-2.6.0-boolean.patch Patch3: abiword-3.0.0-librevenge.patch Patch4: abiword-3.0.0-link-grammar-5.patch Patch5: abiword-3.0.0-link-grammar-5-second.patch +Patch6: abiword-3.0.0-libwp.patch BuildRequires: autoconf BuildRequires: automake @@ -110,17 +111,19 @@ Python bindings for developing with libabiword %patch3 -p0 -b .librevenge %patch4 -p1 -b .link-grammar-5 %patch5 -p1 -b .link-grammar-5-second +%patch6 -p1 -b .libwp # setup abiword documentation %setup -q -T -b 1 -n abiword-docs-%{version} %patch0 -p1 -b .windowshelppaths %build +# build libabiword and abiword +cd $RPM_BUILD_DIR/abiword-%{version} + aclocal autoconf -# build libabiword and abiword -cd $RPM_BUILD_DIR/abiword-%{version} %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection # Build non SMP due to issues with gobject-introspection builds # make %{?_smp_mflags} V=1 From 78af610526081b913f748c32e4870940d4f14365 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 6 Jun 2015 21:41:32 +0200 Subject: [PATCH 04/84] make sure MS Works import is built --- abiword.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abiword.spec b/abiword.spec index daa6890..2850085 100644 --- a/abiword.spec +++ b/abiword.spec @@ -55,6 +55,7 @@ BuildRequires: libxslt-devel BuildRequires: link-grammar-devel BuildRequires: loudmouth-devel BuildRequires: ots-devel +BuildRequires: pkgconfig(libwps-0.3) BuildRequires: poppler-devel BuildRequires: popt-devel BuildRequires: pygobject3 From 1482cf1f893b6378f6c868a1f999912b7bd366d6 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 6 Jun 2015 21:49:18 +0200 Subject: [PATCH 05/84] adapt to libwps 0.4 --- abiword-3.0.1-libwps-0.4.patch | 54 ++++++++++++++++++++++++++++++++++ abiword.spec | 4 ++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 abiword-3.0.1-libwps-0.4.patch diff --git a/abiword-3.0.1-libwps-0.4.patch b/abiword-3.0.1-libwps-0.4.patch new file mode 100644 index 0000000..292f681 --- /dev/null +++ b/abiword-3.0.1-libwps-0.4.patch @@ -0,0 +1,54 @@ +From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sat, 6 Jun 2015 21:48:02 +0200 +Subject: [PATCH] adapt to libwps 0.4 + +--- + plugin-configure.m4 | 2 +- + plugins/wordperfect/plugin.m4 | 2 +- + plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/plugin-configure.m4 b/plugin-configure.m4 +index 2757f4a..093fbcb 100644 +--- a/plugin-configure.m4 ++++ b/plugin-configure.m4 +@@ -1470,7 +1470,7 @@ AC_SUBST([AIKSAURUS_LIBS]) + + + wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.3' ++wordperfect_wps_pkgs='libwps-0.4' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4 +index 0aadbaf..bc32d48 100644 +--- a/plugins/wordperfect/plugin.m4 ++++ b/plugins/wordperfect/plugin.m4 +@@ -1,6 +1,6 @@ + + wordperfect_pkgs="libwpd-0.10 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.3' ++wordperfect_wps_pkgs='libwps-0.4' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp +index bd19971..3e69f79 100644 +--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp ++++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp +@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input) + AbiWordperfectInputStream gsfInput(input); + + libwps::WPSKind kind; +- libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind); ++ libwps::WPSCreator creator; ++ bool needsEncoding = false; ++ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding); + + if (kind != libwps::WPS_TEXT) + confidence = libwps::WPS_CONFIDENCE_NONE; +-- +2.4.2 + diff --git a/abiword.spec b/abiword.spec index 2850085..db824b1 100644 --- a/abiword.spec +++ b/abiword.spec @@ -24,6 +24,7 @@ Patch3: abiword-3.0.0-librevenge.patch Patch4: abiword-3.0.0-link-grammar-5.patch Patch5: abiword-3.0.0-link-grammar-5-second.patch Patch6: abiword-3.0.0-libwp.patch +Patch7: abiword-3.0.1-libwps-0.4.patch BuildRequires: autoconf BuildRequires: automake @@ -55,7 +56,7 @@ BuildRequires: libxslt-devel BuildRequires: link-grammar-devel BuildRequires: loudmouth-devel BuildRequires: ots-devel -BuildRequires: pkgconfig(libwps-0.3) +BuildRequires: pkgconfig(libwps-0.4) BuildRequires: poppler-devel BuildRequires: popt-devel BuildRequires: pygobject3 @@ -113,6 +114,7 @@ Python bindings for developing with libabiword %patch4 -p1 -b .link-grammar-5 %patch5 -p1 -b .link-grammar-5-second %patch6 -p1 -b .libwp +%patch7 -p1 -b .libwps-0.4 # setup abiword documentation %setup -q -T -b 1 -n abiword-docs-%{version} From 96ed9e86b61721cdb72a746bd968887efc2b55cb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 6 Jun 2015 22:31:35 +0200 Subject: [PATCH 06/84] bump release --- abiword.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index db824b1..a4a17a8 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -252,6 +252,10 @@ fi %{python_sitearch}/* %changelog +* Sat Jun 06 2015 David Tardon - 1:3.0.1-5 +- really enable WordPerfect import +- enable MS Works import + * Sat May 02 2015 Kalev Lember - 1:3.0.1-4 - Rebuilt for GCC 5 C++11 ABI change From 0a9a40902e622c38c9e29fdeb4f1d1818638e551 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 7 Jun 2015 17:08:48 +0200 Subject: [PATCH 07/84] fix build in koji Without this, AX_BOOST_BASE macro is not found. --- abiword.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index a4a17a8..59198c3 100644 --- a/abiword.spec +++ b/abiword.spec @@ -124,7 +124,7 @@ Python bindings for developing with libabiword # build libabiword and abiword cd $RPM_BUILD_DIR/abiword-%{version} -aclocal +aclocal -I. autoconf %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection From 4ca470e8b26c4b91ae68fd98690fd741922d0725 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:32:52 +0000 Subject: [PATCH 08/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 59198c3..bb9e7de 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -252,6 +252,9 @@ fi %{python_sitearch}/* %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1:3.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 06 2015 David Tardon - 1:3.0.1-5 - really enable WordPerfect import - enable MS Works import From 1c31eab6ebfa6643ad4a2f4288e710be029dc836 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 18:01:06 +0200 Subject: [PATCH 09/84] rebuild for Boost 1.58 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index bb9e7de..a8f6768 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -252,6 +252,9 @@ fi %{python_sitearch}/* %changelog +* Wed Jul 22 2015 David Tardon - 1:3.0.1-7 +- rebuild for Boost 1.58 + * Tue Jun 16 2015 Fedora Release Engineering - 1:3.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 280bf81950edd888f30cf1bf51b61fde2fb68314 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 11:55:23 -0500 Subject: [PATCH 10/84] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index a8f6768..4e5246b 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -252,6 +252,9 @@ fi %{python_sitearch}/* %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 1:3.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 1:3.0.1-7 - rebuild for Boost 1.58 From 41617ae6d89026dd6b3777427f06bf8a3180a682 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:55:53 +0000 Subject: [PATCH 11/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 4e5246b..32a8cc4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -252,6 +252,9 @@ fi %{python_sitearch}/* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1:3.0.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jul 29 2015 Fedora Release Engineering - 1:3.0.1-8 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From c0d6dffbd16126990eba916782237e5347f4ba47 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 10 Apr 2016 15:31:15 +0100 Subject: [PATCH 12/84] Add patches to fix building with newer gnutls and gcc6, Add patch to fix Wordperfect support --- abiword-3.0.1-fixwps.patch | 31 +++++ abiword-3.0.1-gcc6.patch | 263 +++++++++++++++++++++++++++++++++++++ abiword-3.0.1-gnutls.patch | 23 ++++ abiword.spec | 15 ++- 4 files changed, 329 insertions(+), 3 deletions(-) create mode 100644 abiword-3.0.1-fixwps.patch create mode 100644 abiword-3.0.1-gcc6.patch create mode 100644 abiword-3.0.1-gnutls.patch diff --git a/abiword-3.0.1-fixwps.patch b/abiword-3.0.1-fixwps.patch new file mode 100644 index 0000000..2929d5b --- /dev/null +++ b/abiword-3.0.1-fixwps.patch @@ -0,0 +1,31 @@ +--- abiword-3.0.1/plugin-configure.m4.orig 2016-04-10 14:22:18.271356761 +0100 ++++ abiword-3.0.1/plugin-configure.m4 2016-04-10 14:24:22.493303398 +0100 +@@ -1355,7 +1355,7 @@ + AC_SUBST([BMP_LIBS]) + + +-wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0" ++wpg_pkgs="libwpg-0.3 $gsf_req" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +@@ -1469,8 +1469,8 @@ + AC_SUBST([AIKSAURUS_LIBS]) + + +-wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.4' ++wordperfect_pkgs="libwpd-0.10 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.3' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +@@ -1499,7 +1499,7 @@ + + PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ], + [ +- wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs" ++ wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs" + WPS_DEFINE=" -DHAVE_LIBWPS" + ]) + diff --git a/abiword-3.0.1-gcc6.patch b/abiword-3.0.1-gcc6.patch new file mode 100644 index 0000000..cc14250 --- /dev/null +++ b/abiword-3.0.1-gcc6.patch @@ -0,0 +1,263 @@ +Index: src/af/xap/cocoa/xap_CocoaApp.h +=================================================================== +--- src/af/xap/cocoa/xap_CocoaApp.h (revision 35181) ++++ src/af/xap/cocoa/xap_CocoaApp.h (working copy) +@@ -65,7 +65,7 @@ + virtual void copyToClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard = true) = 0; + virtual void pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard, bool bHonorFormatting = true) = 0; + virtual bool canPasteFromClipboard() = 0; +- virtual const char * getUserPrivateDirectory(); ++ virtual const char * getUserPrivateDirectory() const; + virtual bool findAbiSuiteBundleFile(std::string & path, const char * filename, const char * subdir = 0); // checks only bundle + virtual bool findAbiSuiteLibFile(std::string & path, const char * filename, const char * subdir = 0); + virtual bool findAbiSuiteAppFile(std::string & path, const char * filename, const char * subdir = 0); // doesn't check user-dir +Index: src/af/xap/cocoa/xap_CocoaApp.cpp +=================================================================== +--- src/af/xap/cocoa/xap_CocoaApp.cpp (revision 35181) ++++ src/af/xap/cocoa/xap_CocoaApp.cpp (working copy) +@@ -192,7 +192,7 @@ + *flags = m_geometry.flags; + } + +-const char * XAP_CocoaApp::getUserPrivateDirectory() ++const char * XAP_CocoaApp::getUserPrivateDirectory() const + { + static const char * szAbiDir = "Library/Application Support/AbiSuite"; + +Index: src/af/xap/gtk/xap_UnixApp.h +=================================================================== +--- src/af/xap/gtk/xap_UnixApp.h (revision 35181) ++++ src/af/xap/gtk/xap_UnixApp.h (working copy) +@@ -73,7 +73,7 @@ + virtual void pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard, bool bHonorFormatting = true) = 0; + virtual bool canPasteFromClipboard() = 0; + void migrate(const char *oldName, const char *newName, const char *path) const; +- virtual const char * getUserPrivateDirectory(); ++ virtual const char * getUserPrivateDirectory() const; + + virtual void setSelectionStatus(AV_View * pView) = 0; + virtual void clearSelection() = 0; +Index: src/af/xap/gtk/xap_UnixApp.cpp +=================================================================== +--- src/af/xap/gtk/xap_UnixApp.cpp (revision 35181) ++++ src/af/xap/gtk/xap_UnixApp.cpp (working copy) +@@ -207,70 +207,60 @@ + } + + // This should be removed at some time. +-void XAP_UnixApp::migrate (const char *oldName, const char *newName, const char *path) const ++void XAP_UnixApp::migrate(const char *oldName, ++ const char *newName, const char *path) const + { +- if (path && newName && oldName && (*oldName == '/')) +- { +- char *old = new char[strlen(path) - strlen(newName) + strlen(oldName)]; +- +- if (old) +- { +- size_t len = strrchr(path, '/') - path; +- strncpy(old, path, len); +- old[len] = 0; +- strcat(old, oldName); ++ if (path && newName && oldName && (*oldName == '/')) { + +- if (g_access(old, F_OK) == 0) +- { +- UT_WARNINGMSG(("Renaming: %s -> %s\n", old, path)); +- g_rename(old, path); +- } +- +- delete[] old; +- } +- } ++ const char* end = strrchr(path, '/'); ++ if (!end) { ++ UT_WARNINGMSG(("invalid path '%s', '/' not found", path)); ++ return; ++ } ++ ++ std::string old(path, end); ++ old += oldName; ++ ++ if (g_access(old.c_str(), F_OK) == 0) { ++ UT_WARNINGMSG(("Renaming: %s -> %s\n", old.c_str(), path)); ++ g_rename(old.c_str(), path); ++ } ++ } + } +- +-const char * XAP_UnixApp::getUserPrivateDirectory() ++ ++const char * XAP_UnixApp::getUserPrivateDirectory() const + { +- /* return a pointer to a static buffer */ +- static char *buf = NULL; ++ /* return a pointer to a static buffer */ ++ static std::string private_dir; + +- if (buf == NULL) +- { +- const char * szAbiDir = "abiword"; +- const char * szCfgDir = ".config"; ++ if (private_dir.empty()) { ++ const char * szAbiDir = "abiword"; ++ const char * szCfgDir = ".config"; + +- const char * szXDG = getenv("XDG_CONFIG_HOME"); +- if (!szXDG || !*szXDG) { +- const char * szHome = getenv("HOME"); +- if (!szHome || !*szHome) +- szHome = "./"; ++ const char * szXDG = getenv("XDG_CONFIG_HOME"); ++ if (!szXDG || !*szXDG) { ++ const char * szHome = getenv("HOME"); ++ if (!szHome || !*szHome) ++ szHome = "./"; + +- buf = new char[strlen(szHome)+strlen(szCfgDir)+strlen(szAbiDir)+4]; ++ private_dir = szHome; ++ if (szHome[strlen(szHome)-1] != '/') { ++ private_dir.push_back('/'); ++ } ++ private_dir += szCfgDir; ++ } else { ++ private_dir = szXDG; ++ } + +- strcpy(buf, szHome); +- if (buf[strlen(buf)-1] != '/') +- strcat(buf, "/"); +- strcat(buf, szCfgDir); +- } else { +- buf = new char[strlen(szXDG)+strlen(szAbiDir)+4]; +- strcpy(buf, szXDG); +- } ++ private_dir += '/'; ++ private_dir += szAbiDir; + +- strcat(buf, "/"); +- strcat(buf, szAbiDir); +- +-#ifdef PATH_MAX +- if (strlen(buf) >= PATH_MAX) +- DELETEPV(buf); +-#endif +- +- // migration / legacy +- migrate("/AbiSuite", szAbiDir, buf); ++ // migration / legacy ++ // XXX shouldn't that be /.AbiSuite ? ++ migrate("/AbiSuite", szAbiDir, private_dir.c_str()); + } + +- return buf; ++ return private_dir.c_str(); + } + + +Index: src/af/xap/xp/xap_App.h +=================================================================== +--- src/af/xap/xp/xap_App.h (revision 35181) ++++ src/af/xap/xp/xap_App.h (working copy) +@@ -178,7 +178,7 @@ + + virtual const XAP_StringSet * getStringSet() const = 0; + virtual void migrate(const char *oldName, const char *newName, const char *path) const; +- virtual const char * getUserPrivateDirectory() = 0; ++ virtual const char * getUserPrivateDirectory() const = 0; + virtual const char * getAbiSuiteLibDir() const; + virtual const char * getAbiSuiteAppDir() const = 0; + virtual bool findAbiSuiteLibFile(std::string & path, const char * filename, const char * subdir = 0); +Index: src/af/xap/win/xap_Win32App.h +=================================================================== +--- src/af/xap/win/xap_Win32App.h (revision 35181) ++++ src/af/xap/win/xap_Win32App.h (working copy) +@@ -65,7 +65,7 @@ + virtual void pasteFromClipboard(PD_DocumentRange * pDocRange, bool, bool) = 0; + virtual bool canPasteFromClipboard(void) = 0; + virtual void cacheCurrentSelection(AV_View *) = 0; +- virtual const char * getUserPrivateDirectory(void); ++ virtual const char * getUserPrivateDirectory(void) const; + + virtual HICON getIcon(void) = 0; + virtual HICON getSmallIcon(void) = 0; +Index: src/af/xap/win/xap_Win32App.cpp +=================================================================== +--- src/af/xap/win/xap_Win32App.cpp (revision 35181) ++++ src/af/xap/win/xap_Win32App.cpp (working copy) +@@ -238,7 +238,7 @@ + return result; + } + +-const char * XAP_Win32App::getUserPrivateDirectory(void) ++const char * XAP_Win32App::getUserPrivateDirectory(void) const + { + /* return a pointer to a static buffer */ + +Index: configure.ac +=================================================================== +--- configure.ac (revision 35181) ++++ configure.ac (working copy) +@@ -616,7 +616,7 @@ + # + + # We need libpng +-for l in libpng libpng14 libpng12; do ++for l in libpng libpng16 libpng14 libpng12; do + AC_MSG_CHECKING(for $l) + if $PKG_CONFIG --exists $l ; then + AC_MSG_RESULT(yes) +Index: plugins/xslfo/xp/ie_exp_XSL-FO.cpp +=================================================================== +--- plugins/xslfo/xp/ie_exp_XSL-FO.cpp (revision 35181) ++++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp (working copy) +@@ -1451,7 +1451,7 @@ + { \ + UT_UTF8String esc = szValue; \ + esc.escapeXML(); \ +- buf += " "x"=\""; \ ++ buf += " " x"=\""; \ + buf += esc.utf8_str(); \ + buf += "\""; \ + } +Index: plugins/latex/xp/ie_exp_LaTeX.cpp +=================================================================== +--- plugins/latex/xp/ie_exp_LaTeX.cpp (revision 35181) ++++ plugins/latex/xp/ie_exp_LaTeX.cpp (working copy) +@@ -1330,7 +1330,7 @@ + m_pie->write(sBuf.c_str(),sBuf.size()); + } + +-#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true; ++#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true; + #define SUBd(a,who) case a: subst = who; return true; + static bool _convertLettersToSymbols(char c, const char *& subst) + { +Index: plugins/collab/backends/service/xp/soa_soup.cpp +=================================================================== +--- plugins/collab/backends/service/xp/soa_soup.cpp (revision 35181) ++++ plugins/collab/backends/service/xp/soa_soup.cpp (working copy) +@@ -163,7 +163,7 @@ + + static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) { + if (!sess.m_session || !sess.m_msg ) +- return soa::GenericPtr(); ++ return false; + + guint status = soup_session_send_message (sess.m_session, sess.m_msg); + if (!(SOUP_STATUS_IS_SUCCESSFUL (status) || +Index: plugins/collab/backends/service/xp/RealmProtocol.cpp +=================================================================== +--- plugins/collab/backends/service/xp/RealmProtocol.cpp (revision 35181) ++++ plugins/collab/backends/service/xp/RealmProtocol.cpp (working copy) +@@ -6,8 +6,8 @@ + + #define MAX_PACKET_DATA_SIZE 64*1024*1024 + +-#define RPV1_PACKET_NONEXISTENT -2 +-#define RPV1_PACKET_VARIABLE -1 ++#define RPV1_PACKET_NONEXISTENT uint32_t(-2) ++#define RPV1_PACKET_VARIABLE uint32_t(-1) + + static uint32_t body_size[6] = { + RPV1_PACKET_NONEXISTENT, /* 0: reserved */ diff --git a/abiword-3.0.1-gnutls.patch b/abiword-3.0.1-gnutls.patch new file mode 100644 index 0000000..9b282c0 --- /dev/null +++ b/abiword-3.0.1-gnutls.patch @@ -0,0 +1,23 @@ +Index: plugins/collab/backends/service/xp/tls_tunnel.cpp +=================================================================== +--- plugins/collab/backends/service/xp/tls_tunnel.cpp (revision 35191) ++++ plugins/collab/backends/service/xp/tls_tunnel.cpp (working copy) +@@ -306,9 +306,6 @@ + disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr); + } + +-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 }; +-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 }; +- + // FIXME: this clientproxy can only handle 1 SSL connection at the same time + ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, + const std::string& ca_file, bool check_hostname) +@@ -400,8 +397,6 @@ + // setup session + return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t()); + return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t()); +- return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t()); +- return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t()); + return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t()); + + // setup transport diff --git a/abiword.spec b/abiword.spec index 32a8cc4..ebcf758 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -25,6 +25,9 @@ Patch4: abiword-3.0.0-link-grammar-5.patch Patch5: abiword-3.0.0-link-grammar-5-second.patch Patch6: abiword-3.0.0-libwp.patch Patch7: abiword-3.0.1-libwps-0.4.patch +Patch8: abiword-3.0.1-gnutls.patch +Patch9: abiword-3.0.1-gcc6.patch +Patch10: abiword-3.0.1-fixwps.patch BuildRequires: autoconf BuildRequires: automake @@ -115,6 +118,9 @@ Python bindings for developing with libabiword %patch5 -p1 -b .link-grammar-5-second %patch6 -p1 -b .libwp %patch7 -p1 -b .libwps-0.4 +%patch8 -p0 -b .gnutls +%patch9 -p0 -b .gcc6 +%patch10 -p1 -b .wps2 # setup abiword documentation %setup -q -T -b 1 -n abiword-docs-%{version} @@ -124,8 +130,7 @@ Python bindings for developing with libabiword # build libabiword and abiword cd $RPM_BUILD_DIR/abiword-%{version} -aclocal -I. -autoconf +autoreconf -vif %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection # Build non SMP due to issues with gobject-introspection builds @@ -252,6 +257,10 @@ fi %{python_sitearch}/* %changelog +* Sun Apr 10 2016 Peter Robinson 1:3.0.1-10 +- Add patches to fix building with newer gnutls and gcc6 +- Add patch to fix Wordperfect support + * Wed Feb 03 2016 Fedora Release Engineering - 1:3.0.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 4d3e79383d0faf2858ec89e334d72e830c9b7368 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 10 Apr 2016 20:32:49 +0100 Subject: [PATCH 13/84] fix parallel build (thanks yselkowi) rhbz 1214395 --- abiword-3.0.1-parallel-make.patch | 11 +++++++++++ abiword.spec | 12 ++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 abiword-3.0.1-parallel-make.patch diff --git a/abiword-3.0.1-parallel-make.patch b/abiword-3.0.1-parallel-make.patch new file mode 100644 index 0000000..57608cb --- /dev/null +++ b/abiword-3.0.1-parallel-make.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile.am 2013-02-19 18:39:42.000000000 -0600 ++++ b/src/Makefile.am 2015-04-21 21:36:37.504001500 -0500 +@@ -168,7 +168,7 @@ if HAVE_INTROSPECTION + + INTROSPECTION_GIRS += Abi-@ABIWORD_SERIES@.gir + +-Abi_@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile ++Abi-@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile + Abi_@ABI_SUB_SERIES@_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gsf-1 + Abi_@ABI_SUB_SERIES@_gir_CFLAGS = $(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS) + Abi_@ABI_SUB_SERIES@_gir_LIBS = libabiword-@ABIWORD_SERIES@.la diff --git a/abiword.spec b/abiword.spec index ebcf758..56a7a76 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -28,6 +28,7 @@ Patch7: abiword-3.0.1-libwps-0.4.patch Patch8: abiword-3.0.1-gnutls.patch Patch9: abiword-3.0.1-gcc6.patch Patch10: abiword-3.0.1-fixwps.patch +Patch11: abiword-3.0.1-parallel-make.patch BuildRequires: autoconf BuildRequires: automake @@ -121,6 +122,7 @@ Python bindings for developing with libabiword %patch8 -p0 -b .gnutls %patch9 -p0 -b .gcc6 %patch10 -p1 -b .wps2 +%patch11 -p1 -b .pb # setup abiword documentation %setup -q -T -b 1 -n abiword-docs-%{version} @@ -133,9 +135,8 @@ cd $RPM_BUILD_DIR/abiword-%{version} autoreconf -vif %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection -# Build non SMP due to issues with gobject-introspection builds -# make %{?_smp_mflags} V=1 -make V=1 + +make %{?_smp_mflags} V=1 # build the documentation cd $RPM_BUILD_DIR/abiword-docs-%{version} @@ -257,6 +258,9 @@ fi %{python_sitearch}/* %changelog +* Sun Apr 10 2016 Peter Robinson 1:3.0.1-11 +- fix parallel build (thanks yselkowi) rhbz 1214395 + * Sun Apr 10 2016 Peter Robinson 1:3.0.1-10 - Add patches to fix building with newer gnutls and gcc6 - Add patch to fix Wordperfect support From 35523bd83d815f7aff0e293c3036a5e76f75f444 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:29:21 +0000 Subject: [PATCH 14/84] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 56a7a76..7554713 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -258,6 +258,9 @@ fi %{python_sitearch}/* %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1:3.0.1-12 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Sun Apr 10 2016 Peter Robinson 1:3.0.1-11 - fix parallel build (thanks yselkowi) rhbz 1214395 From 6f5379884d312f506652df769cc25578730a4ac9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 29 Nov 2016 23:48:40 +0000 Subject: [PATCH 15/84] 3.0.2 --- abiword-3.0.0-libwp.patch | 36 --- abiword-3.0.0-link-grammar-5-second.patch | 35 --- abiword-3.0.0-link-grammar-5.patch | 45 ---- abiword-3.0.1-fixwps.patch | 31 --- abiword-3.0.1-gcc6.patch | 263 ---------------------- abiword-3.0.1-gnutls.patch | 23 -- abiword-3.0.1-libwps-0.4.patch | 54 ----- abiword-3.0.1-parallel-make.patch | 11 - abiword.spec | 29 +-- sources | 4 +- 10 files changed, 10 insertions(+), 521 deletions(-) delete mode 100644 abiword-3.0.0-libwp.patch delete mode 100644 abiword-3.0.0-link-grammar-5-second.patch delete mode 100644 abiword-3.0.0-link-grammar-5.patch delete mode 100644 abiword-3.0.1-fixwps.patch delete mode 100644 abiword-3.0.1-gcc6.patch delete mode 100644 abiword-3.0.1-gnutls.patch delete mode 100644 abiword-3.0.1-libwps-0.4.patch delete mode 100644 abiword-3.0.1-parallel-make.patch diff --git a/abiword-3.0.0-libwp.patch b/abiword-3.0.0-libwp.patch deleted file mode 100644 index 9f269bd..0000000 --- a/abiword-3.0.0-libwp.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9734c2cc2638b16cc9b9c33adb2fbe5b793226f5 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 6 Jun 2015 18:43:14 +0200 -Subject: [PATCH] fix libwp? detection - ---- - plugin-configure.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugin-configure.m4 b/plugin-configure.m4 -index 54998fb..92e4ec2 100644 ---- a/plugin-configure.m4 -+++ b/plugin-configure.m4 -@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS]) - AC_SUBST([BMP_LIBS]) - - --wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" -+wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0" - wpg_deps="no" - - if test "$enable_wpg" != ""; then -@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS]) - AC_SUBST([AIKSAURUS_LIBS]) - - --wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' -+wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req" -+wordperfect_wps_pkgs='libwps-0.3' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= --- -2.4.2 - diff --git a/abiword-3.0.0-link-grammar-5-second.patch b/abiword-3.0.0-link-grammar-5-second.patch deleted file mode 100644 index c471c74..0000000 --- a/abiword-3.0.0-link-grammar-5-second.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig 2014-06-30 08:21:30.000000000 -0500 -+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp 2014-06-30 08:27:01.000000000 -0500 -@@ -220,6 +220,7 @@ bool LinkGrammarWrap::parseSentence(Piec - pErr = NULL; - } - -+#ifdef DEAD_DEBUG_CODE - // for(i=0; i< pT->m_vecGrammarErrors.getItemCount(); i++) - // { - // pErr = pT->m_vecGrammarErrors.getNthItem(i); -@@ -227,15 +228,10 @@ bool LinkGrammarWrap::parseSentence(Piec - // } - UT_UTF8String sErr = linkage_get_violation_name(linkage); - // UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str())); -- UT_sint32 count = linkage_get_num_sublinkages(linkage); - // - // Find linkages with violations - // -- for(i=0; im_iErrLow = iLow; -- pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i)); -+ pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i)); - pWordMap->m_iWordNum = i; - vecMapOfWords.addItem(pWordMap); - bool bNew = false; -- if(!sentence_nth_word_has_disjunction(sent, i)) -- { -+ - //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string)); - if(pErr == NULL) - { -@@ -167,7 +166,7 @@ bool LinkGrammarWrap::parseSentence(Piec - } - pErr = new AbiGrammarError(); - } -- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)); -+ iHigh = iLow + strlen(linkage_get_word(linkage, i)); - pErr->m_iErrLow = iLow + iOff -1; - pErr->m_iErrHigh = iHigh + iOff -1; - if(pErr->m_iErrLow < 0) -@@ -188,7 +187,7 @@ bool LinkGrammarWrap::parseSentence(Piec - // - // Expand the sqiggle - // -- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff; -+ iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff; - pErr->m_iErrHigh = iHigh; - if(pErr->m_iErrHigh < totlen-1) - { -@@ -196,8 +195,7 @@ bool LinkGrammarWrap::parseSentence(Piec - } - pErr->m_iWordNum = i; - } -- } -- iLow += strlen(sentence_get_nth_word(sent, i)); -+ iLow += strlen(linkage_get_word(linkage, i)); - } - // - // No NULL links but still an error , mark the whole sentence bad. diff --git a/abiword-3.0.1-fixwps.patch b/abiword-3.0.1-fixwps.patch deleted file mode 100644 index 2929d5b..0000000 --- a/abiword-3.0.1-fixwps.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- abiword-3.0.1/plugin-configure.m4.orig 2016-04-10 14:22:18.271356761 +0100 -+++ abiword-3.0.1/plugin-configure.m4 2016-04-10 14:24:22.493303398 +0100 -@@ -1355,7 +1355,7 @@ - AC_SUBST([BMP_LIBS]) - - --wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0" -+wpg_pkgs="libwpg-0.3 $gsf_req" - wpg_deps="no" - - if test "$enable_wpg" != ""; then -@@ -1469,8 +1469,8 @@ - AC_SUBST([AIKSAURUS_LIBS]) - - --wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.4' -+wordperfect_pkgs="libwpd-0.10 $gsf_req" -+wordperfect_wps_pkgs='libwps-0.3' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -@@ -1499,7 +1499,7 @@ - - PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ], - [ -- wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs" -+ wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs" - WPS_DEFINE=" -DHAVE_LIBWPS" - ]) - diff --git a/abiword-3.0.1-gcc6.patch b/abiword-3.0.1-gcc6.patch deleted file mode 100644 index cc14250..0000000 --- a/abiword-3.0.1-gcc6.patch +++ /dev/null @@ -1,263 +0,0 @@ -Index: src/af/xap/cocoa/xap_CocoaApp.h -=================================================================== ---- src/af/xap/cocoa/xap_CocoaApp.h (revision 35181) -+++ src/af/xap/cocoa/xap_CocoaApp.h (working copy) -@@ -65,7 +65,7 @@ - virtual void copyToClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard = true) = 0; - virtual void pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard, bool bHonorFormatting = true) = 0; - virtual bool canPasteFromClipboard() = 0; -- virtual const char * getUserPrivateDirectory(); -+ virtual const char * getUserPrivateDirectory() const; - virtual bool findAbiSuiteBundleFile(std::string & path, const char * filename, const char * subdir = 0); // checks only bundle - virtual bool findAbiSuiteLibFile(std::string & path, const char * filename, const char * subdir = 0); - virtual bool findAbiSuiteAppFile(std::string & path, const char * filename, const char * subdir = 0); // doesn't check user-dir -Index: src/af/xap/cocoa/xap_CocoaApp.cpp -=================================================================== ---- src/af/xap/cocoa/xap_CocoaApp.cpp (revision 35181) -+++ src/af/xap/cocoa/xap_CocoaApp.cpp (working copy) -@@ -192,7 +192,7 @@ - *flags = m_geometry.flags; - } - --const char * XAP_CocoaApp::getUserPrivateDirectory() -+const char * XAP_CocoaApp::getUserPrivateDirectory() const - { - static const char * szAbiDir = "Library/Application Support/AbiSuite"; - -Index: src/af/xap/gtk/xap_UnixApp.h -=================================================================== ---- src/af/xap/gtk/xap_UnixApp.h (revision 35181) -+++ src/af/xap/gtk/xap_UnixApp.h (working copy) -@@ -73,7 +73,7 @@ - virtual void pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard, bool bHonorFormatting = true) = 0; - virtual bool canPasteFromClipboard() = 0; - void migrate(const char *oldName, const char *newName, const char *path) const; -- virtual const char * getUserPrivateDirectory(); -+ virtual const char * getUserPrivateDirectory() const; - - virtual void setSelectionStatus(AV_View * pView) = 0; - virtual void clearSelection() = 0; -Index: src/af/xap/gtk/xap_UnixApp.cpp -=================================================================== ---- src/af/xap/gtk/xap_UnixApp.cpp (revision 35181) -+++ src/af/xap/gtk/xap_UnixApp.cpp (working copy) -@@ -207,70 +207,60 @@ - } - - // This should be removed at some time. --void XAP_UnixApp::migrate (const char *oldName, const char *newName, const char *path) const -+void XAP_UnixApp::migrate(const char *oldName, -+ const char *newName, const char *path) const - { -- if (path && newName && oldName && (*oldName == '/')) -- { -- char *old = new char[strlen(path) - strlen(newName) + strlen(oldName)]; -- -- if (old) -- { -- size_t len = strrchr(path, '/') - path; -- strncpy(old, path, len); -- old[len] = 0; -- strcat(old, oldName); -+ if (path && newName && oldName && (*oldName == '/')) { - -- if (g_access(old, F_OK) == 0) -- { -- UT_WARNINGMSG(("Renaming: %s -> %s\n", old, path)); -- g_rename(old, path); -- } -- -- delete[] old; -- } -- } -+ const char* end = strrchr(path, '/'); -+ if (!end) { -+ UT_WARNINGMSG(("invalid path '%s', '/' not found", path)); -+ return; -+ } -+ -+ std::string old(path, end); -+ old += oldName; -+ -+ if (g_access(old.c_str(), F_OK) == 0) { -+ UT_WARNINGMSG(("Renaming: %s -> %s\n", old.c_str(), path)); -+ g_rename(old.c_str(), path); -+ } -+ } - } -- --const char * XAP_UnixApp::getUserPrivateDirectory() -+ -+const char * XAP_UnixApp::getUserPrivateDirectory() const - { -- /* return a pointer to a static buffer */ -- static char *buf = NULL; -+ /* return a pointer to a static buffer */ -+ static std::string private_dir; - -- if (buf == NULL) -- { -- const char * szAbiDir = "abiword"; -- const char * szCfgDir = ".config"; -+ if (private_dir.empty()) { -+ const char * szAbiDir = "abiword"; -+ const char * szCfgDir = ".config"; - -- const char * szXDG = getenv("XDG_CONFIG_HOME"); -- if (!szXDG || !*szXDG) { -- const char * szHome = getenv("HOME"); -- if (!szHome || !*szHome) -- szHome = "./"; -+ const char * szXDG = getenv("XDG_CONFIG_HOME"); -+ if (!szXDG || !*szXDG) { -+ const char * szHome = getenv("HOME"); -+ if (!szHome || !*szHome) -+ szHome = "./"; - -- buf = new char[strlen(szHome)+strlen(szCfgDir)+strlen(szAbiDir)+4]; -+ private_dir = szHome; -+ if (szHome[strlen(szHome)-1] != '/') { -+ private_dir.push_back('/'); -+ } -+ private_dir += szCfgDir; -+ } else { -+ private_dir = szXDG; -+ } - -- strcpy(buf, szHome); -- if (buf[strlen(buf)-1] != '/') -- strcat(buf, "/"); -- strcat(buf, szCfgDir); -- } else { -- buf = new char[strlen(szXDG)+strlen(szAbiDir)+4]; -- strcpy(buf, szXDG); -- } -+ private_dir += '/'; -+ private_dir += szAbiDir; - -- strcat(buf, "/"); -- strcat(buf, szAbiDir); -- --#ifdef PATH_MAX -- if (strlen(buf) >= PATH_MAX) -- DELETEPV(buf); --#endif -- -- // migration / legacy -- migrate("/AbiSuite", szAbiDir, buf); -+ // migration / legacy -+ // XXX shouldn't that be /.AbiSuite ? -+ migrate("/AbiSuite", szAbiDir, private_dir.c_str()); - } - -- return buf; -+ return private_dir.c_str(); - } - - -Index: src/af/xap/xp/xap_App.h -=================================================================== ---- src/af/xap/xp/xap_App.h (revision 35181) -+++ src/af/xap/xp/xap_App.h (working copy) -@@ -178,7 +178,7 @@ - - virtual const XAP_StringSet * getStringSet() const = 0; - virtual void migrate(const char *oldName, const char *newName, const char *path) const; -- virtual const char * getUserPrivateDirectory() = 0; -+ virtual const char * getUserPrivateDirectory() const = 0; - virtual const char * getAbiSuiteLibDir() const; - virtual const char * getAbiSuiteAppDir() const = 0; - virtual bool findAbiSuiteLibFile(std::string & path, const char * filename, const char * subdir = 0); -Index: src/af/xap/win/xap_Win32App.h -=================================================================== ---- src/af/xap/win/xap_Win32App.h (revision 35181) -+++ src/af/xap/win/xap_Win32App.h (working copy) -@@ -65,7 +65,7 @@ - virtual void pasteFromClipboard(PD_DocumentRange * pDocRange, bool, bool) = 0; - virtual bool canPasteFromClipboard(void) = 0; - virtual void cacheCurrentSelection(AV_View *) = 0; -- virtual const char * getUserPrivateDirectory(void); -+ virtual const char * getUserPrivateDirectory(void) const; - - virtual HICON getIcon(void) = 0; - virtual HICON getSmallIcon(void) = 0; -Index: src/af/xap/win/xap_Win32App.cpp -=================================================================== ---- src/af/xap/win/xap_Win32App.cpp (revision 35181) -+++ src/af/xap/win/xap_Win32App.cpp (working copy) -@@ -238,7 +238,7 @@ - return result; - } - --const char * XAP_Win32App::getUserPrivateDirectory(void) -+const char * XAP_Win32App::getUserPrivateDirectory(void) const - { - /* return a pointer to a static buffer */ - -Index: configure.ac -=================================================================== ---- configure.ac (revision 35181) -+++ configure.ac (working copy) -@@ -616,7 +616,7 @@ - # - - # We need libpng --for l in libpng libpng14 libpng12; do -+for l in libpng libpng16 libpng14 libpng12; do - AC_MSG_CHECKING(for $l) - if $PKG_CONFIG --exists $l ; then - AC_MSG_RESULT(yes) -Index: plugins/xslfo/xp/ie_exp_XSL-FO.cpp -=================================================================== ---- plugins/xslfo/xp/ie_exp_XSL-FO.cpp (revision 35181) -+++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp (working copy) -@@ -1451,7 +1451,7 @@ - { \ - UT_UTF8String esc = szValue; \ - esc.escapeXML(); \ -- buf += " "x"=\""; \ -+ buf += " " x"=\""; \ - buf += esc.utf8_str(); \ - buf += "\""; \ - } -Index: plugins/latex/xp/ie_exp_LaTeX.cpp -=================================================================== ---- plugins/latex/xp/ie_exp_LaTeX.cpp (revision 35181) -+++ plugins/latex/xp/ie_exp_LaTeX.cpp (working copy) -@@ -1330,7 +1330,7 @@ - m_pie->write(sBuf.c_str(),sBuf.size()); - } - --#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true; -+#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true; - #define SUBd(a,who) case a: subst = who; return true; - static bool _convertLettersToSymbols(char c, const char *& subst) - { -Index: plugins/collab/backends/service/xp/soa_soup.cpp -=================================================================== ---- plugins/collab/backends/service/xp/soa_soup.cpp (revision 35181) -+++ plugins/collab/backends/service/xp/soa_soup.cpp (working copy) -@@ -163,7 +163,7 @@ - - static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) { - if (!sess.m_session || !sess.m_msg ) -- return soa::GenericPtr(); -+ return false; - - guint status = soup_session_send_message (sess.m_session, sess.m_msg); - if (!(SOUP_STATUS_IS_SUCCESSFUL (status) || -Index: plugins/collab/backends/service/xp/RealmProtocol.cpp -=================================================================== ---- plugins/collab/backends/service/xp/RealmProtocol.cpp (revision 35181) -+++ plugins/collab/backends/service/xp/RealmProtocol.cpp (working copy) -@@ -6,8 +6,8 @@ - - #define MAX_PACKET_DATA_SIZE 64*1024*1024 - --#define RPV1_PACKET_NONEXISTENT -2 --#define RPV1_PACKET_VARIABLE -1 -+#define RPV1_PACKET_NONEXISTENT uint32_t(-2) -+#define RPV1_PACKET_VARIABLE uint32_t(-1) - - static uint32_t body_size[6] = { - RPV1_PACKET_NONEXISTENT, /* 0: reserved */ diff --git a/abiword-3.0.1-gnutls.patch b/abiword-3.0.1-gnutls.patch deleted file mode 100644 index 9b282c0..0000000 --- a/abiword-3.0.1-gnutls.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: plugins/collab/backends/service/xp/tls_tunnel.cpp -=================================================================== ---- plugins/collab/backends/service/xp/tls_tunnel.cpp (revision 35191) -+++ plugins/collab/backends/service/xp/tls_tunnel.cpp (working copy) -@@ -306,9 +306,6 @@ - disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr); - } - --static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 }; --static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 }; -- - // FIXME: this clientproxy can only handle 1 SSL connection at the same time - ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, - const std::string& ca_file, bool check_hostname) -@@ -400,8 +397,6 @@ - // setup session - return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t()); - return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t()); -- return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t()); -- return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t()); - return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t()); - - // setup transport diff --git a/abiword-3.0.1-libwps-0.4.patch b/abiword-3.0.1-libwps-0.4.patch deleted file mode 100644 index 292f681..0000000 --- a/abiword-3.0.1-libwps-0.4.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 6 Jun 2015 21:48:02 +0200 -Subject: [PATCH] adapt to libwps 0.4 - ---- - plugin-configure.m4 | 2 +- - plugins/wordperfect/plugin.m4 | 2 +- - plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/plugin-configure.m4 b/plugin-configure.m4 -index 2757f4a..093fbcb 100644 ---- a/plugin-configure.m4 -+++ b/plugin-configure.m4 -@@ -1470,7 +1470,7 @@ AC_SUBST([AIKSAURUS_LIBS]) - - - wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.3' -+wordperfect_wps_pkgs='libwps-0.4' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4 -index 0aadbaf..bc32d48 100644 ---- a/plugins/wordperfect/plugin.m4 -+++ b/plugins/wordperfect/plugin.m4 -@@ -1,6 +1,6 @@ - - wordperfect_pkgs="libwpd-0.10 $gsf_req" --wordperfect_wps_pkgs='libwps-0.3' -+wordperfect_wps_pkgs='libwps-0.4' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp -index bd19971..3e69f79 100644 ---- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp -+++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp -@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input) - AbiWordperfectInputStream gsfInput(input); - - libwps::WPSKind kind; -- libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind); -+ libwps::WPSCreator creator; -+ bool needsEncoding = false; -+ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding); - - if (kind != libwps::WPS_TEXT) - confidence = libwps::WPS_CONFIDENCE_NONE; --- -2.4.2 - diff --git a/abiword-3.0.1-parallel-make.patch b/abiword-3.0.1-parallel-make.patch deleted file mode 100644 index 57608cb..0000000 --- a/abiword-3.0.1-parallel-make.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile.am 2013-02-19 18:39:42.000000000 -0600 -+++ b/src/Makefile.am 2015-04-21 21:36:37.504001500 -0500 -@@ -168,7 +168,7 @@ if HAVE_INTROSPECTION - - INTROSPECTION_GIRS += Abi-@ABIWORD_SERIES@.gir - --Abi_@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile -+Abi-@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile - Abi_@ABI_SUB_SERIES@_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gsf-1 - Abi_@ABI_SUB_SERIES@_gir_CFLAGS = $(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS) - Abi_@ABI_SUB_SERIES@_gir_LIBS = libabiword-@ABIWORD_SERIES@.la diff --git a/abiword.spec b/abiword.spec index 7554713..e13352a 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,12 +1,12 @@ %define majorversion 3 %define minorversion 0 -%define microversion 1 +%define microversion 2 %define svnver 0 Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 12%{?dist} +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -21,14 +21,6 @@ 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.0-link-grammar-5.patch -Patch5: abiword-3.0.0-link-grammar-5-second.patch -Patch6: abiword-3.0.0-libwp.patch -Patch7: abiword-3.0.1-libwps-0.4.patch -Patch8: abiword-3.0.1-gnutls.patch -Patch9: abiword-3.0.1-gcc6.patch -Patch10: abiword-3.0.1-fixwps.patch -Patch11: abiword-3.0.1-parallel-make.patch BuildRequires: autoconf BuildRequires: automake @@ -115,17 +107,9 @@ Python bindings for developing with libabiword %patch1 -p1 -b .desktop %patch2 -p1 -b .boolean %patch3 -p0 -b .librevenge -%patch4 -p1 -b .link-grammar-5 -%patch5 -p1 -b .link-grammar-5-second -%patch6 -p1 -b .libwp -%patch7 -p1 -b .libwps-0.4 -%patch8 -p0 -b .gnutls -%patch9 -p0 -b .gcc6 -%patch10 -p1 -b .wps2 -%patch11 -p1 -b .pb # setup abiword documentation -%setup -q -T -b 1 -n abiword-docs-%{version} +%setup -q -T -b 1 -n abiword-docs-3.0.1 %patch0 -p1 -b .windowshelppaths %build @@ -139,7 +123,7 @@ autoreconf -vif make %{?_smp_mflags} V=1 # build the documentation -cd $RPM_BUILD_DIR/abiword-docs-%{version} +cd $RPM_BUILD_DIR/abiword-docs-3.0.1 ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh %install @@ -192,7 +176,7 @@ SentUpstream: 2014-09-17 EOF # install the documentation -cd $RPM_BUILD_DIR/abiword-docs-%{version} +cd $RPM_BUILD_DIR/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) @@ -258,6 +242,9 @@ fi %{python_sitearch}/* %changelog +* Tue Nov 29 2016 Peter Robinson 1:3.0.2-1 +- Update to 3.0.2 stable + * Tue Jul 19 2016 Fedora Release Engineering - 1:3.0.1-12 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index 5be6e78..d785acb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f3f8052e7b4979a43b75775a381e6cb8 abiword-3.0.1.tar.gz -c9b78cb5f9c415ed63ce1cf9874fa8a4 abiword-docs-3.0.1.tar.gz +cda6dd58c747c133b421cc7eb18f5796 abiword-3.0.2.tar.gz +c92c0e1e2081db20757231a53d80c338 abiword-docs-3.0.2.tar.gz From e2668f6c31009eeb6f2e31ed4eaccd1642d39a3d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 30 Nov 2016 02:40:15 +0000 Subject: [PATCH 16/84] Run ldconfig for libabiword --- abiword.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index e13352a..9cbc7f9 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -208,6 +208,10 @@ fi /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +%post -n libabiword -p /sbin/ldconfig + +%postun -n libabiword -p /sbin/ldconfig + %files %{_bindir}/abiword %{_datadir}/appdata/*.appdata.xml @@ -242,6 +246,9 @@ fi %{python_sitearch}/* %changelog +* Tue Nov 29 2016 Peter Robinson 1:3.0.2-2 +- Run ldconfig for libabiword + * Tue Nov 29 2016 Peter Robinson 1:3.0.2-1 - Update to 3.0.2 stable From 6a88dfb3cc7af339374b3c378bead10a133368c8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 8 Dec 2016 03:03:22 +0000 Subject: [PATCH 17/84] Fix the black drawing regression with Gtk3.22 --- ...d-3.0.2-fix-black-drawing-regression.patch | 54 +++++++++++++++++++ abiword.spec | 7 ++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 abiword-3.0.2-fix-black-drawing-regression.patch diff --git a/abiword-3.0.2-fix-black-drawing-regression.patch b/abiword-3.0.2-fix-black-drawing-regression.patch new file mode 100644 index 0000000..dbce8c6 --- /dev/null +++ b/abiword-3.0.2-fix-black-drawing-regression.patch @@ -0,0 +1,54 @@ +From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001 +From: Hubert Figuiere +Date: Thu, 8 Dec 2016 02:03:10 +0000 +Subject: [PATCH] Bug 13815 - draw event should return TRUE + +This fix the black drawing regression with Gtk3.22 + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 +--- + src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++--- + src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp +index 780000e..10f8e00 100644 +--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp ++++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp +@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g + } + + #if GTK_CHECK_VERSION(3,0,0) +-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) ++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) + #else +-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) ++gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + #endif + { + XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); +@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + pView->draw(&rClip); + #endif + } +- return FALSE; ++ return TRUE; + } + + static bool bScrollWait = false; +diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h +index 30ee5d8..a0ff57f 100644 +--- a/src/af/xap/gtk/xap_UnixFrameImpl.h ++++ b/src/af/xap/gtk/xap_UnixFrameImpl.h +@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl + static gint key_release_event(GtkWidget* w, GdkEventKey* e); + static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); + #if GTK_CHECK_VERSION(3,0,0) +- static gint draw(GtkWidget * w, cairo_t * cr); ++ static gboolean draw(GtkWidget * w, cairo_t * cr); + #else +- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); ++ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent); + #endif + static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p); + static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/); diff --git a/abiword.spec b/abiword.spec index 9cbc7f9..83fc03c 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -21,6 +21,7 @@ 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-fix-black-drawing-regression.patch BuildRequires: autoconf BuildRequires: automake @@ -107,6 +108,7 @@ Python bindings for developing with libabiword %patch1 -p1 -b .desktop %patch2 -p1 -b .boolean %patch3 -p0 -b .librevenge +%patch4 -p1 -b .black # setup abiword documentation %setup -q -T -b 1 -n abiword-docs-3.0.1 @@ -246,6 +248,9 @@ fi %{python_sitearch}/* %changelog +* Wed Dec 7 2016 Peter Robinson 1:3.0.2-3 +- Fix the black drawing regression with Gtk3.22 + * Tue Nov 29 2016 Peter Robinson 1:3.0.2-2 - Run ldconfig for libabiword From 1e57ee2ff4b7e6b245dcdee70d878397fef32148 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Jan 2017 17:30:23 +0100 Subject: [PATCH 18/84] Rebuild for readline 7.x Signed-off-by: Igor Gnatenko --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 83fc03c..53f7e8d 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -248,6 +248,9 @@ fi %{python_sitearch}/* %changelog +* Thu Jan 12 2017 Igor Gnatenko - 1:3.0.2-4 +- Rebuild for readline 7.x + * Wed Dec 7 2016 Peter Robinson 1:3.0.2-3 - Fix the black drawing regression with Gtk3.22 From 0d7cffe1ae9c0886f7116929a764752283c2ea8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:41:11 +0000 Subject: [PATCH 19/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 53f7e8d..11b3a75 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -248,6 +248,9 @@ fi %{python_sitearch}/* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1:3.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jan 12 2017 Igor Gnatenko - 1:3.0.2-4 - Rebuild for readline 7.x From 6eba5d500bde370ff4584c0206b4a31b551da3c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:10:09 +0000 Subject: [PATCH 20/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 11b3a75..3eed95c 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -248,6 +248,9 @@ fi %{python_sitearch}/* %changelog +* Mon May 15 2017 Fedora Release Engineering - 1:3.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1:3.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 5d90ad5938a4ae0229b38805e4423272c007c81d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:31:24 +0000 Subject: [PATCH 21/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 3eed95c..d91325b 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -248,6 +248,9 @@ fi %{python_sitearch}/* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1:3.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 15 2017 Fedora Release Engineering - 1:3.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From 04a3df853800cfb1dc64afdcc2c2b8d07d8cdff4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:21:04 +0000 Subject: [PATCH 22/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index d91325b..d7d4d33 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -248,6 +248,9 @@ fi %{python_sitearch}/* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1:3.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1:3.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8d0823f81e1c2a474227a97f957e9a34c707f624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 12 Aug 2017 14:07:10 -0400 Subject: [PATCH 23/84] Fix build When the docs are unpacked as a separate directory, debugsources generation fails. Simply moving it one level down fixes the issue. --- abiword.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/abiword.spec b/abiword.spec index d7d4d33..6bb11aa 100644 --- a/abiword.spec +++ b/abiword.spec @@ -102,7 +102,7 @@ Python bindings for developing with libabiword %prep # setup abiword -%setup -q +%setup -q -a 1 # patch abiword %patch1 -p1 -b .desktop @@ -111,7 +111,7 @@ Python bindings for developing with libabiword %patch4 -p1 -b .black # setup abiword documentation -%setup -q -T -b 1 -n abiword-docs-3.0.1 +cd abiword-docs-3.0.1 %patch0 -p1 -b .windowshelppaths %build @@ -125,7 +125,7 @@ autoreconf -vif make %{?_smp_mflags} V=1 # build the documentation -cd $RPM_BUILD_DIR/abiword-docs-3.0.1 +cd abiword-docs-3.0.1 ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh %install @@ -178,7 +178,7 @@ SentUpstream: 2014-09-17 EOF # install the documentation -cd $RPM_BUILD_DIR/abiword-docs-3.0.1 +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) From af79af3444a7b82963b08d6bfb8af11520924ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:38:00 -0400 Subject: [PATCH 24/84] Python 2 binary package renamed to python2-abiword --- abiword.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/abiword.spec b/abiword.spec index 6bb11aa..2aebc17 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -89,14 +89,15 @@ Requires: libabiword = %{epoch}:%{version}-%{release} Includes and definitions for developing with libabiword. -%package -n python-abiword +%package -n python2-abiword +%{?python_provide:%python_provide python2-abiword} Summary: Python bindings for developing with libabiword Group: Development/Libraries Requires: libabiword = %{epoch}:%{version}-%{release} Obsoletes: pyabiword <= 0.8.0 Provides: pyabiword > 0.8.0 -%description -n python-abiword +%description -n python2-abiword Python bindings for developing with libabiword @@ -244,10 +245,14 @@ fi %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %{_datadir}/gir-1.0/Abi-3.0.gir -%files -n python-abiword +%files -n python2-abiword %{python_sitearch}/* %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1:3.0.2-9 +- Python 2 binary package renamed to python2-abiword + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Wed Aug 02 2017 Fedora Release Engineering - 1:3.0.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From c4cf962a721aa4b1164d404d6425cc04f95ca06b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 7 Jan 2018 18:59:07 +0100 Subject: [PATCH 25/84] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- abiword.spec | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/abiword.spec b/abiword.spec index 2aebc17..81dfda9 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -193,24 +193,6 @@ install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiwo find %{buildroot} -name '*.la' -delete find %{buildroot} -name '*.a' -delete -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : -/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : -/usr/bin/update-desktop-database &> /dev/null || : - -%postun -/usr/bin/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : - /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : - /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : -/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - %post -n libabiword -p /sbin/ldconfig %postun -n libabiword -p /sbin/ldconfig @@ -249,6 +231,9 @@ fi %{python_sitearch}/* %changelog +* Sun Jan 07 2018 Igor Gnatenko - 1:3.0.2-10 +- Remove obsolete scriptlets + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1:3.0.2-9 - Python 2 binary package renamed to python2-abiword See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From b2119bb9933cf31339d2172a5ee045ea255f3527 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:45:12 +0000 Subject: [PATCH 26/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 81dfda9..019083c 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -231,6 +231,9 @@ find %{buildroot} -name '*.a' -delete %{python_sitearch}/* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1:3.0.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 07 2018 Igor Gnatenko - 1:3.0.2-10 - Remove obsolete scriptlets From 09ac06860aab257d78b5348682e5f7390acb10c1 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 7 Feb 2018 10:32:03 +0100 Subject: [PATCH 27/84] Update Python 2 dependency declarations to new packaging standards --- abiword.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/abiword.spec b/abiword.spec index 019083c..dbeffd0 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -56,9 +56,9 @@ BuildRequires: ots-devel BuildRequires: pkgconfig(libwps-0.4) BuildRequires: poppler-devel BuildRequires: popt-devel -BuildRequires: pygobject3 +BuildRequires: python2-gobject BuildRequires: python2-devel -BuildRequires: python-setuptools +BuildRequires: python2-setuptools BuildRequires: readline-devel BuildRequires: t1lib-devel BuildRequires: telepathy-glib-devel @@ -231,6 +231,10 @@ find %{buildroot} -name '*.a' -delete %{python_sitearch}/* %changelog +* Wed Feb 07 2018 Iryna Shcherbina - 1:3.0.2-12 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 1:3.0.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 643886bee77323a06607f0bc35322727f0af072a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 28 Feb 2018 11:33:50 +0000 Subject: [PATCH 28/84] rebuild for fribidi --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index dbeffd0..7bfbd1f 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -231,6 +231,9 @@ find %{buildroot} -name '*.a' -delete %{python_sitearch}/* %changelog +* Wed Feb 28 2018 Caolán McNamara - 1:3.0.2-13 +- rebuild for fribidi + * Wed Feb 07 2018 Iryna Shcherbina - 1:3.0.2-12 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From cb7c84aa099c22cb8c0d9f3fd72bf030298dacc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:55:55 +0000 Subject: [PATCH 29/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 7bfbd1f..640f2bc 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -231,6 +231,9 @@ find %{buildroot} -name '*.a' -delete %{python_sitearch}/* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1:3.0.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 28 2018 Caolán McNamara - 1:3.0.2-13 - rebuild for fribidi From d87466de81c72231906a6597758f37f28830bb71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 17 Jul 2018 16:38:36 +0200 Subject: [PATCH 30/84] Update Python macros to new packaging standards --- abiword.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/abiword.spec b/abiword.spec index 640f2bc..692c44a 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -228,9 +228,13 @@ find %{buildroot} -name '*.a' -delete %{_datadir}/gir-1.0/Abi-3.0.gir %files -n python2-abiword -%{python_sitearch}/* +%{python2_sitearch}/* %changelog +* Tue Jul 17 2018 Miro Hrončok - 1:3.0.2-15 +- Update Python macros to new packaging standards + (See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package) + * Thu Jul 12 2018 Fedora Release Engineering - 1:3.0.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 36022def7a4329a81ec435709cd5d88d55721cd8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:38:28 +0100 Subject: [PATCH 31/84] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- abiword.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/abiword.spec b/abiword.spec index 692c44a..e31c106 100644 --- a/abiword.spec +++ b/abiword.spec @@ -193,9 +193,7 @@ install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiwo find %{buildroot} -name '*.la' -delete find %{buildroot} -name '*.a' -delete -%post -n libabiword -p /sbin/ldconfig - -%postun -n libabiword -p /sbin/ldconfig +%ldconfig_scriptlets -n libabiword %files %{_bindir}/abiword From db7b21fe870fc6e8bd2f1d9299418da416f7d330 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 32/84] Remove obsolete Group tag Signed-off-by: Igor Gnatenko --- abiword.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/abiword.spec b/abiword.spec index e31c106..9ef65a7 100644 --- a/abiword.spec +++ b/abiword.spec @@ -8,7 +8,6 @@ Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} Release: 15%{?dist} Epoch: 1 -Group: Applications/Editors License: GPLv2+ URL: http://www.abisource.com/ @@ -74,7 +73,6 @@ while still remaining lean. %package -n libabiword Summary: Library for developing applications based on AbiWord's core -Group: System Environment/Libraries %description -n libabiword Library for developing applications based on AbiWord's core. @@ -82,7 +80,6 @@ Library for developing applications based on AbiWord's core. %package -n libabiword-devel Summary: Files for developing with libabiword -Group: Development/Libraries Requires: libabiword = %{epoch}:%{version}-%{release} %description -n libabiword-devel @@ -92,7 +89,6 @@ Includes and definitions for developing with libabiword. %package -n python2-abiword %{?python_provide:%python_provide python2-abiword} Summary: Python bindings for developing with libabiword -Group: Development/Libraries Requires: libabiword = %{epoch}:%{version}-%{release} Obsoletes: pyabiword <= 0.8.0 Provides: pyabiword > 0.8.0 From eac3def038536fab916305963df9a1245813b6ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:52:21 +0000 Subject: [PATCH 33/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 9ef65a7..5862ded 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.abisource.com/ @@ -225,6 +225,9 @@ find %{buildroot} -name '*.a' -delete %{python2_sitearch}/* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1:3.0.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 17 2018 Miro Hrončok - 1:3.0.2-15 - Update Python macros to new packaging standards (See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package) From 24b836ab12ea18ceecf37c2f4c0bf6881e0380d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 1 Feb 2019 11:29:05 +0100 Subject: [PATCH 34/84] Rebuilt for libwmf soname bump --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 5862ded..6e88dbc 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.abisource.com/ @@ -225,6 +225,9 @@ find %{buildroot} -name '*.a' -delete %{python2_sitearch}/* %changelog +* Fri Feb 01 2019 Björn Esser - 1:3.0.2-17 +- Rebuilt for libwmf soname bump + * Thu Jan 31 2019 Fedora Release Engineering - 1:3.0.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2faf172334005db4dae31b6dd105606e6307cc9d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 1 Feb 2019 11:32:35 +0100 Subject: [PATCH 35/84] Fix the build Add missing gcc-c++ build dep. --- abiword.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abiword.spec b/abiword.spec index 6e88dbc..b39b688 100644 --- a/abiword.spec +++ b/abiword.spec @@ -36,6 +36,7 @@ BuildRequires: desktop-file-utils BuildRequires: enchant-devel BuildRequires: flex BuildRequires: fribidi-devel +BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: goffice-devel BuildRequires: gtk3-devel From 452a13f81f5d4aa52b6224a54fa3b7318bc8345e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 1 Feb 2019 12:59:24 +0100 Subject: [PATCH 36/84] BR python-unversioned-command as a dirty workaround of severe FTBFS --- abiword.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/abiword.spec b/abiword.spec index b39b688..d941597 100644 --- a/abiword.spec +++ b/abiword.spec @@ -65,6 +65,10 @@ BuildRequires: telepathy-glib-devel BuildRequires: wv-devel BuildRequires: zlib-devel +# the python2 module deoesn't build without this +# TODO investigate, get rid of the depndency +BuildRequires: python-unversioned-command + Requires: libabiword = %{epoch}:%{version}-%{release} %description @@ -116,6 +120,8 @@ cd abiword-docs-3.0.1 # build libabiword and abiword cd $RPM_BUILD_DIR/abiword-%{version} +export PYTHON=%{__python2} + autoreconf -vif %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection @@ -128,6 +134,7 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh %install cd $RPM_BUILD_DIR/abiword-%{version} +export PYTHON=%{__python2} make install DESTDIR=%{buildroot} # Register as an application to be visible in the software center From 3fd463e8b7042591d3b06ce18a2e903d2ec2cb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 1 Feb 2019 12:56:43 +0100 Subject: [PATCH 37/84] Add patch to explicitly use python2 (#1671692) --- abiword-3.0.2-explicit-python2.patch | 8 ++++++++ abiword.spec | 14 ++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 abiword-3.0.2-explicit-python2.patch diff --git a/abiword-3.0.2-explicit-python2.patch b/abiword-3.0.2-explicit-python2.patch new file mode 100644 index 0000000..6c7db3c --- /dev/null +++ b/abiword-3.0.2-explicit-python2.patch @@ -0,0 +1,8 @@ +Index: abiword-3.0.2/src/gi-overrides/Makefile.am +=================================================================== +--- abiword-3.0.2.orig/src/gi-overrides/Makefile.am ++++ abiword-3.0.2/src/gi-overrides/Makefile.am +@@ -1,2 +1,2 @@ +-overridesdir = `python -c "import gi; print gi._overridesdir"` ++overridesdir = `$(PYTHON) -c "import gi; print gi._overridesdir"` + overrides_PYTHON = Abi.py diff --git a/abiword.spec b/abiword.spec index d941597..896c7e4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.abisource.com/ @@ -21,6 +21,7 @@ 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-fix-black-drawing-regression.patch +Patch5: abiword-3.0.2-explicit-python2.patch BuildRequires: autoconf BuildRequires: automake @@ -65,10 +66,6 @@ BuildRequires: telepathy-glib-devel BuildRequires: wv-devel BuildRequires: zlib-devel -# the python2 module deoesn't build without this -# TODO investigate, get rid of the depndency -BuildRequires: python-unversioned-command - Requires: libabiword = %{epoch}:%{version}-%{release} %description @@ -111,6 +108,7 @@ Python bindings for developing with libabiword %patch2 -p1 -b .boolean %patch3 -p0 -b .librevenge %patch4 -p1 -b .black +%patch5 -p1 -b .explicit_python2 # setup abiword documentation cd abiword-docs-3.0.1 @@ -120,8 +118,6 @@ cd abiword-docs-3.0.1 # build libabiword and abiword cd $RPM_BUILD_DIR/abiword-%{version} -export PYTHON=%{__python2} - autoreconf -vif %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection @@ -134,7 +130,6 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh %install cd $RPM_BUILD_DIR/abiword-%{version} -export PYTHON=%{__python2} make install DESTDIR=%{buildroot} # Register as an application to be visible in the software center @@ -233,6 +228,9 @@ find %{buildroot} -name '*.a' -delete %{python2_sitearch}/* %changelog +* Fri Feb 01 2019 Björn Esser - 1:3.0.2-18 +- Add patch to explicitly use python2 (#1671692) + * Fri Feb 01 2019 Björn Esser - 1:3.0.2-17 - Rebuilt for libwmf soname bump From baa03149a78b65e05ae442b8a8f85168b451083e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 1 Feb 2019 18:28:29 +0000 Subject: [PATCH 38/84] Rebuilt for fixed libwmf soname --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 896c7e4..66e5c60 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.abisource.com/ @@ -228,6 +228,9 @@ find %{buildroot} -name '*.a' -delete %{python2_sitearch}/* %changelog +* Fri Feb 01 2019 Caolán McNamara - 1:3.0.2-19 +- Rebuilt for fixed libwmf soname + * Fri Feb 01 2019 Björn Esser - 1:3.0.2-18 - Add patch to explicitly use python2 (#1671692) From d8495729ff1627873beaf61cdb7dd2c26e634cb2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:49 +0100 Subject: [PATCH 39/84] Rebuild for readline 8.0 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 66e5c60..96b61d2 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.abisource.com/ @@ -228,6 +228,9 @@ find %{buildroot} -name '*.a' -delete %{python2_sitearch}/* %changelog +* Sun Feb 17 2019 Igor Gnatenko - 1:3.0.2-20 +- Rebuild for readline 8.0 + * Fri Feb 01 2019 Caolán McNamara - 1:3.0.2-19 - Rebuilt for fixed libwmf soname From 9da8b49de700b5fa2bf9b3ceef6a67dfa67a7c2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:27:16 +0000 Subject: [PATCH 40/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 96b61d2..8e2cba1 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.abisource.com/ @@ -228,6 +228,9 @@ find %{buildroot} -name '*.a' -delete %{python2_sitearch}/* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1:3.0.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Igor Gnatenko - 1:3.0.2-20 - Rebuild for readline 8.0 From 6b1444b6f003116ffbb84ea531b8f17a4ba08937 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 22 Jan 2020 20:46:12 +0000 Subject: [PATCH 41/84] 3.0.4, python3 gobject introspection bindings --- abiword-3.0.2-explicit-python2.patch | 2 +- ...d-3.0.2-fix-black-drawing-regression.patch | 54 ------------------- abiword.spec | 45 ++++++++-------- sources | 4 +- 4 files changed, 26 insertions(+), 79 deletions(-) delete mode 100644 abiword-3.0.2-fix-black-drawing-regression.patch diff --git a/abiword-3.0.2-explicit-python2.patch b/abiword-3.0.2-explicit-python2.patch index 6c7db3c..49ff7b1 100644 --- a/abiword-3.0.2-explicit-python2.patch +++ b/abiword-3.0.2-explicit-python2.patch @@ -4,5 +4,5 @@ Index: abiword-3.0.2/src/gi-overrides/Makefile.am +++ abiword-3.0.2/src/gi-overrides/Makefile.am @@ -1,2 +1,2 @@ -overridesdir = `python -c "import gi; print gi._overridesdir"` -+overridesdir = `$(PYTHON) -c "import gi; print gi._overridesdir"` ++overridesdir = `$(PYTHON) -c "import gi; print(gi._overridesdir)"` overrides_PYTHON = Abi.py diff --git a/abiword-3.0.2-fix-black-drawing-regression.patch b/abiword-3.0.2-fix-black-drawing-regression.patch deleted file mode 100644 index dbce8c6..0000000 --- a/abiword-3.0.2-fix-black-drawing-regression.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001 -From: Hubert Figuiere -Date: Thu, 8 Dec 2016 02:03:10 +0000 -Subject: [PATCH] Bug 13815 - draw event should return TRUE - -This fix the black drawing regression with Gtk3.22 - -git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 ---- - src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++--- - src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -index 780000e..10f8e00 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g - } - - #if GTK_CHECK_VERSION(3,0,0) --gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) -+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) - #else --gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) -+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - #endif - { - XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); -@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - pView->draw(&rClip); - #endif - } -- return FALSE; -+ return TRUE; - } - - static bool bScrollWait = false; -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h -index 30ee5d8..a0ff57f 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.h -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h -@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl - static gint key_release_event(GtkWidget* w, GdkEventKey* e); - static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); - #if GTK_CHECK_VERSION(3,0,0) -- static gint draw(GtkWidget * w, cairo_t * cr); -+ static gboolean draw(GtkWidget * w, cairo_t * cr); - #else -- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); -+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent); - #endif - static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p); - static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/); diff --git a/abiword.spec b/abiword.spec index 8e2cba1..3bb06be 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,18 +1,18 @@ %define majorversion 3 %define minorversion 0 -%define microversion 2 +%define microversion 4 %define svnver 0 Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 21%{?dist} +Release: 1%{?dist} Epoch: 1 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-%{version}.tar.gz +Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-3.0.2.tar.gz Source11: abiword.mime Source12: abiword.keys Source13: abiword.xml @@ -20,8 +20,8 @@ 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-fix-black-drawing-regression.patch -Patch5: abiword-3.0.2-explicit-python2.patch +Patch4: abiword-3.0.2-explicit-python2.patch +Patch5: abiword-3.0.4-pygobject.patch BuildRequires: autoconf BuildRequires: automake @@ -41,7 +41,7 @@ BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: goffice-devel BuildRequires: gtk3-devel -BuildRequires: gtkmathview-devel +#BuildRequires: gtkmathview-devel BuildRequires: libgsf-devel BuildRequires: libpng-devel BuildRequires: librevenge-devel @@ -54,12 +54,13 @@ BuildRequires: libxslt-devel BuildRequires: link-grammar-devel BuildRequires: loudmouth-devel BuildRequires: ots-devel +BuildRequires: pkgconf-pkg-config BuildRequires: pkgconfig(libwps-0.4) BuildRequires: poppler-devel BuildRequires: popt-devel -BuildRequires: python2-gobject -BuildRequires: python2-devel -BuildRequires: python2-setuptools +BuildRequires: python3-gobject +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: readline-devel BuildRequires: t1lib-devel BuildRequires: telepathy-glib-devel @@ -88,14 +89,12 @@ Requires: libabiword = %{epoch}:%{version}-%{release} Includes and definitions for developing with libabiword. -%package -n python2-abiword -%{?python_provide:%python_provide python2-abiword} +%package -n python3-abiword +%{?python_provide:%python_provide python3-abiword} Summary: Python bindings for developing with libabiword Requires: libabiword = %{epoch}:%{version}-%{release} -Obsoletes: pyabiword <= 0.8.0 -Provides: pyabiword > 0.8.0 -%description -n python2-abiword +%description -n python3-abiword Python bindings for developing with libabiword @@ -107,8 +106,8 @@ Python bindings for developing with libabiword %patch1 -p1 -b .desktop %patch2 -p1 -b .boolean %patch3 -p0 -b .librevenge -%patch4 -p1 -b .black -%patch5 -p1 -b .explicit_python2 +%patch4 -p1 -b .explicit_python2 +%patch5 -p1 -b .pygo # setup abiword documentation cd abiword-docs-3.0.1 @@ -118,11 +117,9 @@ cd abiword-docs-3.0.1 # build libabiword and abiword cd $RPM_BUILD_DIR/abiword-%{version} -autoreconf -vif - %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection -make %{?_smp_mflags} V=1 +%{make_build} V=1 # build the documentation cd abiword-docs-3.0.1 @@ -130,7 +127,7 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh %install cd $RPM_BUILD_DIR/abiword-%{version} -make install DESTDIR=%{buildroot} +%{make_install} # Register as an application to be visible in the software center # @@ -224,10 +221,14 @@ find %{buildroot} -name '*.a' -delete %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %{_datadir}/gir-1.0/Abi-3.0.gir -%files -n python2-abiword -%{python2_sitearch}/* +%files -n python3-abiword +%{python3_sitearch}/* %changelog +* Fri Nov 29 2019 Peter Robinson 1:3.0.4-1 +- Update to 3.0.4 +- Move to python3 gobject introspection bindings + * Wed Jul 24 2019 Fedora Release Engineering - 1:3.0.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index d785acb..93895ad 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cda6dd58c747c133b421cc7eb18f5796 abiword-3.0.2.tar.gz -c92c0e1e2081db20757231a53d80c338 abiword-docs-3.0.2.tar.gz +SHA512 (abiword-3.0.4.tar.gz) = 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4 +SHA512 (abiword-docs-3.0.2.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5 From af40d2aae883f42122c5cf580e79153da17ddf81 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 22 Jan 2020 20:47:07 +0000 Subject: [PATCH 42/84] Disable gtkmathview plugins until requires issue is fixed --- abiword.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abiword.spec b/abiword.spec index 3bb06be..e7b1970 100644 --- a/abiword.spec +++ b/abiword.spec @@ -228,6 +228,7 @@ find %{buildroot} -name '*.a' -delete * Fri Nov 29 2019 Peter Robinson 1:3.0.4-1 - Update to 3.0.4 - Move to python3 gobject introspection bindings +- Disable gtkmathview plugins until requires issue is fixed * Wed Jul 24 2019 Fedora Release Engineering - 1:3.0.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a321b30d63633db0dd0416493743be69726d0cab Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 22 Jan 2020 21:01:27 +0000 Subject: [PATCH 43/84] add missing abiword-3.0.4-pygobject.patch --- abiword-3.0.4-pygobject.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 abiword-3.0.4-pygobject.patch diff --git a/abiword-3.0.4-pygobject.patch b/abiword-3.0.4-pygobject.patch new file mode 100644 index 0000000..0926131 --- /dev/null +++ b/abiword-3.0.4-pygobject.patch @@ -0,0 +1,22 @@ +From 51787d61993cb3981c18e4cf174fc229734fba1e Mon Sep 17 00:00:00 2001 +From: Jean Brefort +Date: Sun, 6 Dec 2015 11:04:10 +0000 +Subject: [PATCH] Update python override code. Fixes #13745 and #13746, thanks + to David Gutteridge. + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35171 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 +--- + src/gi-overrides/Abi.py | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/gi-overrides/Abi.py b/src/gi-overrides/Abi.py +index 666fd61bf4..e3b61b9bf1 100644 +--- a/src/gi-overrides/Abi.py ++++ b/src/gi-overrides/Abi.py +@@ -1,4 +1,6 @@ + import sys ++import gi ++gi.require_version('Gtk', '3.0') + from gi.repository import Gtk + from ..overrides import override + from ..importer import modules From 99b56fca58faa62ca042ae9f59797d931cc892a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:07:30 +0000 Subject: [PATCH 44/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index e7b1970..7b284e4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.abisource.com/ @@ -225,6 +225,9 @@ find %{buildroot} -name '*.a' -delete %{python3_sitearch}/* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1:3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 29 2019 Peter Robinson 1:3.0.4-1 - Update to 3.0.4 - Move to python3 gobject introspection bindings From 41749cbce7f7d46c2ee561d14b30046e80daeeaf Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 29 Jan 2020 15:06:41 +0000 Subject: [PATCH 45/84] Packaging cleanups and py3 fixes --- abiword.spec | 54 +++++++--------------------------------------------- 1 file changed, 7 insertions(+), 47 deletions(-) diff --git a/abiword.spec b/abiword.spec index 7b284e4..77a09f4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -6,7 +6,7 @@ Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2+ URL: http://www.abisource.com/ @@ -16,6 +16,7 @@ Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-3 Source11: abiword.mime Source12: abiword.keys Source13: abiword.xml + Patch0: abiword-2.6.0-windowshelppaths.patch Patch1: abiword-2.8.3-desktop.patch Patch2: abiword-2.6.0-boolean.patch @@ -68,6 +69,7 @@ BuildRequires: wv-devel BuildRequires: zlib-devel Requires: libabiword = %{epoch}:%{version}-%{release} +Requires: python3-gobject-base %description AbiWord is a cross-platform Open Source word processor. It is full-featured, @@ -129,51 +131,6 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh cd $RPM_BUILD_DIR/abiword-%{version} %{make_install} -# Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - abiword.desktop - CC0-1.0 - -

- AbiWord is a free word processing program similar to Microsoft® Word. - It is suitable for a wide variety of word processing tasks. -

-

- AbiWord allows you to collaborate with multiple people on one document at the - same time. - It is tightly integrated with the AbiCollab.net web service, which lets you - store documents online, allows easy document sharing with your friends, and - performs format conversions on the fly. -

- - - http://www.abisource.com/ - - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/a.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/b.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/c.png - - - -EOF - # install the documentation cd abiword-docs-3.0.1 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help @@ -222,9 +179,12 @@ find %{buildroot} -name '*.a' -delete %{_datadir}/gir-1.0/Abi-3.0.gir %files -n python3-abiword -%{python3_sitearch}/* +%pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Wed Jan 29 2020 Peter Robinson 1:3.0.4-3 +- Packaging cleanups and fixes + * Tue Jan 28 2020 Fedora Release Engineering - 1:3.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From ace4550de8b7f126c8c5ec018c443b1f90b151c9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 2 Feb 2020 14:57:02 +0000 Subject: [PATCH 46/84] a few more cleanups --- ...tch => abiword-3.0.2-explicit-python.patch | 0 abiword.spec | 166 ++++-------------- sources | 2 +- 3 files changed, 31 insertions(+), 137 deletions(-) rename abiword-3.0.2-explicit-python2.patch => abiword-3.0.2-explicit-python.patch (100%) 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 From 38cd4bc71a5afcd816736c39af5ab24339b8fee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:39:57 +0200 Subject: [PATCH 47/84] Rebuilt for Python 3.9 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 40de642..33ca3b2 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -178,6 +178,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Tue May 26 2020 Miro Hrončok - 1:3.0.4-5 +- Rebuilt for Python 3.9 + * Sun Feb 2 2020 Peter Robinson 1:3.0.4-4 - More packaging cleanups and fixes From f6c4fa0dec3afd40d81c2e855b2e8a7c304e57ec Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 22 Jun 2020 17:39:26 -0700 Subject: [PATCH 48/84] Fix build with recent ASIO and automake (#1817658) Since automake is now newer than the version used to produce the tarball, our patch that touches gi-overrides/Makefile.am causes the build to fail - we need to run aclocal and automake to fix this. To fix the ASIO-related build failure reported as #1817658 we have to build with `-DASIO_ENABLE_BOOST` - asio now uses standalone mode automatically when C++11 or later is detected, but it seems abiword can't build this way. See https://github.com/chriskohlhoff/asio/commit/265e75cd and https://github.com/openscenegraph/OpenSceneGraph/issues/921 for more on that. --- abiword.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 33ca3b2..797b559 100644 --- a/abiword.spec +++ b/abiword.spec @@ -25,6 +25,8 @@ Patch5: abiword-3.0.4-pygobject.patch BuildRequires: aiksaurus-devel BuildRequires: aiksaurus-gtk-devel BuildRequires: asio-devel +# Needed while explicit-python.patch touches gi-overrides/Makefile.am +BuildRequires: automake BuildRequires: bison BuildRequires: boost-devel BuildRequires: bzip2-devel @@ -116,8 +118,12 @@ find . -type d -exec chmod -c o+rx {} \; popd %build -%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection +# Needed while explicit-python.patch touches gi-overrides/Makefile.am +aclocal +automake +export CXXFLAGS="$RPM_OPT_FLAGS -DASIO_ENABLE_BOOST" +%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection %{make_build} V=1 # build the documentation From a5d5f75ad7115a19a7992fd98d747c1bf3e96939 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:40:07 +0000 Subject: [PATCH 49/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 797b559..5022b9d 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -184,6 +184,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1:3.0.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 1:3.0.4-5 - Rebuilt for Python 3.9 From 0d468c8914be524dfb2dba8820e347663fa3e12f Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 27 Jul 2020 15:36:25 -0600 Subject: [PATCH 50/84] - Force C++14 as the code is not ready for C++17 --- abiword.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/abiword.spec b/abiword.spec index 5022b9d..66cb3e8 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -122,7 +122,7 @@ popd aclocal automake -export CXXFLAGS="$RPM_OPT_FLAGS -DASIO_ENABLE_BOOST" +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS -DASIO_ENABLE_BOOST" %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection %{make_build} V=1 @@ -184,6 +184,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Mon Jul 27 2020 Jeff Law - 1:3.0.4-7 +- Force C++14 as the code is not ready for C++17 + * Mon Jul 27 2020 Fedora Release Engineering - 1:3.0.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5ca85291da755a1874a6a584833c2453448d4c01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:47:04 +0000 Subject: [PATCH 51/84] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 66cb3e8..8c8c5aa 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.4 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -184,6 +184,10 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 1:3.0.4-8 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Jeff Law - 1:3.0.4-7 - Force C++14 as the code is not ready for C++17 From 447b7a3cef69e9782741c5ccf31b76770cd2d3ee Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 22:15:48 +0000 Subject: [PATCH 52/84] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- abiword.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abiword.spec b/abiword.spec index 8c8c5aa..ee05ef4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -66,6 +66,7 @@ BuildRequires: t1lib-devel BuildRequires: telepathy-glib-devel BuildRequires: wv-devel BuildRequires: zlib-devel +BuildRequires: make Requires: libabiword = %{epoch}:%{version}-%{release} Requires: python3-gobject-base From 0ec46942f8893fa79c42619c01f5ab1a299bf035 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:43:55 +0000 Subject: [PATCH 53/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index ee05ef4..ff97505 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.4 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -185,6 +185,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 1:3.0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 1:3.0.4-8 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1d009a9be7c2cb7429f92c7ee3a5ceb4d1d328ea Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 21 Mar 2021 13:46:16 +0000 Subject: [PATCH 54/84] Add libgcrypt-devel build dep --- abiword.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abiword.spec b/abiword.spec index ff97505..efccd26 100644 --- a/abiword.spec +++ b/abiword.spec @@ -42,6 +42,7 @@ BuildRequires: goffice-devel BuildRequires: gtk3-devel # Probably because it's gtk2 based #BuildRequires: gtkmathview-devel +BuildRequires: libgcrypt-devel BuildRequires: libgsf-devel BuildRequires: libpng-devel BuildRequires: librevenge-devel From 9dd015611e98dad8c515577737de5f3054f04b79 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 19:58:43 +0200 Subject: [PATCH 55/84] Rebuilt for Python 3.10 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index efccd26..a3eb50a 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.4 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Fri Jun 04 2021 Python Maint - 1:3.0.4-10 +- Rebuilt for Python 3.10 + * Mon Jan 25 2021 Fedora Release Engineering - 1:3.0.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ee622de5ae1debd9382b65bcebde3b254a51b72b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:15:52 +0000 Subject: [PATCH 56/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From b32100ebad5cf40c846867a1fefd29c927ce140f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:10:57 +0000 Subject: [PATCH 57/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index a3eb50a..e9fb878 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1:3.0.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1:3.0.4-10 - Rebuilt for Python 3.10 From f0e2a4d3fc412ebb05606002cd8dcc44823d496c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 23 Oct 2021 16:57:29 +0100 Subject: [PATCH 58/84] 3.0.5 --- abiword.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/abiword.spec b/abiword.spec index e9fb878..5ad15fb 100644 --- a/abiword.spec +++ b/abiword.spec @@ -2,8 +2,8 @@ %define docsversion 3.0.1 Name: abiword -Version: 3.0.4 -Release: 11%{?dist} +Version: 3.0.5 +Release: 1%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Sat Oct 23 2021 Peter Robinson - 1:3.0.5-1 +- Update to 3.0.5 + * Wed Jul 21 2021 Fedora Release Engineering - 1:3.0.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 440cebf..0b0f5a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (abiword-3.0.4.tar.gz) = 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4 +SHA512 (abiword-3.0.5.tar.gz) = a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6 SHA512 (abiword-docs-3.0.1.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5 From 3ac733d8288ac204a2cb2cb5342228308f9bea7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:50:50 +0000 Subject: [PATCH 59/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 5ad15fb..971f553 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1:3.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Oct 23 2021 Peter Robinson - 1:3.0.5-1 - Update to 3.0.5 From 2532877d8eb1524578f1be9467fa14eccf8e6667 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 20:59:12 +0200 Subject: [PATCH 60/84] Rebuilt for Python 3.11 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 971f553..3471980 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Mon Jun 13 2022 Python Maint - 1:3.0.5-3 +- Rebuilt for Python 3.11 + * Wed Jan 19 2022 Fedora Release Engineering - 1:3.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From aaec86db0d9822d72831448377b3a0d3990f17cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:21:32 +0000 Subject: [PATCH 61/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 3471980..0f1e5ba 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitearch}/gi/overrides/Abi.py %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1:3.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1:3.0.5-3 - Rebuilt for Python 3.11 From 2cdf9b2366e89329dba1d79541b2e8f012be8b65 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 16 Jan 2023 20:10:42 -0500 Subject: [PATCH 62/84] Fix flatpak build --- abiword.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/abiword.spec b/abiword.spec index 0f1e5ba..799da52 100644 --- a/abiword.spec +++ b/abiword.spec @@ -125,7 +125,9 @@ aclocal automake export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS -DASIO_ENABLE_BOOST" -%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection +%configure \ + --enable-plugins --enable-clipart --enable-templates --enable-introspection \ + --with-gir-dir=%{_datadir}/gir-1.0 --with-typelib-dir=%{_libdir}/girepository-1.0 %{make_build} V=1 # build the documentation @@ -134,7 +136,7 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh popd %install -%{make_install} +%{make_install} overridesdir=%{python3_sitelib}/gi/overrides # install the documentation pushd abiword-docs-%{docsversion} @@ -163,7 +165,7 @@ find %{buildroot} -name '*.a' -delete %{_datadir}/icons/hicolor/scalable/apps/abiword.svg # Abiword help %{_datadir}/%{name}-%{bigversion}/AbiWord -%{_mandir}/man1/abiword.1.gz +%{_mandir}/man1/abiword.1* %files -n libabiword %license COPYING COPYRIGHT.TXT @@ -183,7 +185,7 @@ find %{buildroot} -name '*.a' -delete %{_datadir}/gir-1.0/Abi-3.0.gir %files -n python3-abiword -%pycached %{python3_sitearch}/gi/overrides/Abi.py +%pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog * Wed Jul 20 2022 Fedora Release Engineering - 1:3.0.5-4 From 1686779ebb3a9461843d0007973a4c926a364feb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:19:10 +0000 Subject: [PATCH 63/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 799da52..2c2e853 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Word processing program License: GPLv2+ @@ -188,6 +188,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1:3.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1:3.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 457c6b5a5bfff2e988fbce30498d214fd8c36572 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 8 Mar 2023 14:52:52 -0600 Subject: [PATCH 64/84] migrated to SPDX license --- abiword.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/abiword.spec b/abiword.spec index 2c2e853..c065889 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,10 +3,10 @@ Name: abiword Version: 3.0.5 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: Word processing program -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.abisource.com/ Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz @@ -188,6 +188,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Wed Mar 08 2023 Gwyn Ciesla - 1:3.0.5-6 +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 1:3.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From eee51f82bb4e2da12812054d13c0b808e2a14729 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 17:00:03 +0200 Subject: [PATCH 65/84] Rebuilt for Python 3.12 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index c065889..7bbd542 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -188,6 +188,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Thu Jun 15 2023 Python Maint - 1:3.0.5-7 +- Rebuilt for Python 3.12 + * Wed Mar 08 2023 Gwyn Ciesla - 1:3.0.5-6 - migrated to SPDX license From 52591f2d9c73609c160395c551939a725851d90e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:49:09 +0000 Subject: [PATCH 66/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 7bbd542..813f3f4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -188,6 +188,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1:3.0.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 15 2023 Python Maint - 1:3.0.5-7 - Rebuilt for Python 3.12 From 57149a875dec5c87fe20f25ee1d4394eeafbddbd Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 6 Nov 2023 08:38:37 -0600 Subject: [PATCH 67/84] Drop i686 --- abiword.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 813f3f4..1b5f4b4 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -15,6 +15,8 @@ Source11: abiword.mime Source12: abiword.keys Source13: abiword.xml +ExcludeArch: %{ix86} + Patch0: abiword-2.6.0-windowshelppaths.patch Patch1: abiword-2.8.3-desktop.patch Patch2: abiword-2.6.0-boolean.patch @@ -188,6 +190,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* Sat Nov 04 2023 Gwyn Ciesla 1:3.0.5-9 +- Drop i386 on f40+ + * Wed Jul 19 2023 Fedora Release Engineering - 1:3.0.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a87d23c7af932bd2473edb27135c9905eab2d106 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 6 Nov 2023 08:45:12 -0600 Subject: [PATCH 68/84] Update patch macros --- abiword.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/abiword.spec b/abiword.spec index 1b5f4b4..7ad5ba6 100644 --- a/abiword.spec +++ b/abiword.spec @@ -108,15 +108,15 @@ Python bindings for developing with libabiword %setup -q -a 1 # patch abiword -%patch1 -p1 -b .desktop -%patch2 -p1 -b .boolean -%patch3 -p0 -b .librevenge -%patch4 -p1 -b .explicit_python -%patch5 -p1 -b .pygo +%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 # setup abiword documentation pushd abiword-docs-%{docsversion} -%patch0 -p1 -b .windowshelppaths +%patch -P 0 -p1 -b .windowshelppaths # some of the help dirs have bad perms (#109261) find . -type d -exec chmod -c o+rx {} \; popd From 496d4af51003cc5b97b89cec0a06ef30f36804dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:02:03 +0000 Subject: [PATCH 69/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 7ad5ba6..0595c54 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -190,6 +190,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* 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+ From 552658332cb3bda6bed6831d1ef63af535eb9ac0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:33:59 +0000 Subject: [PATCH 70/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 0595c54..3ab4c57 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -190,6 +190,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* 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 From a872c697d4f1f72dc4ad1681d66f16bc11e948de Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 31 Jan 2024 15:59:06 -0600 Subject: [PATCH 71/84] Add missing include --- abiword.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 3ab4c57..5d7c84d 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -23,6 +23,7 @@ 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 @@ -113,6 +114,7 @@ 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} @@ -190,6 +192,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* 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 From 5bf9a4748fe00c76dc8c89c407086b2d651f8fad Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 31 Jan 2024 15:59:31 -0600 Subject: [PATCH 72/84] Add missing include --- xml-inc.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 xml-inc.patch diff --git a/xml-inc.patch b/xml-inc.patch new file mode 100644 index 0000000..549740f --- /dev/null +++ b/xml-inc.patch @@ -0,0 +1,10 @@ +--- 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 4ae5885f00d6b43dffaf15cfcf1aa30330ed388f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:30:49 +0200 Subject: [PATCH 73/84] Rebuilt for Python 3.13 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 5d7c84d..142434e 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -192,6 +192,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* 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 From 236d7c3486548e5c5585b7ec30e93d877cca8f61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:30:35 +0000 Subject: [PATCH 74/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 142434e..d2e4c5a 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -192,6 +192,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* 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 From fbec46193727e02322ca107fe126d1da41936aea Mon Sep 17 00:00:00 2001 From: Alexander Ploumistos Date: Sun, 8 Sep 2024 22:22:45 +0200 Subject: [PATCH 75/84] Rebuilt for goffice-0.10.57 --- abiword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index d2e4c5a..6cf22cc 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -192,6 +192,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* 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 From 918145aef82421e16fed4052eecafd218c13ba2d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 25 Sep 2024 09:55:56 -0500 Subject: [PATCH 76/84] Metainfo fix --- abiword.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/abiword.spec b/abiword.spec index 6cf22cc..5442ac5 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -71,6 +71,7 @@ BuildRequires: telepathy-glib-devel BuildRequires: wv-devel BuildRequires: zlib-devel BuildRequires: make +BuildRequires: libappstream-glib Requires: libabiword = %{epoch}:%{version}-%{release} Requires: python3-gobject-base @@ -156,11 +157,15 @@ install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiwo find %{buildroot} -name '*.la' -delete find %{buildroot} -name '*.a' -delete +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 -%{_datadir}/appdata/*.appdata.xml +%{_metainfodir}/abiword.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/mime-info/abiword.mime %{_datadir}/mime-info/abiword.keys @@ -192,6 +197,9 @@ find %{buildroot} -name '*.a' -delete %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* 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 From f8d69a795cedf33ac62eabec71e9bb2d92f35818 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 22 Oct 2024 13:03:37 -0500 Subject: [PATCH 77/84] Fix desktop filename --- abiword.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/abiword.spec b/abiword.spec index 5442ac5..9c0c74f 100644 --- a/abiword.spec +++ b/abiword.spec @@ -3,7 +3,7 @@ Name: abiword Version: 3.0.5 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 Summary: Word processing program License: GPL-2.0-or-later @@ -157,6 +157,8 @@ 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 @@ -197,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat %pycached %{python3_sitelib}/gi/overrides/Abi.py %changelog +* 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 From 3a0024b3ff276f838d1317cb0176d37f32fb7d72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:28:39 +0000 Subject: [PATCH 78/84] 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 79/84] 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 80/84] 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 81/84] 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 82/84] 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 83/84] 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 84/84] 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