Merge remote-tracking branch 'origin/cmake-conversion'

[libasyncio] / libasyncio.spec.in

diff --git a/libasyncio.spec.in b/libasyncio.spec.in
index acfe250..f80c4fd 100644 (file)
--- a/libasyncio.spec.in
+++ b/libasyncio.spec.in
@@ -1,7 +1,9 @@
-@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
@@ -11,11 +13,12 @@ License:   GPL version 2 + linking exception
 Group:     Intranator
 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}
-BuildRequires: libtool
+Requires:   boost >= 1.32.0
+Requires:  libasyncio-utils = %{version}
+# BuildRequires: libtool
 BuildRequires: boost-devel >= 1.32.0
 Obsoletes: libsimpleio
 
@@ -38,9 +41,10 @@ development files for library with asynchronous io functionality
 %package utils
 Summary:   library with asynchronous io functionality
 Group:     Intranator
-%if %{with_libi2ncommon}
+%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
@@ -56,7 +60,7 @@ Requires:  boost-devel >= 1.32.0
 development files for asyncio utils.
 
 
-%if %{with_libt2n}
+%if %{with libt2n}
 %package t2n
 Summary:    glue library for using t2n with libasyncio
 Group:      Intranator
@@ -84,18 +88,32 @@ development files for glue lib for using t2n with simpleio.
 
 %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}
 
-for dir in utils asyncio; do
-    make -C $dir headerlist
-done
+mkdir build
+cd build
+
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+
+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 ../
+
+dmake %{?_smp_mflags}
 
 export BOOST_TEST_LOG_LEVEL=test_suite
-make check
+dmake check
 
 %install
+cd build
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove unpackaged files
@@ -113,7 +131,7 @@ rm -fr $RPM_BUILD_ROOT
 %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
@@ -124,13 +142,12 @@ rm -fr $RPM_BUILD_ROOT
 %{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