- added soname patch (adds soname, removes rpath)

- removed BR glibc-static (seems not needed now)
- release 2, ready for tcl+tk 8.4.3

Changed files:
    expect-soname.patch -> 1.1
    expect.spec -> 1.48

diff --git a/expect-soname.patch b/expect-soname.patch
new file mode 100644 (file)
index 0000000..2d1539e
--- /dev/null
+++ b/expect-soname.patch
@@ -0,0 +1,25 @@
+--- expect-5.38/Makefile.in.orig       2002-07-18 18:07:41.000000000 +0200
++++ expect-5.38/Makefile.in    2003-06-17 20:51:03.000000000 +0200
+@@ -412,7 +412,8 @@
+ expect-shared-lib-file :: $(EXP_SHARED_LIB_FILE)
+ $(EXP_SHARED_LIB_FILE): $(OFILES)
+       -rm -f $(EXP_SHARED_LIB_FILE)
+-      @TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
++      @TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_SHLIB_LD_LIBS@ -Wl,-soname=`echo $(EXP_SHARED_LIB_FILE) | sed -e 's/\.so.*/.so.0/'`
++      ln -s $(EXP_SHARED_LIB_FILE) `echo $(EXP_SHARED_LIB_FILE) | sed -e 's/\.so.*/.so/'`
+ 
+ .PHONY: install-info install info
+ install-info:
+--- expect-5.38/configure.in.orig      2002-07-18 17:51:06.000000000 +0200
++++ expect-5.38/configure.in   2003-06-17 20:59:20.000000000 +0200
+@@ -1216,8 +1216,8 @@
+ 
+ # now broken out into EXP_AND_TCL_LIBS and EXP_AND_TK_LIBS.  Had to do this
+ # in order to avoid repeating lib specs to which some systems object.
+-EXP_AND_TCL_LIBS="$EXP_AND_TCL_LIBS $EXP_CC_SEARCH_FLAGS"
+-EXP_AND_TK_LIBS="$EXP_AND_TK_LIBS $EXP_CC_SEARCH_FLAGS"
++EXP_AND_TCL_LIBS="$EXP_AND_TCL_LIBS"
++EXP_AND_TK_LIBS="$EXP_AND_TK_LIBS"
+ 
+ #
+ # Set up makefile substitutions

diff --git a/expect.spec b/expect.spec
index f254f3f752754b6c46a33ada06e676b5c328a9e8..ebae080a28ca3fa44ce5f5543386bb48f49a102f 100644 (file)
--- a/expect.spec
+++ b/expect.spec
@@ -6,8 +6,9 @@ Summary(ru):    
 Summary(tr):   Programlar arasý etkileþimi mümkün kýlan tcl geniþletmesi
 Summary(uk):   òÏÚÛÉÒÅÎÎÑ tcl ÄÌÑ ËÅÒÕ×ÁÎÎÑ ÐÒÏÇÒÁÍÁÍÉ Ú¦ ÓËÒÉÐÔ¦×
 Name:          expect
-Version:       5.38.0
-Release:       1
+%define        major   5.38
+Version:       %{major}.0
+Release:       2
 License:       BSD
 Group:         Development/Languages/Tcl
 Source0:       http://expect.nist.gov/src/%{name}-%{version}.tar.gz
@@ -17,13 +18,13 @@ Patch1:             %{name}-alpha.patch
 Patch2:                %{name}-bug7869.patch
 Patch3:                %{name}-fixcat.patch
 Patch4:                %{name}-jbj.patch
+Patch5:                %{name}-soname.patch
 Icon:          tcl.gif
 URL:           http://expect.nist.gov/
-BuildRequires: glibc-static
-BuildRequires: tcl-devel >= 8.3.2
-BuildRequires: tk-devel >= 8.3.2
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: tcl-devel >= 8.4.3
+BuildRequires: tk-devel >= 8.4.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -103,12 +104,13 @@ Tcl extension language static library.
 Biblioteka statyczna rozszerzenia jêzyka TCL.
 
 %prep
-%setup -q -n %{name}-5.38
+%setup -q -n %{name}-%{major}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 chmod +w {.,testsuite}/configure
 
@@ -141,7 +143,12 @@ LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} \
 %{__make} install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
-( cd $RPM_BUILD_ROOT%{_bindir}; mv -f rftp rftp-expect )
+mv -f $RPM_BUILD_ROOT%{_bindir}/{rftp,rftp-expect}
+
+ln -sf $(cd $RPM_BUILD_ROOT%{_libdir} ; echo libexpect%{major}.so.*.*) \
+       $RPM_BUILD_ROOT%{_libdir}/libexpect%{major}.so
+ln -sf $(cd $RPM_BUILD_ROOT%{_libdir} ; echo libexpect%{major}.so.*.*) \
+       $RPM_BUILD_ROOT%{_libdir}/libexpect.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -170,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/weather
 %dir %{_libdir}/expect*
 %attr(755,root,root) %{_libdir}/expect*/pkgIndex.tcl
-%attr(755,root,root) %{_libdir}/libe*.so
+%attr(755,root,root) %{_libdir}/libexpect*.so.*.*
 %{_mandir}/man1/autoexpect.*
 %{_mandir}/man1/cryptdir.*
 %{_mandir}/man1/decryptdir.*
@@ -197,6 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc FAQ README ChangeLog
+%attr(755,root,root) %{_libdir}/libexpect*.so
 %{_includedir}/*
 %{_mandir}/man3/*