RPM packaging: switch tellico to cmake build

1 files changed, 39 insertions, 28 deletions

diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index f20d754f0..2eff43b22 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -105,6 +105,9 @@ BuildRequires:	libv4l-devel
 BuildRequires:	%{_lib}v4l-devel
 %endif
 
+# EXEMPI support
+BuildRequires:	exempi-devel
+
 Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -170,9 +173,12 @@ documentation.
 %{tde_datadir}/apps/tellico/welcome.html
 %{tde_datadir}/config.kcfg
 %{tde_tdedocdir}/HTML/*/tellico/
-%{tde_datadir}/icons
-%{tde_datadir}/apps/mime
-%{tde_datadir}/mimelnk
+%{tde_datadir}/icons/hicolor/*/apps/tellico.png
+%{tde_datadir}/icons/hicolor/*/mimetypes/application-x-tellico.png
+%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
+%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
+%{tde_datadir}/mime/packages/tellico.xml
+%{tde_datadir}/mimelnk/application/x-tellico.desktop
 %{tde_datadir}/apps/tdeconf_update/tellico-1-3-update.pl
 %{tde_datadir}/apps/tdeconf_update/tellico-rename.upd
 %{tde_datadir}/apps/tdeconf_update/tellico.upd
@@ -221,35 +227,40 @@ if [ -r /usr/include/libv4l1-videodev.h ]; then
 %__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|"
 fi
 
-%__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}"
-export kde_confdir="%{tde_confdir}"
-
-# 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} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%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_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --enable-webcam
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_LIBKCDDB=ON \
+  -DWITH_LIBKCAL=ON \
+  -DWITH_LIBBTPARSE=OFF \
+  -DWITH_SAX_LOADER=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -257,7 +268,7 @@ export kde_confdir="%{tde_confdir}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 # Add svg icons to xdg directories
 %__install -D -c -p -m 644 icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg