Accepting request 265435 from X11:terminals
splitbin conditionally done (forwarded request 265434 from dimstar) OBS-URL: https://build.opensuse.org/request/show/265435 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=95
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
fc700d4768
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 16 12:10:56 UTC 2014 - dimstar@opensuse.org
|
||||
|
||||
- Split the desktop launcher from the binaries: there are users
|
||||
that want to clean up their desktop launchers and also remove
|
||||
xterm launchers (but xterm is a deep dependency of xinit, used
|
||||
for fallback situations). The package 'xterm' is the 'app
|
||||
launcher', which depends on xterm-bin. Installing xterm does, as
|
||||
it did in the past, pull a FULL package installation. But the
|
||||
user will be free to remove xterm and only keep xterm-bin (once
|
||||
the dependencies in xinit are corrected as well) (boo#906598).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 14 09:19:26 UTC 2014 - dimstar@opensuse.org
|
||||
|
||||
|
||||
162
xterm.spec
162
xterm.spec
@ -16,44 +16,15 @@
|
||||
#
|
||||
|
||||
|
||||
%define vttest_version 20120506
|
||||
%define splitbin 0%{?suse_version} >= 1300
|
||||
Name: xterm
|
||||
%if 0%{?suse_version} > 1220
|
||||
BuildRequires: fontpackages-devel
|
||||
%endif
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: update-desktop-files
|
||||
%if 0%{?suse_version} > 1130
|
||||
BuildRequires: utempter-devel
|
||||
%else
|
||||
BuildRequires: utempter
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1000
|
||||
BuildRequires: xorg-x11
|
||||
BuildRequires: xorg-x11-devel
|
||||
%if 0%{?suse_version} > 1210
|
||||
# post xorg libs split
|
||||
BuildRequires: libXaw-devel
|
||||
# separate package now
|
||||
BuildRequires: bdftopcf
|
||||
%endif
|
||||
%else
|
||||
BuildRequires: XFree86-devel
|
||||
BuildRequires: XFree86-libs
|
||||
BuildRequires: xaw3d
|
||||
%endif
|
||||
Url: http://invisible-island.net/xterm/
|
||||
Provides: XFree86:/usr/X11R6/bin/xterm
|
||||
Provides: xorg-x11:/usr/X11R6/bin/xterm
|
||||
# post xorg apps split
|
||||
%if 0%{?suse_version} > 1210
|
||||
Requires: luit
|
||||
%endif
|
||||
Version: 312
|
||||
Release: 0
|
||||
Summary: The basic X terminal program
|
||||
License: MIT
|
||||
Group: System/X11/Utilities
|
||||
Url: http://invisible-island.net/xterm/
|
||||
Source: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
|
||||
Source1: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz.asc
|
||||
Source2: luitx
|
||||
@ -61,12 +32,11 @@ Source3: Backarrow2Delete
|
||||
Source4: Backarrow2BackSpace
|
||||
Source5: README.SUSE
|
||||
Source6: terminal.png
|
||||
Source11: xterm.keyring
|
||||
Source8: 20x20ja.bdf.bz2
|
||||
Source9: 20x20ko.bdf.bz2
|
||||
Source11: xterm.keyring
|
||||
# Snoop for the escape sequence assignment of the keypad
|
||||
Source20: snooper.tar.bz2
|
||||
%define vttest_version 20120506
|
||||
Source100: ftp://invisible-island.net/vttest/vttest-%{vttest_version}.tgz
|
||||
Source101: ftp://invisible-island.net/vttest/vttest-%{vttest_version}.tgz.asc
|
||||
Patch1: xterm-settings.patch
|
||||
@ -77,14 +47,57 @@ Patch5: xterm-forbid_window_and_font_ops.patch
|
||||
Patch6: xterm-enable_libtinfo.patch
|
||||
Patch7: xterm-allow_iso-utf_fonts_in_menu.patch
|
||||
Patch8: xterm-decomposed_bitmaps.patch
|
||||
Patch9: xterm-desktop-item-in-gnome-utilities-appfolder.patch
|
||||
Patch9: xterm-desktop-item-in-gnome-utilities-appfolder.patch
|
||||
Patch101: vttest-config_update_aarch64.patch
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: update-desktop-files
|
||||
%if %{splitbin}
|
||||
Requires: %{name}-bin
|
||||
%endif
|
||||
Provides: XFree86:%{_prefix}/X11R6/bin/xterm
|
||||
Provides: xorg-x11:%{_prefix}/X11R6/bin/xterm
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} > 1220
|
||||
%reconfigure_fonts_prereq
|
||||
BuildRequires: fontpackages-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1130
|
||||
BuildRequires: utempter-devel
|
||||
%else
|
||||
BuildRequires: utempter
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1000
|
||||
BuildRequires: xorg-x11
|
||||
BuildRequires: xorg-x11-devel
|
||||
%if 0%{?suse_version} > 1210
|
||||
# separate package now
|
||||
BuildRequires: bdftopcf
|
||||
# post xorg libs split
|
||||
BuildRequires: libXaw-devel
|
||||
%endif
|
||||
%else
|
||||
BuildRequires: XFree86-devel
|
||||
BuildRequires: XFree86-libs
|
||||
BuildRequires: xaw3d
|
||||
%endif
|
||||
# post xorg apps split
|
||||
%if 0%{?suse_version} > 1210
|
||||
Requires: luit
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1220
|
||||
%{reconfigure_fonts_prereq}
|
||||
%endif
|
||||
|
||||
%description
|
||||
%if %{splitbin}
|
||||
This package contains the basic X.Org terminal program desktop launcher.
|
||||
|
||||
%package bin
|
||||
Summary: The basic X terminal program
|
||||
Group: System/X11/Utilities
|
||||
|
||||
%description bin
|
||||
%endif
|
||||
This package contains the basic X.Org terminal program.
|
||||
|
||||
%prep
|
||||
@ -98,21 +111,21 @@ This package contains the basic X.Org terminal program.
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
cp -t . %{S:8} %{S:9}
|
||||
bunzip2 %{basename:%{S:8}} %{basename:%{S:9}}
|
||||
cp -t . %{SOURCE8} %{SOURCE9}
|
||||
bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}}
|
||||
cd ../vttest-%{vttest_version}
|
||||
%patch101 -p1
|
||||
|
||||
%build
|
||||
# suse 10.x uses older X11 directory structure
|
||||
%if 0%{?suse_version} < 1100
|
||||
%define xappdefs /usr/X11R6/lib/X11/app-defaults
|
||||
%define xfontsd /usr/X11R6/lib/X11/fonts
|
||||
%define xterminfo /usr/X11R6/lib/X11/etc
|
||||
%define xappdefs %{_prefix}/X11R6/lib/X11/app-defaults
|
||||
%define xfontsd %{_prefix}/X11R6/lib/X11/fonts
|
||||
%define xterminfo %{_prefix}/X11R6/lib/X11/etc
|
||||
%else
|
||||
%define xappdefs /usr/share/X11/app-defaults
|
||||
%define xfontsd /usr/share/fonts
|
||||
%define xterminfo /usr/lib/X11/etc
|
||||
%define xappdefs %{_datadir}/X11/app-defaults
|
||||
%define xfontsd %{_datadir}/fonts
|
||||
%define xterminfo %{_libexecdir}/X11/etc
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
@ -127,8 +140,8 @@ cd ../vttest-%{vttest_version}
|
||||
--with-tty-group=tty \
|
||||
--with-app-defaults=%{xappdefs} \
|
||||
%if 0%{?suse_version} < 1000
|
||||
--x-includes=/usr/X11R6/include \
|
||||
--x-libraries=/usr/X11R6/%{_lib} \
|
||||
--x-includes=%{_prefix}/X11R6/include \
|
||||
--x-libraries=%{_prefix}/X11R6/%{_lib} \
|
||||
%endif
|
||||
--enable-backarrow-is-erase \
|
||||
--enable-sixel-graphics \
|
||||
@ -147,50 +160,55 @@ do
|
||||
done
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
|
||||
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
|
||||
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 DESTDIR=$RPM_BUILD_ROOT
|
||||
pushd "../vttest-%{vttest_version}"
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
popd
|
||||
install -m 755 $RPM_SOURCE_DIR/luitx $RPM_BUILD_ROOT/usr/bin
|
||||
install -m 755 $RPM_SOURCE_DIR/Backarrow2Delete $RPM_BUILD_ROOT/usr/bin
|
||||
install -m 755 $RPM_SOURCE_DIR/Backarrow2BackSpace $RPM_BUILD_ROOT/usr/bin
|
||||
install -m 755 $RPM_SOURCE_DIR/luitx %{buildroot}%{_prefix}/bin
|
||||
install -m 755 $RPM_SOURCE_DIR/Backarrow2Delete %{buildroot}%{_prefix}/bin
|
||||
install -m 755 $RPM_SOURCE_DIR/Backarrow2BackSpace %{buildroot}%{_prefix}/bin
|
||||
install -m 644 $RPM_SOURCE_DIR/README.SUSE .
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
mkdir -p %{buildroot}%{_datadir}/pixmaps
|
||||
install -m 644 $RPM_SOURCE_DIR/terminal.png \
|
||||
$RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
%{buildroot}%{_datadir}/pixmaps
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{xfontsd}/misc/
|
||||
install -m 644 *.pcf.gz $RPM_BUILD_ROOT%{xfontsd}/misc/
|
||||
mkdir -p %{buildroot}%{xfontsd}/misc/
|
||||
install -m 644 *.pcf.gz %{buildroot}%{xfontsd}/misc/
|
||||
%suse_update_desktop_file -i xterm TerminalEmulator
|
||||
|
||||
%if 0%{?suse_version} > 1220
|
||||
%reconfigure_fonts_scriptlets
|
||||
%{reconfigure_fonts_scriptlets}
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/applications/xterm.desktop
|
||||
%{_datadir}/pixmaps/*
|
||||
|
||||
%if %{splitbin}
|
||||
%files bin
|
||||
%defattr(-,root,root)
|
||||
%endif
|
||||
%doc README README.i18n README.SUSE
|
||||
/usr/bin/vttest
|
||||
/usr/bin/luitx
|
||||
%attr(755,root,root) /usr/bin/xterm
|
||||
/usr/bin/resize
|
||||
/usr/bin/uxterm
|
||||
/usr/bin/koi8rxterm
|
||||
/usr/bin/Backarrow2Delete
|
||||
/usr/bin/Backarrow2BackSpace
|
||||
/usr/share/man/man1/xterm.1.gz
|
||||
/usr/share/man/man1/resize.1.gz
|
||||
%{_bindir}/vttest
|
||||
%{_bindir}/luitx
|
||||
%attr(755,root,root) %{_bindir}/xterm
|
||||
%{_bindir}/resize
|
||||
%{_bindir}/uxterm
|
||||
%{_bindir}/koi8rxterm
|
||||
%{_bindir}/Backarrow2Delete
|
||||
%{_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
|
||||
/usr/share/applications/xterm.desktop
|
||||
/usr/share/pixmaps/*
|
||||
%dir %{xterminfo}
|
||||
%{xterminfo}/xterm.termcap
|
||||
%{xterminfo}/xterm.terminfo
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user