Attachment 291640 Details for Bug 428740 – Patch to spec file to package files in correct directory

[patch] Patch to spec file to package files in correct directory

expect-spec.patch (text/plain), 3.06 KB, created by Wart on 2008-01-14 21:26:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wart

Created: 2008-01-14 21:26:46 UTC

Size: 3.06 KB

patch

obsolete

>? expect-5.43
>? expect-5.43.0-11.fc9.1.src.rpm
>? expect-5.43.0-8.src.rpm
>? expect-5.43.0-9.fc9.1.src.rpm
>? expect-5.43.0-pkgpath.patch
>? expect-spec.patch
>Index: expect-5.38.0-lib-spec.patch
>===================================================================
>RCS file: /cvs/extras/rpms/expect/devel/expect-5.38.0-lib-spec.patch,v
>retrieving revision 1.1
>diff -u -r1.1 expect-5.38.0-lib-spec.patch
>--- expect-5.38.0-lib-spec.patch	9 Sep 2004 04:37:26 -0000	1.1
>+++ expect-5.38.0-lib-spec.patch	14 Jan 2008 21:23:54 -0000
>@@ -5,7 +5,7 @@
>  
>  EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}"
> -EXP_LIB_SPEC="-L\${INSTALL_ROOT}\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}"
>-+EXP_LIB_SPEC="-L\${libdir}/.. -lexpect${EXP_LIB_VERSION}${DBGX}"
>++EXP_LIB_SPEC="-L\${libdir}/../.. -lexpect${EXP_LIB_VERSION}${DBGX}"
>  EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a
>  
>  # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro,
>Index: expect.spec
>===================================================================
>RCS file: /cvs/extras/rpms/expect/devel/expect.spec,v
>retrieving revision 1.22
>diff -u -r1.22 expect.spec
>--- expect.spec	7 Jan 2008 09:42:59 -0000	1.22
>+++ expect.spec	14 Jan 2008 21:23:54 -0000
>@@ -1,9 +1,11 @@
>+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
>+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
> %define majorver 5.43
> 
> Summary: A program-script interaction and testing utility
> Name: expect
> Version: %{majorver}.0
>-Release: 11%{?dist}
>+Release: 12%{?dist}
> License: Public Domain
> Group: Development/Languages
> URL: http://expect.nist.gov/
>@@ -20,6 +22,8 @@
> # examples patches
> Patch100: expect-5.32.2-random.patch
> Patch101: unbuffer-child-flush-143963.patch
>+# Fix install location for tcl 8.5
>+Patch200: expect-5.43.0-pkgpath.patch
> 
> %description
> Expect is a tcl application for automating and testing
>@@ -67,7 +71,8 @@
> # examples fixes
> %patch100 -p1 -b .random
> %patch101 -p1 -b .unbuffer
>-# *-lib-spec.patch and *-tcl8.5.patch touch configure.in
>+%patch200 -p0 -b .pkgpath
>+# *-lib-spec.patch and *-tcl8.5.patch and -pkgpath.patch touch configure.in
> aclocal
> autoconf
> ( cd testsuite
>@@ -115,8 +120,8 @@
> %{_bindir}/unbuffer
> %{_bindir}/weather
> %{_bindir}/xkibitz
>-%dir %{_libdir}/expect%{majorver}
>-%{_libdir}/expect%{majorver}/pkgIndex.tcl
>+%dir %{tcl_sitearch}/expect%{majorver}
>+%{tcl_sitearch}/expect%{majorver}/pkgIndex.tcl
> %{_libdir}/libexpect%{majorver}.so
> %{_mandir}/man1/autoexpect.1.gz
> %{_mandir}/man1/dislocate.1.gz
>@@ -130,7 +135,7 @@
> 
> %files devel
> %defattr(-,root,root,-)
>-%exclude %{_libdir}/expect%{majorver}/libexpect%{majorver}.a
>+%exclude %{tcl_sitearch}/expect%{majorver}/libexpect%{majorver}.a
> %exclude %{_libdir}/libexpect%{majorver}.a
> %{_libdir}/libexpect.so
> %{_mandir}/man3/libexpect.3*
>@@ -148,6 +153,9 @@
> %{_mandir}/man1/tknewsbiff.1*
> 
> %changelog
>+* Mon Jan 14 2008 Wart <wart@kobold.org> - 5.43.0-12
>+- Update install locations to reflect updated auto_path in the tcl 8.5 package
>+
> * Mon Jan 07 2008 Adam Tkac <atkac redhat com> - 5.43.0-11
> - updated "tcl8.5" patch
>

Actions: View | Diff

Attachments on bug 428740: 291638 | 291640