summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kradio/trinity-kradio.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kradio/trinity-kradio.spec')
-rw-r--r--redhat/applications/kradio/trinity-kradio.spec32
1 files changed, 21 insertions, 11 deletions
diff --git a/redhat/applications/kradio/trinity-kradio.spec b/redhat/applications/kradio/trinity-kradio.spec
index 505dca071..f91bbe932 100644
--- a/redhat/applications/kradio/trinity-kradio.spec
+++ b/redhat/applications/kradio/trinity-kradio.spec
@@ -1,12 +1,12 @@
# Default version for this component
%define kdecomp kradio
%define version 0.1.1.1
-%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"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
@@ -67,11 +67,12 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
# 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 -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"
@@ -98,12 +99,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
@@ -113,12 +118,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_libdir}/kradio/plugins/*.la
%{_libdir}/kradio/plugins/*.so
%{_datadir}/applications/kde/kradio.desktop
-%{_datadir}/apps/kradio/icons/*/*/*/*.png
+%{_datadir}/apps/kradio/icons/hicolor/*/*/*.png
+%{_datadir}/apps/kradio/icons/locolor/*/*/*.png
%{_datadir}/apps/kradio/presets/*/*.krp
%{_datadir}/apps/kradio/presets/*/*/*.krp
%{_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
%Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
+- Rebuild for Fedora 17
+- Fix HTML directory location
+
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16