diff --git a/vttest-20091231.tgz b/vttest-20091231.tgz deleted file mode 100644 index 36c9045..0000000 --- a/vttest-20091231.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e1424c0ef0fae816d3c7ff277005ef13a6337d9178414447f6c877974bb4f4d -size 156636 diff --git a/vttest-20120506.tgz b/vttest-20120506.tgz new file mode 100644 index 0000000..9ace75e --- /dev/null +++ b/vttest-20120506.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c03e8e917ab5b06f934c45923dd00a5943c6b36f0a32c38392f8f864d6b39e4 +size 183236 diff --git a/vttest-20120506.tgz.asc b/vttest-20120506.tgz.asc new file mode 100644 index 0000000..2353073 --- /dev/null +++ b/vttest-20120506.tgz.asc @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://invisible-island.net/public/public.html for info + +iEYEABECAAYFAk+rpHQACgkQcCNT4Pfkjtt2KgCeLkIwuDbYoTO2r0UauEXboky5 +J2UAoNfjMijbUJkSRHPtskPFQe6V6aeN +=5dbV +-----END PGP SIGNATURE----- diff --git a/xterm-278.tar.bz2 b/xterm-278.tar.bz2 deleted file mode 100644 index cc681b5..0000000 --- a/xterm-278.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80b746f52efd160f33d8042f165a5857e4139b26a26334385efec5ee803d6a52 -size 839758 diff --git a/xterm-279.tgz b/xterm-279.tgz new file mode 100644 index 0000000..13fbb5f --- /dev/null +++ b/xterm-279.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:350e112f522c90ba0e6c4659001fe46725c2636a9148ed5f0dc495f813cf6278 +size 1009821 diff --git a/xterm-279.tgz.asc b/xterm-279.tgz.asc new file mode 100644 index 0000000..c670de0 --- /dev/null +++ b/xterm-279.tgz.asc @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://invisible-island.net/public/public.html for info + +iEUEABECAAYFAk+ryqUACgkQcCNT4Pfkjttk0ACfWHjpkA+ktjFSLBpvxKRqMDCl +PvcAmKVO3ozURKnCQicGbbKUNMVEiOk= +=zvQM +-----END PGP SIGNATURE----- diff --git a/xterm.changes b/xterm.changes index 9e7cb4f..e4e106b 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun May 13 00:49:13 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 279 +* add support for VT420/VT520 left/right margins and related + origin-mode + ------------------------------------------------------------------- Sat Feb 18 11:30:58 CET 2012 - meissner@suse.de diff --git a/xterm.spec b/xterm.spec index 074d967..13e9bf9 100644 --- a/xterm.spec +++ b/xterm.spec @@ -38,19 +38,23 @@ BuildRequires: XFree86-libs BuildRequires: xaw3d %endif Url: http://invisible-island.net/xterm/ -Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm -Version: 278 +Provides: XFree86:/usr/X11R6/bin/xterm +Provides: xorg-x11:/usr/X11R6/bin/xterm +Version: 279 Release: 0 Summary: The basic X terminal program License: MIT Group: System/X11/Utilities -Source: ftp://invisible-island.net/xterm/%name-%version.tar.bz2 +Source: ftp://invisible-island.net/xterm/%name-%version.tgz +Source2: ftp://invisible-island.net/xterm/%name-%version.tgz.asc Source1: luitx Source3: Backarrow2Delete Source4: Backarrow2BackSpace Source5: README.SuSE Source6: terminal.png -Source7: vttest-20091231.tgz +%define vttest_version 20120506 +Source7: ftp://invisible-island.net/vttest/vttest-%vttest_version.tgz +Source10: ftp://invisible-island.net/vttest/vttest-%vttest_version.tgz.asc Source8: 20x20ja.bdf.bz2 Source9: 20x20ko.bdf.bz2 # Snoop for the escape sequence assignment of the keypad @@ -109,7 +113,7 @@ bunzip2 *.bdf.bz2 make %{?_smp_mflags} -pushd ../vttest-20091231 +pushd "../vttest-%vttest_version" %configure make %{?_smp_mflags} popd @@ -117,7 +121,7 @@ popd if [ ! which bdftopcf ] ; then exit 1; fi for i in *.bdf do - bdftopcf $i | gzip -9 > `basename $i .bdf`.pcf.gz + bdftopcf "$i" | gzip -9 >"${i%.bdf}.pcf.gz" done %install @@ -127,7 +131,7 @@ mkdir -p $RPM_BUILD_ROOT%{xterminfo} install -m 644 terminfo $RPM_BUILD_ROOT%{xterminfo}/xterm.terminfo install -m 644 termcap $RPM_BUILD_ROOT%{xterminfo}/xterm.termcap -pushd ../vttest-20091231 +pushd "../vttest-%vttest_version" make install DESTDIR=$RPM_BUILD_ROOT popd install -m 755 $RPM_SOURCE_DIR/luitx $RPM_BUILD_ROOT/usr/bin @@ -149,9 +153,6 @@ install -m 644 *.pcf.gz $RPM_BUILD_ROOT%{xfontsd}/misc/ %postun %run_suseconfig_fonts -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc README README.i18n README.SuSE