- added acfix and nolibnsl patches, fixed build on athlon

- added missing headers to -devel(!), moved base docs to base
- release 9

Changed files:
    blt-acfix.patch -> 1.1
    blt-nolibnsl.patch -> 1.1
    blt.spec -> 1.32

diff --git a/blt-acfix.patch b/blt-acfix.patch
new file mode 100644 (file)
index 0000000..9605ea0
--- /dev/null
+++ b/blt-acfix.patch
@@ -0,0 +1,55 @@
+--- blt2.4u/aclocal.m4.orig    Wed Jan 12 21:15:36 2000
++++ blt2.4u/aclocal.m4 Tue Mar  4 20:24:37 2003
+@@ -12,10 +12,6 @@
+ cat > conftest.$ac_ext <<EOF
+ [#]line __oline__ "configure"
+ #include "confdefs.h"
+-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+-extern "C" void exit(int);
+-#endif
+-])dnl
+ [$2]
+ EOF
+ eval $ac_link
+--- blt2.4u/configure.in.orig  Fri Jun 23 02:40:05 2000
++++ blt2.4u/configure.in       Tue Mar  4 20:32:04 2003
+@@ -58,6 +58,9 @@
+ AC_ARG_WITH(gnu_ld,   [  --with-gnu-ld           Use GNU linker],
+   blt_with_gnu_ld="yes")
+ 
++AC_PROG_CC
++AC_PROG_CPP
++AC_PROG_EGREP
+ AC_CANONICAL_SYSTEM
+ 
+ # -----------------------------------------------------------------------
+@@ -87,29 +90,9 @@
+ #  4. default to cc
+ #
+ 
+-AC_MSG_CHECKING([which C compiler])
+-if test "x${blt_with_cc}" != "x" ; then 
+-  CC=${blt_with_cc}
+-  unset ac_cv_prog_CPP
+-  unset ac_cv_prog_CC
+-elif test "x${BLT_ENV_CC}" != "x" ; then
+-  unset ac_cv_prog_CPP
+-  unset ac_cv_prog_CC
+-elif test "x${blt_cv_prog_cc}" != "x" ; then
+-  CC=${blt_cv_prog_cc}
+-  unset ac_cv_prog_CC
+-else 
+-  AC_PROG_CC
+-fi
+-if test "x${CC}" = "x" ; then
+-  CC=cc
+-fi
+-AC_MSG_RESULT([$CC])
+ 
+ unset blt_cv_prog_cc
+ AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC)
+-AC_SUBST(CC)
+-AC_PROG_CPP
+ if test "x${GCC}" != "x" ; then
+   BLT_HAVE_GCC="yes"
+ else

diff --git a/blt-nolibnsl.patch b/blt-nolibnsl.patch
new file mode 100644 (file)
index 0000000..e876176
--- /dev/null
+++ b/blt-nolibnsl.patch
@@ -0,0 +1,17 @@
+--- blt2.4u/configure.in.orig  Tue Mar  4 20:32:04 2003
++++ blt2.4u/configure.in       Tue Mar  4 20:51:14 2003
+@@ -795,14 +795,12 @@
+ # -lsocket
+ #
+ # -----------------------------------------------------------------------
+-AC_CHECK_LIB(socket, main)
+ 
+ # -----------------------------------------------------------------------
+ # 
+ # -lnsl
+ #
+ # -----------------------------------------------------------------------
+-AC_CHECK_LIB(nsl, main)
+ 
+ # -----------------------------------------------------------------------
+ # 

diff --git a/blt.spec b/blt.spec
index 5a9858280714f626676477b9a9855dd35ba2ff1f..5cf1f445e83d2d2bde9756d299194b017dc92ca2 100644 (file)
--- a/blt.spec
+++ b/blt.spec
@@ -6,16 +6,18 @@ Summary(ru):  
 Summary(uk):   òÏÚÛÉÒÅÎÎÑ ÎÁÂÏÒÕ tk, ×ËÌÀÞÁÀÞÉ ÇÒÁƦÞΦ ÐÒÉͦÔÉ×É, ÍÅÎÅÄÖÅÒÉ ÇÅÏÍÅÔÒ¦§ ¦ Ô.¦
 Name:          blt
 Version:       2.4u
-Release:       8
+Release:       9
 License:       MIT
 Group:         Development/Tools
 Source0:       ftp://ftp.scriptics.com/pub/tcl/blt/BLT%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-paths.patch
 Patch2:                %{name}-excl.patch
+Patch3:                %{name}-acfix.patch
+Patch4:                %{name}-nolibnsl.patch
 URL:           http://www.tcltk.com/blt/
-#BuildRequires:        autoconf
-#BuildRequires:        automake
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: tcl-devel >= 8.3.2
 BuildRequires: tk-devel >= 8.3.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -111,15 +113,19 @@ Programas que demonstram as caracter
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-#aclocal
-#%%{__autoconf}
-%configure2_13
+cp -f /usr/share/automake/config.* cf
+%{__autoconf}
+%configure
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_prefix}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
@@ -147,15 +153,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc README NEWS PROBLEMS
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*24.so
 %{_libdir}/blt2.4
 
 %files devel
 %defattr(644,root,root,755)
-%doc README NEWS PROBLEMS html
+%doc html
 %attr(755,root,root) %{_libdir}/lib*[a-zA-Z].so
-%{_includedir}/blt.h
+%{_includedir}/blt*.h
 %{_mandir}/mann/*
 
 %files static