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

New version

Browse Source 
Related: rhbz#1313909
This commit is contained in:
Jaroslav Škarvada 2016-03-22 18:30:09 +01:00
parent e9c9304d9b
commit dba1f8b01a
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
261754d7dc2a582f00e35547777e1fea tk8.6.4-src.tar.gz 11dbbd425c3e0201f20d6a51482ce6c4 tk8.6.5-src.tar.gz

4
tk-8.6.1-fix-xft.patch → tk-8.6.5-fix-xft.patch
View File

@ -1,8 +1,8 @@
diff --git a/unix/configure.in b/unix/configure.in diff --git a/unix/configure.in b/unix/configure.in
index e7bf023..7d12f41 100755 index cb412af..abfd43b 100755
--- a/unix/configure.in --- a/unix/configure.in
+++ b/unix/configure.in +++ b/unix/configure.in
@@ -485,8 +485,8 @@ if test $tk_aqua = no; then @@ -479,8 +479,8 @@ if test $tk_aqua = no; then
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then if test "$found_xft" = "no" ; then
found_xft=yes found_xft=yes

4
tk-8.6.1-make.patch → tk-8.6.5-make.patch
View File

@ -1,8 +1,8 @@
diff --git a/unix/Makefile.in b/unix/Makefile.in diff --git a/unix/Makefile.in b/unix/Makefile.in
index 3914940..a69df0e 100644 index 96f1408..05270c6 100644
--- a/unix/Makefile.in --- a/unix/Makefile.in
+++ b/unix/Makefile.in +++ b/unix/Makefile.in
@@ -743,7 +743,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} @@ -739,7 +739,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
fi fi
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@ @@INSTALL_LIB@

12
tk.spec
View File

@ -1,10 +1,10 @@
%define majorver 8.6 %define majorver 8.6
%define vers %{majorver}.4 %define vers %{majorver}.5
Summary: The graphical toolkit for the Tcl scripting language Summary: The graphical toolkit for the Tcl scripting language
Name: tk Name: tk
Version: %{vers} Version: %{vers}
Release: 2%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
License: TCL License: TCL
Group: Development/Languages Group: Development/Languages
@ -21,10 +21,10 @@ BuildRequires: libXft-devel
Conflicts: itcl <= 3.2 Conflicts: itcl <= 3.2
Obsoletes: tile <= 0.8.2 Obsoletes: tile <= 0.8.2
Provides: tile = 0.8.2 Provides: tile = 0.8.2
Patch1: tk-8.6.1-make.patch Patch1: tk-8.6.5-make.patch
Patch2: tk-8.6.3-conf.patch Patch2: tk-8.6.3-conf.patch
# fix implicit linkage of freetype that breaks xft detection (#677692) # fix implicit linkage of freetype that breaks xft detection (#677692)
Patch3: tk-8.6.1-fix-xft.patch Patch3: tk-8.6.5-fix-xft.patch
Patch4: tk-8.6.4-no-fonts-fix.patch Patch4: tk-8.6.4-no-fonts-fix.patch
%description %description
@ -115,6 +115,10 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
%{_datadir}/%{name}%{majorver}/tkAppInit.c %{_datadir}/%{name}%{majorver}/tkAppInit.c
%changelog %changelog
* Tue Mar 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.5-1
- New version
Related: rhbz#1313909
* Thu Jul 2 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.4-2 * Thu Jul 2 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.4-2
- Fixed crash if there is no font installed (by no-fonts-fix patch) - Fixed crash if there is no font installed (by no-fonts-fix patch)
Resolves: rhbz#1229991 Resolves: rhbz#1229991