diff --git a/tk-upstream-fixes.patch b/tk-upstream-fixes.patch deleted file mode 100644 index 43b907f..0000000 --- a/tk-upstream-fixes.patch +++ /dev/null @@ -1,136 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog -+++ ChangeLog -@@ -1,5 +1,15 @@ -+2011-11-08 Reinhard Max -+ -+ * unix/Makefile.in: Add square to DEMOPROGS. It contains a shebang -+ and hence should get installed with executable bits. -+ -+ * doc/label.n: Fix the escaping of leading dots in lines that -+ * doc/text.n: start with a widget name, so that nroff -+ * doc/ttk_notebook.n: doesn't mistake it as a non-existing macro -+ * doc/pack.n: and skips the entire line. -+ - 2011-11-04 Don Porter - - *** 8.5.11 TAGGED FOR RELEASE *** - - * generic/tk.h: Bump to 8.5.11 for release. - -Index: doc/label.n -=================================================================== ---- doc/label.n -+++ doc/label.n -@@ -110,11 +110,11 @@ - \fBlabel\fR .t \-text "This widget is at the top" \-bg red - \fBlabel\fR .b \-text "This widget is at the bottom" \-bg green - \fBlabel\fR .l \-text "Left\enHand\enSide" - \fBlabel\fR .r \-text "Right\enHand\enSide" - text .mid --\.mid insert end "This layout is like Java's BorderLayout" -+\&.mid insert end "This layout is like Java's BorderLayout" - # Lay them out - pack .t \-side top \-fill x - pack .b \-side bottom \-fill x - pack .l \-side left \-fill y - pack .r \-side right \-fill y - -Index: doc/pack.n -=================================================================== ---- doc/pack.n -+++ doc/pack.n -@@ -264,11 +264,11 @@ - label .t \-text "This widget is at the top" \-bg red - label .b \-text "This widget is at the bottom" \-bg green - label .l \-text "Left\enHand\enSide" - label .r \-text "Right\enHand\enSide" - text .mid --\.mid insert end "This layout is like Java's BorderLayout" -+\&.mid insert end "This layout is like Java's BorderLayout" - # Lay them out - \fBpack\fR .t \-side top \-fill x - \fBpack\fR .b \-side bottom \-fill x - \fBpack\fR .l \-side left \-fill y - \fBpack\fR .r \-side right \-fill y - -Index: doc/text.n -=================================================================== ---- doc/text.n -+++ doc/text.n -@@ -2290,12 +2290,12 @@ - returns the incorrect code and adding a second extra line would actually - match, the text widget will return the wrong result. In practice this is - a rare problem, but it can occur, for example: - .CS - pack [text .t] --\.t insert 1.0 "aaaa\enbbbb\encccc\enbbbb\enaaaa\en" --\.t search \-regexp \-\- {(a+|b+\enc+\enb+)+\ena+} 1.0 -+\&.t insert 1.0 "aaaa\enbbbb\encccc\enbbbb\enaaaa\en" -+\&.t search \-regexp \-\- {(a+|b+\enc+\enb+)+\ena+} 1.0 - .CE - will not find a match when one exists of 19 - characters starting from the first - .QW b . - .PP -@@ -2308,12 +2308,12 @@ - algorithm used by the widget does not look back arbitrarily far for a - possible match which might cover large portions of the widget. - For example: - .CS - pack [text .t] --\.t insert 1.0 "aaaa\enbbbb\enbbbb\enbbbb\enbbbb\\n" --\.t search \-regexp \-backward \-\- {b+\en|a+\en(b+\en)+} end -+\&.t insert 1.0 "aaaa\enbbbb\enbbbb\enbbbb\enbbbb\\n" -+\&.t search \-regexp \-backward \-\- {b+\en|a+\en(b+\en)+} end - .CE - matches at - .QW 5.0 - when a true greedy match would match at - .QW 1.0 . - -Index: doc/ttk_notebook.n -=================================================================== ---- doc/ttk_notebook.n -+++ doc/ttk_notebook.n -@@ -197,17 +197,17 @@ - The notebook widget generates a \fB<>\fR - virtual event after a new tab is selected. - .SH "EXAMPLE" - .CS - pack [\fBttk::notebook\fR .nb] --\.nb add [frame .nb.f1] \-text "First tab" --\.nb add [frame .nb.f2] \-text "Second tab" --\.nb select .nb.f2 -+\&.nb add [frame .nb.f1] \-text "First tab" -+\&.nb add [frame .nb.f2] \-text "Second tab" -+\&.nb select .nb.f2 - ttk::notebook::enableTraversal .nb - .CE - .SH "SEE ALSO" - ttk::widget(n), grid(n) - .SH "KEYWORDS" - pane, tab - '\" Local Variables: - '\" mode: nroff - '\" End: - -Index: unix/Makefile.in -=================================================================== ---- unix/Makefile.in -+++ unix/Makefile.in -@@ -550,11 +550,11 @@ - # The private headers we want installed for install-private-headers - PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ - $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ - $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) - --DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget -+DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget - - SHELL_ENV = \ - @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ - export @LD_LIBRARY_PATH_VAR@; \ - TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \ - diff --git a/tk.changes b/tk.changes index 0deed0a..8479527 100644 --- a/tk.changes +++ b/tk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 24 10:25:18 UTC 2012 - max@suse.com + +- 8.5.12rc1 + ------------------------------------------------------------------- Mon Feb 13 10:56:56 UTC 2012 - coolo@suse.com diff --git a/tk.spec b/tk.spec index 4dcb952..7e8f7b5 100644 --- a/tk.spec +++ b/tk.spec @@ -20,8 +20,9 @@ Name: tk BuildRequires: tcl-devel BuildRequires: xorg-x11-devel Url: http://www.tcl.tk -Version: 8.5.11 +Version: 8.5.12 Release: 0 +%define rrc rc1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Graphical User Interface Toolkit for Tcl License: BSD-3-Clause @@ -33,14 +34,14 @@ Obsoletes: tk-64bit # Summary: Graphical User Interface Toolkit for Tcl Group: Development/Languages/Tcl -Provides: wish wish8.4 +Provides: wish +Provides: wish8.4 Requires: tcl >= %version PreReq: /bin/rm -Source0: %name%{version}-src.tar.gz +Source0: %name%{version}%{rrc}-src.tar.gz Source1: tk-rpmlintrc Source2: baselibs.conf Patch0: %name.patch -Patch1: tk-upstream-fixes.patch %description Tk is a graphical user interface toolkit that takes developing desktop @@ -58,8 +59,8 @@ Authors: %package devel Summary: Header Files and C API Documentation for Tk Group: Development/Libraries/Tcl -Requires: tk = %version Requires: tcl-devel +Requires: tk = %version Requires: xorg-x11-libX11-devel # bug437293 %ifarch ppc64 @@ -87,7 +88,6 @@ Authors: %prep %setup -q -n %name%version %patch0 -%patch1 %build cd unix diff --git a/tk8.5.11-src.tar.gz b/tk8.5.11-src.tar.gz deleted file mode 100644 index 96c1075..0000000 --- a/tk8.5.11-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d35810b33a0931656f1d128e7e0776cc0c4d8b9c72af322cab5a7ee30485eb70 -size 3809826 diff --git a/tk8.5.12rc1-src.tar.gz b/tk8.5.12rc1-src.tar.gz new file mode 100644 index 0000000..12ab878 --- /dev/null +++ b/tk8.5.12rc1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e798221101fbc17873163f37f8a225a8c66929aebc3679493bbb0ddb3d377d8 +size 3825991