diff --git a/tk.spec b/tk.spec index 0edf7ba..8f9caa9 100644 --- a/tk.spec +++ b/tk.spec @@ -3,7 +3,7 @@ Summary: Tk graphical toolkit for the Tcl scripting language Name: tk Version: %{majorver}.9 -Release: 2 +Release: 3 License: BSD Group: Development/Languages URL: http://tcl.sourceforge.net/ @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: tcl = %{version} Requires(post,postun): /sbin/ldconfig BuildRequires: tcl-devel = %{version}, autoconf -BuildRequires: XFree86-devel, perl +BuildRequires: xorg-x11-devel, sed # panedwindow.n from itcl conflicts Obsoletes: itcl <= 3.2 Patch1: tk-8.3.5-tclm4-soname.patch @@ -29,7 +29,7 @@ Version: %{version} Summary: Tk graphical toolkit development files Group: Development/Languages URL: http://tcl.sourceforge.net/ -Requires: %{name} = %{version}-%{release}, XFree86-devel +Requires: %{name} = %{version}-%{release}, tcl-devel = %{version}, xorg-x11-devel %description devel When paired with the Tcl scripting language, Tk provides a fast and powerful @@ -82,7 +82,7 @@ find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name} ) # remove buildroot traces -perl -pi -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|" %buildroot/%{_libdir}/%{name}Config.sh %clean rm -rf $RPM_BUILD_ROOT @@ -115,6 +115,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/mann/* %changelog +* Wed Mar 9 2005 Jens Petersen - 8.4.9-3 +- tk-devel requires tcl-devel and xorg-x11-devel instead of XFree86-devel +- use sed instead of perl for fixing tkConfig.sh + - buildrequire sed instead of perl +- buildrequire xorg-x11-devel instead of XFree86-devel +- rebuild with gcc 4 + * Tue Dec 14 2004 Jens Petersen - 8.4.9-2 - move tkConfig.sh into -devel (Axel Thimm, 142724)