RHEL/Fedora: fix lots of application building

1 files changed, 20 insertions, 11 deletions

diff --git a/redhat/applications/katapult/trinity-katapult-3.5.13.spec b/redhat/applications/katapult/trinity-katapult-3.5.13.spec
index c746befce..9f745b2f2 100644
--- a/redhat/applications/katapult/trinity-katapult-3.5.13.spec
+++ b/redhat/applications/katapult/trinity-katapult-3.5.13.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp katapult
 %define version 0.3.2.1
-%define release 3
+%define release 4
 
 # 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 @@ inspired by Quicksilver for OS X.
 # 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"
-%__make -f "admin/Makefile.common"
+%__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
@@ -84,13 +84,17 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 /sbin/ldconfig
 
 
@@ -99,7 +103,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %doc AUTHORS COPYING
 %{_bindir}/*
 %{_datadir}/applications/*/*.desktop
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/locale/*/*/*.mo
 %{_datadir}/services/*.desktop
 %{_datadir}/servicetypes/*.desktop
@@ -113,6 +118,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %exclude %{_libdir}/*.la
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-4
+- Rebuilt for Fedora 17
+- Fix post and postun
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-3
 - Fix HTML directory location