summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec')
-rw-r--r--redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec24
1 files changed, 10 insertions, 14 deletions
diff --git a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
index 172f54bf3..350e38237 100644
--- a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
+++ b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
@@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp kio-umountwrapper
%define version 0.2
-%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"
@@ -52,12 +52,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"
@@ -83,14 +83,6 @@ export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
%files
%defattr(-,root,root,-)
@@ -99,6 +91,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16