summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies')
-rw-r--r--redhat/dependencies/akode/akode.spec2
-rw-r--r--redhat/dependencies/arts/arts.spec2
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt.spec2
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec2
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt.spec2
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl.spec2
-rw-r--r--redhat/dependencies/libcaldav/libcaldav.spec2
-rw-r--r--redhat/dependencies/libcarddav/libcarddav.spec2
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls.spec2
-rw-r--r--redhat/dependencies/tqca/tqca.spec2
-rw-r--r--redhat/dependencies/tqscintilla/tqscintilla.spec2
-rw-r--r--redhat/dependencies/tqtinterface/tqtinterface.spec23
12 files changed, 13 insertions, 32 deletions
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}"
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-03 09:12:48 +0000