Remove patches, change spec file for review.
This commit is contained in:
parent
1ab82cc20f
commit
77ef7eeddf
64
tcl.spec
64
tcl.spec
@ -1,17 +1,16 @@
|
|||||||
%define majorver 8.4
|
%define majorver 8.4
|
||||||
%define epoch 1
|
|
||||||
|
|
||||||
Summary: Tcl scripting language development environment
|
Summary: Tcl scripting language development environment
|
||||||
Name: tcl
|
Name: tcl
|
||||||
Version: %{majorver}.13
|
Version: %{majorver}.13
|
||||||
Release: 9%{?dist}
|
Release: 9%{?dist}
|
||||||
Epoch: %{epoch}
|
Epoch: 1
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
URL: http://tcl.sourceforge.net/
|
URL: http://tcl.sourceforge.net/
|
||||||
Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz
|
Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz
|
||||||
Source1: http://superb-east.dl.sourceforge.net/sourceforge/tcl/tcl8.4.13-html.tar.gz
|
Source1: http://superb-east.dl.sourceforge.net/sourceforge/tcl/tcl8.4.13-html.tar.gz
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Buildrequires: autoconf
|
Buildrequires: autoconf
|
||||||
##Conflicts: tcldict
|
##Conflicts: tcldict
|
||||||
Patch1: tcl-8.3.5-tclm4-soname.patch
|
Patch1: tcl-8.3.5-tclm4-soname.patch
|
||||||
@ -20,10 +19,6 @@ Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
|
|||||||
Patch4: tcl-8.4-no_rpath.patch
|
Patch4: tcl-8.4-no_rpath.patch
|
||||||
Patch5: tcl-8.4.13-autoconf.patch
|
Patch5: tcl-8.4.13-autoconf.patch
|
||||||
Patch6: tcl-8.4.13-html.patch
|
Patch6: tcl-8.4.13-html.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
|
%description
|
||||||
The Tcl (Tool Command Language) provides a powerful platform for
|
The Tcl (Tool Command Language) provides a powerful platform for
|
||||||
@ -62,8 +57,8 @@ This package contains the html manual.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -T -D -c %{name}-%{version} -q -a 0 -a 1
|
%setup -T -D -c %{name}-%{version} -q -a 0 -a 1
|
||||||
##-a 1
|
|
||||||
cd %{name}%{version}
|
cd %{name}%{version}
|
||||||
|
chmod -x generic/tclThreadAlloc.c
|
||||||
|
|
||||||
# define DT SONAME in shared lib
|
# define DT SONAME in shared lib
|
||||||
%patch1 -p1 -b .soname
|
%patch1 -p1 -b .soname
|
||||||
@ -72,12 +67,6 @@ cd %{name}%{version}
|
|||||||
%patch4 -p1 -b .4-rpath
|
%patch4 -p1 -b .4-rpath
|
||||||
%patch5 -p1 -b .5-ac213
|
%patch5 -p1 -b .5-ac213
|
||||||
%patch6 -p1 -b .6-html
|
%patch6 -p1 -b .6-html
|
||||||
#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
|
# patch1 touches tcl.m4, and patch3 touches configure.in
|
||||||
cd unix
|
cd unix
|
||||||
@ -102,33 +91,30 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
cd %{name}%{version}
|
cd %{name}%{version}
|
||||||
make install -C unix INSTALL_ROOT=%{buildroot} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
|
make install -C unix INSTALL_ROOT=%{buildroot} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
|
||||||
|
|
||||||
# generate HTML doc set, run from unix, makefile
|
ln -s tclsh%{majorver} $RPM_BUILD_ROOT%{_bindir}/tclsh
|
||||||
#make -C unix html HTML_DIR=`pwd`/html
|
|
||||||
|
|
||||||
ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh
|
|
||||||
|
|
||||||
# for linking with -l%{name}
|
# for linking with -l%{name}
|
||||||
ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so
|
ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
|
||||||
|
|
||||||
# backward compatible symlink for legacy tcl packages that hardcode lib path
|
# backward compatible symlink for legacy tcl packages that hardcode lib path
|
||||||
# to prefix/lib/%{name}%{majorver}
|
# to prefix/lib/%{name}%{majorver}
|
||||||
## make /usr/lib for multilib archs
|
## 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 ./%{name}%{majorver} %buildroot/%{_prefix}/%{_lib}/%{name}%{majorver}
|
|
||||||
|
|
||||||
mkdir -p %buildroot/%{_includedir}/%{name}-private/{generic,unix}
|
find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
|
||||||
find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name}-private/'{}' ';'
|
( cd $RPM_BUILD_ROOT/%{_includedir}
|
||||||
( cd %buildroot/%{_includedir}
|
|
||||||
for i in *.h ; do
|
for i in *.h ; do
|
||||||
[ -f %buildroot/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %buildroot/%{_includedir}/%{name}-private/generic ;
|
[ -f $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic ;
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
|
|
||||||
|
cd %{_datadir}
|
||||||
|
ln -s %{name}%{majorver} $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
|
||||||
|
|
||||||
# remove buildroot traces
|
# remove buildroot traces
|
||||||
sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %buildroot/%{_libdir}/%{name}Config.sh
|
sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh
|
||||||
rm -rf %buildroot/%{_datadir}/%{name}%{majorver}/tclAppInit.c
|
rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/tclAppInit.c
|
||||||
mv %buildroot/%{_datadir}/%{name}%{majorver}/ldAix %buildroot/%{_bindir}/ldAix
|
rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ldAix
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -140,20 +126,15 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_bindir}/tclsh*
|
%{_bindir}/tclsh*
|
||||||
%{_datadir}/%{name}%{majorver}/encoding/*
|
%{_datadir}/%{name}%{majorver}
|
||||||
%{_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
|
|
||||||
%attr(755,root,root) %{_bindir}/ldAix
|
|
||||||
%{_libdir}/lib%{name}%{majorver}.so
|
%{_libdir}/lib%{name}%{majorver}.so
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
%{_mandir}/man3/*
|
||||||
|
%{_mandir}/mann/*
|
||||||
# this should be prefix/lib
|
# this should be prefix/lib
|
||||||
%{_prefix}/%{_lib}/%{name}%{majorver}
|
%{_libdir}/%{name}%{majorver}
|
||||||
%doc %{name}%{version}/README %{name}%{version}/changes %{name}%{version}/license.terms
|
%doc %{name}%{version}/README %{name}%{version}/changes
|
||||||
|
%doc %{name}%{version}/license.terms
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -161,8 +142,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/lib%{name}stub%{majorver}.a
|
%{_libdir}/lib%{name}stub%{majorver}.a
|
||||||
%{_libdir}/lib%{name}.so
|
%{_libdir}/lib%{name}.so
|
||||||
%{_libdir}/%{name}Config.sh
|
%{_libdir}/%{name}Config.sh
|
||||||
%{_mandir}/man3/*
|
#%doc is in html
|
||||||
%{_mandir}/mann/*
|
|
||||||
|
|
||||||
%files html
|
%files html
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
Loading…
Reference in New Issue
Block a user