Merge branch 'f18'

Conflicts:
	wt.spec

.gitignore

@@ -1,2 +1,3 @@
 /wt-3.2.2-p1-free.tar.gz
 /wt-3.2.3-free.tar.gz
+/wt-3.3.0-free.tar.gz

sources

@@ -1,2 +1,2 @@
-dbf753792c27247ca3a52e3198b178f4  wt-3.2.2-p1-free.tar.gz
 234e3d21d7fa7407d3784bb757d8e3cd  wt-3.2.3-free.tar.gz
+506c639db4c7e7e0880cb34d931eda12  wt-3.3.0-free.tar.gz

wt.spec

@@ -5,8 +5,8 @@
 %global WTRUNGROUP      apache
 
 Name:           wt
-Version:        3.2.3
-Release:        2%{?dist}
+Version:        3.3.0
+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.2.3/wt-3.2.3.tar.gz
-# by running generate-tarball.sh 3.2.3 from tarball's directory
+#  http://citylan.dl.sourceforge.net/project/witty/wt/3.3.0/wt-3.3.0.tar.gz
+# by running ./wt-generate-tarball.sh 3.3.0 from tarball's directory
 Source0:        %{name}-%{version}-free.tar.gz
 Source1:        %{name}-%{version}-PACKAGE-LICENSING
 # wt toolkit contains bundled non-free library (IBPP) that we cannot ship.
@@ -185,7 +185,6 @@ popd
 %files
 %config(noreplace) %{_sysconfdir}/%{name}/wt_config.xml
 %{_libdir}/libwt.so.*
-%{_libdir}/libwtext.so.*
 %{_libdir}/libwtfcgi.so.*
 %{_libdir}/libwthttp.so.*
 %{_libdir}/libwttest.so.*
@@ -238,6 +237,9 @@ popd
 %{_defaultdocdir}/%{name}-doc-%{version}/examples/*
 
 %changelog
+* Thu Jun 20 2013 Michal Minar <miminar@redhat.com> 3.3.0-1
+- Version 3.3.0
+
 * Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 3.2.3-2
 - Rebuild for Boost-1.53.0