diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:11:35 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:11:35 +0200 |
| commit | 01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9 (patch) | |
| tree | 44a49e67fe0e2b487938d3af116a8804950c8ca7 /redhat/applications/kpilot | |
| parent | 4a5605e233305678da64153c9664a0d06f00bcbe (diff) | |
| download | tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.tar.gz tde-packaging-01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9.zip | |
RHEL/Fedora: more application fixes ...
Diffstat (limited to 'redhat/applications/kpilot')
| -rw-r--r-- | redhat/applications/kpilot/trinity-kpilot.spec | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/redhat/applications/kpilot/trinity-kpilot.spec b/redhat/applications/kpilot/trinity-kpilot.spec index 19e13e95f..ad078e091 100644 --- a/redhat/applications/kpilot/trinity-kpilot.spec +++ b/redhat/applications/kpilot/trinity-kpilot.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kpilot %define version 0.7 -%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" @@ -59,11 +59,11 @@ and synchronize the built-in applications with their KDE counterparts. # 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" @@ -94,13 +94,17 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in hicolor locolor crystalsvg; 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 hicolor locolor crystalsvg; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig || : @@ -144,11 +148,16 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/kconf_update/kpilot.upd %{_datadir}/apps/kpilot %{_datadir}/config.kcfg/*.kcfg -%{_datadir}/icons/*/*/apps/*.png +%{_datadir}/icons/crystalsvg/*/apps/*.png +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/locolor/*/apps/*.png %{_datadir}/services/*.desktop %{_datadir}/servicetypes/kpilotconduit.desktop %Changelog +* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2 +- Rebuild for Fedora 17 + * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |