Accepting request 137850 from home:pcerny:factory

- Patch #283 - 2012/10/09
- fix build on older SUSE distros (post-12.2)

OBS-URL: https://build.opensuse.org/request/show/137850
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=49

p_xterm-settings.diff

@@ -231,7 +231,7 @@ Index: xterm-264/xterm.man
 @@ -3546,9 +3546,13 @@ It is the XIM server's responsibility to
  The XIM client must inform the XIM server of the cursor position.
  For best results, the preedit string must be displayed with a proper font.
- Therefore, \fIxterm\fP informs the XIM server of the proper font.
+ Therefore, \fI\*n\fP informs the XIM server of the proper font.
 -The font is be supplied by a "fontset", whose default value is \*(``*\*(''.
 -This matches every font, the X library automatically chooses fonts with
 -proper charsets.

xterm-282.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74a292469b6a7fe298f895a529d068015865c29ab3ccb7aaa1fa497ba948be43
-size 1095632

xterm-283.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a4c74fd1aa99cda52655720ca25cc31a976ca19e9bb658036dd7e14cb49a411
+size 1097238

xterm-283.tgz.asc

@@ -2,7 +2,7 @@
 Version: GnuPG v1.4.10 (GNU/Linux)
 Comment: See http://invisible-island.net/public/public.html for info
 
-iEYEABECAAYFAlBmQmgACgkQcCNT4Pfkjts2ogCfSSNVxbO/1rZkgHyIiX+AFUTp
+iEYEABECAAYFAlB0AgkACgkQcCNT4PfkjtsBpQCdFD/4ESSUyL+ilm2wSVXYdZ5B
-h+0AoIxlrmGd3FaOxYvY69uf91djkWuV
+HdwAoIXYKlkWFPwqX/iKOu4Zn8YYo8A8
-=SPgf
+=eeGo
 -----END PGP SIGNATURE-----

xterm.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Oct 11 11:56:44 UTC 2012 - pcerny@suse.com
+
+- Patch #283 - 2012/10/09
+  * modify makefile and script to generate appropriate renaming
+    s/xterm/xterm-dev/ for test-package's manpage.
+  * improve makefile rules for installing/uninstalling pixmap
+    files, to include the newer mini- and filled- variants.
+  * clarify change in manpage regarding patch #282 change to
+    always set a window-decoration icon, even if iconName is not
+    set.
+  * add a fourth flavor of window-decoration icons,
+    "filled-xterm" for a monochrome xterm with filled interior.
+  * use shape-mask to improve contrast of the window-decoration
+    icons.
+  * minor changes to icon colors to improve contrast on
+    bright-mud backgrounds.
+  * drop configure checks for memmove versus bcopy, and strerror
+    function; all currently tested platforms support these.
+  * cleanup configure macros, as done in byacc 20121003.
+  * improve configurability of the built-in icon selectable via
+    the iconName resource.
+  * update config.guess, config.sub
+- fix build on older SUSE distros (post-12.2)
+
 -------------------------------------------------------------------
 Fri Oct  5 11:07:31 UTC 2012 - meissner@suse.com
 

xterm.spec

@@ -47,7 +47,7 @@ Provides:       xorg-x11:/usr/X11R6/bin/xterm
 %if 0%{?suse_version} > 1210
 Requires:       luit
 %endif
-Version:        282
+Version:        283
 Release:        0
 Summary:        The basic X terminal program
 License:        MIT
@@ -158,7 +158,9 @@ mkdir -p $RPM_BUILD_ROOT%{xfontsd}/misc/
 install -m 644 *.pcf.gz $RPM_BUILD_ROOT%{xfontsd}/misc/
 %suse_update_desktop_file -i xterm TerminalEmulator
 
+%if 0%{?suse_version} > 1220
 %reconfigure_fonts_scriptlets
+%endif
 
 %files
 %defattr(-,root,root)