Accepting request 63582 from home:pcerny:factory

OK, thanks\!

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

p_xterm-settings.diff

@@ -87,7 +87,7 @@ Index: xterm-264/XTerm.ad
 ===================================================================
 --- xterm-264.orig/XTerm.ad
 +++ xterm-264/XTerm.ad
-@@ -98,21 +98,46 @@
+@@ -99,21 +99,46 @@
  *vtMenu*vthide*Label:  Hide VT Window
  *vtMenu*altscreen*Label:  Show Alternate Screen
  
@@ -141,7 +141,7 @@ Index: xterm-264/XTerm.ad
  *fontMenu*fontescape*Label:	Escape Sequence
  *fontMenu*fontsel*Label:	Selection
  !fontescape and fontsel overridden by application
-@@ -130,12 +155,13 @@
+@@ -131,12 +156,13 @@
  *fontMenu*allow-title-ops*Label:	Allow Title Ops
  *fontMenu*allow-window-ops*Label:	Allow Window Ops
  
@@ -161,7 +161,7 @@ Index: xterm-264/XTerm.ad
  
  *tekMenu.Label:  Tek Options
  *tekMenu*tektextlarge*Label:  Large Characters
-@@ -232,6 +258,62 @@
+@@ -233,6 +259,62 @@
  ! Alternatively,
  !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
  
@@ -228,16 +228,16 @@ Index: xterm-264/xterm.man
 ===================================================================
 --- xterm-264.orig/xterm.man
 +++ xterm-264/xterm.man
