diff --git a/0001-Fix-linking-with-newer-tools-by-getting-the-library-.patch b/0001-Fix-linking-with-newer-tools-by-getting-the-library-.patch new file mode 100644 index 0000000..c14b5d7 --- /dev/null +++ b/0001-Fix-linking-with-newer-tools-by-getting-the-library-.patch @@ -0,0 +1,95 @@ +From b881efabd544f34d82410bb937fce1d599dde070 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +Date: Tue, 9 Jan 2018 08:41:48 +0100 +Subject: [PATCH] Fix linking with newer tools by getting the library order + right + +--- + src/conv/abw/Makefile.am | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/src/conv/abw/Makefile.am b/src/conv/abw/Makefile.am +index b52d060..3b20f05 100644 +--- a/src/conv/abw/Makefile.am ++++ b/src/conv/abw/Makefile.am +@@ -23,10 +23,13 @@ libhelperRVNGABW_la_SOURCES = \ + + wpft2abw_DEPENDENCIES = @WPFT2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la + wpft2abw_CPPFLAGS = $(REVENGE_STREAM_CFLAGS) +-wpft2abw_LDADD = $(REVENGE_STREAM_LIBS) ++wpft2abw_LDADD = + wpft2abw_SOURCES = wpft2abw.cxx + + if USE_LIBABW ++ wpft2abw_CPPFLAGS += $(ABW_CFLAGS) ++ wpft2abw_LDADD += $(wrapper_dir)/libwpabw.la $(ABW_LIBS) ++ + bin_PROGRAMS += abw2abw + + abw2abw_DEPENDENCIES = @ABW2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la +@@ -37,7 +40,7 @@ endif + + if USE_LIBEBOOK + wpft2abw_CPPFLAGS += $(EBOOK_CFLAGS) +- wpft2abw_LDADD += $(EBOOK_LIBS) $(wrapper_dir)/libwpebook.la ++ wpft2abw_LDADD += $(wrapper_dir)/libwpebook.la $(EBOOK_LIBS) + + bin_PROGRAMS += ebook2abw + +@@ -49,7 +52,7 @@ endif + + if USE_LIBETONYEK + wpft2abw_CPPFLAGS += $(ETONYEK_CFLAGS) +- wpft2abw_LDADD += $(ETONYEK_LIBS) $(wrapper_dir)/libwpetonyek.la ++ wpft2abw_LDADD += $(wrapper_dir)/libwpetonyek.la $(ETONYEK_LIBS) + + bin_PROGRAMS += pages2abw + +@@ -68,7 +71,7 @@ if USE_LIBMWAW + + wpft2abw_DEPENDENCIES += libabwmwaw.la + wpft2abw_CPPFLAGS += $(MWAW_CFLAGS) +- wpft2abw_LDADD += $(MWAW_LIBS) libabwmwaw.la ++ wpft2abw_LDADD += libabwmwaw.la $(MWAW_LIBS) + + bin_PROGRAMS += mwaw2abw + +@@ -87,7 +90,7 @@ if USE_LIBSTAROFFICE + + wpft2abw_DEPENDENCIES += libabwstaroffice.la + wpft2abw_CPPFLAGS += $(STAROFFICE_CFLAGS) +- wpft2abw_LDADD += $(STAROFFICE_LIBS) libabwstaroffice.la ++ wpft2abw_LDADD += libabwstaroffice.la $(STAROFFICE_LIBS) + + bin_PROGRAMS += sd2abw + +@@ -106,7 +109,7 @@ if USE_LIBWPD + + wpft2abw_DEPENDENCIES += libabwwpd.la + wpft2abw_CPPFLAGS += $(WPD_CFLAGS) $(WPG_CFLAGS) +- wpft2abw_LDADD += $(WPD_LIBS) $(WPG_LIBS) libabwwpd.la ++ wpft2abw_LDADD += libabwwpd.la $(WPD_LIBS) $(WPG_LIBS) + + bin_PROGRAMS += wpd2abw + wpd2abw_DEPENDENCIES = @WPD2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la libabwwpd.la +@@ -124,7 +127,7 @@ if USE_LIBWPS + + wpft2abw_DEPENDENCIES += libabwwps.la + wpft2abw_CPPFLAGS += $(WPS_CFLAGS) +- wpft2abw_LDADD += $(WPS_LIBS) libabwwps.la ++ wpft2abw_LDADD += libabwwps.la $(WPS_LIBS) + + bin_PROGRAMS += wps2abw + +@@ -134,7 +137,7 @@ if USE_LIBWPS + wps2abw_SOURCES = wps2abw.cxx + endif + +-wpft2abw_LDADD += @WPFT2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la ++wpft2abw_LDADD += @WPFT2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la $(REVENGE_STREAM_LIBS) + + if OS_WIN32 + +-- +2.17.1 + diff --git a/changelog b/changelog new file mode 100644 index 0000000..8f2600b --- /dev/null +++ b/changelog @@ -0,0 +1,123 @@ +* Mon Nov 21 2022 David Tardon - 0.9.6-12 +- Convert license to SPDX + +* Sat Jul 23 2022 Fedora Release Engineering - 0.9.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.9.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.9.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.9.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.9.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.9.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Dec 14 2017 David Tardon - 0.9.6-1 +- new upstream release + +* Thu Aug 03 2017 Fedora Release Engineering - 0.9.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.9.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.9.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 27 2017 Jonathan Wakely - 0.9.5-3 +- Rebuilt for Boost 1.63 + +* Fri Jan 27 2017 Jonathan Wakely - 0.9.5-2 +- Rebuilt for Boost 1.63 + +* Thu Mar 03 2016 David Tardon - 0.9.5-1 +- new upstream release + +* Fri Feb 05 2016 Fedora Release Engineering - 0.9.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Jan 16 2016 Jonathan Wakely - 0.9.4-7 +- Rebuilt for Boost 1.60 + +* Thu Aug 27 2015 Jonathan Wakely - 0.9.4-6 +- Rebuilt for Boost 1.59 + +* Wed Jul 29 2015 Fedora Release Engineering - 0.9.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Wed Jul 22 2015 David Tardon - 0.9.4-4 +- rebuild for Boost 1.58 + +* Fri Jun 19 2015 Fedora Release Engineering - 0.9.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon May 25 2015 David Tardon - 0.9.4-2 +- enable AbiWord export + +* Wed May 20 2015 David Tardon - 0.9.4-1 +- new upstream release + +* Sat May 02 2015 Kalev Lember - 0.9.2-5 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Jan 26 2015 Petr Machata - 0.9.2-4 +- Rebuild for boost 1.57.0 + +* Mon Aug 18 2014 Fedora Release Engineering - 0.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jul 26 2014 David Tardon - 0.9.2-2 +- put EPUB export tools into a separate subpackage + +* Sun Jul 06 2014 David Tardon - 0.9.2-1 +- new upstream release +- enable EPUB export + +* Fri Jun 27 2014 David Tardon - 0.9.1-3 +- enable support for Adobe PageMaker documents + +* Sun Jun 08 2014 Fedora Release Engineering - 0.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Jun 03 2014 David Tardon - 0.9.1-1 +- new upstream release + +* Thu May 29 2014 David Tardon - 0.9.0-2 +- fix libe-book integration + +* Mon May 26 2014 David Tardon - 0.9.0-1 +- new upstream release + +* Wed Apr 09 2014 David Tardon - 0.8.4-1 +- new upstream release + +* Sat Nov 02 2013 David Tardon - 0.8.3-1 +- new release + +* Sun Aug 04 2013 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu May 16 2013 David Tardon - 0.8.2-2 +- package license files + +* Sun May 12 2013 David Tardon - 0.8.2-1 +- initial import diff --git a/writerperfect.spec b/writerperfect.spec index 3d869cf..37d8098 100644 --- a/writerperfect.spec +++ b/writerperfect.spec @@ -1,18 +1,21 @@ Name: writerperfect Version: 0.9.6 -Release: 1%{?dist} +Release: %autorelease Summary: A collection of tools to transform various file formats into ODF -License: MPLv2.0 or LGPLv2+ +License: LGPL-2.1-or-later OR MPL-2.0 URL: http://sourceforge.net/p/libwpd/wiki/writerperfect/ Source: http://downloads.sourceforge.net/libwpd/%{name}-%{version}.tar.xz +BuildRequires: make +BuildRequires: automake +BuildRequires: gcc-c++ BuildRequires: help2man BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libcdr-0.1) BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) -BuildRequires: pkgconfig(libepubgen-0.0) +BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libetonyek-0.1) BuildRequires: pkgconfig(libfreehand-0.1) BuildRequires: pkgconfig(libgsf-1) @@ -31,6 +34,7 @@ BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libzmf-0.0) Patch0: 0001-fix-build-with-libgsf.patch +Patch1: 0001-Fix-linking-with-newer-tools-by-getting-the-library-.patch %description %{name} is a collection of command-line tools to transform various document @@ -74,6 +78,8 @@ formats into AbiWord format. Among supported input formats are: %autosetup -p1 %build +aclocal +automake %configure \ --disable-silent-rules \ --disable-werror \ @@ -204,93 +210,4 @@ install -m 0644 *2abw.1 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1 %{_mandir}/man1/wps2abw.1* %changelog -* Thu Dec 14 2017 David Tardon - 0.9.6-1 -- new upstream release - -* Thu Aug 03 2017 Fedora Release Engineering - 0.9.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.9.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.9.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.9.5-3 -- Rebuilt for Boost 1.63 - -* Fri Jan 27 2017 Jonathan Wakely - 0.9.5-2 -- Rebuilt for Boost 1.63 - -* Thu Mar 03 2016 David Tardon - 0.9.5-1 -- new upstream release - -* Fri Feb 05 2016 Fedora Release Engineering - 0.9.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 0.9.4-7 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 0.9.4-6 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.9.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.9.4-4 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 0.9.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 25 2015 David Tardon - 0.9.4-2 -- enable AbiWord export - -* Wed May 20 2015 David Tardon - 0.9.4-1 -- new upstream release - -* Sat May 02 2015 Kalev Lember - 0.9.2-5 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Jan 26 2015 Petr Machata - 0.9.2-4 -- Rebuild for boost 1.57.0 - -* Mon Aug 18 2014 Fedora Release Engineering - 0.9.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jul 26 2014 David Tardon - 0.9.2-2 -- put EPUB export tools into a separate subpackage - -* Sun Jul 06 2014 David Tardon - 0.9.2-1 -- new upstream release -- enable EPUB export - -* Fri Jun 27 2014 David Tardon - 0.9.1-3 -- enable support for Adobe PageMaker documents - -* Sun Jun 08 2014 Fedora Release Engineering - 0.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Jun 03 2014 David Tardon - 0.9.1-1 -- new upstream release - -* Thu May 29 2014 David Tardon - 0.9.0-2 -- fix libe-book integration - -* Mon May 26 2014 David Tardon - 0.9.0-1 -- new upstream release - -* Wed Apr 09 2014 David Tardon - 0.8.4-1 -- new upstream release - -* Sat Nov 02 2013 David Tardon - 0.8.3-1 -- new release - -* Sun Aug 04 2013 Fedora Release Engineering - 0.8.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu May 16 2013 David Tardon - 0.8.2-2 -- package license files - -* Sun May 12 2013 David Tardon - 0.8.2-1 -- initial import +%autochangelog