-@HAVE_LIBI2NCOMMON_TRUE@%define with_libi2ncommon 1
-@HAVE_LIBI2NCOMMON_FALSE@%define with_libi2ncommon 0
-@HAVE_LIBT2N_TRUE@%define with_t2n 1
-@HAVE_LIBT2N_FALSE@%define with_t2n 1
+# @HAVE_LIBI2NCOMMON_TRUE@%define with_libi2ncommon 1
+# @HAVE_LIBI2NCOMMON_FALSE@%define with_libi2ncommon 0
+# @HAVE_LIBT2N_TRUE@%define with_libt2n 1
+# @HAVE_LIBT2N_FALSE@%define with_libt2n 0
+%define with_libi2ncommon 1
+%define with_libt2n 1
Summary: library with asynchronous io functionality
Name: libasyncio
Version: @VERSION@
Release: 1
License: GPL version 2 + linking exception
-Group: Intranator
+Group: Intra2net
Vendor: Intra2net AG
Source: %{name}-%{version}.tar.gz
-Buildroot: /tmp/%{name}-%{version}-root
+# Buildroot: /tmp/%{name}-%{version}-root
Prefix: /usr
Requires: libi2ncommon >= 1.0
-Requires: libasynio-utils = %{version}
Requires: boost >= 1.32.0
-BuildRequires: libtool
+Requires: libasyncio-utils = %{version}
+# BuildRequires: libtool
BuildRequires: boost-devel >= 1.32.0
Obsoletes: libsimpleio
%package devel
Summary: library with asynchronous io functionality
-Group: Intranator/Development
+Group: Intra2net/Development
Requires: libi2ncommon-devel
Requires: boost-devel >= 1.32.0
Obsoletes: libsimpleio-devel
%package utils
Summary: library with asynchronous io functionality
-Group: Intranator
-Requires: boost >= 1.32.0
-%if %{with_libi2ncommon}
+Group: Intra2net
+%if %{with libi2ncommon}
Requires: libi2ncommon >= 1.0
%endif
+Requires: boost >= 1.32.0
%description utils
A collection of util function and classes used within asyncio, but
%package utils-devel
Summary: library with asynchronous io functionality
-Group: Intranator/Development
-Requires: boost-devel >= 1.32.0
+Group: Intra2net/Development
+Requires: boost-devel >= 1.32.0
%description utils-devel
development files for asyncio utils.
-%if %{with_libt2n}
+%if %{with libt2n}
%package t2n
Summary: glue library for using t2n with libasyncio
-Group: Intranator
+Group: Intra2net
BuildRequires: libt2n-devel >= 0.4
Requires: libt2n >= 0.4
Obsoletes: libsimpleio-t2n
%package t2n-devel
Summary: glue library for using t2n with libasyncio
-Group: Intranator/Development
+Group: Intra2net/Development
Requires: libt2n-devel >= 0.4
%description t2n-devel
%build
export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/intranator/lib/pkgconfig
-autoreconf --force -i
-./configure $RPM_BUILD_WITH_OPTIMIZE --prefix=%{prefix}
-make %{?_smp_mflags}
+# autoreconf --force -i
+# ./configure $RPM_BUILD_WITH_OPTIMIZE --prefix=%{prefix}
+
+mkdir build
+cd build
+
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
-for dir in utils asyncio; do
- make -C $dir headerlist
-done
+CMAKE_OPTS=""
+%if %{with libi2ncommon}
+ CMAKE_OPTS="$CMAKE_OPTS -DWITH_LIBI2NCOMMON=ON"
+%endif
+%if %{with libt2n}
+ CMAKE_OPTS="$CMAKE_OPTS -DWITH_LIBT2N=ON"
+%endif
+
+cmake -DCMAKE_INSTALL_PREFIX="%{prefix}" $CMAKE_OPTS ../
-make check
+dmake %{?_smp_mflags}
+
+export BOOST_TEST_LOG_LEVEL=test_suite
+dmake check
%install
+cd build
make DESTDIR=$RPM_BUILD_ROOT install
# Remove unpackaged files
%doc LICENSE COPYING.GPL
%{prefix}/lib/libasyncio.so*
-%files devel -f headerlist.asyncio
+%files devel -f build/headerlist.asyncio
%defattr(-,root,root)
%{prefix}/lib/libasyncio.*a*
%{prefix}/lib/pkgconfig/libasyncio.pc
%{prefix}/lib/libasyncio_utils.so*
-%files utils-devel -f headerlist.utils
+%files utils-devel -f build/headerlist.utils
%defattr(-,root,root)
%{prefix}/lib/libasyncio.*a*
%{prefix}/lib/pkgconfig/libasyncio_utils.pc
-
-%if %{with_libt2n}
+%if %{with libt2n}
%files t2n
%defattr(-,root,root)
%doc LICENSE