diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:09:11 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:09:11 +0200 |
| commit | d45bc6f2a0b63a4533b1d325207c9421ffd8051c (patch) | |
| tree | 0178af4d916a54c33484bb7cab9ee148e9d09ea3 /redhat/applications/kcpuload | |
| parent | 8b32b1132dd028eb502cc670932070dcd1e527c3 (diff) | |
| download | tde-packaging-d45bc6f2a0b63a4533b1d325207c9421ffd8051c.tar.gz tde-packaging-d45bc6f2a0b63a4533b1d325207c9421ffd8051c.zip | |
RHEL/Fedora: fix lots of application building
Diffstat (limited to 'redhat/applications/kcpuload')
| -rw-r--r-- | redhat/applications/kcpuload/trinity-kcpuload.spec | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/redhat/applications/kcpuload/trinity-kcpuload.spec b/redhat/applications/kcpuload/trinity-kcpuload.spec index 67b2c39d1..345381e31 100644 --- a/redhat/applications/kcpuload/trinity-kcpuload.spec +++ b/redhat/applications/kcpuload/trinity-kcpuload.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kcpuload %define version 2.00 -%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" @@ -41,7 +41,7 @@ BuildRequires: gettext %description -KCPULoad is a small program for Kicker (the KDE panel). It shows a +KCPULoad is a small program for Kicker (the TDE panel). It shows a recent history of CPU usage in the form of one or two configurable diagrams in the system tray. These diagrams have settings for colours and various different styles. @@ -54,11 +54,12 @@ KCPULoad has support for SMP and separate user/system loads. # 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" @@ -84,12 +85,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg 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 crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files @@ -97,12 +102,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/kcpuload %{_datadir}/applnk/System/kcpuload.desktop %{_datadir}/apps/kcpuload/icons/*/*/*/*.png -%{_datadir}/icons/*/*/apps/kcpuload.png -%{_docdir}/HTML/en/kcpuload/common -%{_docdir}/HTML/en/kcpuload/index.cache.bz2 -%{_docdir}/HTML/en/kcpuload/index.docbook +%{_datadir}/icons/crystalsvg/*/apps/kcpuload.png +%{_datadir}/icons/locolor/*/apps/kcpuload.png +%{tde_docdir}/HTML/en/kcpuload/common +%{tde_docdir}/HTML/en/kcpuload/index.cache.bz2 +%{tde_docdir}/HTML/en/kcpuload/index.docbook %Changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix HTML directory location + * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |