[packages/wkhtmltopdf] - package docs - added qt5 bcond

qboosh qboosh at pld-linux.org
Mon Apr 6 19:49:59 CEST 2015


commit 2266e8b027c1decc8581d4236a254d2fadd6e475
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 6 19:51:25 2015 +0200

    - package docs
    - added qt5 bcond

 wkhtmltopdf.spec | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/wkhtmltopdf.spec b/wkhtmltopdf.spec
index b52a8ca..a6a5389 100644
--- a/wkhtmltopdf.spec
+++ b/wkhtmltopdf.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with	qt5	# build against Qt5
+#
 Summary:	Programs capable of converting HTML documents into images or PDF documents
 Summary(pl.UTF-8):	Programy do konwersji dokumentów HTML do obrazów lub dokumentów PDF
 Name:		wkhtmltopdf
@@ -8,6 +12,16 @@ Group:		Applications/Graphics
 Source0:	https://github.com/wkhtmltopdf/wkhtmltopdf/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	f3a665a462f4939fa31dfd3ef1d3231d
 URL:		http://wkhtmltopdf.org/
+%if %{with qt5}
+BuildRequires:	Qt5Core-devel >= 5
+BuildRequires:	Qt5Gui-devel >= 5
+BuildRequires:	Qt5Network-devel >= 5
+BuildRequires:	Qt5PrintSupport-devel >= 5.2
+BuildRequires:	Qt5Svg-devel >= 5
+BuildRequires:	Qt5WebKit-devel >= 5
+BuildRequires:	Qt5XmlPatterns-devel >= 5
+BuildRequires:	qt5-qmake
+%else
 BuildRequires:	QtCore-devel >= 4
 BuildRequires:	QtGui-devel >= 4
 BuildRequires:	QtNetwork-devel >= 4
@@ -15,6 +29,7 @@ BuildRequires:	QtSvg-devel >= 4
 BuildRequires:	QtWebKit-devel >= 4
 BuildRequires:	QtXmlPatterns-devel >= 4
 BuildRequires:	qt4-qmake
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,9 +45,15 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki wkhtmltox
 License:	LGPL v3+
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%if %{with qt5}
+Requires:	Qt5Core-devel >= 5
+Requires:	Qt5Network-devel >= 5
+Requires:	Qt5WebKit-devel >= 5
+%else
 Requires:	QtCore-devel >= 4
 Requires:	QtNetwork-devel >= 4
 Requires:	QtWebKit-devel >= 4
+%endif
 
 %description devel
 Header files for wkhtmltox library.
@@ -44,7 +65,7 @@ Pliki nagłówkowe biblioteki wkhtmltox.
 %setup -q
 
 %build
-qmake-qt4 \
+qmake-%{?with_qt5:qt5}%{!?with_qt5:qt4} \
 	QMAKE_CXX="%{__cxx}" \
 	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
 	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
@@ -67,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS CHANGELOG.md README.md
 %attr(755,root,root) %{_bindir}/wkhtmltoimage
 %attr(755,root,root) %{_bindir}/wkhtmltopdf
 %attr(755,root,root) %{_libdir}/libwkhtmltox.so.*.*.*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wkhtmltopdf.git/commitdiff/2266e8b027c1decc8581d4236a254d2fadd6e475



More information about the pld-cvs-commit mailing list