summaryrefslogtreecommitdiffstats
path: root/redhat/kdeutils
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:33:09 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:33:09 +0200
commitdcfb68136c0561ba4bcbef1336ff6f02b49c8900 (patch)
tree452dfc902693c31d8b5c4a088c63f56878073862 /redhat/kdeutils
parentf345812d8248f8a1c6a062cb5af470a9f44b0dc0 (diff)
downloadtde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.tar.gz
tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.zip
RHEL/Fedora: updates main components
Diffstat (limited to 'redhat/kdeutils')
-rwxr-xr-xredhat/kdeutils/trinity-kdeutils-3.5.13.spec11
1 files changed, 5 insertions, 6 deletions
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index 657e53abe..75288260f 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -121,13 +121,12 @@ More Utilities for the K Desktop Environment:
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
- -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt.sh