summaryrefslogtreecommitdiffstats
path: root/redhat/applications/knutclient
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:11:35 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:11:35 +0200
commit01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9 (patch)
tree44a49e67fe0e2b487938d3af116a8804950c8ca7 /redhat/applications/knutclient
parent4a5605e233305678da64153c9664a0d06f00bcbe (diff)
downloadtde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.tar.gz
tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.zip
RHEL/Fedora: more application fixes ...
Diffstat (limited to 'redhat/applications/knutclient')
-rw-r--r--redhat/applications/knutclient/trinity-knutclient.spec31
1 files changed, 19 insertions, 12 deletions
diff --git a/redhat/applications/knutclient/trinity-knutclient.spec b/redhat/applications/knutclient/trinity-knutclient.spec
index be92e93df..ef45ad28d 100644
--- a/redhat/applications/knutclient/trinity-knutclient.spec
+++ b/redhat/applications/knutclient/trinity-knutclient.spec
@@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp knutclient
%define version 0.9.5
-%define release 1
+%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -53,12 +53,12 @@ unset QTDIR; . /etc/profile.d/qt.sh
# 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"
+%__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"
+%__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"
@@ -86,12 +86,16 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor; do
+ touch --no-create %{_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor; do
+ touch --no-create %{_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
%files -f %{kdecomp}.lang
@@ -103,10 +107,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_datadir}/apps/knutclient
%{tde_docdir}/HTML/cs/knutclient
%{tde_docdir}/HTML/en/knutclient
-%{_datadir}/icons/*/*/apps/*.png
-
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/locolor/*/apps/*.png
%Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
+- Rebuild for Fedora 17
+
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16