Hello community, here is the log from the commit of package tk for openSUSE:Factory checked in at 2012-02-16 16:24:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tk (Old) and /work/SRC/openSUSE:Factory/.tk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tk", Maintainer is "m...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/tk/tk.changes 2011-09-23 12:48:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tk.new/tk.changes 2012-02-16 16:24:15.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Feb 13 10:56:56 UTC 2012 - co...@suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Tue Nov 8 17:32:59 UTC 2011 - m...@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. + +------------------------------------------------------------------- Old: ---- tk8.5.10-src.tar.bz2 New: ---- tk-upstream-fixes.patch tk8.5.11-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tk.spec ++++++ --- /var/tmp/diff_new_pack.C10bgy/_old 2012-02-16 16:24:17.000000000 +0100 +++ /var/tmp/diff_new_pack.C10bgy/_new 2012-02-16 16:24:17.000000000 +0100 @@ -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 @@ -15,32 +15,32 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: tk -BuildRequires: tcl-devel xorg-x11-devel +BuildRequires: tcl-devel +BuildRequires: xorg-x11-devel Url: http://www.tcl.tk -Version: 8.5.10 -Release: 1 +Version: 8.5.11 +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 -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 @@ -56,9 +56,8 @@ The Tcl Core Team <tcl-c...@lists.sourceforge.net> %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 @@ -88,6 +87,7 @@ %prep %setup -q -n %name%version %patch0 +%patch1 %build cd unix @@ -110,9 +110,8 @@ 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 ++++++ tk-upstream-fixes.patch ++++++ Index: ChangeLog =================================================================== --- ChangeLog +++ ChangeLog @@ -1,5 +1,15 @@ +2011-11-08 Reinhard Max <m...@suse.de> + + * 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 <d...@users.sourceforge.net> *** 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<<NotebookTabChanged>>\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; \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
