From 21aad4b06b285c91b5504fe239ece1773d752ab8 Mon Sep 17 00:00:00 2001
From: "Graydon, Tracy" <tracy.graydon@intel.com>
Date: Thu, 17 May 2012 21:26:24 -0700
Subject: [PATCH] initial commit

---
 {packaging => package}/debian/changelog      |   0
 {packaging => package}/debian/color.sed      |   0
 {packaging => package}/debian/compat         |   0
 {packaging => package}/debian/control        |   0
 {packaging => package}/debian/copyright      |   0
 {packaging => package}/debian/rules          |   0
 {packaging => package}/debian/source/format  |   0
 {packaging => package}/debian/watch          |   0
 {packaging => package}/debian/xterm-dev.docs |   0
 {packaging => package}/debian/xterm-xres.sed |   0
 package/xterm.spec                           | 175 ++++++++++++++++++++
 packaging/xterm.changes                      |   7 +-
 packaging/xterm.spec                         | 232 +++++++++------------------
 13 files changed, 251 insertions(+), 163 deletions(-)
 rename {packaging => package}/debian/changelog (100%)
 rename {packaging => package}/debian/color.sed (100%)
 rename {packaging => package}/debian/compat (100%)
 rename {packaging => package}/debian/control (100%)
 rename {packaging => package}/debian/copyright (100%)
 rename {packaging => package}/debian/rules (100%)
 rename {packaging => package}/debian/source/format (100%)
 rename {packaging => package}/debian/watch (100%)
 rename {packaging => package}/debian/xterm-dev.docs (100%)
 rename {packaging => package}/debian/xterm-xres.sed (100%)
 create mode 100644 package/xterm.spec

