- release 12 - fixed changes from HEAD (STBR)

Changed files:
    blt.spec -> 1.32.2.3

diff --git a/blt.spec b/blt.spec
index 30c8981eb7a4298189388deed56bc580b368a042..806a4657620cc95f7a5f8b244de330f373e5203a 100644 (file)
--- a/blt.spec
+++ b/blt.spec
@@ -6,7 +6,7 @@ Summary(ru):    
 Summary(uk):   òÏÚÛÉÒÅÎÎÑ ÎÁÂÏÒÕ Tk, ×ËÌÀÞÁÀÞÉ ÇÒÁƦÞΦ ÐÒÉͦÔÉ×É, ÍÅÎÅÄÖÅÒÉ ÇÅÏÍÅÔÒ¦§ ¦ Ô.¦
 Name:          blt
 Version:       2.4u
-Release:       10
+Release:       12
 License:       MIT
 Group:         Development/Tools
 Source0:       ftp://ftp.scriptics.com/pub/tcl/blt/BLT%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch1:               %{name}-paths.patch
 Patch2:                %{name}-excl.patch
 Patch3:                %{name}-acfix.patch
 Patch4:                %{name}-nolibnsl.patch
+Patch5:                %{name}-norpath.patch
 URL:           http://www.tcltk.com/blt/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -116,11 +117,13 @@ Programas que demonstram as caracter
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* cf
 %{__autoconf}
 %configure
+
 %{__make}
 
 %install
@@ -130,18 +133,26 @@ install -d $RPM_BUILD_ROOT{%{_prefix},%{_examplesdir}/%{name}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf libBLT24.so $RPM_BUILD_ROOT%{_libdir}/libBLT.so
-ln -sf libBLTlite24.so $RPM_BUILD_ROOT%{_libdir}/libBLTlite.so
+mv $RPM_BUILD_ROOT%{_libdir}/libBLT24.so $RPM_BUILD_ROOT%{_libdir}/libBLT24.so.0.0
+mv $RPM_BUILD_ROOT%{_libdir}/libBLTlite24.so $RPM_BUILD_ROOT%{_libdir}/libBLTlite24.so.0.0
+ln -sf libBLT24.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libBLT.so.0.0
+ln -sf libBLT24.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libBLT24.so
+ln -sf libBLT24.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libBLT.so
+ln -sf libBLTlite24.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libBLTlite.so.0.0
+ln -sf libBLTlite24.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libBLTlite24.so
+ln -sf libBLTlite24.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libBLTlite.so
 
 # use dynamically linked binaries
 mv -f $RPM_BUILD_ROOT%{_bindir}/bltsh24 $RPM_BUILD_ROOT%{_bindir}/bltsh
 mv -f $RPM_BUILD_ROOT%{_bindir}/bltwish24 $RPM_BUILD_ROOT%{_bindir}/bltwish
+
+# bitmap.n is provided by tk-devel
+rm -f $RPM_BUILD_ROOT%{_mandir}/mann/bitmap.n
+
 mv -f $RPM_BUILD_ROOT%{_libdir}/blt2.4/demos $RPM_BUILD_ROOT%{_examplesdir}/%{name}
 cp -rf examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}
 
 rm -f html/Makefile* $RPM_BUILD_ROOT%{_libdir}/blt2.4/{NEWS,README,PROBLEMS}
-# bitmap.n is provided by tk-devel
-rm -f $RPM_BUILD_ROOT%{_mandir}/mann/bitmap.n
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -153,13 +164,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README NEWS PROBLEMS
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*24.so
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_libdir}/blt2.4
 
 %files devel
 %defattr(644,root,root,755)
 %doc html
-%attr(755,root,root) %{_libdir}/lib*[a-zA-Z].so
+%attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/blt*.h
 %{_mandir}/mann/*