summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/tqtinterface/tqtinterface.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies/tqtinterface/tqtinterface.spec')
-rw-r--r--redhat/dependencies/tqtinterface/tqtinterface.spec23
1 files changed, 2 insertions, 21 deletions
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index e83429533..3fb6f42f4 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -25,7 +25,6 @@
%define tde_version 14.0.11
%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}"