Hello community,
here is the log from the commit of package wt for openSUSE:Factory checked in
at 2014-12-05 21:04:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wt (Old)
and /work/SRC/openSUSE:Factory/.wt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wt/wt.changes 2014-04-26 10:12:10.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.wt.new/wt.changes 2014-12-05
21:04:55.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Dec 4 14:18:05 UTC 2014 - tchva...@suse.com
+
+- Add various missing dependencies and switches to ensure we build
+ against system libraries
+- add -dbo-* subpackages for db connectors, thus our core does not
+ pull in all various database providers
+- Cleanup with spec cleaner
+- Remove support for < 12.3 as it failed to build there anyway
+- Use %cmake macro instead of directly calling %cmake
+- Version bump to 3.3.3:
+ * various bugfixes
+ * improved meta header support
+- Add patch to build on Factory with boost 5.16.0:
+ * wt-boost-1.56.0.patch
+
+-------------------------------------------------------------------
Old:
----
wt-3.3.2.tar.gz
New:
----
wt-3.3.3.tar.gz
wt-boost-1.56.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wt.spec ++++++
--- /var/tmp/diff_new_pack.c8Jwkl/_old 2014-12-05 21:04:57.000000000 +0100
+++ /var/tmp/diff_new_pack.c8Jwkl/_new 2014-12-05 21:04:57.000000000 +0100
@@ -16,40 +16,47 @@
#
+%define WTSRVDIR /srv/wt
+%define WTRUNDIR %{WTSRVDIR}/run
+%define mysqllib libwtdbomysql38
+%define pglib libwtdbopostgres38
Name: wt
-Version: 3.3.2
+Version: 3.3.3
Release: 0
Summary: Web Toolkit
License: GPL-2.0
Group: Development/Libraries/C and C++
Url: http://www.webtoolkit.eu/wt/
Source0:
https://downloads.sourceforge.net/project/witty/wt/%{version}/wt-%{version}.tar.gz
-
+# PATCH-FIX-UPSTREAM: boost 1.56 compat included in upstream VCS
+Patch0: wt-boost-1.56.0.patch
BuildRequires: FastCGI-devel
-%if 0%{?suse_version} < 1220
-BuildRequires: Mesa-devel
-%endif
# wt will build with boost-devel < 1.36.0 but it won't work
+BuildRequires: GraphicsMagick-devel
+BuildRequires: Mesa-devel
+BuildRequires: apache-rpm-macros
BuildRequires: boost-devel >= 1.36.0
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: fdupes
-%if 0%{?suse_version} >= 1220
-BuildRequires: firebird-devel
-%endif
BuildRequires: gcc-c++
+BuildRequires: glew-devel
+BuildRequires: glu-devel
BuildRequires: graphviz
-%if 0%{?suse_version} >= 1230
BuildRequires: libharu-devel
-%endif
+BuildRequires: libpng-devel
BuildRequires: libqt4-devel
+BuildRequires: mysql-devel
BuildRequires: openssl-devel
BuildRequires: pango-devel
BuildRequires: pkgconfig
BuildRequires: postgresql-devel
-
+BuildRequires: zlib-devel
Requires: FastCGI
Requires: openssl
+Recommends: %{name}-dbo = %{version}
+Suggests: %{name}-dbo-mysql = %{version}
+Suggests: %{name}-dbo-postgres = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -61,13 +68,43 @@
the library generates the necessary HTML, Javascript, CGI, and AJAX
code.
+%package dbo
+Summary: Wt::Dbo ORM library and Sqlite3 back-end
+Group: Development/Libraries
+
+%description dbo
+This package contains the Wt::Dbo Object-Relational Mapping library
+and Sqlite3 back-end of it.
+
+%package -n %{mysqllib}
+Summary: MySQL back-end for the Wt::Dbo ORM library
+Group: Development/Libraries
+Provides: %{name}-dbo-mysql = %{version}
+Requires: %{name}-dbo = %{version}
+
+%description -n %{mysqllib}
+This package contains the MySQL back-end for the Wt::Dbo ORM library.
+
+%package -n %{pglib}
+Summary: PostgreSQL back-end for the Wt::Dbo ORM library
+Group: Development/Libraries
+Provides: %{name}-dbo-postgres = %{version}
+Requires: %{name}-dbo = %{version}
+
+%description -n %{pglib}
+This package contains the PostgresSQL back-end for the Wt::Dbo ORM library.
+
%package devel
Summary: Web Toolkit - Development Files
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
+Requires: %{name}-dbo = %{version}
+Requires: %{name}-dbo-mysql = %{version}
+Requires: %{name}-dbo-postgres = %{version}
Requires: FastCGI-devel
Requires: Xerces-c-devel
Requires: boost-devel >= 1.34.1
+Requires: cmake
Requires: mxml-devel >= 2.3
Requires: openssl-devel
@@ -86,6 +123,7 @@
Summary: Web Toolkit - Doxygen Documentation
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
+BuildArch: noarch
%description doc
Doxygen documentation for the Wt library.
@@ -100,51 +138,43 @@
%prep
%setup -q
+%patch0 -p1
%build
-%define WTSRVDIR /srv/wt
-# path to runtime session data
-%define WTRUNDIR %{WTSRVDIR}/run
-# webserve user and group
-%define WTRUNUSER wwwrun
-%define WTRUNGROUP www
-mkdir wt-build
-cd wt-build
-cmake .. \
- -DCMAKE_C_FLAGS="%{optflags}" \
- -DCMAKE_CXX_FLAGS="%{optflags}" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -DLIB_INSTALL_DIR=%{_lib} \
+%cmake \
+ -DENABLE_FIREBIRD=OFF \
+ -DWT_CPP_11_MODE=-std=c++0x \
+ -DUSE_SYSTEM_IBPP=ON \
+ -DSHARED_LIBS=ON \
+ -DMULTI_THREADED=ON \
+ -DUSE_SYSTEM_SQLITE3=ON \
+ -DUSE_SYSTEM_GLEW=ON \
-DCONNECTOR_HTTP=ON \
-DCONNECTOR_FCGI=ON \
-%if 0%{?suse_version} < 1220
- -DWT_NO_BOOST_RANDOM=ON \
-%endif
- -DENABLE_EXT=True \
- -DWEBGROUP="%{WTRUNGROUP}" -DWEBUSER="%{WTRUNUSER}" \
+ -DENABLE_EXT=ON \
+ -DWEBGROUP="%{apache_group}" -DWEBUSER="%{apache_user}" \
-DRUNDIR="%{WTRUNDIR}" \
- -DBUILD_EXAMPLES=ON
+ -DBUILD_EXAMPLES=ON \
+ -DENABLE_GM=ON \
+ -DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick \
+ -DENABLE_HARU=ON \
+ -DENABLE_POSTGRES=ON \
+ -DENABLE_SQLITE=ON \
+ -DENABLE_MYSQL=ON \
+ -DWT_WITH_SSL=ON \
+ -DHTTP_WITH_ZLIB=ON
make V=1 %{?_smp_mflags}
%install
-cd wt-build
-make V=1 DESTDIR="%{buildroot}" install
-# hack for broken cmake configs on archs with /lib64
-%ifarch ppc64 s390x
-mv %{buildroot}/usr/lib/* %{buildroot}/usr/%{_lib} || true
-rm -Rf %{buildroot}/usr/lib
-%endif
-# end hack
+%cmake_install
+
mkdir -p %{buildroot}/%{_docdir}/%{name}
mkdir -p %{buildroot}/%{WTSRVDIR}
mkdir -p %{buildroot}/%{WTRUNDIR}
mkdir %{buildroot}/%{_docdir}/%{name}-devel/
-cp -rv ../doc/* %{buildroot}/%{_docdir}/%{name}-devel/
+cp -rv doc/* %{buildroot}/%{_docdir}/%{name}-devel/
mv -v %{buildroot}/%{_datadir}/Wt %{buildroot}/%{_datadir}/wt
-# We mustn't package .orig files
-find %{buildroot}/%{_includedir}/Wt -name '*.orig' -delete
-
# Remove the installdox script used for the installation of documentation.
rm %{buildroot}/%{_docdir}/%{name}-devel/examples/html/installdox
@@ -163,21 +193,48 @@
%postun -p /sbin/ldconfig
+%post dbo -p /sbin/ldconfig
+
+%postun dbo -p /sbin/ldconfig
+
+%post -n %{mysqllib} -p /sbin/ldconfig
+
+%postun -n %{mysqllib} -p /sbin/ldconfig
+
+%post -n %{pglib} -p /sbin/ldconfig
+
+%postun -n %{pglib} -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
-%{_libdir}/*.so.%{version}
+%{_libdir}/libwt.so.*
+%{_libdir}/libwtfcgi.so.*
+%{_libdir}/libwthttp.so.*
+%{_libdir}/libwttest.so.*
+%{_libdir}/libwtext.so.*
%doc Changelog LICENSE
%dir %{WTSRVDIR}
%dir %{_sysconfdir}/wt
%{_datadir}/wt
%config(noreplace) %{_sysconfdir}/wt/wt_config.xml
-%attr(-,%{WTRUNUSER},%{WTRUNGROUP}) %{WTRUNDIR}
+%attr(-,%{apache_user},%{apache_group}) %{WTRUNDIR}
+
+%files dbo
+%defattr(-,root,root)
+%{_libdir}/libwtdbo.so.*
+%{_libdir}/libwtdbosqlite3.so.*
+
+%files -n %{mysqllib}
+%defattr(-,root,root)
+%{_libdir}/libwtdbomysql.so.*
+
+%files -n %{pglib}
+%defattr(-,root,root)
+%{_libdir}/libwtdbopostgres.so.*
%files devel
%defattr(-,root,root)
%{_includedir}/Wt
-%exclude %{_libdir}/*.so.%{version}
-%{_libdir}/*.so.*
%{_libdir}/*.so
%exclude %{_docdir}/%{name}-devel/reference
%doc %{_docdir}/%{name}-devel
++++++ wt-3.3.2.tar.gz -> wt-3.3.3.tar.gz ++++++
/work/SRC/openSUSE:Factory/wt/wt-3.3.2.tar.gz
/work/SRC/openSUSE:Factory/.wt.new/wt-3.3.3.tar.gz differ: char 5, line 1
++++++ wt-boost-1.56.0.patch ++++++
Index: wt-3.3.3/src/Wt/Json/Parser.C
===================================================================
--- wt-3.3.3.orig/src/Wt/Json/Parser.C
+++ wt-3.3.3/src/Wt/Json/Parser.C
@@ -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
Index: wt-3.3.3/src/Wt/Render/CssParser.C
===================================================================
--- wt-3.3.3.orig/src/Wt/Render/CssParser.C
+++ wt-3.3.3/src/Wt/Render/CssParser.C
@@ -34,7 +34,11 @@ using namespace Wt::Render;
#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>
Index: wt-3.3.3/src/Wt/Dbo/SqlQueryParse.C
===================================================================
--- wt-3.3.3.orig/src/Wt/Dbo/SqlQueryParse.C
+++ wt-3.3.3/src/Wt/Dbo/SqlQueryParse.C
@@ -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>
-#include <boost/spirit/home/phoenix/statement/throw.hpp>
+#if BOOST_VERSION < 105600
+#include <boost/spirit/home/phoenix.hpp>
+#else
+#include <boost/phoenix.hpp>
+#endif
#include <boost/bind.hpp>
#include <iostream>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