-@@ -1208,7 +1208,7 @@ Application specific resources (e.g., "\
+@@ -1227,7 +1227,7 @@ Application specific resources (e.g., "\
  Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources
  together by setting the DECBKM state according to whether the initial value of
  stty erase is a backspace (8) or delete (127) character.
 -The default is \*(``false\*('', which disables this feature.
 +The default is \*(``true\*('', which disables this feature.
  .TP 8
- .B "hold (\fPclass\fB Hold)"
+ .B "fullscreen (\fPclass\fB Fullscreen)"
- If true,
+ Specifies whether or not \fIxterm\fP should ask the window manager to
-@@ -2983,7 +2983,7 @@ always.
+@@ -3045,7 +3045,7 @@ always.
  .TP 8
  .B "pointerShape (\fPclass\fB Cursor)"
  Specifies the name of the shape of the pointer.
@@ -246,7 +246,7 @@ Index: xterm-264/xterm.man
  .TP 8
  .B "popOnBell (\fPclass\fB PopOnBell)"
  Specifies whether the window would be raised when Control-G is received.
-@@ -3434,9 +3434,13 @@ It is the XIM server's responsibility to
+@@ -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.

xterm-268.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4df58da2e2862993db2a96730d7e60e86f0f8da7a08591312484885fcc3aa5c7
-size 801287

xterm-269.tar.bz2

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

xterm.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Thu Mar  3 11:31:32 UTC 2011 - pcerny@novell.com
+
+- Patch #269 - 2011/02/19
+  * build-fixes for imake (report by Heiko Berges).
+  * modify autoconf macro CF_PKG_CONFIG to work with cross-compile
+    environments (patch by Thierry Reding).
+  * modify MapToColorMode() to favor bold over underline, matching
+    the precedence used before patch #252 (report/analysis by
+    Nicolas George).
+  * add omitTranslation resource, which can be used to suppress
+    the default translations for these features:
+    o fullscreen
+    o scroll-lock
+    o shift-fonts
+    o wheel-mouse 
+  * make the fullscreen feature configurable (Debian #612978)
+    o add it to the configurable list disallowedWindowOps.
+    o add command-line option -fullscreen to allow the feature to
+      be enabled at startup.
+    o add resource fullscreen to control whether the feature is
+      active or may be enabled. 
+  * modify probe_netwm_fullscreen_capability for 64-bit machines.
+    Contrary to XGetWindowProperty manpage, that function returns
+    32-bit data packed as long's.
+  * eliminate copy of name resource, which was otherwise used only
+    to give the terminal-description name for the tcap-query
+    feature. Use the actual $TERM value instead, as derived from
+    termName resource, etc.
+  * eliminate an old inconsistency with error messages, some used
+    the -name option, while others used argv[0]. The latter is now
+    used consistently.
+  * improve configure check for rpath-hack, to improve builds on
+    systems where gcc will not search /usr/local/lib, etc.
+  * build-fix for Xaw3d configuration (report by H Merijn Brand).
+  * update config.guess, config.sub  
+
 -------------------------------------------------------------------
 Wed Feb 16 18:30:45 UTC 2011 - pcerny@novell.com
 

xterm.spec

@@ -31,7 +31,7 @@ License:        MIT
 Group:          System/X11/Utilities
 Provides:       xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
 AutoReqProv:    on
-Version:        268
+Version:        269
 Release:        1
 Summary:        The basic X terminal program
 Source:         ftp://invisible-island.net/xterm/%name-%version.tar.bz2
@@ -68,6 +68,17 @@ cp $RPM_SOURCE_DIR/*bdf.bz2 .
 bunzip2 *.bdf.bz2
 
 %build
+# suse 10.x uses older X11 directory structure
+%if 0%{?suse_version} < 1100
+%define xappdefs   /usr/X11R6/lib/X11/app-defaults
+%define xfontsd    /usr/X11R6/lib/X11/fonts
+%define xterminfo  /usr/X11R6/lib/X11/etc
+%else
+%define xappdefs   /usr/share/X11/app-defaults
+%define xfontsd    /usr/share/fonts
+%define xterminfo  /usr/lib/X11/etc
+%endif
+
 %configure \
     --enable-256-color \
     --enable-dec-locator \
@@ -78,29 +89,27 @@ bunzip2 *.bdf.bz2
     --enable-wide-chars \
     --with-utempter \
     --with-tty-group=tty \
-    --with-app-defaults=/usr/share/X11/app-defaults
+    --with-app-defaults=%{xappdefs}
 make %{?_smp_mflags}
+
 pushd ../vttest-20091231
-  %configure
+%configure
-  make %{?_smp_mflags}
+make %{?_smp_mflags}
 popd
-if [ ! -x /usr/bin/bdftopcf ] ; then exit 1; fi
+
+if [ ! which bdftopcf ] ; then exit 1; fi
 for i in *.bdf
 do
-    /usr/bin/bdftopcf $i | gzip -9 > `basename $i .bdf`.pcf.gz
+    bdftopcf $i | gzip -9 > `basename $i .bdf`.pcf.gz
 done
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-if [ -d /usr/share/fonts ]; then
+
-  mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/etc/
+mkdir -p $RPM_BUILD_ROOT%{xterminfo}
-  install -m 644 terminfo $RPM_BUILD_ROOT/usr/lib/X11/etc/xterm.terminfo
+install -m 644 terminfo $RPM_BUILD_ROOT%{xterminfo}/xterm.terminfo
-  install -m 644 termcap  $RPM_BUILD_ROOT/usr/lib/X11/etc/xterm.termcap
+install -m 644 termcap  $RPM_BUILD_ROOT%{xterminfo}/xterm.termcap
-else
+
-  mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/etc/
-  install -m 644 terminfo $RPM_BUILD_ROOT/usr/X11R6/lib/X11/etc/xterm.terminfo
-  install -m 644 termcap  $RPM_BUILD_ROOT/usr/X11R6/lib/X11/etc/xterm.termcap
-fi
 pushd ../vttest-20091231
     make install DESTDIR=$RPM_BUILD_ROOT
 popd
@@ -108,45 +117,14 @@ install -m 755 $RPM_SOURCE_DIR/luitx $RPM_BUILD_ROOT/usr/bin
 install -m 755 $RPM_SOURCE_DIR/Backarrow2Delete $RPM_BUILD_ROOT/usr/bin
 install -m 755 $RPM_SOURCE_DIR/Backarrow2BackSpace $RPM_BUILD_ROOT/usr/bin
 install -m 644 $RPM_SOURCE_DIR/README.SuSE .
+
 mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
 install -m 644 $RPM_SOURCE_DIR/terminal.png \
     $RPM_BUILD_ROOT/usr/share/pixmaps
-if [ -d /usr/X11R6/lib/X11/fonts/misc ]; then
+
-  mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc
+mkdir -p $RPM_BUILD_ROOT%{xfontsd}/misc/
-  install -m 644 *.pcf.gz $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc
+install -m 644 *.pcf.gz $RPM_BUILD_ROOT%{xfontsd}/misc/
-else
-  mkdir -p $RPM_BUILD_ROOT/usr/share/fonts/misc/
-  install -m 644 *.pcf.gz $RPM_BUILD_ROOT/usr/share/fonts/misc/
-fi
 %suse_update_desktop_file -i xterm TerminalEmulator
-if [ -d $RPM_BUILD_ROOT/usr/share/fonts/misc ]; then
-  cat > files.xterm << EOF
-%dir /usr/lib/X11/etc
-%dir /usr/share/fonts/misc/
-/usr/lib/X11/etc/xterm.termcap
-/usr/lib/X11/etc/xterm.terminfo
-/usr/share/X11/app-defaults/XTerm
-/usr/share/X11/app-defaults/XTerm-color
-/usr/share/X11/app-defaults/UXTerm
-/usr/share/X11/app-defaults/UXTerm-color
-/usr/share/X11/app-defaults/KOI8RXTerm
-/usr/share/X11/app-defaults/KOI8RXTerm-color
-/usr/share/fonts/misc/20x20ja.pcf.gz
-/usr/share/fonts/misc/20x20ko.pcf.gz
-EOF
-else
-  cat > files.xterm << EOF
-%dir /usr/X11R6/lib/X11/etc
-/usr/X11R6/lib/X11/app-defaults/UXTerm
-/usr/X11R6/lib/X11/app-defaults/UXTerm-color
-/usr/X11R6/lib/X11/app-defaults/XTerm
-/usr/X11R6/lib/X11/app-defaults/XTerm-color
-/usr/X11R6/lib/X11/etc/xterm.termcap
-/usr/X11R6/lib/X11/etc/xterm.terminfo
-/usr/X11R6/lib/X11/fonts/misc/20x20ja.pcf.gz
-/usr/X11R6/lib/X11/fonts/misc/20x20ko.pcf.gz
-EOF
-fi
 
 %post
 %run_suseconfig_fonts
@@ -157,7 +135,7 @@ fi
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f files.xterm
+%files
 %defattr(-,root,root)
 %doc README README.i18n README.SuSE
 /usr/bin/vttest
@@ -175,5 +153,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/uxterm.1.gz
 /usr/share/applications/xterm.desktop
 /usr/share/pixmaps/*
+%dir %{xterminfo}
+%{xterminfo}/xterm.termcap
+%{xterminfo}/xterm.terminfo
+%dir %{xfontsd}/misc
+%{xfontsd}/misc/20x20ja.pcf.gz
+%{xfontsd}/misc/20x20ko.pcf.gz
+%{xappdefs}/KOI8RXTerm
+%{xappdefs}/KOI8RXTerm-color
+%{xappdefs}/UXTerm
+%{xappdefs}/UXTerm-color
+%{xappdefs}/XTerm
+%{xappdefs}/XTerm-color
 
 %changelog