summaryrefslogtreecommitdiffstats
path: root/redhat/libraries/libksquirrel
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/libraries/libksquirrel
parentf345812d8248f8a1c6a062cb5af470a9f44b0dc0 (diff)
downloadtde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.tar.gz
tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.zip
RHEL/Fedora: updates main components
Diffstat (limited to 'redhat/libraries/libksquirrel')
-rw-r--r--redhat/libraries/libksquirrel/trinity-libksquirrel.spec15
1 files changed, 6 insertions, 9 deletions
diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
index 0be591792..6a1659ace 100644
--- a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
@@ -78,12 +78,13 @@ Tools for KSquirrel.
# 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"
+%__sed -i admin/acinclude.m4.in \
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common" cvs
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
%build
@@ -109,13 +110,9 @@ export PATH="%{_bindir}:${PATH}"
%post
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files