diff --git a/tcl.spec b/tcl.spec index d196755..6fa94e8 100644 --- a/tcl.spec +++ b/tcl.spec @@ -3,7 +3,7 @@ Summary: Tcl scripting language development environment Name: tcl Version: %{majorver}.13 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 License: BSD Group: Development/Languages @@ -12,6 +12,7 @@ Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar. Source1: http://superb-east.dl.sourceforge.net/sourceforge/tcl/tcl8.4.13-html.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: autoconf +Provides: tcl(abi)=%{majorver} ##Conflicts: tcldict Patch1: tcl-8.3.5-tclm4-soname.patch Patch2: tcl-8.4.5-lib-perm.patch @@ -103,8 +104,12 @@ ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so # to prefix/lib/%{name}%{majorver} ## make /usr/lib for multilib archs mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib +#mkdir -p $RPM_BUILD_ROOT/%{_libdir} #ln -s %{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_prefix}/lib/%{name}%{majorver} -ln -s %{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver} +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver} +#cp -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver} +cp -Rp $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ $RPM_BUILD_ROOT/%{_libdir}/ mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic,unix} find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';' @@ -153,8 +158,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{name}%{version}/html/* %changelog -* Tue Mar 13 2007 Marcela Maslanova - 1:8.4.13-13 -- multilib problem +* Tue Mar 21 2007 Marcela Maslanova - 1:8.4.13-14 +- multilib problem, rhbz#227200 * Tue Feb 27 2007 Marcela Maslanova - 1:8.4.13-12 - review