diff --git a/vttest-20140305.tgz b/vttest-20140305.tgz deleted file mode 100644 index a9d5f3b..0000000 --- a/vttest-20140305.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0168aa34061d4470a68b0dd0781a2a9e2bbfb1493e540c99f615b867a11cbf83 -size 191096 diff --git a/vttest-20140305.tgz.asc b/vttest-20140305.tgz.asc deleted file mode 100644 index 23b8846..0000000 --- a/vttest-20140305.tgz.asc +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) -Comment: See http://invisible-island.net/public/public.html for info - -iEYEABECAAYFAlMXzngACgkQcCNT4PfkjtsjRwCgwcGPm3a1Yal7TWz7A9HNP/co -3MYAniUiDBh4nZHMFaIHWT6NRW9BFaTC -=VFaU ------END PGP SIGNATURE----- diff --git a/xterm.changes b/xterm.changes index 3b3d4ff..a32989a 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 23 07:55:37 UTC 2019 - Marcus Meissner + +- split out vttest +- enable LTO (was only a problem for vttest) + ------------------------------------------------------------------- Wed May 15 13:59:14 UTC 2019 - seanlew@opensuse.org diff --git a/xterm.spec b/xterm.spec index a0fb9db..fd7215b 100644 --- a/xterm.spec +++ b/xterm.spec @@ -12,11 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define vttest_version 20140305 %define splitbin 0%{?suse_version} >= 1300 Name: xterm @@ -38,8 +37,6 @@ Source9: 20x20ko.bdf.bz2 Source11: xterm.keyring # Snoop for the escape sequence assignment of the keypad Source20: snooper.tar.bz2 -Source100: ftp://ftp.invisible-island.net/vttest/vttest-%{vttest_version}.tgz -Source101: ftp://ftp.invisible-island.net/vttest/vttest-%{vttest_version}.tgz.asc Patch1: xterm-settings.patch Patch2: xterm-sigwinch.patch Patch3: xterm-double_width_fonts.patch @@ -87,7 +84,7 @@ Group: System/X11/Utilities This package contains the basic X.Org terminal program. %prep -%setup -q -b100 +%setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -100,11 +97,8 @@ This package contains the basic X.Org terminal program. %patch10 -p1 cp -t . %{SOURCE8} %{SOURCE9} bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}} -cp config.guess config.sub ../vttest-%{vttest_version} -cd ../vttest-%{vttest_version} %build -%define _lto_cflags %{nil} %define xappdefs %{_datadir}/X11/app-defaults %define xfontsd %{_datadir}/fonts %define xterminfo %{_libexecdir}/X11%{_sysconfdir} @@ -127,11 +121,6 @@ cd ../vttest-%{vttest_version} grep "#define XRENDERFONT 1" xtermcfg.h make %{?_smp_mflags} -pushd "../vttest-%{vttest_version}" -%configure -make %{?_smp_mflags} -popd - if ! which bdftopcf &> /dev/null; then exit 1; fi for i in *.bdf do @@ -145,9 +134,6 @@ mkdir -p %{buildroot}%{xterminfo} install -m 644 terminfo %{buildroot}%{xterminfo}/xterm.terminfo install -m 644 termcap %{buildroot}%{xterminfo}/xterm.termcap -pushd "../vttest-%{vttest_version}" -%make_install -popd install -m 755 $RPM_SOURCE_DIR/luitx %{buildroot}%{_bindir} install -m 755 $RPM_SOURCE_DIR/Backarrow2Delete %{buildroot}%{_bindir} install -m 755 $RPM_SOURCE_DIR/Backarrow2BackSpace %{buildroot}%{_bindir} @@ -173,7 +159,6 @@ install -m 644 *.pcf.gz %{buildroot}%{xfontsd}/misc/ %files bin %endif %doc README README.i18n README.SUSE -%{_bindir}/vttest %{_bindir}/luitx %attr(755,root,root) %{_bindir}/xterm %{_bindir}/resize @@ -183,7 +168,6 @@ install -m 644 *.pcf.gz %{buildroot}%{xfontsd}/misc/ %{_bindir}/Backarrow2BackSpace %{_mandir}/man1/xterm.1.gz %{_mandir}/man1/resize.1.gz -%{_mandir}/man1/vttest.1.gz %{_mandir}/man1/koi8rxterm.1.gz %{_mandir}/man1/uxterm.1.gz %dir %{xterminfo}