[packages/xpdf] package private libraries used by tools, use them by main binary too

[gotar]

commit 423447612d053a4d8e983dfceabd1ea70193a467
Author: Tomasz Pala <gotar at pld-linux.org>
Date:   Sun Nov 19 13:25:31 2017 +0100

    package private libraries used by tools, use them by main binary too

 dynamic_private.patch | 20 ++++++++++++++++++++
 xpdf.spec             | 10 ++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/xpdf.spec b/xpdf.spec
index 95b72fe..7d3f2c0 100644
--- a/xpdf.spec
+++ b/xpdf.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):	Программа для просмотра PDF файлов
 Summary(uk.UTF-8):	Програма для перегляду PDF файлів
 Name:		xpdf
 Version:	4.00
-Release:	3
+Release:	4
 License:	GPL v2 or GPL v3
 Group:		Applications/Publishing
 Source0:	http://www.xpdfreader.com/dl/%{name}-%{version}.tar.gz
@@ -27,6 +27,7 @@ Source2:	%{name}.png
 Source3:	%{name}rc
 Patch0:		%{name}-remove_protections.patch
 Patch1:		%{name}-fontdirs.patch
+Patch2:		dynamic_private.patch
 URL:		http://www.xpdfreader.com/
 BuildRequires:	cmake >= 2.8.8
 BuildRequires:	freetype-devel >= 2.1.0
@@ -107,6 +108,7 @@ pdftops, pdftotext).
 %setup -q
 %{!?with_protections:%patch0 -p1}
 %patch1 -p1
+%patch2 -p1
 sed -e 's|DESTINATION man/|DESTINATION share/man/|g' -i xpdf{,-qt}/CMakeLists.txt
 
 %build
@@ -116,17 +118,20 @@ sed -e 's|DESTINATION man/|DESTINATION share/man/|g' -i xpdf{,-qt}/CMakeLists.tx
 	-DOPI_SUPPORT=ON \
 	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 \
 	-DCMAKE_CXX_FLAGS="%{rpmcxxflags}" \
+	-DCMAKE_INSTALL_RPATH="%{_libexecdir}/%{name}" \
 	-DCMAKE_EXE_LINKER_FLAGS="-lpaper %{rpmldflags}"
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/xpdf}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_desktopdir},%{_pixmapsdir},{%{_datadir},%{_libexecdir}}/%{name}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install {fofi/libfofi,goo/libgoo,splash/libsplash}.so $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
@@ -164,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pdftoppm
 %attr(755,root,root) %{_bindir}/pdftops
 %attr(755,root,root) %{_bindir}/pdftotext
+%attr(755,root,root) %{_libexecdir}/%{name}/lib*.so
 %{_mandir}/man1/pdfdetach.1*
 %{_mandir}/man1/pdffonts.1*
 %{_mandir}/man1/pdfimages.1*
diff --git a/dynamic_private.patch b/dynamic_private.patch
new file mode 100644
index 0000000..b59ad92
--- /dev/null
+++ b/dynamic_private.patch
@@ -0,0 +1,20 @@
+--- a/xpdf-qt/CMakeLists.txt.orig	2017-08-09 01:22:50.000000000 +0200
++++ b/xpdf-qt/CMakeLists.txt	2017-11-19 12:38:14.000000000 +0100
+@@ -63,9 +63,6 @@
+   endif ()
+ 
+   add_executable(xpdf
+-    $<TARGET_OBJECTS:goo_objs>
+-    $<TARGET_OBJECTS:fofi_objs>
+-    $<TARGET_OBJECTS:splash_objs>
+     $<TARGET_OBJECTS:xpdf_objs>
+     $<TARGET_OBJECTS:xpdf_widget_objs>
+     ${XPDFWIDGET_PRINT_MODULES}
+@@ -81,6 +78,7 @@
+     ${XPDF_ICONS}
+   )
+   target_link_libraries(xpdf ${QT_LIBRARIES} ${EXTRA_QT_LIBRARIES}
++			goo fofi splash
+                         ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
+                         ${DTYPE_LIBRARY} ${LCMS_LIBRARY}
+                         ${CMAKE_THREAD_LIBS_INIT})
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xpdf.git/commitdiff/423447612d053a4d8e983dfceabd1ea70193a467