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

New version

Browse Source 
- Defuzzified patches
This commit is contained in:
Jaroslav Škarvada 2014-04-24 17:17:50 +02:00
parent d3ba33b555
commit e94131cd5e
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tk-8.6.0-conf.patch → tk-8.6.1-conf.patch
View File

@ -1,8 +1,8 @@
diff --git a/unix/tcl.m4 b/unix/tcl.m4 diff --git a/unix/tcl.m4 b/unix/tcl.m4
index b13fddd..cd9607f 100644 index 194cf90..c470e36 100644
--- a/unix/tcl.m4 --- a/unix/tcl.m4
+++ b/unix/tcl.m4 +++ b/unix/tcl.m4
@@ -1408,12 +1408,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ @@ -1415,12 +1415,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# get rid of the warnings. # get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

4
tk-8.6.0-fix-xft.patch → tk-8.6.1-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 abc8a1d..065a6c2 100755 index e7bf023..7d12f41 100755
--- a/unix/configure.in --- a/unix/configure.in
+++ b/unix/configure.in +++ b/unix/configure.in
@@ -557,8 +557,8 @@ if test $tk_aqua = no; then @@ -485,8 +485,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
tk8.6-make.patch → tk-8.6.1-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 1df6721..08017a4 100644 index 3914940..a69df0e 100644
--- a/unix/Makefile.in --- a/unix/Makefile.in
+++ b/unix/Makefile.in +++ b/unix/Makefile.in
@@ -744,7 +744,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} @@ -743,7 +743,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_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,5 +1,5 @@
%define majorver 8.6 %define majorver 8.6
%define vers %{majorver}.0 %define vers %{majorver}.1
Summary: The graphical toolkit for the Tcl scripting language Summary: The graphical toolkit for the Tcl scripting language
Name: tk Name: tk
@ -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: tk8.6-make.patch Patch1: tk-8.6.1-make.patch
Patch2: tk-8.6.0-conf.patch Patch2: tk-8.6.1-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.0-fix-xft.patch Patch3: tk-8.6.1-fix-xft.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
@ -113,6 +113,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
* Thu Apr 24 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.1-1
- New version
- Defuzzified patches
* Thu Aug 15 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.0-1 * Thu Aug 15 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.0-1
- New version - New version
Resolves: rhbz#889201 Resolves: rhbz#889201