new upstream version: 4.1.0

NVR: wt-4.1.0-1

Resolves: bz#1742106

Signed-off-by: Michal Minář <miminar@redhat.com>

.gitignore

@@ -1 +1 @@
-/wt-4.0.3-free.tar.xz
+/wt-4.1.0-free.tar.xz

find-mysql.patch

@@ -1,13 +0,0 @@
-Index: wt-3.3.1-rc1/cmake/WtFindMysql.txt
-===================================================================
---- wt-3.3.1-rc1.orig/cmake/WtFindMysql.txt
-+++ wt-3.3.1-rc1/cmake/WtFindMysql.txt
-@@ -25,6 +25,8 @@ FIND_LIBRARY(MYSQL_LIB
-     PATHS
-     ${MYSQL_PREFIX}/lib
-     ${MYSQL_PREFIX}/lib/opt
-+    ${MYSQL_PREFIX}/lib/mysql
-+    ${MYSQL_PREFIX}/lib64/mysql
-     /usr/lib
-     /usr/local/lib
-     /opt/local/lib

pango-add-harfbuzz-include.patch

@@ -0,0 +1,31 @@
+From 20e552a69e3cf3f1c3e77c9cab05e3ce191c5e3b Mon Sep 17 00:00:00 2001
+From: Roel Standaert <roel@emweb.be>
+Date: Wed, 14 Aug 2019 12:19:11 +0200
+Subject: [PATCH] Issue #7193: Pango 1.44 fix: add harfbuzz include dir
+
+---
+ cmake/WtFindPangoFt2.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
+index 5dae4cbf7..d64eeeecc 100644
+--- a/cmake/WtFindPangoFt2.txt
++++ b/cmake/WtFindPangoFt2.txt
+@@ -14,6 +14,9 @@ FIND_PATH(FT2BUILD_INCLUDE_DIR ft2build.h
+ FIND_PATH(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
+           HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
+ 
++FIND_PATH(HARFBUZZ_INCLUDE_DIR hb.h
++          HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
++
+ FIND_PATH(GLIB2_INCLUDE_DIR glib.h
+           HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
+ 
+@@ -40,6 +43,7 @@ SET(PANGO_FT2_INCLUDE_DIRS
+     ${FT2_INCLUDE_DIR}
+     ${FT2BUILD_INCLUDE_DIR}
+     ${FONTCONFIG_INCLUDE_DIR}
++    ${HARFBUZZ_INCLUDE_DIR}
+     ${GLIB2_INCLUDE_DIR}
+     ${GLIB2_CONFIG_INCLUDE_DIR})
+ 

sources

@@ -1 +1 @@
-SHA512 (wt-4.0.3-free.tar.xz) = 80d9c24bec270692324f1db22618875cb514d7f54a4ce285f3517d98c25798619b9c74bd8e717eb83db43edb6cd2da992ded8629d0d239bfdbc5052d56cb19fa
+SHA512 (wt-4.1.0-free.tar.xz) = 663afdb0c16a2ca1218e3bae73d973c3120112b6f22db4726ff555547b2eaed2a42da8446969db1a2f83ba2c97f9d300da59111018c15bdbb8aed44b078064f1

use-system-sqlite.patch

@@ -1,9 +1,9 @@
-Index: wt-3.3.2/src/CMakeLists.txt
+Index: wt-4.0.5/src/CMakeLists.txt
 ===================================================================
---- wt-3.3.2.orig/src/CMakeLists.txt
+--- wt-4.0.5.orig/src/CMakeLists.txt
-+++ wt-3.3.2/src/CMakeLists.txt
++++ wt-4.0.5/src/CMakeLists.txt
-@@ -5,9 +5,12 @@ INCLUDE_DIRECTORIES(
+@@ -6,9 +6,12 @@ INCLUDE_DIRECTORIES(
-   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_CURRENT_SOURCE_DIR}/Wt/Date/include
    ${CMAKE_CURRENT_BINARY_DIR} # for WConfig.h
    ${BOOST_INCLUDE_DIRS}
 -  Wt/Dbo/backend/amalgamation # for sqlite3.h

wt-generate-tarball.sh

@@ -4,16 +4,24 @@ set -euo pipefail
 IFS=$'\n\t'
 
 NAME="wt"
-VERSION=$1
+VERSION="$1"
 
 tmp=`mktemp -d`
-tar -xzvf $VERSION.tar.gz -C $tmp
+archiveName="$VERSION.tar.gz"
-pushd $tmp
+[[ -f "${archiveName}" ]] || archiveName="$NAME-$VERSION.tar.gz"
-pushd $NAME-$VERSION/src/Wt/Dbo/backend
+if [[ ! -f "${archiveName}" ]]; then
+    printf 'Could not find source archive %s!\n' "$archiveName" >&2
+    exit 1
+fi
+
+dirName="$NAME-$VERSION"
+tar -xzvf "$archiveName" -C "$tmp"
+pushd "$tmp"
+pushd "$dirName/src/Wt/Dbo/backend"
 rm -r ibpp
 popd # backend
-rm -r $NAME-$VERSION/resources/jPlayer
+rm -r "$dirName/resources/jPlayer"
-tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION
+tar -cJvf "$dirName-free.tar.xz" "$dirName"
 popd # tmp
-mv $tmp/$NAME-$VERSION-free.tar.xz .
+mv "$tmp/$dirName-free.tar.xz" .
-rm -r $tmp
+rm -r "$tmp"

wt.spec

@@ -5,8 +5,8 @@
 %global WTRUNGROUP      apache
 
 Name:           wt
-Version:        4.0.3
+Version:        4.1.0
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        C++ library for developing web applications
 
 # For a breakdown of the licensing, see PACKAGE-LICENSING
@@ -29,6 +29,8 @@ Source3:        README.fedora
 Source4:        wt-generate-tarball.sh
 
 Patch0:         use-system-sqlite.patch
+# fix for pango 1.44: https://github.com/Pandinosaurus/wt/pull/66
+Patch1:         pango-add-harfbuzz-include.patch
 
 BuildRequires:  cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen
 BuildRequires:  GraphicsMagick-devel pango-devel sqlite-devel libpq-devel
@@ -280,6 +282,12 @@ popd
 %{_defaultdocdir}/%{name}-doc/examples/*
 
 %changelog
+* Mon Aug 19 2019 Michal Minář <miminar@redhat.com> - 4.1.0-1
+- New upstream version.
+
+* Mon May 20 2019 Michal Minář <miminar@redhat.com> - 4.0.5-1
+- New upstream version 4.0.5
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild