Downgrade.

This commit is contained in:
Marcela Mašláňová 2007-02-08 17:05:41 +00:00
parent b47d66ba26
commit aec77e6c04
3 changed files with 35 additions and 24 deletions

View File

@ -1,3 +1,3 @@
tk8.5a5-src.tar.gz
tcl8.5a5-src.tar.gz
lst.tar.gz
tcl8.4.13-src.tar.gz
tk8.4.13-src.tar.gz

View File

@ -1,3 +1,3 @@
8118677251db51faf49bb3333ed6db16 tk8.5a5-src.tar.gz
fe9e399c1f186f8c605de8d2e262881e tcl8.5a5-src.tar.gz
d3c75c99e2767cbf1b587aa1e4538df8 lst.tar.gz
f3420b9439bcc769992c1367934a060d tcl8.4.13-src.tar.gz
0a16d4d9398e43cbb85784c85fb807a4 tk8.4.13-src.tar.gz

View File

@ -1,11 +1,10 @@
%define majorver 8.5
%define superver 8
%define majorver %{superver}.5
%define majorver 8.4
Summary: Tcl scripting language development environment
Name: tcl
Version: %{majorver}a5
Version: %{majorver}.13
Release: 7%{?dist}
Epoch: 1
License: BSD
Group: Development/Languages
URL: http://tcl.sourceforge.net/
@ -14,15 +13,16 @@ Source1: http://switch.dl.sourceforge.net/sourceforge/tcl/tk%{version}-src.tar.g
Source2: lst.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Buildrequires: autoconf, sed, man
Obsoletes: tcldict
Patch1: tcl-8.5a5-tclm4-soname.patch
Conflicts: tcldict
Patch1: tcl-8.3.5-tclm4-soname.patch
Patch2: tcl-8.4.5-lib-perm.patch
Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
Patch4: tcl-8.5a5-no_rpath.patch
#Patch5: tcl-8.4.13-autoconf.patch
Patch6: tcl-8.5a5-cflags.patch
Patch7: tcl-8.5a5-makefile.patch
Patch8: tcl-8.5a5-stackchk.patch
Patch4: tcl-8.4-no_rpath.patch
Patch5: tcl-8.4.13-autoconf.patch
Patch6: tcl-8.4.13-cflags.patch
#Patch7: tcl-8.5a5-makefile.patch
#Patch8: tcl-8.5a5-stackchk.patch
#Patch9: tcl-8.5a5-http.patch
%description
The Tcl (Tool Command Language) provides a powerful platform for
@ -69,13 +69,16 @@ cd %{name}%{version}
# define DT SONAME in shared lib
%patch1 -p1 -b .soname
#%patch2 -p1 -b .2-ro-lib
%patch2 -p1 -b .2-ro-lib
%patch3 -p1 -b .3-pkgpath
%patch4 -p1 -b .4-rpath
#%patch5 -p1 -b .5-ac213
%patch6 -p2 -b .6-cflags
%patch7 -p2 -b .7-makefile
%patch8 -p1 -b .8-stackchk
%patch5 -p1 -b .5-ac213
pushd ..
%patch6 -p1 -b .6-cflags
popd
#%patch7 -p2 -b .7-makefile
#%patch8 -p1 -b .8-stackchk
#%patch9 -p1 -b .9-http
# patch1 touches tcl.m4, and patch3 touches configure.in
cd unix
@ -112,14 +115,16 @@ ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so
# to prefix/lib/%{name}%{majorver}
## make /usr/lib for multilib archs
mkdir -p %{buildroot}%{_prefix}/lib
#mkdir -p %{buildroot}%{_libdir}
ln -s %{_datadir}/%{name}%{majorver} %{buildroot}%{_prefix}/lib/%{name}%{majorver}
#ln -s %{_datadir}/%{name}%{majorver} %{buildroot}%{_libdir}/%{name}%{majorver}
mkdir -p %buildroot/%{_includedir}/%{name}-private/{generic,unix}
find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name}-private/'{}' ';'
( cd %buildroot/%{_includedir}
for i in *.h ; do
[ -f %buildroot/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %buildroot/%{_includedir}/%{name}-private/generic ;
done
for i in *.h ; do
[ -f %buildroot/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %buildroot/%{_includedir}/%{name}-private/generic ;
done
)
# remove buildroot traces
@ -138,7 +143,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_bindir}/tclsh*
%{_datadir}/%{name}%{majorver}
%{_datadir}/%{name}%{superver}
%{_libdir}/lib%{name}%{majorver}.so
%{_mandir}/man1/*
# this should be prefix/lib
@ -160,6 +164,13 @@ rm -rf $RPM_BUILD_ROOT
%doc %{name}%{version}/html/*
%changelog
* Thu Feb 8 2007 Marcela Maslanova <mmaslano@redhat.com> - 1:8.4.13-4
- downgrade back to 8.4.13
- rhbz #226479 review
* Mon Feb 5 2007 Marcela Maslanova <mmaslano@redhat.com> - 8.5a5-8
- rhbz#227173
* Sun Feb 4 2007 Jakub Jelinek <jakub@redhat.com> - 8.5a5-7
- fix broken stack checking code (#226785)