From 75a92174cac43b347b209d1e6c2be0d17334cc82 Mon Sep 17 00:00:00 2001 From: Clark Williams Date: Tue, 10 Nov 2009 16:32:51 -0600 Subject: changed generation of /usr/bin/rteval to be during %install and added /usr/bin/rteval back to %files section (on recommendation of mikeb) Signed-off-by: Clark Williams CC: David Sommerseth --- rteval.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'rteval.spec') diff --git a/rteval.spec b/rteval.spec index d041716..b5257c2 100644 --- a/rteval.spec +++ b/rteval.spec @@ -3,7 +3,7 @@ Name: rteval Version: 1.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utility to evaluate system suitability for RT Linux Group: Development/Tools @@ -12,6 +12,7 @@ URL: http://git.kernel.org/?p=linux/kernel/git/clrkwllms/rteval.git Source0: rteval-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python Requires: python Requires: python-schedutils python-ethtool libxslt-python >= 1.1.17 Requires: python-dmidecode >= 3.10 @@ -58,6 +59,8 @@ rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT} #make DESTDIR=${RPM_BUILD_ROOT} LOADDIR=%{_sourcedir} install_rteval make DESTDIR=${RPM_BUILD_ROOT} LOADDIR=${RPM_SOURCE_DIR} install_rteval +mkdir -p ${RPM_BUILD_ROOT}/usr/bin +ln -s ../../%{python_sitelib}/rteval/rteval.py ${RPM_BUILD_ROOT}/usr/bin/rteval # XML-RPC server install cd server @@ -71,13 +74,6 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/httpd/conf.d/ install -m 644 apache-rteval.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/rteval-xmlrpc.conf cd .. -%posttrans -ln -fs %{python_sitelib}/rteval/rteval.py /usr/bin/rteval - -%postun -rm -f /usr/bin/rteval - - %clean rm -rf $RPM_BUILD_ROOT @@ -94,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/rteval_*.xsl %config(noreplace) %{_sysconfdir}/rteval.conf %{python_sitelib}/rteval/ - +/usr/bin/rteval %files xmlrpc %defattr(-,root,root,-) @@ -104,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 10 2009 Clark Williams - 1.11-4 +- changed symlink back to install and tracked by %files + * Mon Nov 9 2009 Clark Williams - 1.11-3 - changed symlink generation from %post to %posttrans -- cgit From 63ae9e4c8cd48039d04e18d58bea951b62630aa5 Mon Sep 17 00:00:00 2001 From: Clark Williams Date: Mon, 16 Nov 2009 14:06:02 -0600 Subject: ensure that no double-slashes appear in symlink path for the /usr/bin/rteval link. This exposes a problem with rpmdiff. Signed-off-by: Clark Williams --- rteval.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'rteval.spec') diff --git a/rteval.spec b/rteval.spec index b5257c2..2df4c93 100644 --- a/rteval.spec +++ b/rteval.spec @@ -3,7 +3,7 @@ Name: rteval Version: 1.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utility to evaluate system suitability for RT Linux Group: Development/Tools @@ -57,10 +57,10 @@ a central server. %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT} -#make DESTDIR=${RPM_BUILD_ROOT} LOADDIR=%{_sourcedir} install_rteval -make DESTDIR=${RPM_BUILD_ROOT} LOADDIR=${RPM_SOURCE_DIR} install_rteval +make DESTDIR=${RPM_BUILD_ROOT} install_rteval mkdir -p ${RPM_BUILD_ROOT}/usr/bin -ln -s ../../%{python_sitelib}/rteval/rteval.py ${RPM_BUILD_ROOT}/usr/bin/rteval +# note that python_sitelib has a leading slash... +ln -s ../..%{python_sitelib}/rteval/rteval.py ${RPM_BUILD_ROOT}/usr/bin/rteval # XML-RPC server install cd server @@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 16 2009 Clark Williams - 1.11-5 +- ensure that no double-slashes ("//") appear in the symlink + path for /usr/bin/rteval (problem with rpmdiff) + * Tue Nov 10 2009 Clark Williams - 1.11-4 - changed symlink back to install and tracked by %files -- cgit From 2e9fda3fb0f8e880d283f1d91d06abc2a3e1b80c Mon Sep 17 00:00:00 2001 From: Clark Williams Date: Wed, 25 Nov 2009 10:34:53 -0600 Subject: version bump to 1.12 --- rteval.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'rteval.spec') diff --git a/rteval.spec b/rteval.spec index 2df4c93..e98964e 100644 --- a/rteval.spec +++ b/rteval.spec @@ -2,8 +2,8 @@ %{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: rteval -Version: 1.11 -Release: 5%{?dist} +Version: 1.12 +Release: 1%{?dist} Summary: Utility to evaluate system suitability for RT Linux Group: Development/Tools @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 25 2009 Clark Williams - 1.12-1 +- fix incorrect reporting of measurement thread priorities + * Mon Nov 16 2009 Clark Williams - 1.11-5 - ensure that no double-slashes ("//") appear in the symlink path for /usr/bin/rteval (problem with rpmdiff) -- cgit