diff options
Diffstat (limited to 'redhat/dependencies/tqtinterface/tqtinterface.spec')
| -rw-r--r-- | redhat/dependencies/tqtinterface/tqtinterface.spec | 52 |
1 files changed, 14 insertions, 38 deletions
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index be71f7f6e..7c2bac258 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -22,10 +22,9 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.2 %endif %define tde_pkg tqtinterface -%define cmake_modules_dir %{_datadir}/cmake/Modules %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 @@ -57,28 +56,26 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt3-mt-devel >= 3.5.0 BuildRequires: tqt3-dev-tools >= 3.5.0 +BuildRequires: trinity-tde-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 # UUID support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 %define uuid_devel libuuid-devel %endif +%if 0%{?mgaversion} || 0%{?mdkversion} +%define uuid_devel %{_lib}uuid-devel +%endif %if 0%{?rhel} == 5 %define uuid_devel e2fsprogs-devel %endif %{?uuid_devel:BuildRequires: %{uuid_devel}} - # PTHREAD support %if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mgaversion} >= 7 +%if 0%{?mgaversion} >= 7 || 0%{?mdkver} BuildRequires: %{_lib}npth-devel %else BuildRequires: pth-devel @@ -100,8 +97,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if "%{?distribution}" == "OpenMandriva Lx" +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -112,7 +113,7 @@ BuildRequires: Mesa-libGLU-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-devel +BuildRequires: %{_lib}xi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -137,10 +138,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 +168,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-tde-cmake >= %{version}-%{release} Obsoletes: trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release} @@ -193,24 +187,12 @@ although some code has been added for useful functions that are no longer part o %files -n %{libtqt4}-devel %defattr(-,root,root,-) -%{_bindir}/convert_qt_tqt1 -%{_bindir}/convert_qt_tqt2 -%{_bindir}/convert_qt_tqt3 -%{_bindir}/dcopidl-tqt -%{_bindir}/dcopidl2cpp-tqt -%{_bindir}/dcopidlng-tqt -%{_bindir}/mcopidl-tqt -%{_bindir}/moc-tqt %{_bindir}/tmoc -%{_bindir}/tqt-replace -%{_bindir}/tqt-replace-stream -%{_bindir}/uic-tqt %{_includedir}/tqt/ %{_libdir}/libtqt.la %{_libdir}/libtqt.so %{_libdir}/pkgconfig/tqt.pc %{_libdir}/pkgconfig/tqtqui.pc -%{cmake_modules_dir}/*.cmake ########## @@ -227,7 +209,7 @@ although some code has been added for useful functions that are no longer part o %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -265,12 +247,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}" |