Attachment 893166 Details for Bug 1080382 – Add tsung-recorder prefix on lib64

[patch] Add tsung-recorder prefix on lib64

0001-Add-erlang-prefix-to-fix-lib64-path.patch (text/plain), 2.21 KB, created by Nicolas Chauvet (kwizart) on 2014-05-07 08:59:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Chauvet (kwizart)

Created: 2014-05-07 08:59:33 UTC

Size: 2.21 KB

patch

obsolete

>From 347fbc443d8806e48bc53f4a08d9c1f1b2260320 Mon Sep 17 00:00:00 2001
>From: Nicolas Chauvet <kwizart@gmail.com>
>Date: Tue, 25 Mar 2014 11:30:17 +0100
>Subject: [PATCH] Add erlang prefix to fix lib64 path
>
>---
> tsung-recorder-libdir.patch | 12 ++++++++++++
> tsung.spec                  |  9 +++++++--
> 2 files changed, 19 insertions(+), 2 deletions(-)
> create mode 100644 tsung-recorder-libdir.patch
>
>diff --git a/tsung-recorder-libdir.patch b/tsung-recorder-libdir.patch
>new file mode 100644
>index 0000000..7ad6ab3
>--- /dev/null
>+++ b/tsung-recorder-libdir.patch
>@@ -0,0 +1,12 @@
>+diff -up tsung-1.5.0/tsung-recorder.sh.in.libdir tsung-1.5.0/tsung-recorder.sh.in
>+--- tsung-1.5.0/tsung-recorder.sh.in.libdir	2013-05-24 10:27:59.000000000 +0200
>++++ tsung-1.5.0/tsung-recorder.sh.in	2014-05-07 10:53:33.091610465 +0200
>+@@ -7,7 +7,7 @@ case $UNAME in
>+         *) HOST=`hostname -s`;;
>+ esac
>+ 
>+-INSTALL_DIR=@prefix@/lib/erlang/
>++INSTALL_DIR=@EXPANDED_LIBDIR@/erlang/
>+ ERL=@ERL@
>+ MAIN_DIR=$HOME/.tsung
>+ LOG_DIR=$MAIN_DIR/log
>diff --git a/tsung.spec b/tsung.spec
>index 7ebe320..5b8c9b2 100644
>--- a/tsung.spec
>+++ b/tsung.spec
>@@ -3,11 +3,12 @@
> 
> Name:           tsung
> Version:        1.5.0
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        A distributed multi-protocol load testing tool
> License:        GPLv2
> URL:            http://tsung.erlang-projects.org/
> Source0:        http://tsung.erlang-projects.org/dist/%{name}-%{version}.tar.gz
>+Patch0:         tsung-recorder-libdir.patch
> BuildRequires:  erlang
> Requires:       erlang
> Requires:       perl(Template)
>@@ -25,13 +26,14 @@ It also has support for SSL.
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .libdir
> iconv -f ISO-8859-1 -t UTF-8 CONTRIBUTORS > CONTRIBUTORS.new && \
> touch -r CONTRIBUTORS CONTRIBUTORS.new && \
> mv CONTRIBUTORS.new CONTRIBUTORS
> sed -i 's/\r$//' examples/*
> 
> %build
>-%configure
>+%configure --with-erlang=%{_libdir}/erlang/bin/erl
> make %{?_smp_mflags}
> 
> %install
>@@ -50,6 +52,9 @@ rm -rf %{buildroot}%{_defaultdocdir}
> %{_mandir}/man1/tsplot.1*
> 
> %changelog
>+* Wed May  7 2014 Nicolas Chauvet <kwizart@gmail.com> - 1.5.0-4
>+- Fix rhbz#1080382
>+
> * Sun Sep 01 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.5.0-3
> - Fix versioned/unversioned docdir
> 
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1080382: 878381 | 893166