diff options
author | François Andriot <[email protected]> | 2021-08-03 10:53:56 +0200 |
---|---|---|
committer | François Andriot <[email protected]> | 2021-08-03 10:58:50 +0200 |
commit | 17683433eadb1f4b3061e4b7ba885dfac09a198c (patch) | |
tree | 51aeedd7ae02cb4f2fe50563311f1819a3222530 /redhat/applications/kdbg | |
parent | 5a9c30ef24e29ddc32121934330a495005633b3a (diff) | |
download | tde-packaging-17683433eadb1f4b3061e4b7ba885dfac09a198c.tar.gz tde-packaging-17683433eadb1f4b3061e4b7ba885dfac09a198c.zip |
RPM: various updates for TDE 14.0.11
Signed-off-by: François Andriot <[email protected]>
Diffstat (limited to 'redhat/applications/kdbg')
-rw-r--r-- | redhat/applications/kdbg/kdbg.spec | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/kdbg/kdbg.spec index b37eef30f..5a4a17a69 100644 --- a/redhat/applications/kdbg/kdbg.spec +++ b/redhat/applications/kdbg/kdbg.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake libtool m4 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -113,33 +113,37 @@ Features include the following: %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} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +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}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -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}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -147,7 +151,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} @@ -167,6 +171,7 @@ export PATH="%{tde_bindir}:${PATH}" %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/ %{tde_datadir}/icons/hicolor/*/apps/kdbg.png %{tde_datadir}/icons/locolor/*/apps/kdbg.png +%{tde_mandir}/man1/kdbg.* %changelog |