Hello community,
here is the log from the commit of package wt
checked in at Mon Apr 21 18:55:48 CEST 2008.
--------
--- wt/wt.changes 2008-02-01 18:51:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/wt/wt.changes 2008-04-19 21:11:46.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 18 10:41:58 CEST 2008 - pcerny@suse.cz
+
+- update to 2.1.2 (details in package Changelog)
+ * wt-2.1.2-cmake_config.patch - fixes broken cmake config files
+- removed -fpermissive (building against boost 1.34.1 works now)
+
+-------------------------------------------------------------------
Old:
----
wt-2.0.6-missing_includes.patch
wt-2.0.6.tar.bz2
New:
----
wt-2.1.2-cmake_config.patch
wt-2.1.2-missing_includes.patch
wt-2.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wt.spec ++++++
--- /var/tmp/diff_new_pack.n23831/_old 2008-04-21 18:55:33.000000000 +0200
+++ /var/tmp/diff_new_pack.n23831/_new 2008-04-21 18:55:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package wt (Version 2.0.6)
+# spec file for package wt (Version 2.1.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,21 +10,27 @@
# norootforbuild
+
Name: wt
Url: http://www.webtoolkit.eu/wt/
License: GPL v2 only
Group: Development/Libraries/C and C++
AutoReqProv: on
-Version: 2.0.6
+Version: 2.1.2
Release: 1
Summary: Web Toolkit
Source0: %{name}-%{version}.tar.bz2
-Patch0: %{name}-2.0.6-missing_includes.patch
-Requires: FastCGI openssl Xerces-c boost >= 1.33.1
+Patch0: %{name}-%{version}-missing_includes.patch
+Patch1: %{name}-%{version}-cmake_config.patch
+Requires: FastCGI openssl Xerces-c
+#Requires: asio >= 0.3.9
+Requires: boost >= 1.34.1
Requires: mxml >= 2.3
+#Suggests: apache2-mod_fcgid
BuildRequires: gcc-c++
BuildRequires: FastCGI-devel Xerces-c-devel openssl-devel
-BuildRequires: boost-devel >= 1.33.1
+#BuildRequires: asio-devel >= 0.3.9
+BuildRequires: boost-devel >= 1.34.1
BuildRequires: mxml-devel >= 2.3
BuildRequires: cmake pkgconfig
BuildRequires: fdupes
@@ -48,10 +54,12 @@
Wim Dumon (wim.dumon@gmail.com)
%package devel
+License: GPL v2 only
Summary: Web Toolkit
Group: Development/Libraries/C and C++
Requires: FastCGI-devel openssl-devel Xerces-c-devel
-Requires: boost-devel >= 1.33.1
+#Requires: asio-devel >= 0.3.9
+Requires: boost-devel >= 1.34.1
Requires: mxml-devel >= 2.3
Requires: %{name} = %{version}
@@ -75,6 +83,7 @@
%prep
%setup
%patch0 -p1
+%patch1 -p1
%build
%define WTSRVDIR /srv/wt
@@ -85,7 +94,7 @@
%define WTRUNGROUP www
mkdir wt-build
cd wt-build
-CFLAGS=$RPM_OPT_FLAGS CXXFLAGS="$RPM_OPT_FLAGS -fpermissive" \
+CFLAGS=$RPM_OPT_FLAGS CXXFLAGS="$RPM_OPT_FLAGS" \
cmake .. \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DLIB_INSTALL_DIR=/%{_lib} \
@@ -99,6 +108,12 @@
%install
cd wt-build
make DESTDIR="%{buildroot}" install
+# hack for broken cmake configs on archs with /lib64
+%ifarch ppc64 s390x x86_64
+mv %{buildroot}/usr/lib/* %{buildroot}/usr/%{_lib} || true
+rm -Rf %{buildroot}/usr/lib
+%endif
+# end hack
mkdir -p %{buildroot}%{_docdir}/%{name}
mkdir -p %{buildroot}%{WTSRVDIR}
mkdir -p %{buildroot}%{WTRUNDIR}
@@ -129,8 +144,14 @@
%{_libdir}/*.so.*
%{_libdir}/*.so
%doc %{_docdir}/%{name}-devel
+%{_libdir}/*.so
+%{_datadir}/cmake/Modules/*
%changelog
+* Fri Apr 18 2008 pcerny@suse.cz
+- update to 2.1.2 (details in package Changelog)
+ * wt-2.1.2-cmake_config.patch - fixes broken cmake config files
+- removed -fpermissive (building against boost 1.34.1 works now)
* Fri Feb 01 2008 pcerny@suse.cz
- upgrade to 2.0.6
* removed patches included in upstream
++++++ wt-2.1.2-cmake_config.patch ++++++
# fixes install destination for FindWt.cmake
--- wt-2.1.2.orig/CMakeLists.txt 2008-04-17 15:31:25.559732680 +0000
+++ wt-2.1.2/CMakeLists.txt 2008-04-17 15:32:25.687730075 +0000
@@ -104,9 +104,9 @@
ENDIF(WIN32)
IF( NOT DEFINED WT_CMAKE_FINDER_INSTALL_DIR )
- SET( WT_CMAKE_FINDER_INSTALL_DIR "/usr/share/cmake-2.4/Modules" )
+ SET( WT_CMAKE_FINDER_INSTALL_DIR "/usr/share/cmake/Modules" )
ENDIF( NOT DEFINED WT_CMAKE_FINDER_INSTALL_DIR)
INSTALL(FILES ${PROJECT_SOURCE_DIR}/cmake/FindWt.cmake DESTINATION
- ${CMAKE_INSTALL_PREFIX}/${WT_CMAKE_FINDER_INSTALL_DIR} )
+ ${WT_CMAKE_FINDER_INSTALL_DIR} )
++++++ wt-2.0.6-missing_includes.patch -> wt-2.1.2-missing_includes.patch ++++++
--- wt/wt-2.0.6-missing_includes.patch 2008-01-25 19:07:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/wt/wt-2.1.2-missing_includes.patch 2008-04-16 20:08:45.000000000 +0200
@@ -1,6 +1,7 @@
-# adds missing includes
---- wt-2.0.6/src/fcgi/FCGIRecord.h 2006-08-16 13:21:02.000000000 +0200
-+++ wt-2.0.6.new/src/fcgi/FCGIRecord.h 2008-01-25 19:00:41.311281850 +0100
+# adds missing includes from C++ standard library
+diff -ur wt-2.1.2/src/fcgi/FCGIRecord.h wt-2.1.2.new/src/fcgi/FCGIRecord.h
+--- wt-2.1.2/src/fcgi/FCGIRecord.h 2006-08-16 13:21:02.000000000 +0200
++++ wt-2.1.2.new/src/fcgi/FCGIRecord.h 2008-01-25 19:00:41.311281850 +0100
@@ -9,6 +9,8 @@
#include