diff --git a/packaging/debian/changelog b/package/debian/changelog
similarity index 100%
rename from packaging/debian/changelog
rename to package/debian/changelog
diff --git a/packaging/debian/color.sed b/package/debian/color.sed
similarity index 100%
rename from packaging/debian/color.sed
rename to package/debian/color.sed
diff --git a/packaging/debian/compat b/package/debian/compat
similarity index 100%
rename from packaging/debian/compat
rename to package/debian/compat
diff --git a/packaging/debian/control b/package/debian/control
similarity index 100%
rename from packaging/debian/control
rename to package/debian/control
diff --git a/packaging/debian/copyright b/package/debian/copyright
similarity index 100%
rename from packaging/debian/copyright
rename to package/debian/copyright
diff --git a/packaging/debian/rules b/package/debian/rules
similarity index 100%
rename from packaging/debian/rules
rename to package/debian/rules
diff --git a/packaging/debian/source/format b/package/debian/source/format
similarity index 100%
rename from packaging/debian/source/format
rename to package/debian/source/format
diff --git a/packaging/debian/watch b/package/debian/watch
similarity index 100%
rename from packaging/debian/watch
rename to package/debian/watch
diff --git a/packaging/debian/xterm-dev.docs b/package/debian/xterm-dev.docs
similarity index 100%
rename from packaging/debian/xterm-dev.docs
rename to package/debian/xterm-dev.docs
diff --git a/packaging/debian/xterm-xres.sed b/package/debian/xterm-xres.sed
similarity index 100%
rename from packaging/debian/xterm-xres.sed
rename to package/debian/xterm-xres.sed
diff --git a/package/xterm.spec b/package/xterm.spec
new file mode 100644
index 0000000..668cb42
--- /dev/null
+++ b/package/xterm.spec
@@ -0,0 +1,175 @@
+# $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 <<EOF
+*backarrowKeyIsErase: true
+*ptyInitialErase: true
+EOF
+ls -l *.ad
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# Usually do not use install-ti, since that will conflict with ncurses.
+make install-bin install-man install-app install-icon \
+%if "%{install_ti}" == "yes"
+	install-ti \
+%endif
+	DESTDIR=$RPM_BUILD_ROOT \
+	TERMINFO=%{_datadir}/terminfo
+
+	mkdir -p $RPM_BUILD_ROOT%{my_docdir}
+	cp \
+		ctlseqs.txt \
+		README.i18n \
+		THANKS \
+		xterm.log.html \
+	$RPM_BUILD_ROOT%{my_docdir}/
+
+	cp -r vttests \
+	$RPM_BUILD_ROOT%{my_docdir}/
+
+	# The scripts are readable, but not executable, to let find-requires
+	# know that they do not depend on Perl packages.
+	chmod 644 $RPM_BUILD_ROOT%{my_docdir}/vttests/*
+
+%if "%{desktop_utils}" == "yes"
+for p in *.desktop
+do
+	sed -i \
+		-e 's/Categories=System;/Categories=Application;Utility;/' \
+		-e 's/^\\(Name=.*\\)/\\1%{my_suffix}/' \
+		-e 's/^\\(Exec=.*\\)/\\1%{my_suffix}/' \
+	$p
+done
+
+make install-desktop \
+	DESKTOP_FLAGS="--vendor='%{desktop_vendor}' --dir $RPM_BUILD_ROOT%{_datadir}/applications"
+
+test -n "%{my_suffix}" && \
+( cd $RPM_BUILD_ROOT%{_datadir}/applications
+	for p in *.desktop
+	do
+		mv $p `basename $p .desktop`%{my_suffix}.desktop
+	done
+)
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/koi8rxterm%{my_suffix}
+%{_bindir}/xterm%{my_suffix}
+%{_bindir}/uxterm%{my_suffix}
+%{_bindir}/resize%{my_suffix}
+%{_mandir}/*/*
+%{my_docdir}/*
+%{_pixmapsdir}/xterm*.xpm
+%{_xresdir}/*XTerm*
+
+%if "%{install_ti}" == "yes"
+%{_datadir}/terminfo/*
+%endif
+
+%if "%{desktop_utils}" == "yes"
+%config(missingok) %{_datadir}/applications/%{desktop_vendor}-xterm%{my_suffix}.desktop
+%config(missingok) %{_datadir}/applications/%{desktop_vendor}-uxterm%{my_suffix}.desktop
+%endif
+
+%changelog
+
+* Fri Oct 22 2010 Thomas E. Dickey
+- initial version.
diff --git a/packaging/xterm.changes b/packaging/xterm.changes
index 1ff47b0..76a6fa7 100644
--- a/packaging/xterm.changes
+++ b/packaging/xterm.changes
@@ -1,6 +1,3 @@
-* Fri May 18 04:10:06 UTC 2012 - tracy.graydon@intel.com
-- fix spec 
-
-* Fri May 18 03:38:56 UTC 2012 - tracy.graydon@intel.com
-- Initial gerrit commit 
+* Fri May 18 04:25:31 UTC 2012 - tracy.graydon@intel.com
+- obs/gerrit sync 
 
diff --git a/packaging/xterm.spec b/packaging/xterm.spec
index 668cb42..ab51dc7 100644
--- a/packaging/xterm.spec
+++ b/packaging/xterm.spec
@@ -1,175 +1,91 @@
-# $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
+%define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
+
+Name:       xterm
+Summary:    Terminal emulator for the X Window System
+Version:    268
+Release:    2.5
+Group:      System/X
+License:    MIT
+URL:        http://dickey.his.com/xterm
+Source0:    ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
+Source1:    ftp://invisible-island.net/xterm/16colors.txt
+Source2:    xterm.desktop
+Source3:    failsafe.desktop
+Patch0:     xterm-261-resources.patch
+Patch1:     xterm-256-man-page_paths.patch
+Patch2:     buildfix.patch
+BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xaw7)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(ncurses)
+BuildRequires:  pkgconfig(xkbfile)
+BuildRequires:  imake
+BuildRequires:  desktop-file-utils
 
-%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.
+%description
+The xterm program is a terminal emulator for the X Window System. It
+provides DEC VT102 and Tektronix 4014 compatible terminals for
+programs that can not use the window system directly.
 
-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.
+%prep
+%setup -q -n %{name}-%{version}
 
-Those interested in using koi8rxterm will likely want to install the
-xfonts-cyrillic package as well.
+# xterm-261-resources.patch
+%patch0 -p1
+# xterm-256-man-page_paths.patch
+%patch1 -p1
+# buildfix.patch
+%patch2 -p1
 
-%prep
+%build
 
-%define my_suffix -dev
+%configure --disable-static \
+    --with-app-defaults=%{x11_app_defaults_dir} \
+    --enable-256-color \
+    --enable-exec-xterm \
+    --enable-luit \
+    --enable-warnings \
+    --enable-wide-chars \
+    --with-tty-group=tty \
+    --disable-full-tgetent
 
-%define desktop_vendor  dickey
-%define desktop_utils   %(if which desktop-file-install 2>&1 >/dev/null ; then echo "yes" ; fi)
+make %{?jobs:-j%jobs}
 
-%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)
+%install
+rm -rf %{buildroot}
+%make_install
 
-%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}
+mkdir -p %{buildroot}%{_datadir}/applications/
+install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/
+mkdir -p %{buildroot}%{_datadir}/xsessions/
+install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/
 
-%setup -q -n xterm-%{release}
+cp -fp %{SOURCE1} 16colors.txt
 
-%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 <<EOF
-*backarrowKeyIsErase: true
-*ptyInitialErase: true
-EOF
-ls -l *.ad
+desktop-file-install --delete-original       \
+  --dir %{buildroot}%{_datadir}/applications             \
+   %{buildroot}%{_datadir}/applications/*.desktop
 
-%install
-rm -rf $RPM_BUILD_ROOT
-
-# Usually do not use install-ti, since that will conflict with ncurses.
-make install-bin install-man install-app install-icon \
-%if "%{install_ti}" == "yes"
-	install-ti \
-%endif
-	DESTDIR=$RPM_BUILD_ROOT \
-	TERMINFO=%{_datadir}/terminfo
-
-	mkdir -p $RPM_BUILD_ROOT%{my_docdir}
-	cp \
-		ctlseqs.txt \
-		README.i18n \
-		THANKS \
-		xterm.log.html \
-	$RPM_BUILD_ROOT%{my_docdir}/
-
-	cp -r vttests \
-	$RPM_BUILD_ROOT%{my_docdir}/
-
-	# The scripts are readable, but not executable, to let find-requires
-	# know that they do not depend on Perl packages.
-	chmod 644 $RPM_BUILD_ROOT%{my_docdir}/vttests/*
-
-%if "%{desktop_utils}" == "yes"
-for p in *.desktop
-do
-	sed -i \
-		-e 's/Categories=System;/Categories=Application;Utility;/' \
-		-e 's/^\\(Name=.*\\)/\\1%{my_suffix}/' \
-		-e 's/^\\(Exec=.*\\)/\\1%{my_suffix}/' \
-	$p
-done
-
-make install-desktop \
-	DESKTOP_FLAGS="--vendor='%{desktop_vendor}' --dir $RPM_BUILD_ROOT%{_datadir}/applications"
-
-test -n "%{my_suffix}" && \
-( cd $RPM_BUILD_ROOT%{_datadir}/applications
-	for p in *.desktop
-	do
-		mv $p `basename $p .desktop`%{my_suffix}.desktop
-	done
-)
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/koi8rxterm%{my_suffix}
-%{_bindir}/xterm%{my_suffix}
-%{_bindir}/uxterm%{my_suffix}
-%{_bindir}/resize%{my_suffix}
-%{_mandir}/*/*
-%{my_docdir}/*
-%{_pixmapsdir}/xterm*.xpm
-%{_xresdir}/*XTerm*
-
-%if "%{install_ti}" == "yes"
-%{_datadir}/terminfo/*
-%endif
-
-%if "%{desktop_utils}" == "yes"
-%config(missingok) %{_datadir}/applications/%{desktop_vendor}-xterm%{my_suffix}.desktop
-%config(missingok) %{_datadir}/applications/%{desktop_vendor}-uxterm%{my_suffix}.desktop
-%endif
-
-%changelog
-
-* Fri Oct 22 2010 Thomas E. Dickey
-- initial version.
+%doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n
+%{_bindir}/xterm
+%{_bindir}/koi8rxterm
+%{_bindir}/resize
+%{_bindir}/uxterm
+%doc %{_mandir}/man1/koi8rxterm.1*
+%doc %{_mandir}/man1/resize.1*
+%doc %{_mandir}/man1/uxterm.1*
+%doc %{_mandir}/man1/xterm.1*
+%{_datadir}/applications/xterm.desktop
+%{_datadir}/xsessions/failsafe.desktop
+%{_datadir}/pixmaps/*
+%{x11_app_defaults_dir}/KOI8RXTerm*
+%{x11_app_defaults_dir}/UXTerm*
+%{x11_app_defaults_dir}/XTerm*
+
+
-- 
2.7.4