1 files changed, 31 insertions, 24 deletions

diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode.spec
index 6938322cb..9687ea489 100644
--- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec
+++ b/redhat/applications/kbarcode/kbarcode.spec
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -119,6 +119,7 @@ to use them in another application.
 %{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
 %{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
 %{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
+%{tde_mandir}/man1/*.1*
 %{tde_tdedocdir}/HTML/en/kbarcode/
 
 ##########
@@ -148,41 +149,47 @@ Group:			Applications/Utilities
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  -DWITH_NATIVE_GNU_BARCODE=OFF \
+  -DWITH_JAVASCRIPT=ON \
   \
-  --with-extra-includes=%{_includedir}/pcre
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
 
-# SMP safe !
-%__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}