Author: qboosh Date: Sat Oct 2 10:45:20 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 5.44.1.15
- updated soname patch (no .0.0 suffix, just set soname)
- removed obsolete alpha,lib64,build,tcl85 patches
- dropped static package (not built if shared library is built)
---- Files affected:
packages/expect:
expect-soname.patch (1.2 -> 1.3) , expect.spec (1.70 -> 1.71) ,
expect-alpha.patch (1.2 -> NONE) (REMOVED), expect-build.patch (1.1 -> NONE)
(REMOVED), expect-lib64.patch (1.2 -> NONE) (REMOVED), expect-tcl85.patch (1.1
-> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/expect/expect-soname.patch
diff -u packages/expect/expect-soname.patch:1.2
packages/expect/expect-soname.patch:1.3
--- packages/expect/expect-soname.patch:1.2 Sat Mar 6 23:30:41 2004
+++ packages/expect/expect-soname.patch Sat Oct 2 12:45:15 2010
@@ -1,38 +1,11 @@
---- 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,@EXP_SHARED_LIB_SONAME@
-+ ln -s $(EXP_SHARED_LIB_FILE) libexpect${versi...@shlib_suffix@
+--- expect-5.44.1.15/tclconfig/tcl.m4.orig 2010-03-11 20:06:30.000000000
+0100
++++ expect-5.44.1.15/tclconfig/tcl.m4 2010-10-02 12:25:10.095738529 +0200
+@@ -3149,7 +3149,7 @@
+ MAKE_STUB_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_STUB_OBJECTS)"
+ else
+ MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)"
+- MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS)
\${SHLIB_LD_LIBS}"
++ MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS)
\${SHLIB_LD_LIBS} -Wl,-soname,\[$]@"
+ MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)"
+ fi
- .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
-@@ -1143,7 +1143,11 @@
- AC_MSG_CHECKING([for type of library to build])
- if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
- EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
-- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
-+ EXP_SHLIB_SOMAJOR=".0"
-+ EXP_SHLIB_SOVERSION="${EXP_SHLIB_SOMAJOR}.0"
-+ eval
"EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}${EXP_SHLIB_SOVERSION}"
-+ eval
"EXP_SHARED_LIB_SONAME=libexpect${TCL_SHARED_LIB_SUFFIX}${EXP_SHLIB_SOMAJOR}"
-+ AC_SUBST(EXP_SHARED_LIB_SONAME)
- EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
- EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_UNSHARED_LIB_FILE"
- AC_MSG_RESULT(both shared and unshared)
-@@ -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
================================================================
Index: packages/expect/expect.spec
diff -u packages/expect/expect.spec:1.70 packages/expect/expect.spec:1.71
--- packages/expect/expect.spec:1.70 Sat Jan 19 18:33:51 2008
+++ packages/expect/expect.spec Sat Oct 2 12:45:15 2010
@@ -3,29 +3,24 @@
# BIG FAT WARNING:
# - expect requires mounted /dev/pts to avoid `spawn failed' errors.
#
-Summary: Tcl extension
+Summary: Tcl expect extension
Summary(de.UTF-8): Tcl-Erweiterung
Summary(fr.UTF-8): Extension Tcl
-Summary(pl.UTF-8): Rozszerzenie Tcl
+Summary(pl.UTF-8): Rozszerzenie Tcl expect
Summary(ru.UTF-8): Расширение Tcl для управления программами из скриптов
Summary(tr.UTF-8): Programlar arası etkileşimi mümkün kılan Tcl
genişletmesi
Summary(uk.UTF-8): Розширення Tcl для керування програмами зі скриптів
Name: expect
-%define major 5.43
-Version: %{major}.0
-Release: 2
+Version: 5.44.1.15
+Release: 1
License: BSD
Group: Development/Languages/Tcl
-Source0: http://expect.nist.gov/src/%{name}-%{version}.tar.gz
-# Source0-md5: 230400129630335b3060a42f66fec11d
+Source0:
http://downloads.sourceforge.net/expect/%{name}-%{version}.tar.bz2
+# Source0-md5: 9307bbf67e19125036ce34544a78dadf
Patch0: %{name}-pty.patch
-Patch1: %{name}-alpha.patch
-Patch2: %{name}-bug7869.patch
-Patch3: %{name}-fixcat.patch
-Patch4: %{name}-soname.patch
-Patch5: %{name}-lib64.patch
-Patch6: %{name}-build.patch
-Patch7: %{name}-tcl85.patch
+Patch1: %{name}-bug7869.patch
+Patch2: %{name}-fixcat.patch
+Patch3: %{name}-soname.patch
URL: http://expect.nist.gov/
BuildRequires: autoconf
BuildRequires: automake
@@ -91,42 +86,26 @@
expect jest dla Tcl.
%package devel
-Summary: Tcl extension header files and development documentation
-Summary(pl.UTF-8): Pliki nagłówkowe i dokumentacja do rozszerzenia języka
Tcl
+Summary: Tcl expect extension header files and development documentation
+Summary(pl.UTF-8): Pliki nagłówkowe i dokumentacja do rozszerzenia expect
języka Tcl
Group: Development/Languages/Tcl
Requires: %{name} = %{version}-%{release}
-Requires: tcl-devel >= 8.4.6
+Requires: tcl-devel >= 8.5.0
+Obsoletes: expect-static
%description devel
-Tcl extension language header files and develppment documentation.
+Tcl expect extension language header files and development
+documentation.
%description devel -l pl.UTF-8
-Pliki nagłówkowe i dokumentacja do rozszerzenie języka Tcl.
-
-%package static
-Summary: Tcl extension static library
-Summary(pl.UTF-8): Biblioteka statyczna rozszerzenia języka Tcl
-Group: Development/Languages/Tcl
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Tcl extension language static library.
-
-%description static -l pl.UTF-8
-Biblioteka statyczna rozszerzenia języka Tcl.
+Pliki nagłówkowe i dokumentacja do rozszerzenia expect języka Tcl.
%prep
-%setup -q -n %{name}-%{major}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%if "%{_lib}" == "lib64"
-%patch5 -p1
-%endif
-%patch6 -p1
-%patch7 -p1
chmod +w {.,testsuite}/configure
@@ -135,9 +114,8 @@
# only local macros, don't call aclocal
%{__autoconf}
cd testsuite
-cp ../aclocal.m4 .
-%{__autoconf}
-cd -
+%{__autoconf} -I ..
+cd ..
CFLAGS="%{rpmcflags} -I%{_includedir}/tcl-private/unix"
%configure \
--enable-gcc \
@@ -147,9 +125,6 @@
--with-tclinclude=%{_includedir}/tcl-private \
--with-tkinclude=%{_includedir}
-cat expect_cf.h | sed "s|.*SETPGRP_VOID.*|\#define SETPGRP_VOID 1|" >
expect_cf.h.new
-mv -f expect_cf.h{.new,}
-
%{__make}
%install
@@ -157,14 +132,14 @@
LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} \
%{__make} install \
- INSTALL_ROOT=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT \
+ TCLSH_PROG=tclsh
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
+mv -f $RPM_BUILD_ROOT%{_libdir}/expect%{version}/libexpect%{version}.so
$RPM_BUILD_ROOT%{_libdir}
+ln -sf ../libexpect%{version}.so
$RPM_BUILD_ROOT%{_libdir}/expect%{version}/libexpect%{version}.so
+ln -sf libexpect%{version}.so $RPM_BUILD_ROOT%{_libdir}/libexpect.so
%clean
rm -rf $RPM_BUILD_ROOT
@@ -174,6 +149,7 @@
%files
%defattr(644,root,root,755)
+%doc ChangeLog FAQ HISTORY NEWS README
%attr(755,root,root) %{_bindir}/autoexpect
%attr(755,root,root) %{_bindir}/autopasswd
%attr(755,root,root) %{_bindir}/cryptdir
@@ -191,18 +167,19 @@
%attr(755,root,root) %{_bindir}/timed-run
%attr(755,root,root) %{_bindir}/unbuffer
%attr(755,root,root) %{_bindir}/weather
-%dir %{_libdir}/expect*
-%attr(755,root,root) %{_libdir}/expect*/pkgIndex.tcl
-%attr(755,root,root) %{_libdir}/libexpect*.so.*.*
-%{_mandir}/man1/autoexpect.*
-%{_mandir}/man1/cryptdir.*
-%{_mandir}/man1/decryptdir.*
-%{_mandir}/man1/dislocate.*
-%{_mandir}/man1/expect.*
-%{_mandir}/man1/kibitz.*
-%{_mandir}/man1/mkpasswd.*
-%{_mandir}/man1/passmass.*
-%{_mandir}/man1/unbuffer.*
+%attr(755,root,root) %{_libdir}/libexpect%{version}.so
+%dir %{_libdir}/expect%{version}
+%attr(755,root,root) %{_libdir}/expect%{version}/pkgIndex.tcl
+%attr(755,root,root) %{_libdir}/expect%{version}/libexpect%{version}.so
+%{_mandir}/man1/autoexpect.1*
+%{_mandir}/man1/cryptdir.1*
+%{_mandir}/man1/decryptdir.1*
+%{_mandir}/man1/dislocate.1*
+%{_mandir}/man1/expect.1*
+%{_mandir}/man1/kibitz.1*
+%{_mandir}/man1/mkpasswd.1*
+%{_mandir}/man1/passmass.1*
+%{_mandir}/man1/unbuffer.1*
%files X11
%defattr(644,root,root,755)
@@ -212,21 +189,17 @@
%attr(755,root,root) %{_bindir}/tkpasswd
%attr(755,root,root) %{_bindir}/xkibitz
%attr(755,root,root) %{_bindir}/xpstat
-%{_mandir}/man1/expectk.*
-%{_mandir}/man1/multixterm.*
-%{_mandir}/man1/tknewsbiff.*
-%{_mandir}/man1/xkibitz.*
+%{_mandir}/man1/expectk.1*
+%{_mandir}/man1/multixterm.1*
+%{_mandir}/man1/tknewsbiff.1*
+%{_mandir}/man1/xkibitz.1*
%files devel
%defattr(644,root,root,755)
-%doc ChangeLog FAQ HISTORY NEWS README
-%attr(755,root,root) %{_libdir}/libexpect*.so
-%{_includedir}/*.h
-%{_mandir}/man3/*
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libexpect*.a
+%attr(755,root,root) %{_libdir}/libexpect.so
+%{_includedir}/expect*.h
+%{_includedir}/tcldbg.h
+%{_mandir}/man3/libexpect.3*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -234,6 +207,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.71 2010/10/02 10:45:15 qboosh
+- updated to 5.44.1.15
+- updated soname patch (no .0.0 suffix, just set soname)
+- removed obsolete alpha,lib64,build,tcl85 patches
+- dropped static package (not built if shared library is built)
+
Revision 1.70 2008/01/19 17:33:51 hawk
- added xorg BRs required to link expectk, some guru may check if they're
really required
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/expect/expect-soname.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/expect/expect.spec?r1=1.70&r2=1.71&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
