summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kooldock
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2019-03-18 20:57:03 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2019-03-28 19:45:23 +0100
commit5fdf097f42dfeacda1d81387933ef20acedb1fc7 (patch)
tree5ae69373db075eee458f37e658e8f66f1b880344 /redhat/applications/kooldock
parent9011dcc5b79c6f60170fad0315ed914f3796ea03 (diff)
downloadtde-packaging-5fdf097f42dfeacda1d81387933ef20acedb1fc7.tar.gz
tde-packaging-5fdf097f42dfeacda1d81387933ef20acedb1fc7.zip
RPM: update build scripts for TDE R14.0.6
Diffstat (limited to 'redhat/applications/kooldock')
-rw-r--r--redhat/applications/kooldock/kooldock.spec57
1 files changed, 29 insertions, 28 deletions
diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec
index 5d0635d9f..647d511c7 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/kooldock/kooldock.spec
@@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -103,32 +103,37 @@ Homepage: http://sourceforge.net/projects/kooldock/
%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}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
+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}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ ..
%__make %{?_smp_mflags} || %__make
@@ -136,7 +141,7 @@ export kde_confdir="%{tde_confdir}"
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
@@ -173,14 +178,10 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/kooldock/backgrounds/osx/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/osx/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/osx/background-right.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/128x128/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/16x16/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/32x32/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/64x64/apps/kooldock.png
-%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png
+%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
%changelog