From cb7a7ba8221329060345936d0d971e3e26bbf974 Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Thu, 17 May 2012 21:11:15 -0700 Subject: [PATCH 1/1] fix spec --- package/xterm.spec | 175 -------------------- {package => packaging}/debian/changelog | 0 {package => packaging}/debian/color.sed | 0 {package => packaging}/debian/compat | 0 {package => packaging}/debian/control | 0 {package => packaging}/debian/copyright | 0 {package => packaging}/debian/rules | 0 {package => packaging}/debian/source/format | 0 {package => packaging}/debian/watch | 0 {package => packaging}/debian/xterm-dev.docs | 0 {package => packaging}/debian/xterm-xres.sed | 0 packaging/xterm.changes | 3 + packaging/xterm.spec | 232 ++++++++++++++++++--------- 13 files changed, 161 insertions(+), 249 deletions(-) delete mode 100644 package/xterm.spec rename {package => packaging}/debian/changelog (100%) rename {package => packaging}/debian/color.sed (100%) rename {package => packaging}/debian/compat (100%) rename {package => packaging}/debian/control (100%) rename {package => packaging}/debian/copyright (100%) rename {package => packaging}/debian/rules (100%) rename {package => packaging}/debian/source/format (100%) rename {package => packaging}/debian/watch (100%) rename {package => packaging}/debian/xterm-dev.docs (100%) rename {package => packaging}/debian/xterm-xres.sed (100%) diff --git a/package/xterm.spec b/package/xterm.spec deleted file mode 100644 index 668cb42..0000000 --- a/package/xterm.spec +++ /dev/null @@ -1,175 +0,0 @@ -# $XTermId: xterm.spec,v 1.7 2010/11/24 11:16:58 tom Exp $ -Summary: A text-based Web browser -Name: xterm -Version: dev -Release: 268 -License: X11 -Group: Applications/Internet -Source: xterm-%{release}.tgz -# URL: http://invisible-island.net/xterm/ -Provides: x-terminal-emulator - -%description -xterm is the standard terminal emulator for the X Window System. -It provides DEC VT102 and Tektronix 4014 compatible terminals for -programs that cannot use the window system directly. This version -implements ISO/ANSI colors, Unicode, and most of the control sequences -used by DEC VT220 terminals. - -This package provides four commands: - a) xterm, which is the actual terminal emulator - b) uxterm, which is a wrapper around xterm which sets xterm to use UTF-8 - encoding when the user's locale supports this, - c) koi8rxterm, a wrapper similar to uxterm for locales that use the - KOI8-R character set, and - d) resize. - -A complete list of control sequences supported by the X terminal emulator -is provided in /usr/share/doc/xterm. - -The xterm program uses bitmap images provided by the xbitmaps package. - -Those interested in using koi8rxterm will likely want to install the -xfonts-cyrillic package as well. - -%prep - -%define my_suffix -dev - -%define desktop_vendor dickey -%define desktop_utils %(if which desktop-file-install 2>&1 >/dev/null ; then echo "yes" ; fi) - -%define apps_shared %(test -d /usr/share/X11/app-defaults && echo 1 || echo 0) -%define apps_syscnf %(test -d /etc/X11/app-defaults && echo 1 || echo 0) - -%if %{apps_shared} -%define _xresdir %{_datadir}/X11/app-defaults -%else -%define _xresdir %{_sysconfdir}/X11/app-defaults -%endif - -%define _iconsdir %{_datadir}/icons -%define _pixmapsdir %{_datadir}/pixmaps -%define my_docdir %{_datadir}/doc/xterm%{my_suffix} - -%setup -q -n xterm-%{release} - -%build -CPPFLAGS="-DMISC_EXP -DEXP_HTTP_HEADERS" \ -%configure \ - --target %{_target_platform} \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} \ -%if "%{my_suffix}" != "" - --program-suffix=%{my_suffix} \ - --without-xterm-symlink \ -%endif - --enable-256-color \ - --enable-88-color \ - --enable-dabbrev \ - --enable-dec-locator \ - --enable-exec-xterm \ - --enable-hp-fkeys \ - --enable-load-vt-fonts \ - --enable-logfile-exec \ - --enable-logging \ - --enable-mini-luit \ - --enable-paste64 \ - --enable-rectangles \ - --enable-sco-fkeys \ - --enable-tcap-fkeys \ - --enable-tcap-query \ - --enable-toolbar \ - --enable-wide-chars \ - --enable-xmc-glitch \ - --with-app-defaults=%{_xresdir} \ - --with-icondir=%{_pixmapsdir} \ - --with-own-terminfo=%{_datadir}/terminfo \ - --with-terminal-type=xterm-new \ - --with-utempter -make - -chmod u+w XTerm.ad -cat >>XTerm.ad <&1 >/dev/null ; then echo "yes" ; fi) +%define apps_shared %(test -d /usr/share/X11/app-defaults && echo 1 || echo 0) +%define apps_syscnf %(test -d /etc/X11/app-defaults && echo 1 || echo 0) -mkdir -p %{buildroot}%{_datadir}/applications/ -install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/ -mkdir -p %{buildroot}%{_datadir}/xsessions/ -install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/ +%if %{apps_shared} +%define _xresdir %{_datadir}/X11/app-defaults +%else +%define _xresdir %{_sysconfdir}/X11/app-defaults +%endif -cp -fp %{SOURCE1} 16colors.txt +%define _iconsdir %{_datadir}/icons +%define _pixmapsdir %{_datadir}/pixmaps +%define my_docdir %{_datadir}/doc/xterm%{my_suffix} -desktop-file-install --delete-original \ - --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/*.desktop +%setup -q -n xterm-%{release} +%build +CPPFLAGS="-DMISC_EXP -DEXP_HTTP_HEADERS" \ +%configure \ + --target %{_target_platform} \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ +%if "%{my_suffix}" != "" + --program-suffix=%{my_suffix} \ + --without-xterm-symlink \ +%endif + --enable-256-color \ + --enable-88-color \ + --enable-dabbrev \ + --enable-dec-locator \ + --enable-exec-xterm \ + --enable-hp-fkeys \ + --enable-load-vt-fonts \ + --enable-logfile-exec \ + --enable-logging \ + --enable-mini-luit \ + --enable-paste64 \ + --enable-rectangles \ + --enable-sco-fkeys \ + --enable-tcap-fkeys \ + --enable-tcap-query \ + --enable-toolbar \ + --enable-wide-chars \ + --enable-xmc-glitch \ + --with-app-defaults=%{_xresdir} \ + --with-icondir=%{_pixmapsdir} \ + --with-own-terminfo=%{_datadir}/terminfo \ + --with-terminal-type=xterm-new \ + --with-utempter +make + +chmod u+w XTerm.ad +cat >>XTerm.ad <