From 3c55a9c8fcc8dec42fd6e32664d1db6fb036aab05c890b569e5039a5e26ae9ab Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 8 Nov 2011 17:37:11 +0000 Subject: [PATCH 1/2] Version 8.5.11 OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tk?expand=0&rev=21 --- tk-upstream-fixes.patch | 136 ++++++++++++++++++++++++++++++++++++++++ tk.changes | 15 +++++ tk.spec | 12 ++-- tk8.5.10-src.tar.bz2 | 3 - tk8.5.11-src.tar.gz | 3 + 5 files changed, 160 insertions(+), 9 deletions(-) create mode 100644 tk-upstream-fixes.patch delete mode 100644 tk8.5.10-src.tar.bz2 create mode 100644 tk8.5.11-src.tar.gz diff --git a/tk-upstream-fixes.patch b/tk-upstream-fixes.patch new file mode 100644 index 0000000..43b907f --- /dev/null +++ b/tk-upstream-fixes.patch @@ -0,0 +1,136 @@ +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 2964cd8..4a8e1af 100644 --- a/tk.changes +++ b/tk.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 8 17:32:59 UTC 2011 - max@suse.com + +- New patchlevel release 8.5.11: + * [3341056] new crash in unset traces + * [3314770] restore file dialog resizeability + * [3404541] -takefocus option + * [TIP 382] -confirmoverwrite on save dialog + * [3410609] AltGr keysyms on Swiss keyboard + * [3431491] improved "pixels" shimmer logic +- Add a manpage for wish8.5 by symlinking to the wish manpage. +- Remove unneeded %clean section and norootforbuild comment. +- Add tk-upstream-fixes.patch with fixes for manpage bugs and + a missing x-bit in the demo section. + ------------------------------------------------------------------- Fri Jul 1 11:18:51 UTC 2011 - max@novell.com diff --git a/tk.spec b/tk.spec index ca99d3d..dd1b59e 100644 --- a/tk.spec +++ b/tk.spec @@ -15,14 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: tk BuildRequires: tcl-devel xorg-x11-devel Url: http://www.tcl.tk -Version: 8.5.10 -Release: 5 +Version: 8.5.11 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Graphical User Interface Toolkit for Tcl License: BSD3c(or similar) @@ -37,10 +36,11 @@ Summary: Graphical User Interface Toolkit for Tcl Provides: wish wish8.4 Requires: tcl >= %version PreReq: /bin/rm -Source0: %name%{version}-src.tar.bz2 +Source0: %name%{version}-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 @@ -88,6 +88,7 @@ Authors: %prep %setup -q -n %name%version %patch0 +%patch1 %build cd unix @@ -110,9 +111,8 @@ make -C unix install install-private-headers \ 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 -%clean -rm -rf %buildroot %if %_lib == lib64 %post diff --git a/tk8.5.10-src.tar.bz2 b/tk8.5.10-src.tar.bz2 deleted file mode 100644 index 99625a3..0000000 --- a/tk8.5.10-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:046e3425a17ddc5942e0277b6f071821d5530dc60b1118df774ea5383a9594bc -size 3048759 diff --git a/tk8.5.11-src.tar.gz b/tk8.5.11-src.tar.gz new file mode 100644 index 0000000..96c1075 --- /dev/null +++ b/tk8.5.11-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d35810b33a0931656f1d128e7e0776cc0c4d8b9c72af322cab5a7ee30485eb70 +size 3809826 From 9f70a65ba561087924c98294268aa5411ae5c7412337d9ff52d5eed012bd38a5 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 14 Feb 2012 13:54:25 +0000 Subject: [PATCH 2/2] Accepting request 104561 from devel:openSUSE:Factory:patch-license patch license to follow spdx.org standard OBS-URL: https://build.opensuse.org/request/show/104561 OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tk?expand=0&rev=22 --- tk.changes | 5 +++++ tk.spec | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tk.changes b/tk.changes index 4a8e1af..0deed0a 100644 --- a/tk.changes +++ b/tk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 13 10:56:56 UTC 2012 - coolo@suse.com + +- patch license to follow spdx.org standard + ------------------------------------------------------------------- Tue Nov 8 17:32:59 UTC 2011 - max@suse.com diff --git a/tk.spec b/tk.spec index dd1b59e..4dcb952 100644 --- a/tk.spec +++ b/tk.spec @@ -1,7 +1,7 @@ # # spec file for package tk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,23 @@ # - Name: tk -BuildRequires: tcl-devel xorg-x11-devel +BuildRequires: tcl-devel +BuildRequires: xorg-x11-devel Url: http://www.tcl.tk Version: 8.5.11 -Release: 1 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Graphical User Interface Toolkit for Tcl -License: BSD3c(or similar) +License: BSD-3-Clause Group: Development/Languages/Tcl -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: tk-64bit %endif # Summary: Graphical User Interface Toolkit for Tcl +Group: Development/Languages/Tcl Provides: wish wish8.4 Requires: tcl >= %version PreReq: /bin/rm @@ -56,9 +56,8 @@ Authors: The Tcl Core Team %package devel -Group: Development/Libraries/Tcl -License: BSD3c(or similar) Summary: Header Files and C API Documentation for Tk +Group: Development/Libraries/Tcl Requires: tk = %version Requires: tcl-devel Requires: xorg-x11-libX11-devel