commit d7030ae437414c1c590facd6f9a57f51018f40ab Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Thu Jan 16 05:40:53 2020 +0100
- updated to 8.6.10 - removed obsolete link patch tk-link.patch | 15 --------------- tk.spec | 11 ++++++----- 2 files changed, 6 insertions(+), 20 deletions(-) --- diff --git a/tk.spec b/tk.spec index 9e3e3a0..47c38f5 100644 --- a/tk.spec +++ b/tk.spec @@ -8,20 +8,19 @@ Summary(uk.UTF-8): Tk GUI toolkit для Tcl Name: tk # note: 8.6.9 tarball was regenerated after df, there is also 8.6.9.1 - but both contain only OSX specific fixes %define major 8.6 -%define minor 9 +%define minor 10 %define tcl_ver %{version} Version: %{major}.%{minor} Release: 1 License: BSD Group: Development/Languages/Tcl Source0: http://downloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz -# Source0-md5: 77242dcea4e8bbf9f7fef9621c18cb74 +# Source0-md5: 602a47ad9ecac7bf655ada729d140a94 Patch0: %{name}-manlnk.patch Patch1: %{name}-opt_flags_pass_fix.patch Patch2: %{name}-norpath.patch Patch3: %{name}-no_tcl_stub.patch -Patch4: %{name}-link.patch -Patch5: %{name}-soname_fix.patch +Patch4: %{name}-soname_fix.patch URL: http://www.tcl.tk/ BuildRequires: autoconf >= 2.59 BuildRequires: pkgconfig @@ -125,7 +124,6 @@ Narzędzia Tk GUI - programy demonstracyjne. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build cd unix @@ -220,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT %{_pkgconfigdir}/tk.pc %{_includedir}/tk*.h %{_includedir}/tk-private +%{_mandir}/man3/FindPhoto.3* +%{_mandir}/man3/FontId.3* +%{_mandir}/man3/MeasureChar.3* %{_mandir}/man3/Tk_*.3* %{_mandir}/man3/Ttk_*.3* %{_mandir}/mann/*.n* diff --git a/tk-link.patch b/tk-link.patch deleted file mode 100644 index c80c583..0000000 --- a/tk-link.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/unix/configure.in b/unix/configure.in -index e7bf023..7d12f41 100755 ---- a/unix/configure.in -+++ b/unix/configure.in -@@ -485,8 +485,8 @@ if test $tk_aqua = no; then - XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" - if test "$found_xft" = "no" ; then - found_xft=yes -- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" -- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" -+ XFT_CFLAGS=`pkg-config --cflags xft fontconfig freetype2 2>/dev/null` || found_xft="no" -+ XFT_LIBS=`pkg-config --libs xft fontconfig freetype2 2>/dev/null` || found_xft="no" - fi - AC_MSG_RESULT([$found_xft]) - dnl make sure that compiling against Xft header file doesn't bomb ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/tk.git/commitdiff/d7030ae437414c1c590facd6f9a57f51018f40ab _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit