From a042f6e1da20b2ef4d25930a8e6feeaee31229c8 Mon Sep 17 00:00:00 2001
From: Michal Minar <miminar@redhat.com>
Date: Mon, 20 Apr 2015 10:50:49 +0200
Subject: [PATCH] New upstream version 3.3.4

Signed-off-by: Michal Minar <miminar@redhat.com>
---
 .gitignore                                    |  3 +-
 sources                                       |  2 +-
 wt-3.3.3-boost-1.57.patch                     | 58 -------------------
 ...GE-LICENSING => wt-3.3.4-PACKAGE-LICENSING |  0
 wt.spec                                       | 15 +++--
 5 files changed, 9 insertions(+), 69 deletions(-)
 delete mode 100644 wt-3.3.3-boost-1.57.patch
 rename wt-3.3.3-PACKAGE-LICENSING => wt-3.3.4-PACKAGE-LICENSING (100%)

diff --git a/.gitignore b/.gitignore
index c8cd48d..67f0dc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/wt-3.3.2-free.tar.xz
-/wt-3.3.3-free.tar.xz
+/wt-3.3.4-free.tar.xz
diff --git a/sources b/sources
index 0ca071c..f22de67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61ed3b79c409efffeb749a9fe103d7e2  wt-3.3.3-free.tar.xz
+8d5e7670a7acaa225aea516931cffb8c  wt-3.3.4-free.tar.xz
diff --git a/wt-3.3.3-boost-1.57.patch b/wt-3.3.3-boost-1.57.patch
deleted file mode 100644
index e37240a..0000000
--- a/wt-3.3.3-boost-1.57.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur wt-3.3.3.orig/src/Wt/Dbo/SqlQueryParse.C wt-3.3.3/src/Wt/Dbo/SqlQueryParse.C
---- wt-3.3.3.orig/src/Wt/Dbo/SqlQueryParse.C	2012-02-27 22:14:29.000000000 +0100
-+++ wt-3.3.3/src/Wt/Dbo/SqlQueryParse.C	2015-02-08 15:15:27.820770357 +0100
-@@ -20,7 +20,11 @@
- #include <boost/spirit/include/phoenix_core.hpp>
- #include <boost/spirit/include/phoenix_operator.hpp>
- #include <boost/spirit/include/phoenix_object.hpp>
-+#if BOOST_VERSION < 105600
- #include <boost/spirit/home/phoenix/statement/throw.hpp>
-+#else
-+#include <boost/phoenix.hpp>
-+#endif
- #include <boost/bind.hpp>
- #include <iostream>
- 
-diff -Naur wt-3.3.3.orig/src/Wt/Json/Parser.C wt-3.3.3/src/Wt/Json/Parser.C
---- wt-3.3.3.orig/src/Wt/Json/Parser.C	2013-02-03 22:26:10.000000000 +0100
-+++ wt-3.3.3/src/Wt/Json/Parser.C	2015-02-08 15:18:41.573842062 +0100
-@@ -24,7 +24,11 @@
- #include <boost/spirit/include/phoenix_core.hpp>
- #include <boost/spirit/include/phoenix_operator.hpp>
- #include <boost/spirit/include/phoenix_object.hpp>
-+#if BOOST_VERSION < 105600
- #include <boost/spirit/home/phoenix/statement/throw.hpp>
-+#else
-+#include <boost/phoenix.hpp>
-+#endif
- #include <boost/bind.hpp>
- 
- #endif // JSON_PARSER
-diff -Naur wt-3.3.3.orig/src/Wt/Render/CssParser.C wt-3.3.3/src/Wt/Render/CssParser.C
---- wt-3.3.3.orig/src/Wt/Render/CssParser.C	2013-08-08 20:43:18.000000000 +0200
-+++ wt-3.3.3/src/Wt/Render/CssParser.C	2015-02-08 15:15:27.821770347 +0100
-@@ -34,7 +34,11 @@
- #include <boost/fusion/include/adapt_struct.hpp>
- #include <boost/variant/recursive_variant.hpp>
- #include <boost/spirit/home/support/context.hpp>
-+#if BOOST_VERSION < 105600
- #include <boost/spirit/home/phoenix.hpp>
-+#else
-+#include <boost/phoenix.hpp>
-+#endif
- #include <boost/spirit/include/classic_file_iterator.hpp>
- 
- #include <map>
-@@ -157,8 +161,12 @@
- template< typename Iterator >
- struct ErrorReporting
- {
-+#if BOOST_VERSION < 105600
-   template< typename, typename, typename, typename, typename > // Phoenix v2
-   struct result { typedef void type;};
-+#else
-+  typedef void result_type;
-+#endif
- 
-   ErrorReporting(CssGrammer< Iterator >* grammer)
-     : grammer_(grammer)
diff --git a/wt-3.3.3-PACKAGE-LICENSING b/wt-3.3.4-PACKAGE-LICENSING
similarity index 100%
rename from wt-3.3.3-PACKAGE-LICENSING
rename to wt-3.3.4-PACKAGE-LICENSING
diff --git a/wt.spec b/wt.spec
index fb24b4c..b09b681 100644
--- a/wt.spec
+++ b/wt.spec
@@ -5,8 +5,8 @@
 %global WTRUNGROUP      apache
 
 Name:           wt
-Version:        3.3.3
-Release:        4%{?dist}
+Version:        3.3.4
+Release:        1%{?dist}
 Summary:        C++ library for developing web applications
 
 Group:          Development/Libraries
@@ -14,8 +14,8 @@ Group:          Development/Libraries
 License:        GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib
 URL:            http://www.webtoolkit.eu/wt
 # Following archive was made from upstream tarball downloaded from
-#  http://citylan.dl.sourceforge.net/project/witty/wt/3.3.3/wt-3.3.3.tar.gz
-# by running ./wt-generate-tarball.sh 3.3.3 from tarball's directory
+#  http://citylan.dl.sourceforge.net/project/witty/wt/3.3.4/wt-3.3.4.tar.gz
+# by running ./wt-generate-tarball.sh 3.3.4 from tarball's directory
 Source0:        %{name}-%{version}-free.tar.xz
 Source1:        %{name}-%{version}-PACKAGE-LICENSING
 # Explain why the locale example is renamed to timezone.
@@ -30,9 +30,6 @@ Source3:        README.fedora
 Source4:        wt-generate-tarball.sh
 Patch0:         find-mysql.patch
 Patch1:         use-system-sqlite.patch
-# boost-1.57 compatibility patches
-# from https://github.com/kdeforche/wt
-Patch2:         wt-3.3.3-boost-1.57.patch
 
 BuildRequires:  cmake >= 2.6 boost-devel >= 1.41 openssl-devel
 BuildRequires:  GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel
@@ -114,7 +111,6 @@ This package contains the documents for Wt API and examples.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .find-mysql
 %patch1 -p1 -b .use-system-sqlite
-%patch2 -p1
 
 # static files like javascript and css should not be executable
 for d in src resources examples; do
@@ -295,6 +291,9 @@ popd
 %{_defaultdocdir}/%{name}-doc/examples/*
 
 %changelog
+* Mon Apr 20 2015 Michal Minar <miminar@redhat.com> 3.3.4-1
+- New upstream version 3.3.4
+
 * Mon Feb 09 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.3.3-4
 - Add wt-3.3.3-boost-1.57.patch (Fix boost-1.57 FTBFS).
 - Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel.