From 3c430f95c1f8fa0db4c502f5f76a35970954de6e Mon Sep 17 00:00:00 2001 From: François Andriot Date: Sun, 27 Sep 2026 21:11:39 +0200 Subject: RPM: cmake: keep 'mkdir build' and '..' options, needed for most distributions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/applications/development/kxmleditor/kxmleditor.spec | 3 ++- redhat/applications/development/piklab/piklab.spec | 9 +++++++-- redhat/applications/graphics/gwenview/gwenview.spec | 8 +++++++- redhat/applications/internet/kasablanca/kasablanca.spec | 8 +++++++- redhat/applications/internet/ktorrent/ktorrent.spec | 9 +++++++-- redhat/applications/internet/kvirc/kvirc.spec | 9 ++++++++- redhat/applications/misc/krecipes/krecipes.spec | 9 +++++++-- redhat/applications/multimedia/amarok/amarok.spec | 8 +++++++- redhat/applications/multimedia/codeine/codeine.spec | 9 ++++++++- redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec | 3 ++- .../applications/multimedia/soundkonverter/soundkonverter.spec | 3 +-- redhat/applications/settings/kmyfirewall/kmyfirewall.spec | 5 +++++ redhat/applications/system/kbfx/kbfx.spec | 8 +++++++- redhat/applications/system/krusader/krusader.spec | 4 +++- redhat/applications/system/kvkbd/kvkbd.spec | 3 ++- redhat/applications/system/smartcardauth/smartcardauth.spec | 9 ++++++++- redhat/applications/utilities/abakus/abakus.spec | 8 +++++++- redhat/applications/utilities/kbarcode/kbarcode.spec | 8 +++++++- redhat/libraries/libkipi/libkipi.spec | 9 ++++++++- redhat/libraries/libtdeldap/libtdeldap.spec | 4 +++- 20 files changed, 113 insertions(+), 23 deletions(-) diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec index 5c1f38513..a8f6d119f 100644 --- a/redhat/applications/development/kxmleditor/kxmleditor.spec +++ b/redhat/applications/development/kxmleditor/kxmleditor.spec @@ -130,7 +130,8 @@ fi -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DBUILD_ALL=ON + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index 2315cabbf..b0793bbde 100644 --- a/redhat/applications/development/piklab/piklab.spec +++ b/redhat/applications/development/piklab/piklab.spec @@ -118,6 +118,11 @@ are supported. A command-line programmer and debugger are also available. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ @@ -126,8 +131,8 @@ export PATH="%{tde_bindir}:${PATH}" -DWITH_ALL_OPTIONS=OFF \ -DWITH_GCC_VISIBILITY=OFF \ -DBUILD_ALL=ON \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DWITH_ALL_OPTIONS=ON \ + .. %__make %{?_smp_mflags} diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec index 39c606bb1..1cdb73ca8 100644 --- a/redhat/applications/graphics/gwenview/gwenview.spec +++ b/redhat/applications/graphics/gwenview/gwenview.spec @@ -127,6 +127,11 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + # Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ @@ -146,7 +151,8 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ -DWITH_ALL_OPTIONS=ON \ - -DBUILD_ALL=ON + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index 0da15063d..ee59054c7 100644 --- a/redhat/applications/internet/kasablanca/kasablanca.spec +++ b/redhat/applications/internet/kasablanca/kasablanca.spec @@ -123,6 +123,11 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ @@ -141,7 +146,8 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index 19b49cac7..51591f239 100644 --- a/redhat/applications/internet/ktorrent/ktorrent.spec +++ b/redhat/applications/internet/ktorrent/ktorrent.spec @@ -125,6 +125,10 @@ enabling background downloading. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" @@ -144,11 +148,12 @@ export PATH="%{tde_bindir}:${PATH}" -DWITH_BUILTIN_GEOIP=OFF \ %else -DWITH_SYSTEM_GEOIP=OFF \ + -DBUILD_ALL=ON \ -DWITH_BUILTIN_GEOIP=ON \ -DWITH_BUILTIN_FLAGS=ON \ %endif - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + \ + .. # Not SMP safe ! diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index fc8fb89cd..ed8b29158 100644 --- a/redhat/applications/internet/kvirc/kvirc.spec +++ b/redhat/applications/internet/kvirc/kvirc.spec @@ -145,6 +145,11 @@ with the K Desktop Environment version 3. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ @@ -165,7 +170,9 @@ export PATH="%{tde_bindir}:${PATH}" -DWITH_TRANSPARENCY=ON \ -DWITH_ZLIB=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + \ + .. %__make %{?_smp_mflags} diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec index 2956468eb..368e06501 100644 --- a/redhat/applications/misc/krecipes/krecipes.spec +++ b/redhat/applications/misc/krecipes/krecipes.spec @@ -116,6 +116,11 @@ databases. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ @@ -123,8 +128,8 @@ export PATH="%{tde_bindir}:${PATH}" -DCMAKE_INSTALL_RPATH=%{tde_libdir} \ -DWITH_GCC_VISIBILITY=OFF \ -DWITH_ALL_OPTIONS=ON \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index 36dbd9dc4..a59e6a58a 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -511,6 +511,11 @@ if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + # Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ @@ -543,7 +548,8 @@ fi %{?with_mp4v2:-DWITH_MP4V2=ON} \ %{?with_inotify:-DWITH_INOTIFY=ON} \ -DWITH_SYSTEM_SQLITE=ON \ - -DBUILD_ALL=ON + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index de688855a..7e3e04404 100644 --- a/redhat/applications/multimedia/codeine/codeine.spec +++ b/redhat/applications/multimedia/codeine/codeine.spec @@ -119,6 +119,11 @@ Features: %build +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ @@ -134,7 +139,9 @@ Features: -DLIB_INSTALL_DIR=%{tde_libdir} \ \ -DBUILD_ALL=ON \ - -DWITH_ALL_OPTIONS=ON + -DWITH_ALL_OPTIONS=ON \ + \ + .. %__make %{?_smp_mflags} diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec index 3afc0f245..e1d731dff 100644 --- a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec @@ -140,7 +140,8 @@ fi \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec index 3641f4443..101fed72b 100644 --- a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec +++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec @@ -154,8 +154,7 @@ fi -DLIB_INSTALL_DIR="%{tde_libdir}" \ -DWITH_ALL_OPTIONS=ON \ -DBUILD_ALL=ON \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + .. %__make %{?_smp_mflags} diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index 65fa46709..2174fe2cb 100644 --- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec @@ -183,6 +183,11 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export kde_confdir="%{tde_confdir}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec index 43829b7c3..2d6dec108 100644 --- a/redhat/applications/system/kbfx/kbfx.spec +++ b/redhat/applications/system/kbfx/kbfx.spec @@ -144,6 +144,11 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ @@ -166,7 +171,8 @@ fi -DUSE_STRIGI=OFF \ -DUSE_MENUDRAKE=OFF \ -DBUILD_DOC=ON \ - -DBUILD_ALL=ON + -DBUILD_ALL=ON \ + .. # Not SMP safe ! %__make diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec index 0eb359acb..ab709c0a0 100644 --- a/redhat/applications/system/krusader/krusader.spec +++ b/redhat/applications/system/krusader/krusader.spec @@ -139,7 +139,9 @@ fi -DWITH_GCC_VISIBILITY=ON \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + \ + .. %__make %{?_smp_mflags} diff --git a/redhat/applications/system/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec index 46394c8da..4914c1544 100644 --- a/redhat/applications/system/kvkbd/kvkbd.spec +++ b/redhat/applications/system/kvkbd/kvkbd.spec @@ -138,7 +138,8 @@ fi \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/system/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec index 6ab4b8126..95f256bf6 100644 --- a/redhat/applications/system/smartcardauth/smartcardauth.spec +++ b/redhat/applications/system/smartcardauth/smartcardauth.spec @@ -132,6 +132,11 @@ in addition to the PKCS certificate functionality unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ @@ -157,7 +162,9 @@ export PATH="%{tde_bindir}:${PATH}" \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + \ + .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec index 727d64310..eba0ec6bf 100644 --- a/redhat/applications/utilities/abakus/abakus.spec +++ b/redhat/applications/utilities/abakus/abakus.spec @@ -130,6 +130,11 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ @@ -142,7 +147,8 @@ fi \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DBUILD_ALL=ON + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index 394dd97aa..bae6c6cfc 100644 --- a/redhat/applications/utilities/kbarcode/kbarcode.spec +++ b/redhat/applications/utilities/kbarcode/kbarcode.spec @@ -171,6 +171,11 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ @@ -192,7 +197,8 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec index 5a9ff58c7..8c8546eb5 100644 --- a/redhat/libraries/libkipi/libkipi.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -176,6 +176,11 @@ Homepage: http://www.kipi-plugins.org/ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ @@ -198,7 +203,9 @@ export PATH="%{tde_bindir}:${PATH}" \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + \ + .. %install diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 0ed7048ef..e6e31905b 100644 --- a/redhat/libraries/libtdeldap/libtdeldap.spec +++ b/redhat/libraries/libtdeldap/libtdeldap.spec @@ -226,7 +226,9 @@ fi \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DBUILD_TRANSLATIONS=ON \ + \ + .. %__make %{?_smp_mflags} || %__make -- cgit v1.2.3