.gitignore

@@ -1 +1 @@
-SOURCES/libwpd-0.10.3.tar.xz
+SOURCES/libwpd-0.10.2.tar.xz

.libwpd.metadata

@@ -1 +1 @@
-c1254f05b2318c160d836e5583c221386db50dd2 SOURCES/libwpd-0.10.3.tar.xz
+ad9d53e22e746b449f8a2937481e2b36766908b9 SOURCES/libwpd-0.10.2.tar.xz

SOURCES/0001-Resolves-rhbz-1643752-bounds-check-m_currentTable-ac.patch

@@ -0,0 +1,29 @@
+diff -ru libwpd-0.10.2/src/lib/WP6ContentListener.cpp libwpd-0.10.2.new/src/lib/WP6ContentListener.cpp
+--- libwpd-0.10.2/src/lib/WP6ContentListener.cpp	2017-09-08 18:04:25.000000000 +0100
++++ libwpd-0.10.2.new/src/lib/WP6ContentListener.cpp	2018-10-30 10:54:22.326697162 +0000
+@@ -1311,7 +1311,10 @@
+ 		m_ps->m_tableDefinition.m_columnsProperties.clear();
+ 
+ 		// pull a table definition off of our stack
+-		m_parseState->m_currentTable = m_parseState->m_tableList[m_parseState->m_nextTableIndice++];
++		auto index = m_parseState->m_nextTableIndice++;
++		if (index >= m_parseState->m_tableList.size())
++			throw ParseException();
++		m_parseState->m_currentTable = m_parseState->m_tableList[index];
+ 		if (!m_parseState->m_currentTable)
+ 			throw ParseException();
+ 		m_parseState->m_currentTable->makeBordersConsistent();
+diff -ru libwpd-0.10.2/src/lib/WPXTable.h libwpd-0.10.2.new/src/lib/WPXTable.h
+--- libwpd-0.10.2/src/lib/WPXTable.h	2015-12-30 08:27:30.000000000 +0000
++++ libwpd-0.10.2.new/src/lib/WPXTable.h	2018-10-30 10:55:41.264362182 +0000
+@@ -92,6 +92,10 @@
+ 	{
+ 		m_tableList->push_back(table);
+ 	}
++	size_t size() const
++	{
++		return m_tableList->size();
++	}
+ 
+ private:
+ 	void release();

SOURCES/libwpd-gcc11.patch

@@ -1,25 +0,0 @@
-diff --git a/src/lib/WPXContentListener.cpp b/src/lib/WPXContentListener.cpp
-index ab0f9b1..0b559e6 100644
---- a/src/lib/WPXContentListener.cpp
-+++ b/src/lib/WPXContentListener.cpp
-@@ -23,6 +23,7 @@
-  * Corel Corporation or Corel Corporation Limited."
-  */
- 
-+#include <cstddef>
- #include "WPXContentListener.h"
- #include "WPXPageSpan.h"
- #include "libwpd_internal.h"
-diff --git a/src/lib/WPXTable.cpp b/src/lib/WPXTable.cpp
-index 0ad202a..3ff35e1 100644
---- a/src/lib/WPXTable.cpp
-+++ b/src/lib/WPXTable.cpp
-@@ -25,6 +25,8 @@
-  * Corel Corporation or Corel Corporation Limited."
-  */
- 
-+#include <cstddef>
-+
- #include "WPXTable.h"
- 
- #include "libwpd_internal.h"

SPECS/libwpd.spec

@@ -2,22 +2,19 @@
 
 Name: libwpd
 Summary: A library for import of WordPerfect documents
-Version: 0.10.3
-Release: 10%{?dist}
+Version: 0.10.2
+Release: 2%{?dist}
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
-Patch0: %{name}-gcc11.patch
 URL: http://libwpd.sf.net/
 License: LGPLv2+ or MPLv2.0
 
 BuildRequires: boost-devel
 BuildRequires: doxygen
-BuildRequires: gcc-c++
 BuildRequires: help2man
 BuildRequires: pkgconfig(librevenge-0.0)
-BuildRequires: pkgconfig(librevenge-generators-0.0)
-BuildRequires: pkgconfig(librevenge-stream-0.0)
 BuildRequires: pkgconfig(zlib)
-BuildRequires: make
+
+Patch0: 0001-Resolves-rhbz-1643752-bounds-check-m_currentTable-ac.patch
 
 %description
 %{name} is a library for import of WordPerfect documents.
@@ -48,13 +45,13 @@ The %{name}-doc package contains API documentation for %{name}.
 %autosetup -p1
 
 %build
-%configure --disable-static --disable-silent-rules
+%configure --disable-static --disable-werror --disable-silent-rules
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%make_build
+make %{?_smp_mflags}
 
 %install
-%make_install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 # we install API docs directly from build
 rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
@@ -67,7 +64,8 @@ done
 install -m 0755 -d %{buildroot}/%{_mandir}/man1
 install -m 0644 wpd2*.1 %{buildroot}/%{_mandir}/man1
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %doc CREDITS NEWS README
@@ -95,46 +93,11 @@ install -m 0644 wpd2*.1 %{buildroot}/%{_mandir}/man1
 %doc docs/%{name}.png
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.10.3-10
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.10.3-9
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Nov 04 2020 Jeff Law <law@redhat.com> - 0.10.3-7
-- Fix missing #includes for gcc-11
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.10.3-5
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Dec 29 2018 David Tardon <dtardon@redhat.com> - 0.10.3-1
-- new upstream release
-
-* Tue Oct 30 2018 Caolán McNamara <caolanm@redhat.com> - 0.10.2-4
-- Resolves: rhbz#1643752 crash in specific wpd file
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 0.10.2-2
+- Rebuilt for MSVSphere 8.8
 
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Tue Oct 30 2018 Caolán McNamara <caolanm@redhat.com> - 0.10.2-2
+- Resolves: rhbz#1644276 crash in specific wpd file
 
 * Tue Sep 12 2017 David Tardon <dtardon@redhat.com> - 0.10.2-1
 - new upstream release