- more lib64 fixes

[packages/blt.git] / blt.spec

diff --git a/blt.spec b/blt.spec
index 11c5007971c0f3fa26c9fc8ec447689d6bbd4dda..1f2337397e8f5d7a9d5bd863626b4182db5b4e00 100644 (file)
--- a/blt.spec
+++ b/blt.spec
@@ -1,12 +1,12 @@
 Summary:       A Tk toolkit extension, including widgets, geometry managers, etc
-Summary(es):   Componentes (widgets) y comandos extras para aplicaciones tk
+Summary(es):   Componentes (widgets) y comandos extras para aplicaciones Tk
 Summary(pl):   Rozszerzenie Tk umo¿liwiaj±ce operowanie na kontrolkach i wiele innych
-Summary(pt_BR):        Componentes (widgets) e comandos extras para aplicações tk
-Summary(ru):   òÁÓÛÉÒÅÎÉÅ ÎÁÂÏÒÁ tk, ×ËÌÀÞÁÑ ÇÒÁÆÉÞÅÓËÉÅ ÐÒÉÍÉÔÉ×Ù, ÍÅÎÅÄÖÅÒÙ ÇÅÏÍÅÔÒÉÉ É Ô.Ä
-Summary(uk):   òÏÚÛÉÒÅÎÎÑ ÎÁÂÏÒÕ tk, ×ËÌÀÞÁÀÞÉ ÇÒÁƦÞΦ ÐÒÉͦÔÉ×É, ÍÅÎÅÄÖÅÒÉ ÇÅÏÍÅÔÒ¦§ ¦ Ô.¦
+Summary(pt_BR):        Componentes (widgets) e comandos extras para aplicações Tk
+Summary(ru):   òÁÓÛÉÒÅÎÉÅ ÎÁÂÏÒÁ Tk, ×ËÌÀÞÁÑ ÇÒÁÆÉÞÅÓËÉÅ ÐÒÉÍÉÔÉ×Ù, ÍÅÎÅÄÖÅÒÙ ÇÅÏÍÅÔÒÉÉ É Ô.Ä
+Summary(uk):   òÏÚÛÉÒÅÎÎÑ ÎÁÂÏÒÕ Tk, ×ËÌÀÞÁÀÞÉ ÇÒÁƦÞΦ ÐÒÉͦÔÉ×É, ÍÅÎÅÄÖÅÒÉ ÇÅÏÍÅÔÒ¦§ ¦ Ô.¦
 Name:          blt
 Version:       2.4u
-Release:       11
+Release:       14
 License:       MIT
 Group:         Development/Tools
 Source0:       ftp://ftp.scriptics.com/pub/tcl/blt/BLT%{version}.tar.gz
@@ -18,13 +18,17 @@ Patch3:             %{name}-acfix.patch
 Patch4:                %{name}-nolibnsl.patch
 Patch5:                %{name}-tcltk84.patch
 Patch6:                %{name}-norpath.patch
-URL:           http://www.tcltk.com/blt/
+URL:           http://incrtcl.sourceforge.net/blt/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: tcl-devel >= 8.4.3
-BuildRequires: tk-devel >= 8.4.3
+BuildRequires: tcl-devel >= 8.4.6
+BuildRequires: tk-devel >= 8.4.6
+Requires:      tcl >= 8.4.6
+Requires:      tk >= 8.4.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _ulibdir        %{_prefix}/lib
+
 %description
 BLT is an extension to the Tk toolkit. BLT's most useful feature is
 the provision of more widgets for Tk, but it also provides more
@@ -35,7 +39,7 @@ If you are programming with the Tk toolkit, you should install BLT.
 You will need to have Tcl/Tk installed.
 
 %description -l es
-BLT ofrece componentes (widgets) y comandos extras para programas tk.
+BLT ofrece componentes (widgets) y comandos extras para programas Tk.
 Incluye componentes gráficos, administración de geometría de tablas y
 folders.
 
@@ -49,7 +53,7 @@ zainstalowa
 
 %description -l pt_BR
 O BLT fornece componentes (widgets) e comandos extras para programas
-tk. Ele inclui componentes gráficos, gerenciamento de geometria de
+Tk. Ele inclui componentes gráficos, gerenciamento de geometria de
 tabelas e folders.
 
 %description -l ru
@@ -71,7 +75,7 @@ BLT, 
 Summary:       BLT development package
 Summary(pl):   Pakiet dla programistów BLT
 Group:         Development/Tools
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 BLT header files.
@@ -83,7 +87,7 @@ Pliki nag
 Summary:       BLT static libraries
 Summary(pl):   Biblioteki statyczne BLT
 Group:         Development/Tools
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 BLT static libraries.
@@ -97,7 +101,7 @@ Summary(pl): Dema i przyk
 Summary(pt_BR):        Programas que demonstram as características do BLT
 Summary(es):   BLT Demonstrations
 Group:         Development/Tools
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description demos
 BLT demos and examples.
@@ -124,16 +128,19 @@ Programas que demonstram as caracter
 %build
 cp -f /usr/share/automake/config.* cf
 %{__autoconf}
-%configure
+%configure \
+       --with-tcllibs=%{_libdir} \
+       --with-tklibs=%{_libdir}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_prefix},%{_examplesdir}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_prefix},%{_examplesdir}/%{name}-%{release}}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       libdir=%{_libdir}
 
 ln -sf libBLT24.so $RPM_BUILD_ROOT%{_libdir}/libBLT.so
 ln -sf libBLTlite24.so $RPM_BUILD_ROOT%{_libdir}/libBLTlite.so
@@ -145,10 +152,10 @@ 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}
+mv -f $RPM_BUILD_ROOT%{_ulibdir}/blt2.4/demos $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{release}
+cp -rf examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{release}
 
-rm -f html/Makefile* $RPM_BUILD_ROOT%{_libdir}/blt2.4/{NEWS,README,PROBLEMS}
+rm -f html/Makefile* $RPM_BUILD_ROOT%{_ulibdir}/blt2.4/{NEWS,README,PROBLEMS}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -160,13 +167,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
-%{_libdir}/blt2.4
+%attr(755,root,root) %{_libdir}/libBLT*24.so
+%{_ulibdir}/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}/libBLT*[A-Za-z].so
 %{_includedir}/blt*.h
 %{_mandir}/mann/*
 
@@ -176,4 +183,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files demos
 %defattr(644,root,root,755)
-%{_examplesdir}/%{name}
+%{_examplesdir}/%{name}-%{release}