[wkhtmltopdf] 0.12.1

[Mamoru TASAKA]

commit 9a0aa00556f0b8c9eb4fd05e79406c6cea73bf3e
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Wed Aug 27 23:32:04 2014 +0900

    0.12.1

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...pdf-0.12.0-fix-compilation-with-native-qt.patch |  209 --------------------
 wkhtmltopdf.spec                                   |   16 +-
 4 files changed, 12 insertions(+), 216 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bcf3929..95a2ab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /wkhtmltopdf-0.11.0_rc1.tar.bz2
 /wkhtmltopdf-0.12.0.tar.gz
+/wkhtmltopdf-0.12.1.tar.gz
diff --git a/sources b/sources
index b6ebd41..8beef54 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2af84222d651791d10270ce9ccf1245  wkhtmltopdf-0.12.0.tar.gz
+c45d22a1001c6692c6e68b3452dff409  wkhtmltopdf-0.12.1.tar.gz
diff --git a/wkhtmltopdf.spec b/wkhtmltopdf.spec
index a3e7853..2e86d4d 100644
--- a/wkhtmltopdf.spec
+++ b/wkhtmltopdf.spec
@@ -1,11 +1,11 @@
-%global	mainver	0.12.0
+%global	mainver	0.12.1
 #%%global	minorver	rc1
 
 %global	fedorarel	1
 
 Name:		wkhtmltopdf
 Version:	%{mainver}
-Release:	%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}%{?dist}.2
+Release:	%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}%{?dist}
 Summary:	Simple shell utility to convert html to pdf
 
 License:	GPLv3+
@@ -14,9 +14,6 @@ URL:		http://wkhtmltopdf.org/
 # https://github.com/wkhtmltopdf/wkhtmltopdf/archive/%%{version}.tar.gz
 # Renamed above
 Source0:	%{name}-%{version}.tar.gz
-# https://github.com/wkhtmltopdf/wkhtmltopdf/commit/88d5e32c7392855650f8bfe0089662bb41ae07c.patch
-# Slightly modified
-Patch0:	wkhtmltopdf-0.12.0-fix-compilation-with-native-qt.patch
 
 BuildRequires:	qtwebkit-devel%{?isa}
 
@@ -36,7 +33,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n %{name}-%{mainver}%{?minorver:_%minorver}
-%patch0 -p1 -b .qt
 # libdir handling.. better handling needed
 sed -i.lib -e \
 	'/INSTALLBASE/s|lib|%{_lib}|' \
@@ -62,12 +58,17 @@ make install \
 %files
 %doc	AUTHORS
 %doc	COPYING
+%doc	CHANGELOG.md
+%doc	CHANGELOG-OLD
 %doc	README.md
 
 %{_libdir}/libwkhtmltox.so.0*
 %{_bindir}/wkhtmltoimage
 %{_bindir}/wkhtmltopdf
 
+%{_mandir}/man1/wkhtmltoimage.1*
+%{_mandir}/man1/wkhtmltopdf.1*
+
 %files devel
 %doc    examples/
 %{_libdir}/libwkhtmltox.so
@@ -75,6 +76,9 @@ make install \
 
 
 %changelog
+* Wed Aug 27 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.12.1-1
+- 0.12.1
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.0-1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild