fix spec initial-commit
authorGraydon, Tracy <tracy.graydon@intel.com>
Fri, 18 May 2012 04:11:15 +0000 (21:11 -0700)
committerGraydon, Tracy <tracy.graydon@intel.com>
Fri, 18 May 2012 04:11:15 +0000 (21:11 -0700)
13 files changed:
package/xterm.spec [deleted file]
packaging/debian/changelog [moved from package/debian/changelog with 100% similarity]
packaging/debian/color.sed [moved from package/debian/color.sed with 100% similarity]
packaging/debian/compat [moved from package/debian/compat with 100% similarity]
packaging/debian/control [moved from package/debian/control with 100% similarity]
packaging/debian/copyright [moved from package/debian/copyright with 100% similarity]
packaging/debian/rules [moved from package/debian/rules with 100% similarity]
packaging/debian/source/format [moved from package/debian/source/format with 100% similarity]
packaging/debian/watch [moved from package/debian/watch with 100% similarity]
packaging/debian/xterm-dev.docs [moved from package/debian/xterm-dev.docs with 100% similarity]
packaging/debian/xterm-xres.sed [moved from package/debian/xterm-xres.sed with 100% similarity]
packaging/xterm.changes
packaging/xterm.spec

diff --git a/package/xterm.spec b/package/xterm.spec
deleted file mode 100644 (file)
index 668cb42..0000000
+++ /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 <<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.
similarity index 100%
rename from package/debian/rules
rename to packaging/debian/rules
similarity index 100%
rename from package/debian/watch
rename to packaging/debian/watch
index 1adbc9f..1ff47b0 100644 (file)
@@ -1,3 +1,6 @@
+* 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 
 
index ab51dc7..668cb42 100644 (file)
-%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
-
+# $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
-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.
+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.
 
-%prep
-%setup -q -n %{name}-%{version}
+A complete list of control sequences supported by the X terminal emulator
+is provided in /usr/share/doc/xterm.
 
-# xterm-261-resources.patch
-%patch0 -p1
-# xterm-256-man-page_paths.patch
-%patch1 -p1
-# buildfix.patch
-%patch2 -p1
+The xterm program uses bitmap images provided by the xbitmaps package.
 
-%build
+Those interested in using koi8rxterm will likely want to install the
+xfonts-cyrillic package as well.
 
-%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
+%prep
 
-make %{?jobs:-j%jobs}
+%define my_suffix -dev
 
-%install
-rm -rf %{buildroot}
-%make_install
+%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)
 
-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 <<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,-)
-%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*
-
-
+%{_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.