diff options
author | Clark Williams <williams@redhat.com> | 2009-11-10 16:32:51 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2009-11-10 16:32:51 -0600 |
commit | 75a92174cac43b347b209d1e6c2be0d17334cc82 (patch) | |
tree | 4908c977d6a737bf151549bd78a880c864a85f0d /rteval.spec | |
parent | 894afa71680bbdb6592c12eedc44cbfb110f9e5e (diff) | |
download | rteval-75a92174cac43b347b209d1e6c2be0d17334cc82.tar.gz rteval-75a92174cac43b347b209d1e6c2be0d17334cc82.tar.xz rteval-75a92174cac43b347b209d1e6c2be0d17334cc82.zip |
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 <williams@redhat.com>
CC: David Sommerseth <davids@redhat.com
CC: Mike Bonnet <mikeb@redhat.com>
Diffstat (limited to 'rteval.spec')
-rw-r--r-- | rteval.spec | 17 |
1 files changed, 8 insertions, 9 deletions
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 <williams@redhat.com> - 1.11-4 +- changed symlink back to install and tracked by %files + * Mon Nov 9 2009 Clark Williams <williams@redhat.com> - 1.11-3 - changed symlink generation from %post to %posttrans |