From 01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 5 May 2012 11:11:35 +0200 Subject: RHEL/Fedora: more application fixes ... --- redhat/applications/kdirstat/trinity-kdirstat.spec | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'redhat/applications/kdirstat') diff --git a/redhat/applications/kdirstat/trinity-kdirstat.spec b/redhat/applications/kdirstat/trinity-kdirstat.spec index 85161eabf..153c4b1a6 100644 --- a/redhat/applications/kdirstat/trinity-kdirstat.spec +++ b/redhat/applications/kdirstat/trinity-kdirstat.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdirstat %define version 2.4.4 -%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" @@ -57,11 +57,11 @@ own cleanup actions. # 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 -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" @@ -92,12 +92,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 @@ -108,9 +112,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/kconf_update/kdirstat.upd %{_datadir}/apps/kdirstat %{tde_docdir}/HTML/en/kdirstat -%{_datadir}/icons/*/*/apps/kdirstat.png +%{_datadir}/icons/hicolor/*/apps/kdirstat.png +%{_datadir}/icons/locolor/*/apps/kdirstat.png %Changelog +* Tue May 01 2012 Francois Andriot - 2.4.4-2 +- Rebuilt for Fedora 17 +- Fix post and postun + * Wed Nov 30 2011 Francois Andriot - 2.4.4-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- cgit v1.2.3