summaryrefslogtreecommitdiffstats
path: root/redhat/applications/knetload
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/knetload')
-rw-r--r--redhat/applications/knetload/trinity-knetload.spec28
1 files changed, 18 insertions, 10 deletions
diff --git a/redhat/applications/knetload/trinity-knetload.spec b/redhat/applications/knetload/trinity-knetload.spec
index 1e90086c7..55b1383c2 100644
--- a/redhat/applications/knetload/trinity-knetload.spec
+++ b/redhat/applications/knetload/trinity-knetload.spec
@@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp knetload
%define version 2.3
-%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"
@@ -56,11 +56,11 @@ KNetLoad can monitor just about any network device.
# 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 -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"
@@ -90,12 +90,16 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in crystalsvg 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 crystalsvg locolor ; do
+ touch --no-create %{_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
%files -f %{kdecomp}.lang
@@ -103,9 +107,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/knetload
%{_datadir}/applications/kde/knetload.desktop
%{_datadir}/apps/knetload
-%{_datadir}/icons/*/*/apps/knetload.png
+%{_datadir}/icons/crystalsvg/*/apps/knetload.png
+%{_datadir}/icons/locolor/*/apps/knetload.png
%Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
+- Rebuild for Fedora 17
+
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16