diff options
Diffstat (limited to 'redhat/applications/kcpuload/kcpuload-3.5.13.2.spec')
| -rw-r--r-- | redhat/applications/kcpuload/kcpuload-3.5.13.2.spec | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec index a5374081e..df8ec2705 100644 --- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec +++ b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kcpuload %define tde_version 3.5.13.2 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: a CPU meter for Kicker [Trinity] Version: 2.00 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -68,7 +63,7 @@ KCPULoad has support for SMP and separate user/system loads. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__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" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -128,19 +123,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-5 -- Initial release for TDE 3.5.13.1 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-3 -- Initial release for TDE 3.5.13.1 - -* 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 release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |