1 files changed, 26 insertions, 27 deletions
diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/ktechlab/ktechlab.spec
index 848381fce..0f55647f7 100644
--- a/redhat/applications/ktechlab/ktechlab.spec
+++ b/redhat/applications/ktechlab/ktechlab.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -101,47 +101,44 @@ Homepage: http://ktechlab.org/
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GPSIM=OFF \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Development/ktechlab.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -r -n ktechlab Science Math
@@ -166,6 +163,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/mimelnk/application/x-flowcode.desktop
 %{tde_datadir}/mimelnk/application/x-ktechlab.desktop
 %{tde_datadir}/mimelnk/application/x-microbe.desktop
+%{tde_mandir}/man1/ktechlab.1*
+%{tde_mandir}/man1/microbe.1*
 
 
 %changelog