[tsung/el6: 2/2] Merge branch 'master' into el6
by Christopher Meng
commit 3c1b18d6b85d9278e9189e312921f2c361f22498
Merge: 608f999 f224fec
Author: Christopher Meng <i(a)cicku.me>
Date: Fri Jul 18 12:23:22 2014 +0800
Merge branch 'master' into el6
tsung.spec | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
---
9 years, 9 months
[tsung/el6: 1/2] Include the example config Patch the shebangs
by Christopher Meng
commit f224fec6dda730dbb2aebacf88222a93926c9b6c
Author: Christopher Meng <i(a)cicku.me>
Date: Fri Jul 18 12:18:40 2014 +0800
Include the example config
Patch the shebangs
tsung.spec | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/tsung.spec b/tsung.spec
index a943ee2..1cf469b 100644
--- a/tsung.spec
+++ b/tsung.spec
@@ -4,7 +4,7 @@
Name: tsung
Version: 1.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A distributed multi-protocol load testing tool
License: GPLv2
URL: http://tsung.erlang-projects.org/
@@ -31,7 +31,7 @@ It also has support for SSL.
%setup -q
# Fix bogus shebangs.
sed -i 's|/usr/bin/env bash|/bin/bash|' *.sh.in
-sed -i 's| /usr/bin/env python|%{__python2}|' src/tsung-plotter/tsplot.py.in
+sed -i 's|/usr/bin/env python|%{__python2}|' src/tsung-plotter/tsplot.py.in
sed -i 's|/usr/bin/env perl|%{__perl}|' src/log2tsung.pl.in
%build
@@ -40,20 +40,31 @@ sed -i 's|/usr/bin/env perl|%{__perl}|' src/log2tsung.pl.in
%install
%make_install
+
+for i in `ls %{buildroot}%{_libdir}/%{name}/bin | grep .pl$ | cut -d"." -f1`
+do
+ ln -sf %{_libdir}/%{name}/bin/$i.pl %{buildroot}%{_bindir}/$i
+done
+
# Fix versioned/unversioned docdir
rm -frv %{buildroot}%{_docdir}
+rm -frv examples/*.xml.in
%files
%doc CHANGES CONTRIBUTORS COPYING README* TODO
-%{_bindir}/%{name}*
-%{_bindir}/tsplot
+%doc examples/
+%{_bindir}/*
+%{_datadir}/%{name}/
%{_libdir}/erlang/lib/*
%{_libdir}/%{name}/
-%{_datadir}/%{name}/
%{_mandir}/man1/%{name}*.1*
%{_mandir}/man1/tsplot.1*
%changelog
+* Thu Jul 10 2014 Christopher Meng <rpm(a)cicku.me> - 1.5.1-2
+- Include example config files
+- Better user experience for perl scripts
+
* Thu Jul 10 2014 Christopher Meng <rpm(a)cicku.me> - 1.5.1-1
- Update to 1.5.1
9 years, 9 months
