Hello community, here is the log from the commit of package xiterm for openSUSE:Factory checked in at 2017-09-20 17:06:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xiterm (Old) and /work/SRC/openSUSE:Factory/.xiterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xiterm" Wed Sep 20 17:06:13 2017 rev:35 rq:527317 version:0.5.20040304 Changes: -------- --- /work/SRC/openSUSE:Factory/xiterm/xiterm.changes 2017-08-22 11:04:55.116176081 +0200 +++ /work/SRC/openSUSE:Factory/.xiterm.new/xiterm.changes 2017-09-20 17:06:13.756131856 +0200 @@ -1,0 +2,6 @@ +Tue Sep 19 13:42:39 UTC 2017 - [email protected] + +- Conflict libiterm1 with terminfo-iterm: terminfo-iterm is an + alternative to xiterm, and the conflict is meant to be. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xiterm.spec ++++++ --- /var/tmp/diff_new_pack.jqoRss/_old 2017-09-20 17:06:14.727995045 +0200 +++ /var/tmp/diff_new_pack.jqoRss/_new 2017-09-20 17:06:14.731994483 +0200 @@ -16,32 +16,15 @@ # +%define appdefdir %{_datadir}/X11 +%define xincludes %{_prefix}/include +%define xlibraries %{_prefix}/%{_lib} Name: xiterm -BuildRequires: bdftopcf -BuildRequires: fribidi-devel -BuildRequires: gtk2-devel -BuildRequires: libtool -BuildRequires: ncurses-devel -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xaw7) -BuildRequires: pkgconfig(xfont) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xt) -%if 0%{?suse_version} > 1130 -BuildRequires: utempter-devel -%else -BuildRequires: utempter -%endif -%define appdefdir /usr/share/X11 -%define xincludes /usr/include -%define xlibraries /usr/%{_lib} -Provides: locale(xorg-x11:ja;ko;zh) -%if 0%{?suse_version} >= 1330 -Requires(pre): group(tty) -%endif Version: 0.5.20040304 Release: 0 +Summary: Internationalized Terminal Emulator for X11 +License: SUSE-CPL-0.5 +Group: System/X11/Terminals # cvs -d:pserver:[email protected]:/cvsroot login (no password to login) # cvs -d:pserver:[email protected]:/cvsroot co iterm # tar jcvf iterm-0.5.20040304.tar.bz2 iterm @@ -59,10 +42,27 @@ Patch9: xiterm-asneeded-and-dso.patch Patch10: xiterm-automake-1.13.patch Patch11: implict-ptsname-decl.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Internationalized Terminal Emulator for X11 -License: SUSE-CPL-0.5 -Group: System/X11/Terminals +BuildRequires: bdftopcf +BuildRequires: fribidi-devel +BuildRequires: gtk2-devel +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xfont) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xt) +Provides: locale(xorg-x11:ja;ko;zh) +%if 0%{?suse_version} > 1130 +BuildRequires: utempter-devel +%else +BuildRequires: utempter +%endif +%if 0%{?suse_version} >= 1330 +Requires(pre): group(tty) +%endif %description Internationalized Terminal Emulator for X11 @@ -92,6 +92,8 @@ %package -n libiterm1 Summary: Internationalized Terminal Emulator Library Group: System/Libraries +# ncurses provides an alternative /usr/share/terminfo/i/iterm, the files conflict though +Conflicts: terminfo-iterm # O/P added in 12.3 Provides: libiterm = %version-%release Obsoletes: libiterm < %version-%release @@ -151,7 +153,7 @@ done %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" pushd lib autoreconf --force --install %configure --with-pic --disable-static --x-includes=%{xincludes} \ @@ -187,38 +189,38 @@ %install pushd lib - make DESTDIR=$RPM_BUILD_ROOT install + make DESTDIR=%{buildroot} install popd pushd unix/Xaw/lib - make DESTDIR=$RPM_BUILD_ROOT install + make DESTDIR=%{buildroot} install popd pushd unix/Xaw/src - make DESTDIR=$RPM_BUILD_ROOT install + make DESTDIR=%{buildroot} install popd pushd unix/fbiterm - make DESTDIR=$RPM_BUILD_ROOT install + make DESTDIR=%{buildroot} install popd pushd unix/gtk - install -m 755 src/gtkiterm $RPM_BUILD_ROOT/usr/bin + install -m 755 src/gtkiterm %{buildroot}%{_prefix}/bin popd # install terminfo entry-description -mkdir -p $RPM_BUILD_ROOT/usr/share/terminfo/i -tic -o $RPM_BUILD_ROOT/usr/share/terminfo/ unix/terminfo/iterm.terminfo -mkdir -p $RPM_BUILD_ROOT%{appdefdir}/{ja,ja_JP.UTF-8,}/app-defaults -install -m 644 unix/Xaw/src/XIterm $RPM_BUILD_ROOT%{appdefdir}/app-defaults/XIterm -install -m 644 unix/Xaw/src/XIterm.ja $RPM_BUILD_ROOT%{appdefdir}/ja/app-defaults/XIterm +mkdir -p %{buildroot}%{_datadir}/terminfo/i +tic -o %{buildroot}%{_datadir}/terminfo/ unix/terminfo/iterm.terminfo +mkdir -p %{buildroot}%{appdefdir}/{ja,ja_JP.UTF-8,}/app-defaults +install -m 644 unix/Xaw/src/XIterm %{buildroot}%{appdefdir}/app-defaults/XIterm +install -m 644 unix/Xaw/src/XIterm.ja %{buildroot}%{appdefdir}/ja/app-defaults/XIterm iconv -f EUC-JP -t UTF-8 < unix/Xaw/src/XIterm.ja > unix/Xaw/src/XIterm.ja.UTF-8 -install -m 644 unix/Xaw/src/XIterm.ja.UTF-8 $RPM_BUILD_ROOT%{appdefdir}/ja_JP.UTF-8/app-defaults/XIterm +install -m 644 unix/Xaw/src/XIterm.ja.UTF-8 %{buildroot}%{appdefdir}/ja_JP.UTF-8/app-defaults/XIterm # install fallback fonts for fbiterm: -mkdir -p $RPM_BUILD_ROOT/usr/share/fbiterm/fonts +mkdir -p %{buildroot}%{_datadir}/fbiterm/fonts pushd fonts for i in *.bdf do - bdftopcf ${i} | gzip --no-name --best --stdout --force > $RPM_BUILD_ROOT/usr/share/fbiterm/fonts/${i%.bdf}.pcf.gz + bdftopcf ${i} | gzip --no-name --best --stdout --force > %{buildroot}%{_datadir}/fbiterm/fonts/${i%.bdf}.pcf.gz done popd rm -f %{buildroot}%{_libdir}/*.la -chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/* +chmod 0755 %{buildroot}/%{_bindir}/* %post -n libiterm1 -p /sbin/ldconfig @@ -244,9 +246,9 @@ %defattr(-, root, root) %doc unix/fbiterm/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README*} %attr(-,root,tty) %{_bindir}/fbiterm -%dir /usr/share/fbiterm/ -%dir /usr/share/fbiterm/fonts -/usr/share/fbiterm/fonts/* +%dir %{_datadir}/fbiterm/ +%dir %{_datadir}/fbiterm/fonts +%{_datadir}/fbiterm/fonts/* %files -n gtkiterm %defattr(-, root, root) @@ -256,14 +258,14 @@ %files -n libiterm1 %defattr(-, root, root) %{_libdir}/libiterm.so.1* -/usr/share/terminfo/i/iterm* +%{_datadir}/terminfo/i/iterm* %files -n libiterm-devel %defattr(-, root, root) %doc README* INSTALL* RELNOTES* lib/{COPYING,README*,INSTALL*,ChangeLog} lib/docs/ %doc unix/terminfo/ %{_libdir}/libiterm.so -/usr/include/iterm/ +%{_includedir}/iterm/ %files -n libXiterm1 %defattr(-, root, root) @@ -273,6 +275,6 @@ %defattr(-, root, root) %doc unix/Xaw/lib/ChangeLog %{_libdir}/libXiterm.so -/usr/include/Iterm*.h +%{_includedir}/Iterm*.h %changelog
