RPM: massive update and cleanup

1 files changed, 31 insertions, 17 deletions

diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
index cd8a9ebc2..2f072719f 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
@@ -19,7 +19,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -51,6 +51,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -165,6 +166,7 @@ especially suitable for embedded applications.
 %{_includedir}/libart-2.0/libart_lgpl/libart-features.h
 %{_includedir}/libart-2.0/libart_lgpl/libart.h
 %{_libdir}/pkgconfig/libart-2.0.pc
+%{_mandir}/man1/libart2-config.*
 
 ##########
 
@@ -177,30 +179,42 @@ especially suitable for embedded applications.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
-autoreconf -fiv
-
 
 %build
 unset QTDIR QTINC QTLIB
-
-%configure \
-  --prefix=%{_prefix} \
-  --exec-prefix=%{_prefix} \
-  --bindir=%{_bindir} \
-  --libdir=%{_libdir} \
-  --datadir=%{_datadir} \
-  --includedir=%{_includedir} \
+export PATH="%{tde_bindir}:${PATH}"
+
+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_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{_datadir}" \
   \
-  --disable-dependency-tracking
-  
-%__make %{?_smp_mflags}
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 
 %clean