[packages/writerperfect] - upstream link fix

[baggins]

commit 8f566324a800346586770d68c782ede4f6eb3295
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 11 16:00:16 2018 +0100

    - upstream link fix

 link.patch         | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 writerperfect.spec |  7 +++++
 2 files changed, 95 insertions(+)
---
diff --git a/writerperfect.spec b/writerperfect.spec
index 92584f3..a7f802c 100644
--- a/writerperfect.spec
+++ b/writerperfect.spec
@@ -8,6 +8,7 @@ Group:		Applications/Publishing
 Source0:	http://downloads.sourceforge.net/libwpd/%{name}-%{version}.tar.xz
 # Source0-md5:	9b554883621a9a1809c2582a6d2febd4
 Patch0:		libgsf-build.patch
+Patch1:		link.patch
 URL:		http://libwpd.sourceforge.net/
 BuildRequires:	glib2-devel >= 2.0.0
 BuildRequires:	libabw-devel >= 0.1
@@ -67,6 +68,7 @@ Narzędzia do konwertowania dokumentów:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -113,6 +115,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pmd2odg
 %attr(755,root,root) %{_bindir}/pub2epub
 %attr(755,root,root) %{_bindir}/pub2odg
+%attr(755,root,root) %{_bindir}/sd2abw
+%attr(755,root,root) %{_bindir}/sd2epub
 %attr(755,root,root) %{_bindir}/sd2odf
 %attr(755,root,root) %{_bindir}/vsd2epub
 %attr(755,root,root) %{_bindir}/vsd2odg
@@ -122,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/wpd2abw
 %attr(755,root,root) %{_bindir}/wpd2epub
 %attr(755,root,root) %{_bindir}/wpd2odt
+%attr(755,root,root) %{_bindir}/wpft2abw
+%attr(755,root,root) %{_bindir}/wpft2epub
+%attr(755,root,root) %{_bindir}/wpft2odf
 %attr(755,root,root) %{_bindir}/wpg2epub
 %attr(755,root,root) %{_bindir}/wpg2odg
 %attr(755,root,root) %{_bindir}/wps2abw
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..1728500
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,88 @@
+commit b881efabd544f34d82410bb937fce1d599dde070
+Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
+Date:   Tue Jan 9 08:41:48 2018 +0100
+
+    Fix linking with newer tools by getting the library order right
+
+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
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/writerperfect.git/commitdiff/8f566324a800346586770d68c782ede4f6eb3295