summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2016-10-13 20:55:21 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2016-10-13 20:55:21 +0200
commitcf66f06bf6179eb1b11f18621c121277ef62cbe9 (patch)
treef2a958ac87f6e63a548cacc8cba9bdb0141ef3d6
parent589742fc1116ffe717cf13adcefc0ee0bfdf23da (diff)
downloadtde-packaging-cf66f06bf6179eb1b11f18621c121277ef62cbe9.tar.gz
tde-packaging-cf66f06bf6179eb1b11f18621c121277ef62cbe9.zip
RPM packaging: switch filelight to cmake build
-rw-r--r--redhat/applications/filelight/filelight-14.0.0.spec52
1 files changed, 28 insertions, 24 deletions
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec
index af3009a42..d1929206f 100644
--- a/redhat/applications/filelight/filelight-14.0.0.spec
+++ b/redhat/applications/filelight/filelight-14.0.0.spec
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -93,40 +93,44 @@ directories on your computer.
%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}"
-export kde_confdir="%{tde_confdir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --docdir=%{tde_tdedocdir} \
- --libdir=%{tde_libdir} \
+
+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_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -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} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBUILD_ALL="ON" \
+ ..
-%__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}