summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kcpuload/kcpuload-3.5.13.2.spec')
-rw-r--r--redhat/applications/kcpuload/kcpuload-3.5.13.2.spec60
1 files changed, 32 insertions, 28 deletions
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
index e9da08b8a..a5374081e 100644
--- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
+++ b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define kdecomp kcpuload
+%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 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -15,7 +16,7 @@
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
-%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdeappdir %{tde_appdir}/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
@@ -23,27 +24,29 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{kdecomp}
-Summary: a CPU meter for Kicker [Trinity]
-Version: 2.00
-Release: 4%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: a CPU meter for Kicker [Trinity]
+Version: 2.00
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+
BuildRequires: gettext
@@ -62,13 +65,7 @@ KCPULoad has support for SMP and separate user/system loads.
%prep
-%setup -q -n %{name}-3.5.13.2
-
-# 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|%{tde_includedir}/tqt|g" \
- -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
+%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"
@@ -78,7 +75,6 @@ KCPULoad has support for SMP and separate user/system loads.
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@@ -87,8 +83,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --enable-rpath
%__make %{?_smp_mflags}
@@ -127,6 +128,9 @@ 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