From 00e55d893c5db8948d5c8871c345925758664684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 6 Feb 2022 22:08:37 +0100 Subject: [PATCH] RPM: add cmake package for trinity cmake macros --- redhat/Makefile | 7 +- redhat/applications/abakus/abakus.spec | 2 +- redhat/applications/amarok/amarok.spec | 2 +- redhat/applications/basket/basket.spec | 2 +- redhat/applications/codeine/codeine.spec | 2 +- redhat/applications/dolphin/dolphin.spec | 2 +- redhat/applications/filelight/filelight.spec | 2 +- .../gtk-qt-engine/gtk-qt-engine.spec | 2 +- .../gwenview-i18n/gwenview-i18n.spec | 2 +- redhat/applications/k3b-i18n/k3b-i18n.spec | 2 +- redhat/applications/k3b/k3b.spec | 2 +- .../kaffeine-mozilla/kaffeine-mozilla.spec | 2 +- redhat/applications/kaffeine/kaffeine.spec | 2 +- .../applications/kasablanca/kasablanca.spec | 2 +- redhat/applications/katapult/katapult.spec | 2 +- redhat/applications/kbarcode/kbarcode.spec | 2 +- redhat/applications/kbfx/kbfx.spec | 3 +- redhat/applications/kbibtex/kbibtex.spec | 2 +- redhat/applications/kbiff/kbiff.spec | 2 +- .../applications/kbookreader/kbookreader.spec | 2 +- .../applications/kchmviewer/kchmviewer.spec | 2 +- .../kcmautostart/kcmautostart.spec | 2 +- redhat/applications/kcmldap/kcmldap.spec | 2 +- .../kcmldapcontroller/kcmldapcontroller.spec | 2 +- .../kcmldapmanager/kcmldapmanager.spec | 2 +- redhat/applications/kcpuload/kcpuload.spec | 2 +- redhat/applications/kdbg/kdbg.spec | 3 +- .../kdbusnotification/kdbusnotification.spec | 2 +- redhat/applications/kdiff3/kdiff3.spec | 2 +- redhat/applications/kdirstat/kdirstat.spec | 2 +- redhat/applications/keep/keep.spec | 2 +- .../kerberostray/kerberostray.spec | 2 +- redhat/applications/keximdb/keximdb.spec | 2 +- .../applications/kftpgrabber/kftpgrabber.spec | 2 +- redhat/applications/kgtk-qt3/kgtk-qt3.spec | 3 +- redhat/applications/kima/kima.spec | 2 +- redhat/applications/kiosktool/kiosktool.spec | 2 +- redhat/applications/kkbswitch/kkbswitch.spec | 2 +- redhat/applications/klamav/klamav.spec | 2 +- .../applications/klcddimmer/klcddimmer.spec | 2 +- redhat/applications/kmplayer/kmplayer.spec | 2 +- redhat/applications/knemo/knemo.spec | 2 +- redhat/applications/knetload/knetload.spec | 2 +- redhat/applications/knetstats/knetstats.spec | 2 +- redhat/applications/knights/knights.spec | 2 +- redhat/applications/knmap/knmap.spec | 2 +- redhat/applications/knowit/knowit.spec | 2 +- .../applications/knutclient/knutclient.spec | 2 +- redhat/applications/kompose/kompose.spec | 2 +- .../konversation/konversation.spec | 2 +- redhat/applications/kooldock/kooldock.spec | 2 +- .../applications/kopete-otr/kopete-otr.spec | 2 +- redhat/applications/kpicosim/kpicosim.spec | 2 +- redhat/applications/kpilot/kpilot.spec | 2 +- redhat/applications/kplayer/kplayer.spec | 2 +- .../applications/kpowersave/kpowersave.spec | 3 +- redhat/applications/krename/krename.spec | 2 +- redhat/applications/kscope/kscope.spec | 2 +- redhat/applications/ksensors/ksensors.spec | 2 +- redhat/applications/kshowmail/kshowmail.spec | 2 +- redhat/applications/kshutdown/kshutdown.spec | 2 +- .../ksplash-engine-moodin.spec | 2 +- .../kstreamripper/kstreamripper.spec | 2 +- .../applications/ksystemlog/ksystemlog.spec | 2 +- redhat/applications/ktechlab/ktechlab.spec | 2 +- redhat/applications/kvkbd/kvkbd.spec | 2 +- redhat/applications/kvpnc/kvpnc.spec | 2 +- .../applications/kxmleditor/kxmleditor.spec | 2 +- .../applications/mathemagics/mathemagics.spec | 2 +- .../mplayerthumbs/mplayerthumbs.spec | 2 +- .../applications/potracegui/potracegui.spec | 2 +- .../qalculate-tde/qalculate-tde.spec | 2 +- .../applications/rosegarden/rosegarden.spec | 3 +- .../smartcardauth/smartcardauth.spec | 2 +- .../system/tdesshaskpass/tdesshaskpass.spec | 2 +- redhat/applications/tastymenu/tastymenu.spec | 2 +- .../tde-style-baghira/tde-style-baghira.spec | 2 +- .../tde-style-domino/tde-style-domino.spec | 2 +- .../tde-style-ia-ora/tde-style-ia-ora.spec | 2 +- .../tde-style-lipstik/tde-style-lipstik.spec | 2 +- .../tde-style-qtcurve/tde-style-qtcurve.spec | 3 +- .../tde-systemsettings.spec | 2 +- redhat/applications/tdedocker/tdedocker.spec | 2 +- redhat/applications/tdeio-apt/tdeio-apt.spec | 2 +- .../applications/tdeio-ftps/tdeio-ftps.spec | 2 +- .../tdeio-gopher/tdeio-gopher.spec | 2 +- .../tdeio-locate/tdeio-locate.spec | 2 +- .../applications/tdeio-sword/tdeio-sword.spec | 2 +- .../tdeio-umountwrapper.spec | 2 +- .../tdenetworkmanager/tdenetworkmanager.spec | 3 +- redhat/applications/tdepacman/tdepacman.spec | 2 +- .../tdepowersave/tdepowersave.spec | 3 +- redhat/applications/tdesudo/tdesudo.spec | 2 +- redhat/applications/tdesvn/tdesvn.spec | 3 +- redhat/applications/tdmtheme/tdmtheme.spec | 2 +- redhat/applications/tellico/tellico.spec | 2 +- redhat/applications/tork/tork.spec | 2 +- .../twin-style-crystal.spec | 2 +- .../twin-style-dekorator.spec | 2 +- .../twin-style-suse2/twin-style-suse2.spec | 2 +- .../applications/wlassistant/wlassistant.spec | 3 +- redhat/applications/yakuake/yakuake.spec | 2 +- redhat/build/get_rpm_package_name.sh | 3 +- redhat/common/cmake/cmake.spec | 112 ++++++++++++++++++ redhat/dependencies/akode/akode.spec | 2 +- redhat/dependencies/arts/arts.spec | 2 +- redhat/dependencies/avahi-tqt/avahi-tqt.spec | 2 +- .../dependencies/dbus-1-tqt/dbus-1-tqt.spec | 2 +- redhat/dependencies/dbus-tqt/dbus-tqt.spec | 2 +- .../dependencies/libart-lgpl/libart-lgpl.spec | 2 +- redhat/dependencies/libcaldav/libcaldav.spec | 2 +- .../dependencies/libcarddav/libcarddav.spec | 2 +- redhat/dependencies/tqca-tls/tqca-tls.spec | 2 +- redhat/dependencies/tqca/tqca.spec | 2 +- .../dependencies/tqscintilla/tqscintilla.spec | 2 +- .../tqtinterface/tqtinterface.spec | 23 +--- redhat/libraries/libkdcraw/libkdcraw.spec | 3 +- redhat/libraries/libkexiv2/libkexiv2.spec | 2 +- redhat/libraries/libkipi/libkipi.spec | 2 +- redhat/libraries/libtdeldap/libtdeldap.spec | 2 +- redhat/main/tde-i18n/tde-i18n.spec | 2 +- redhat/main/tdeaddons/tdeaddons.spec | 2 +- redhat/main/tdeadmin/tdeadmin.spec | 2 +- redhat/main/tdeartwork/tdeartwork.spec | 2 +- redhat/main/tdebase/tdebase.spec | 2 +- redhat/main/tdeedu/tdeedu.spec | 2 +- redhat/main/tdegames/tdegames.spec | 2 +- redhat/main/tdegraphics/tdegraphics.spec | 2 +- redhat/main/tdelibs/tdelibs.spec | 2 +- redhat/main/tdemultimedia/tdemultimedia.spec | 2 +- redhat/main/tdenetwork/tdenetwork.spec | 2 +- redhat/main/tdepim/tdepim.spec | 2 +- redhat/main/tdesdk/tdesdk.spec | 2 +- redhat/main/tdetoys/tdetoys.spec | 2 +- redhat/main/tdeutils/tdeutils.spec | 2 +- redhat/main/tdevelop/tdevelop.spec | 2 +- 136 files changed, 264 insertions(+), 156 deletions(-) create mode 100644 redhat/common/cmake/cmake.spec diff --git a/redhat/Makefile b/redhat/Makefile index 6598c60ad..b54816e91 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -23,13 +23,18 @@ buildpkg = \ echo -all: dependencies main libraries applications i18n meta +all: common dependencies main libraries applications i18n meta +common: cmake dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-suse2 wlassistant yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n +### Trinity Common + +cmake: + $(call buildpkg,common/cmake) ### Trinity Dependencies akode: tqtinterface trinity-filesystem diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec index 840ba20d0..ecc87ddbb 100644 --- a/redhat/applications/abakus/abakus.spec +++ b/redhat/applications/abakus/abakus.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec index e3dbc568a..e2b03ffc1 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/amarok/amarok.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-filesystem >= %{tde_version} Requires: trinity-filesystem >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: gettext diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec index 1f99ea6c0..2f66f7f8f 100644 --- a/redhat/applications/basket/basket.spec +++ b/redhat/applications/basket/basket.spec @@ -65,7 +65,7 @@ BuildRequires: trinity-kontact-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gpgme-devel -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/codeine/codeine.spec index 9daa6e5b6..3207527cf 100644 --- a/redhat/applications/codeine/codeine.spec +++ b/redhat/applications/codeine/codeine.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/dolphin/dolphin.spec index ecc07e7da..09b73918d 100644 --- a/redhat/applications/dolphin/dolphin.spec +++ b/redhat/applications/dolphin/dolphin.spec @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec index da445b80a..f3a4a5897 100644 --- a/redhat/applications/filelight/filelight.spec +++ b/redhat/applications/filelight/filelight.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec index 43f5a2637..843cd5440 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/gwenview-i18n/gwenview-i18n.spec index ab08edf97..2c11af151 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n.spec @@ -66,7 +66,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/k3b-i18n/k3b-i18n.spec index 0d3fe2c20..81266f348 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n.spec @@ -70,7 +70,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/k3b/k3b.spec index 92c41d4f6..2edb92088 100644 --- a/redhat/applications/k3b/k3b.spec +++ b/redhat/applications/k3b/k3b.spec @@ -63,7 +63,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec index e336136d6..2b72a1dff 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec @@ -59,7 +59,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/kaffeine/kaffeine.spec index 148234adb..f09429271 100644 --- a/redhat/applications/kaffeine/kaffeine.spec +++ b/redhat/applications/kaffeine/kaffeine.spec @@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kasablanca/kasablanca.spec b/redhat/applications/kasablanca/kasablanca.spec index 651e6575d..a9c342fcd 100644 --- a/redhat/applications/kasablanca/kasablanca.spec +++ b/redhat/applications/kasablanca/kasablanca.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec index a1c8fc008..456a9958b 100644 --- a/redhat/applications/katapult/katapult.spec +++ b/redhat/applications/katapult/katapult.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/kbarcode/kbarcode.spec index 4fea52fc7..8684d27bb 100644 --- a/redhat/applications/kbarcode/kbarcode.spec +++ b/redhat/applications/kbarcode/kbarcode.spec @@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec index f19de7f83..3e5c06b1b 100644 --- a/redhat/applications/kbfx/kbfx.spec +++ b/redhat/applications/kbfx/kbfx.spec @@ -62,7 +62,8 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec index 1bb5c7259..4777b3b36 100644 --- a/redhat/applications/kbibtex/kbibtex.spec +++ b/redhat/applications/kbibtex/kbibtex.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec index b5cab1e88..8cca38c4f 100644 --- a/redhat/applications/kbiff/kbiff.spec +++ b/redhat/applications/kbiff/kbiff.spec @@ -64,7 +64,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec index 0d9692b4f..8cc7ca8c4 100644 --- a/redhat/applications/kbookreader/kbookreader.spec +++ b/redhat/applications/kbookreader/kbookreader.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/kchmviewer/kchmviewer.spec index 78dc56d18..b6c21725b 100644 --- a/redhat/applications/kchmviewer/kchmviewer.spec +++ b/redhat/applications/kchmviewer/kchmviewer.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/kcmautostart/kcmautostart.spec index fde0f224b..bd0a90c70 100644 --- a/redhat/applications/kcmautostart/kcmautostart.spec +++ b/redhat/applications/kcmautostart/kcmautostart.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec index b7f6b8bde..1f83bf798 100644 --- a/redhat/applications/kcmldap/kcmldap.spec +++ b/redhat/applications/kcmldap/kcmldap.spec @@ -67,7 +67,7 @@ BuildRequires: trinity-libtdeldap-devel >= 0.5 Requires: trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec index 1b2b39808..fe4121f07 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec index efce26148..16aec6e48 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec index 1b45a498b..12749667d 100644 --- a/redhat/applications/kcpuload/kcpuload.spec +++ b/redhat/applications/kcpuload/kcpuload.spec @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/kdbg/kdbg.spec index 5a4a17a69..628167d81 100644 --- a/redhat/applications/kdbg/kdbg.spec +++ b/redhat/applications/kdbg/kdbg.spec @@ -63,7 +63,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool m4 +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool m4 BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec index e5a23059a..194020fbc 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification.spec @@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/kdiff3/kdiff3.spec index d6283c3ad..6eba92631 100644 --- a/redhat/applications/kdiff3/kdiff3.spec +++ b/redhat/applications/kdiff3/kdiff3.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec index b91f176b3..cddd115ee 100644 --- a/redhat/applications/kdirstat/kdirstat.spec +++ b/redhat/applications/kdirstat/kdirstat.spec @@ -61,7 +61,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/keep/keep.spec b/redhat/applications/keep/keep.spec index c3ddddc77..e4c67749a 100644 --- a/redhat/applications/keep/keep.spec +++ b/redhat/applications/keep/keep.spec @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/kerberostray/kerberostray.spec index de4e6cdbc..5bc1c3709 100644 --- a/redhat/applications/kerberostray/kerberostray.spec +++ b/redhat/applications/kerberostray/kerberostray.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec index b457b4ec7..bf89c420e 100644 --- a/redhat/applications/keximdb/keximdb.spec +++ b/redhat/applications/keximdb/keximdb.spec @@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: trinity-koffice-devel BuildRequires: trinity-koffice-kexi -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec index ed5940cbd..ccf99169e 100644 --- a/redhat/applications/kftpgrabber/kftpgrabber.spec +++ b/redhat/applications/kftpgrabber/kftpgrabber.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec index 4120e4b9d..cff4f8b69 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec @@ -62,7 +62,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kima/kima.spec b/redhat/applications/kima/kima.spec index ce1c911a6..279725f90 100644 --- a/redhat/applications/kima/kima.spec +++ b/redhat/applications/kima/kima.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec index bc42e6a3c..913ff3ed4 100644 --- a/redhat/applications/kiosktool/kiosktool.spec +++ b/redhat/applications/kiosktool/kiosktool.spec @@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec index 80857d027..0f6c24db8 100644 --- a/redhat/applications/kkbswitch/kkbswitch.spec +++ b/redhat/applications/kkbswitch/kkbswitch.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/klamav/klamav.spec index 2520086ff..41882f16e 100644 --- a/redhat/applications/klamav/klamav.spec +++ b/redhat/applications/klamav/klamav.spec @@ -58,7 +58,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec index 82128c225..c62c09936 100644 --- a/redhat/applications/klcddimmer/klcddimmer.spec +++ b/redhat/applications/klcddimmer/klcddimmer.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/kmplayer/kmplayer.spec index 675d8406b..6132f7d9f 100644 --- a/redhat/applications/kmplayer/kmplayer.spec +++ b/redhat/applications/kmplayer/kmplayer.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/knemo/knemo.spec b/redhat/applications/knemo/knemo.spec index 5349d8c26..630273418 100644 --- a/redhat/applications/knemo/knemo.spec +++ b/redhat/applications/knemo/knemo.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/knetload/knetload.spec index ed13175ab..c6d482b2f 100644 --- a/redhat/applications/knetload/knetload.spec +++ b/redhat/applications/knetload/knetload.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/knetstats/knetstats.spec index e52cc8256..d6dfad2c8 100644 --- a/redhat/applications/knetstats/knetstats.spec +++ b/redhat/applications/knetstats/knetstats.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec index 6522d35cc..200d6e915 100644 --- a/redhat/applications/knights/knights.spec +++ b/redhat/applications/knights/knights.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec index bfebfa365..4b9b3b822 100644 --- a/redhat/applications/knmap/knmap.spec +++ b/redhat/applications/knmap/knmap.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/knowit/knowit.spec index 020616bd3..d9b671aa0 100644 --- a/redhat/applications/knowit/knowit.spec +++ b/redhat/applications/knowit/knowit.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec index 9bc84ad01..e171f037e 100644 --- a/redhat/applications/knutclient/knutclient.spec +++ b/redhat/applications/knutclient/knutclient.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/kompose/kompose.spec index 543b695ec..bdda7fcd9 100644 --- a/redhat/applications/kompose/kompose.spec +++ b/redhat/applications/kompose/kompose.spec @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec index a77b13313..80e0b7e39 100644 --- a/redhat/applications/konversation/konversation.spec +++ b/redhat/applications/konversation/konversation.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec index b2634aaf6..4d5338bc0 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: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/kopete-otr/kopete-otr.spec b/redhat/applications/kopete-otr/kopete-otr.spec index 577d72d04..59c99c731 100644 --- a/redhat/applications/kopete-otr/kopete-otr.spec +++ b/redhat/applications/kopete-otr/kopete-otr.spec @@ -68,7 +68,7 @@ BuildRequires: trinity-tdenetwork-devel >= %{tde_version} # Kopete is provided by tdenetwork Requires: trinity-kopete >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec index c3863834e..187bcf3c1 100644 --- a/redhat/applications/kpicosim/kpicosim.spec +++ b/redhat/applications/kpicosim/kpicosim.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/kpilot/kpilot.spec index e7914058d..39f4382f6 100644 --- a/redhat/applications/kpilot/kpilot.spec +++ b/redhat/applications/kpilot/kpilot.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/kplayer/kplayer.spec index 602b6c371..2246f8d37 100644 --- a/redhat/applications/kplayer/kplayer.spec +++ b/redhat/applications/kplayer/kplayer.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/kpowersave/kpowersave.spec index cba094deb..30563e4fd 100644 --- a/redhat/applications/kpowersave/kpowersave.spec +++ b/redhat/applications/kpowersave/kpowersave.spec @@ -63,7 +63,8 @@ BuildRequires: desktop-file-utils BuildRequires: hal-devel BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/krename/krename.spec index 7e14786a8..5cbec4e22 100644 --- a/redhat/applications/krename/krename.spec +++ b/redhat/applications/krename/krename.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/kscope/kscope.spec index 495f8940a..ad3b6bbd7 100644 --- a/redhat/applications/kscope/kscope.spec +++ b/redhat/applications/kscope/kscope.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext Requires: cscope -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec index eb325aec0..aa329febc 100644 --- a/redhat/applications/ksensors/ksensors.spec +++ b/redhat/applications/ksensors/ksensors.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/kshowmail/kshowmail.spec index 8d445fe97..74044fd96 100644 --- a/redhat/applications/kshowmail/kshowmail.spec +++ b/redhat/applications/kshowmail/kshowmail.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec index f965f79f5..3889525f7 100644 --- a/redhat/applications/kshutdown/kshutdown.spec +++ b/redhat/applications/kshutdown/kshutdown.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec index 96e00f658..8a6c3aeac 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/kstreamripper/kstreamripper.spec index 11686d704..b7bd141c4 100644 --- a/redhat/applications/kstreamripper/kstreamripper.spec +++ b/redhat/applications/kstreamripper/kstreamripper.spec @@ -75,7 +75,7 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} %description diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/ksystemlog/ksystemlog.spec index eb8bc66e0..412aab89d 100644 --- a/redhat/applications/ksystemlog/ksystemlog.spec +++ b/redhat/applications/ksystemlog/ksystemlog.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/ktechlab/ktechlab.spec index 0f55647f7..095cdfeaf 100644 --- a/redhat/applications/ktechlab/ktechlab.spec +++ b/redhat/applications/ktechlab/ktechlab.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/kvkbd/kvkbd.spec index 1bf56e90d..14d1ae3bd 100644 --- a/redhat/applications/kvkbd/kvkbd.spec +++ b/redhat/applications/kvkbd/kvkbd.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec index 242b37b37..9377caf39 100644 --- a/redhat/applications/kvpnc/kvpnc.spec +++ b/redhat/applications/kvpnc/kvpnc.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec index c7e72f756..13fc08a17 100644 --- a/redhat/applications/kxmleditor/kxmleditor.spec +++ b/redhat/applications/kxmleditor/kxmleditor.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec index 1c34074cb..3eb6700dd 100644 --- a/redhat/applications/mathemagics/mathemagics.spec +++ b/redhat/applications/mathemagics/mathemagics.spec @@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/mplayerthumbs/mplayerthumbs.spec index e917cc0a7..af8bb6924 100644 --- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/mplayerthumbs/mplayerthumbs.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/potracegui/potracegui.spec index 38650b218..87760d1cf 100644 --- a/redhat/applications/potracegui/potracegui.spec +++ b/redhat/applications/potracegui/potracegui.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index dc724dc09..d786285a8 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/rosegarden/rosegarden.spec index f3437f155..94c5bfee1 100644 --- a/redhat/applications/rosegarden/rosegarden.spec +++ b/redhat/applications/rosegarden/rosegarden.spec @@ -64,7 +64,8 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/smartcardauth/smartcardauth.spec index 08d5fb76d..1578431a9 100644 --- a/redhat/applications/smartcardauth/smartcardauth.spec +++ b/redhat/applications/smartcardauth/smartcardauth.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index 721377ca1..191e9949e 100644 --- a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec +++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/tastymenu/tastymenu.spec index 8a5032bc8..59e0991ab 100644 --- a/redhat/applications/tastymenu/tastymenu.spec +++ b/redhat/applications/tastymenu/tastymenu.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec index 204b2c444..7cab17109 100644 --- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec @@ -62,7 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec index 9fc33cf88..7bb66c619 100644 --- a/redhat/applications/tde-style-domino/tde-style-domino.spec +++ b/redhat/applications/tde-style-domino/tde-style-domino.spec @@ -62,7 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec index eee02ddbb..14277f757 100644 --- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec @@ -60,7 +60,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec index 80223ce84..629182637 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec @@ -65,7 +65,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec index d58d8fb5c..368233282 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec @@ -61,7 +61,8 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec index 64315ad92..4e6f9a959 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec @@ -69,7 +69,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec index 21e8a6715..2a88d64c2 100644 --- a/redhat/applications/tdedocker/tdedocker.spec +++ b/redhat/applications/tdedocker/tdedocker.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec index 9899044ee..d52db658a 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec index e793248f2..efb471c97 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec index 87fe4c307..c8fd9e09d 100644 --- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec index 8ee35756e..cdbfafeef 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec index f78299a70..c95b32631 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec index 5507745c2..3509b473d 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -65,7 +65,7 @@ BuildRequires: desktop-file-utils Obsoletes: trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec index 5673869bf..b8e37c2c5 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec @@ -62,7 +62,8 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec index ac0841d2d..f6ab3805d 100644 --- a/redhat/applications/tdepacman/tdepacman.spec +++ b/redhat/applications/tdepacman/tdepacman.spec @@ -66,7 +66,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec index db0ae8d73..461b1c98e 100644 --- a/redhat/applications/tdepowersave/tdepowersave.spec +++ b/redhat/applications/tdepowersave/tdepowersave.spec @@ -63,7 +63,8 @@ BuildRequires: desktop-file-utils BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/tdesudo/tdesudo.spec index 16d2e8bc8..89ffa7add 100644 --- a/redhat/applications/tdesudo/tdesudo.spec +++ b/redhat/applications/tdesudo/tdesudo.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/tdesvn/tdesvn.spec index f5313d607..7ee60eec3 100644 --- a/redhat/applications/tdesvn/tdesvn.spec +++ b/redhat/applications/tdesvn/tdesvn.spec @@ -60,7 +60,8 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/tdmtheme/tdmtheme.spec index 85a6c65ab..0dcf28d8c 100644 --- a/redhat/applications/tdmtheme/tdmtheme.spec +++ b/redhat/applications/tdmtheme/tdmtheme.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec index 3a92024ea..ce61b2048 100644 --- a/redhat/applications/tellico/tellico.spec +++ b/redhat/applications/tellico/tellico.spec @@ -69,7 +69,7 @@ BuildRequires: trinity-libpoppler-tqt-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/tork/tork.spec index 940fb8e98..4f713673d 100644 --- a/redhat/applications/tork/tork.spec +++ b/redhat/applications/tork/tork.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/twin-style-crystal/twin-style-crystal.spec index f595966a2..093d4e599 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec index 2364ece18..47950e707 100644 --- a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec +++ b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/twin-style-suse2/twin-style-suse2.spec index ec3533239..c53e0e878 100644 --- a/redhat/applications/twin-style-suse2/twin-style-suse2.spec +++ b/redhat/applications/twin-style-suse2/twin-style-suse2.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec index a750235df..033460cad 100644 --- a/redhat/applications/wlassistant/wlassistant.spec +++ b/redhat/applications/wlassistant/wlassistant.spec @@ -61,7 +61,8 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/yakuake/yakuake.spec index c1bf91ab4..2dd8f3cf9 100644 --- a/redhat/applications/yakuake/yakuake.spec +++ b/redhat/applications/yakuake/yakuake.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 5cfc902e3..58bb933f4 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -24,8 +24,7 @@ case "${PKGNAME}" in # 3rd party dependencies "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff - "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";; - # Other + "autoconf"|"automake"|"brp-check-trinity"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";; # Other "curl") PREFIX="trinity-lib";; # Default case: add prefix *) PREFIX="trinity-";; diff --git a/redhat/common/cmake/cmake.spec b/redhat/common/cmake/cmake.spec new file mode 100644 index 000000000..fc4e0ca42 --- /dev/null +++ b/redhat/common/cmake/cmake.spec @@ -0,0 +1,112 @@ +# +# spec file for package cmake-trinity (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%if "%{?tde_version}" == "" +%define tde_version 14.0.11 +%endif +%define tde_pkg cmake + + +Name: trinity-%{tde_pkg} +Version: %{tde_version} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE CMake modules +Group: Development/Libraries/C and C++ +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: cmake +BuildRequires: desktop-file-utils + +Requires: cmake + + +%description +TDE uses its own set of modules and macros to simplify CMake rules. + +This also includes the TDEL10n module that is used to generate and +update templates for translations and the modified version of +intltool-merge used to merge translations into desktop files. + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf %{?buildroot} +%__make install -C build DESTDIR=%{?buildroot} + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{_datadir}/cmake/Modules/FindTDE.cmake +%{_datadir}/cmake/Modules/FindTQt.cmake +%{_datadir}/cmake/Modules/FindTQtQUI.cmake +%{_datadir}/cmake/Modules/TDEL10n.cmake +%{_datadir}/cmake/Modules/TDEMacros.cmake +%{_datadir}/cmake/Modules/TDESetupPaths.cmake +%{_datadir}/cmake/Modules/tde_automoc.cmake +%{_datadir}/cmake/Modules/tde_l10n_merge.pl +%{_datadir}/cmake/Modules/tde_uic.cmake +%{_datadir}/cmake/Templates/tde_dummy_cpp.cmake +%{_datadir}/cmake/Templates/tde_export_library.cmake +%{_datadir}/cmake/Templates/tde_libtool_file.cmake +%{_datadir}/cmake/Templates/tde_tdeinit_executable.cmake +%{_datadir}/cmake/Templates/tde_tdeinit_module.cmake + + +%changelog diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 6b6369e7a..6176c2d49 100644 --- a/redhat/dependencies/akode/akode.spec +++ b/redhat/dependencies/akode/akode.spec @@ -62,7 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: libtool diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 062fb1415..8480ddc7e 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -66,7 +66,7 @@ BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} Requires: trinity-filesystem >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 527f7d305..df1e72379 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec @@ -52,7 +52,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index d79016dc7..2915ce93e 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec @@ -53,7 +53,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt3-mt-devel >= 3.5.0 BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec index 1617316b9..f9bddec2e 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec @@ -52,7 +52,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index 924074c91..95d16308f 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -51,7 +51,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index bbfdaa22a..d0287ec28 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -54,7 +54,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: make BuildRequires: libtool BuildRequires: fdupes diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index 9a58cc122..09970f7a0 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -54,7 +54,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libtool diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 4c391d70b..ca5b7c49a 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -57,7 +57,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: openssl-devel >= 0.9.8 diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec index e230248f9..ff7f51a8a 100644 --- a/redhat/dependencies/tqca/tqca.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -65,7 +65,7 @@ Obsoletes: %{libtqt3}-mt-tqca-tls < %{version}-%{release} Provides: %{libtqt3}-mt-tqca-tls = %{version}-%{release} BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: openssl-devel >= 0.9.8 diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index 5743a88bf..f781ac806 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -55,7 +55,7 @@ Source1: trinity-tqscintilla-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-filesystem >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: gettext diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index be71f7f6e..4d9b6b348 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -25,7 +25,6 @@ %define tde_version 14.1.0 %endif %define tde_pkg tqtinterface -%define cmake_modules_dir %{_datadir}/cmake/Modules %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 @@ -57,12 +56,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt3-mt-devel >= 3.5.0 BuildRequires: tqt3-dev-tools >= 3.5.0 +BuildRequires: trinity-cmake >= %{tde_version} -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -BuildRequires: trinity-cmake-macros -%endif - -BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -137,10 +132,6 @@ Provides: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libtqt3-mt >= 3.5.0 -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -Requires: trinity-cmake-macros -%endif - Obsoletes: trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release} @@ -171,10 +162,7 @@ Provides: libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libtqt3-mt-devel >= 3.5.0 Requires: tqt3-dev-tools >= 3.5.0 - -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -Requires: trinity-cmake-macros -%endif +Requires: trinity-cmake >= %{version}-%{release} Obsoletes: trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release} @@ -210,7 +198,6 @@ although some code has been added for useful functions that are no longer part o %{_libdir}/libtqt.so %{_libdir}/pkgconfig/tqt.pc %{_libdir}/pkgconfig/tqtqui.pc -%{cmake_modules_dir}/*.cmake ########## @@ -265,12 +252,6 @@ fi %__rm -rf "%{?buildroot}" %__make install DESTDIR="%{?buildroot}" -C build -# Install 'cmake' modules for development use -%__mkdir_p "%{?buildroot}%{cmake_modules_dir}" -for i in cmake/modules/*.cmake; do - %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}" -done - %clean %__rm -rf "%{?buildroot}" diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index 159f01c1d..3f4464dac 100644 --- a/redhat/libraries/libkdcraw/libkdcraw.spec +++ b/redhat/libraries/libkdcraw/libkdcraw.spec @@ -56,10 +56,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-filesystem >= %{tde_version} -BuildRequires: cmake libtool +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: pkgconfig diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec index 4cef24737..858918854 100644 --- a/redhat/libraries/libkexiv2/libkexiv2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2.spec @@ -67,7 +67,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gettext BuildRequires: gcc-c++ diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec index ca99a2b9e..3d66e9868 100644 --- a/redhat/libraries/libkipi/libkipi.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -92,7 +92,7 @@ BuildRequires: libidn-devel BuildRequires: openssl-devel # CMAKE -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} %description Libkipi is a library diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 43886ccc4..d27b53dee 100644 --- a/redhat/libraries/libtdeldap/libtdeldap.spec +++ b/redhat/libraries/libtdeldap/libtdeldap.spec @@ -64,7 +64,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gcc-c++ -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: pkgconfig # LIBTOOL diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/main/tde-i18n/tde-i18n.spec index 97eda4a8b..418ae31d4 100644 --- a/redhat/main/tde-i18n/tde-i18n.spec +++ b/redhat/main/tde-i18n/tde-i18n.spec @@ -70,7 +70,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: findutils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ %description diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec index e9f622a3b..858a17b8a 100644 --- a/redhat/main/tdeaddons/tdeaddons.spec +++ b/redhat/main/tdeaddons/tdeaddons.spec @@ -70,7 +70,7 @@ BuildRequires: trinity-tdegames-devel >= %{tde_version} BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/main/tdeadmin/tdeadmin.spec index 8a84b4662..9eebbaa10 100644 --- a/redhat/main/tdeadmin/tdeadmin.spec +++ b/redhat/main/tdeadmin/tdeadmin.spec @@ -72,7 +72,7 @@ Provides: trinity-kdeadmin = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: libtool BuildRequires: fdupes BuildRequires: gcc-c++ diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec index 5c2ec0ea5..8f375e734 100644 --- a/redhat/main/tdeartwork/tdeartwork.spec +++ b/redhat/main/tdeartwork/tdeartwork.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: fdupes diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index c8eb9b7ce..165c11a5b 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -488,7 +488,7 @@ Requires: hicolor-icon-theme-branding BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: make BuildRequires: fdupes diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index 7423d0c91..06f9dd206 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -63,7 +63,7 @@ Source1: %{name}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: desktop-file-utils # SUSE desktop files utility diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec index 8deae8f67..7c925dd1c 100644 --- a/redhat/main/tdegames/tdegames.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: fdupes diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec index f061739c0..7d3037300 100644 --- a/redhat/main/tdegraphics/tdegraphics.spec +++ b/redhat/main/tdegraphics/tdegraphics.spec @@ -59,7 +59,7 @@ Source1: %{name}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: libtool diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 31bd0aad7..5f9eac00b 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -86,7 +86,7 @@ Requires: trinity-filesystem >= %{tde_version} Requires: fileshareset >= 2.0 %endif -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/main/tdemultimedia/tdemultimedia.spec index e566b7d4d..0370625f9 100644 --- a/redhat/main/tdemultimedia/tdemultimedia.spec +++ b/redhat/main/tdemultimedia/tdemultimedia.spec @@ -72,7 +72,7 @@ BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: fdupes BuildRequires: desktop-file-utils diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index 53560862a..06a5369c0 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -77,7 +77,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gettext BuildRequires: coreutils BuildRequires: gcc-c++ diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index dd1e5ed05..244229e11 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -68,7 +68,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: libcaldav-devel >= %{tde_epoch}:0.6.5 BuildRequires: libcarddav-devel >= %{tde_epoch}:0.6.2 -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: fdupes BuildRequires: desktop-file-utils diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec index 97612f4f9..0718a6fa8 100644 --- a/redhat/main/tdesdk/tdesdk.spec +++ b/redhat/main/tdesdk/tdesdk.spec @@ -64,7 +64,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-perl-dcop >= %{tde_version} BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: fdupes diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec index 42652f272..98b95239a 100644 --- a/redhat/main/tdetoys/tdetoys.spec +++ b/redhat/main/tdetoys/tdetoys.spec @@ -64,7 +64,7 @@ BuildRequires: trinity-kdesktop >= %{tde_version} BuildRequires: trinity-kicker >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec index 5b56731c1..0975736dd 100644 --- a/redhat/main/tdeutils/tdeutils.spec +++ b/redhat/main/tdeutils/tdeutils.spec @@ -74,7 +74,7 @@ BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec index 21f4d0c8d..8755c4bd0 100644 --- a/redhat/main/tdevelop/tdevelop.spec +++ b/redhat/main/tdevelop/tdevelop.spec @@ -81,7 +81,7 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: fdupes BuildRequires: desktop-file-utils