From bc15a1deee1ee87b9bade81daa017e5e2221991f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 9 Feb 2007 15:06:32 +0000 Subject: [PATCH] Downgrade tcl. --- .cvsignore | 1 - sources | 1 - tcl.spec | 58 ++++++++++++++++++++++++++++++------------------------ 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/.cvsignore b/.cvsignore index 42ed029..58075e8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -lst.tar.gz tcl8.4.13-src.tar.gz tk8.4.13-src.tar.gz diff --git a/sources b/sources index bc6f0e6..09e02bb 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -d3c75c99e2767cbf1b587aa1e4538df8 lst.tar.gz f3420b9439bcc769992c1367934a060d tcl8.4.13-src.tar.gz 0a16d4d9398e43cbb85784c85fb807a4 tk8.4.13-src.tar.gz diff --git a/tcl.spec b/tcl.spec index 825a8d5..5456ea1 100644 --- a/tcl.spec +++ b/tcl.spec @@ -1,25 +1,25 @@ %define majorver 8.4 +%define epoch 1 Summary: Tcl scripting language development environment Name: tcl Version: %{majorver}.13 Release: 7%{?dist} -Epoch: 1 +Epoch: %{epoch} License: BSD Group: Development/Languages URL: http://tcl.sourceforge.net/ Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz Source1: http://switch.dl.sourceforge.net/sourceforge/tcl/tk%{version}-src.tar.gz -Source2: lst.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Buildrequires: autoconf, sed, man -Conflicts: tcldict +##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.4-no_rpath.patch Patch5: tcl-8.4.13-autoconf.patch -Patch6: tcl-8.4.13-cflags.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 @@ -38,7 +38,7 @@ Version: %{version} Summary: Tcl scripting language development environment Group: Development/Languages URL: http://tcl.sourceforge.net/ -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description devel The Tcl (Tool Command Language) provides a powerful platform for @@ -63,7 +63,7 @@ Tcl/Tk is a powerful scripting language and GUI toolkit. This package contains the html manual. %prep -%setup -T -D -c %{name}-%{version} -q -a 0 -a 1 -a 2 +%setup -T -D -c %{name}-%{version} -q -a 0 -a 1 ##-a 1 cd %{name}%{version} @@ -74,7 +74,7 @@ cd %{name}%{version} %patch4 -p1 -b .4-rpath %patch5 -p1 -b .5-ac213 pushd .. -%patch6 -p1 -b .6-cflags +#%patch6 -p1 -b .6-cflags popd #%patch7 -p2 -b .7-makefile #%patch8 -p1 -b .8-stackchk @@ -85,11 +85,11 @@ cd unix autoconf %build -ls %{_tmppath} cd %{name}%{version}/unix %configure --enable-threads make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver} +%check # don't run "make test" by default %{?_without_check: %define _without_check 0} %{!?_without_check: %define _without_check 1} @@ -103,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT cd %{name}%{version} make install -C unix INSTALL_ROOT=%{buildroot} TCL_LIBRARY=%{_datadir}/%{name}%{majorver} -# generate HTML doc set +# generate HTML doc set, run from unix, makefile make -C unix html HTML_DIR=`pwd`/html ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh @@ -114,10 +114,8 @@ ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so # backward compatible symlink for legacy tcl packages that hardcode lib path # 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}%{_prefix}/%{_lib} +ln -s %{_datadir}/%{name}%{majorver} %{buildroot}%{_prefix}/%{_lib}/%{name}%{majorver} mkdir -p %buildroot/%{_includedir}/%{name}-private/{generic,unix} find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name}-private/'{}' ';' @@ -129,24 +127,32 @@ find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name} # remove buildroot traces sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %buildroot/%{_libdir}/%{name}Config.sh +rm -rf %buildroot/%{_datadir}/%{name}%{majorver}/tclAppInit.c +mv %buildroot/%{_datadir}/%{name}%{majorver}/ldAix %buildroot/%{_bindir}/ldAix %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/tclsh* -%{_datadir}/%{name}%{majorver} +%{_datadir}/%{name}%{majorver}/encoding/* +%{_datadir}/%{name}%{majorver}/http1.0/* +%{_datadir}/%{name}%{majorver}/http2.5/* +%{_datadir}/%{name}%{majorver}/msgcat1.3/* +%{_datadir}/%{name}%{majorver}/opt0.4/* +%{_datadir}/%{name}%{majorver}/tcltest2.2/* +%{_datadir}/%{name}%{majorver}/*.tcl +%{_datadir}/%{name}%{majorver}/tclIndex +%{_bindir}/ldAix %{_libdir}/lib%{name}%{majorver}.so %{_mandir}/man1/* # this should be prefix/lib -%{_prefix}/lib/%{name}%{majorver} +%{_prefix}/%{_lib}/%{name}%{majorver} %doc %{name}%{version}/README %{name}%{version}/changes %doc %{name}%{version}/license.terms @@ -164,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT %doc %{name}%{version}/html/* %changelog -* Thu Feb 8 2007 Marcela Maslanova - 1:8.4.13-4 +* Thu Feb 8 2007 Marcela Maslanova - 1:8.4.13-7.fc7 - downgrade back to 8.4.13 - rhbz #226479 review @@ -264,8 +270,8 @@ rm -rf $RPM_BUILD_ROOT - use %%{name} more extensively for script portability - run "make test" by default when building (can be disabled with "--without check") -- add a backwards compatible symlink %{_prefix}/lib/tk8.4 -> - %{_datadir}/tk8.4 (Michal Jaegermann, part of #90160) +- add a backwards compatible symlink {_prefix}/lib/tk8.4 -> + {_datadir}/tk8.4 (Michal Jaegermann, part of #90160) - use "mkdir -p" instead of "mkdirhier" (Robert Scheck, #116771) - include some doc files @@ -276,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT - rebuilt * Mon Feb 2 2004 Jens Petersen - 8.4.5-4 -- include all private .h files under %{_includedir}/tcl-private +- include all private .h files under {_includedir}/tcl-private * Mon Dec 1 2003 Thomas Woerner 8.4.5-3 - removed rpath (patch 4) @@ -284,15 +290,15 @@ rm -rf $RPM_BUILD_ROOT * Fri Nov 28 2003 Jens Petersen - 8.4.5-2 - put private header files under generic and unix subdirs - include real generic/tclPort.h not just a symlink to tclUnixPort.h -- add tclMath.h to %{_includedir}/tcl-private/generic for building tk +- add tclMath.h to {_includedir}/tcl-private/generic for building tk - remove build remnants from tclConfig.sh * Thu Nov 27 2003 Jens Petersen - 8.4.5-1 - new package split out from tcltk - update to tcl 8.4.5 (#88429) - drop tcl-8.3.3-heiierarchy.patch, tcl-8.3.3-dlopen.patch - and tcl8.3.5-koi8-u.enc-88806.patch -- include private include headers under %{_includedir}/tcl-private + and tcl8.3.5-koi8-u.enc-88806.patch +- include private include headers under {_includedir}/tcl-private - filtered changelog for tcl - buildrequire autoconf213 (#110583) [mvd@mylinux.com.ua]