rpms/tk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- move pkgIndex.tcl back into %{_libdir}/%{name}%{majorver} so that

Browse Source 
multilib parallel installs works (135310)
- drop tk-8.4.5-pkgIndex-loc.patch
- remove any compat symlink present before installing
- do not generate compat symlink after installing
This commit is contained in:
Jens Petersen 2004-10-15 08:28:55 +00:00
parent f3af943817
commit d330f4c30f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tk.spec
View File

@ -3,7 +3,7 @@
Summary: Tk graphical toolkit for the Tcl scripting language Summary: Tk graphical toolkit for the Tcl scripting language
Name: tk Name: tk
Version: %{majorver}.7 Version: %{majorver}.7
Release: 1 Release: 2
License: BSD License: BSD
Group: Development/Languages Group: Development/Languages
URL: http://tcl.sourceforge.net/ URL: http://tcl.sourceforge.net/
@ -19,7 +19,6 @@ Patch1: tk-8.3.5-tclm4-soname.patch
Patch2: tk-8.4.4-lib-perm.patch Patch2: tk-8.4.4-lib-perm.patch
Patch3: tk-8.4-no_rpath.patch Patch3: tk-8.4-no_rpath.patch
Patch4: tk-8.4-autoconf.patch Patch4: tk-8.4-autoconf.patch
Patch5: tk-8.4.5-pkgIndex-loc.patch
%description %description
When paired with the Tcl scripting language, Tk provides a fast and powerful When paired with the Tcl scripting language, Tk provides a fast and powerful
@ -46,7 +45,6 @@ The package contains the development files and man pages for tk.
%patch2 -p1 -b .rolib %patch2 -p1 -b .rolib
%patch3 -p1 -b .no_rpath %patch3 -p1 -b .no_rpath
%patch4 -p1 -b .ac213 %patch4 -p1 -b .ac213
%patch5 -p1 -b .pkgIdx
# patch1 touches tcl.m4 # patch1 touches tcl.m4
cd unix cd unix
@ -89,13 +87,12 @@ perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %b
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre
[ ! -h %{_prefix}/lib/%{name}%{majorver} ] || rm %{_prefix}/lib/%{name}%{majorver}
%post %post
/sbin/ldconfig /sbin/ldconfig
# try to make a backward compatible symlink for legacy tk packages
# that hardcode lib path to prefix/lib/%{name}%{majorver}
[ -d %{_prefix}/lib/%{name}%{majorver} ] || ln -s %{_datadir}/%{name}%{majorver} %{_prefix}/lib/%{name}%{majorver}
%postun %postun
/sbin/ldconfig /sbin/ldconfig
@ -105,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}%{majorver} %{_datadir}/%{name}%{majorver}
%{_libdir}/lib%{name}%{majorver}.so %{_libdir}/lib%{name}%{majorver}.so
%{_libdir}/%{name}Config.sh %{_libdir}/%{name}Config.sh
%{_libdir}/%{name}%{majorver}
%{_mandir}/man1/* %{_mandir}/man1/*
%doc README changes license.terms %doc README changes license.terms
@ -117,6 +115,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/mann/* %{_mandir}/mann/*
%changelog %changelog
* Fri Oct 15 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-2
- move pkgIndex.tcl back into %{_libdir}/%{name}%{majorver} so that multilib
parallel installs works (135310)
- drop tk-8.4.5-pkgIndex-loc.patch
- remove any compat symlink present before installing
- do not generate compat symlink after installing
* Fri Jul 30 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-1 * Fri Jul 30 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-1
- update to 8.4.7 - update to 8.4.7
- replace tk-8.4.5-no_rpath.patch with tk-8.4-no_rpath.patch - replace tk-8.4.5-no_rpath.patch with tk-8.4-no_rpath.patch