diff options
| author | Francois Andriot <[email protected]> | 2012-05-05 11:11:35 +0200 |
|---|---|---|
| committer | Francois Andriot <[email protected]> | 2012-05-05 11:11:35 +0200 |
| commit | 01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9 (patch) | |
| tree | 44a49e67fe0e2b487938d3af116a8804950c8ca7 /redhat/applications/kiosktool | |
| parent | 4a5605e233305678da64153c9664a0d06f00bcbe (diff) | |
| download | tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.tar.gz tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.zip | |
RHEL/Fedora: more application fixes ...
Diffstat (limited to 'redhat/applications/kiosktool')
| -rw-r--r-- | redhat/applications/kiosktool/trinity-kiosktool.spec | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/redhat/applications/kiosktool/trinity-kiosktool.spec b/redhat/applications/kiosktool/trinity-kiosktool.spec index ec96de232..523f5682e 100644 --- a/redhat/applications/kiosktool/trinity-kiosktool.spec +++ b/redhat/applications/kiosktool/trinity-kiosktool.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kiosktool %define version 1.0 -%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" @@ -47,12 +47,14 @@ groups of users. # 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" +%__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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__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 unset QTDIR || : ; source /etc/profile.d/qt.sh @@ -103,13 +105,13 @@ fi %post -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +touch --no-create %{_datadir}/icons/crystalsvg ||: +gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||: update-desktop-database >& /dev/null ||: %postun -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +touch --no-create %{_datadir}/icons/crystalsvg ||: +gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||: update-desktop-database >& /dev/null ||: @@ -121,11 +123,15 @@ update-desktop-database >& /dev/null ||: %{_bindir}/kiosktool-kdedirs %{_datadir}/applications/kde/kiosktool.desktop %{_datadir}/apps/kiosktool/*.png -%{_docdir}/HTML/en/kiosktool/ +%{tde_docdir}/HTML/en/kiosktool/ %{_datadir}/icons/crystalsvg/*/apps/kiosktool.png %{_datadir}/apps/kiosktool/kiosk_data.xml %{_datadir}/apps/kiosktool/kiosktoolui.rc %Changelog +* Wed May 02 2012 Francois Andriot <[email protected]> - 1.0-2 +- Rebuilt for Fedora 17 +- Fix post and postun + * Sat Nov 19 2011 Francois Andriot <[email protected]> - 1.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |