Build with tcl 8.6

diff --git a/packaging/tk.spec b/packaging/tk.spec
index cb81b54..5faa6ed 100644 (file)
--- a/packaging/tk.spec
+++ b/packaging/tk.spec
@@ -13,30 +13,29 @@
 # published by the Open Source Initiative.
 
 Name:           tk
-BuildRequires:  imake
-BuildRequires:  libX11-devel
-BuildRequires:  libXScrnSaver-devel
-BuildRequires:  libXft-devel
-BuildRequires:  libXt-devel
-BuildRequires:  pkg-config
-BuildRequires:  tcl-devel
-Url:            http://www.tcl.tk
 Version:        8.6.0
 Release:        0
-%define         rrc %nil
-Summary:        Graphical User Interface Toolkit for Tcl
 License:        BSD-3-Clause
-Group:          Development/Languages/Tcl
-Provides:       tkcon = 2.7
+%define         rrc %nil
 Summary:        Graphical User Interface Toolkit for Tcl
-Provides:       wish
-Provides:       wish8.6
-Requires:       tcl >= %version
-Requires(pre):         /bin/rm
-Source0:        ftp://ftp.tcl.tk/pub/tcl/tcl8_6/%name%{version}%{rrc}-src.tar.gz
+Url:            http://www.tcl.tk
+Group:          Development/Languages
+Source0:        ftp://ftp.tcl.tk/pub/tcl/tcl8_6/%{name}%{version}%{rrc}-src.tar.gz
 Source1:        tk-rpmlintrc
 Source2:        baselibs.conf
 Source3:        http://tkcon.cvs.sourceforge.net/tkcon/tkcon/tkcon.tcl
+BuildRequires:  imake
+BuildRequires:  pkgconfig(pkg-config)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(tcl) >= 8.6
+Requires:       tcl
+Provides:       tkcon = 2.7
+Provides:       wish
+Provides:       wish8.6
+Requires(pre):         /usr/bin/rm
 
 %description
 Tk is a graphical user interface toolkit that takes developing desktop
@@ -47,8 +46,8 @@ Windows, Mac OS X, Linux and more.
 
 %package devel
 Summary:        Header Files and C API Documentation for Tk
-Requires:       tcl-devel
-Requires:       tk = %version
+Requires:       pkgconfig(tcl)
+Requires:       tk = %{version}
 
 %description devel
 This package contains header files and documentation needed for writing
@@ -58,16 +57,16 @@ Tk in programs written in such languages.
 This package is not needed for writing extensions or applications for
 Tk in the Tcl language itself.
 
-%define TK_MINOR %(echo %version | cut -c1-3)
+%define TK_MINOR %(echo %{version} | cut -c1-3)
 %define scriptdir %(echo 'puts -nonewline [file dirname $tcl_library]' | tclsh)/tk%TK_MINOR
 
 %prep
-%setup -q -n %name%version
+%setup -q -n %{name}%{version}
 
 %build
 cd unix
 %configure \
-       --with-tcl=%_libdir \
+       --with-tcl=%{_libdir} \
        --enable-threads \
        --enable-man-symlinks \
        --enable-man-compression=gzip
@@ -81,14 +80,14 @@ mv doc/menubar.n doc/tk_menubar.n
 mv doc/dialog.n doc/tk_dialog.n
 mv doc/panedwindow.n doc/tk_panedwindow.n
 make -C unix install install-private-headers \
-       INSTALL_ROOT=%buildroot \
+       INSTALL_ROOT=%{buildroot} \
        TK_LIBRARY="%scriptdir" \
        TK_PKG_DIR="tcl/tk%TK_MINOR"
-ln -sf wish%TK_MINOR %buildroot%_prefix/bin/wish
-ln -sf wish%TK_MINOR.n.gz %buildroot%_mandir/mann/wish.n.gz
-install -m 0755 %{S:3} %buildroot%_bindir/tkcon
+ln -sf wish%TK_MINOR %{buildroot}%{_bindir}/wish
+ln -sf wish%TK_MINOR.n.gz %{buildroot}%{_mandir}/mann/wish.n.gz
+install -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/tkcon
 
-%if %_lib == lib64
+%if %{_lib} == lib64
 
 %post
 test -L /usr/lib/tk%TK_MINOR && rm -f /usr/lib/tk%TK_MINOR
@@ -98,21 +97,21 @@ exit 0
 %files
 %defattr(-,root,root)
 %license license.terms
-%docdir %_mandir/mann
-%doc %_mandir/man1/*
-%doc %_mandir/mann/*
-%_prefix/bin/*
-%_libdir/*.so
+%docdir %{_mandir}/mann
+%doc %{_mandir}/man1/*
+%doc %{_mandir}/mann/*
+%{_bindir}/*
+%{_libdir}/*.so
 %scriptdir
 %exclude %scriptdir/tkAppInit.c
 
 %files devel
 %defattr(-,root,root)
-%doc %_mandir/man3/*
-%_prefix/include/*
+%doc %{_mandir}/man3/*
+%{_includedir}/*
 %scriptdir/tkAppInit.c
-%attr(0644,root,root) %_libdir/*.a
-%_libdir/tkConfig.sh
-%_libdir/pkgconfig/*
+%attr(0644,root,root) %{_libdir}/*.a
+%{_libdir}/tkConfig.sh
+%{_libdir}/pkgconfig/*
 
 %changelog