[dejagnu] fixed search runtest.exp after usrmove Resolves: #788811
Jan Horak
hhorak at fedoraproject.org
Thu Mar 15 13:14:38 UTC 2012
commit bcb4340d160d482db2f097c9320ba68cc690efb0
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date: Thu Mar 15 14:10:42 2012 +0100
fixed search runtest.exp after usrmove
Resolves: #788811
dejagnu-1.5-usrmove.patch | 12 ++++++++++++
dejagnu.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/dejagnu-1.5-usrmove.patch b/dejagnu-1.5-usrmove.patch
new file mode 100644
index 0000000..96f1a85
--- /dev/null
+++ b/dejagnu-1.5-usrmove.patch
@@ -0,0 +1,12 @@
+diff -up dejagnu-1.5/runtest.usrmove dejagnu-1.5/runtest
+--- dejagnu-1.5/runtest.usrmove 2012-02-24 13:03:17.145409711 +0100
++++ dejagnu-1.5/runtest 2012-02-24 13:04:32.068473042 +0100
+@@ -109,7 +109,7 @@ fi
+ #
+ # .. which is a very weak assumption
+
+-for i in `echo ${execpath} | sed -e 's@/[^/]*$@/share/dejagnu@'` `echo ${execpath} | sed -e 's@/[^/]*/[^/]*$@/share/dejagnu@'` $execpath ; do
++for i in `echo ${execpath} | sed -e 's@/[^/]*$@/share/dejagnu@'` `echo ${execpath} | sed -e 's@/[^/]*/[^/]*$@/share/dejagnu@'` $execpath '/usr/share/dejagnu' '/usr/local/share/dejagnu' ; do
+ if expr $verbose \> 1 > /dev/null ; then
+ echo Looking for $i/runtest.exp.
+ fi
diff --git a/dejagnu.spec b/dejagnu.spec
index 5ea4342..6f623f9 100644
--- a/dejagnu.spec
+++ b/dejagnu.spec
@@ -1,7 +1,7 @@
Summary: A front end for testing other programs
Name: dejagnu
Version: 1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv3+
Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -14,6 +14,7 @@ BuildArch: noarch
BuildRequires: expect screen texinfo
Patch1: dejagnu-1.5-smp-1.patch
Patch2: dejagnu-1.5-runtest.patch
+Patch3: dejagnu-1.5-usrmove.patch
%description
DejaGnu is an Expect/Tcl based framework for testing other programs.
@@ -27,6 +28,7 @@ into software development).
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%configure -v
@@ -77,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/dejagnu*
%changelog
+* Thu Mar 15 2012 Honza Horak <hhorak at redhat.com> 1:1.5-3
+- fixed search runtest.exp after usrmove
+ Resolves: #788811
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list