summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/tqtinterface
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-12-24 18:18:33 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2013-12-24 18:18:33 +0100
commit55bddf58868a60bd9282233024948707f441d679 (patch)
tree163ab09ea22c1fc100ee9975b48cc4e0caed7a75 /redhat/dependencies/tqtinterface
parentf4d8002c33f7660d874c3c667a25bfe01e278a71 (diff)
downloadtde-packaging-55bddf58868a60bd9282233024948707f441d679.tar.gz
tde-packaging-55bddf58868a60bd9282233024948707f441d679.zip
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/dependencies/tqtinterface')
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec17
1 files changed, 4 insertions, 13 deletions
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index bfa90ad66..36d1d77b1 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -74,8 +74,6 @@ Trinity QT Interface
%{tde_bindir}/tqt-replace
%{tde_bindir}/tqt-replace-stream
%{tde_bindir}/uic-tqt
-%{tde_libdir}/libtqassistantclient.so.4
-%{tde_libdir}/libtqassistantclient.so.4.2.0
%{tde_libdir}/libtqt.so.4
%{tde_libdir}/libtqt.so.4.2.0
@@ -102,8 +100,6 @@ Development files for %{name}
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/tqt/
-%{tde_libdir}/libtqassistantclient.la
-%{tde_libdir}/libtqassistantclient.so
%{tde_libdir}/libtqt.la
%{tde_libdir}/libtqt.so
%{tde_libdir}/pkgconfig/tqt.pc
@@ -116,10 +112,12 @@ Development files for %{name}
%debug_package
%endif
+##########
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
%build
unset QTDIR QTINC QTLIB
@@ -145,7 +143,7 @@ fi
-DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-\
+ \
-DCMAKE_LIBRARY_PATH="%{tde_libdir}" \
-DCMAKE_INCLUDE_PATH="%{tde_includedir}" \
\
@@ -154,20 +152,13 @@ fi
-DUSE_QT3="ON" \
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
-# RHEL 5: add newline at end of include files to avoid warnings
-%if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
- echo "" >>${i}
-done
-%endif
-
# Install 'cmake' modules for development use
%__mkdir_p %{?buildroot}%{cmake_modules_dir}
for i in cmake/modules/*.cmake; do