From f1b373adea700a7c4908d0e758ff0f816ed146644d35aaab996e4ed93f6ab66d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 8 Oct 2015 08:10:43 +0000 Subject: [PATCH] Accepting request 337089 from home:sleep_walker:branches:Base:System - remove macro defined system-wide already - remove special handling of patch which is no longer present - move tack replacement code to one spot under comment - remove duplicate parameters for configure - fix position of libgpm.so - Simplify bootstrapping of libtinfo and its fallback.c OBS-URL: https://build.opensuse.org/request/show/337089 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=222 --- ncurses.changes | 11 ++++++++++- ncurses.spec | 21 ++++----------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ncurses.changes b/ncurses.changes index 07fd035..34f4712 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,7 +1,16 @@ +------------------------------------------------------------------- +Wed Oct 7 19:36:38 UTC 2015 - sleep_walker@opensuse.org + +- remove macro defined system-wide already +- remove special handling of patch which is no longer present +- move tack replacement code to one spot under comment +- remove duplicate parameters for configure +- fix position of libgpm.so + ------------------------------------------------------------------- Wed Oct 7 12:05:37 UTC 2015 - werner@suse.de -- Simplfy bootstrapping of libtinfo and its fallback.c +- Simplify bootstrapping of libtinfo and its fallback.c ------------------------------------------------------------------- Tue Oct 6 11:30:22 UTC 2015 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index fc79c0c..f707228 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -71,7 +71,6 @@ Patch5: ncurses-5.9-environment.dif Patch6: ncurses-6.0-avoid-line-markers.dif Patch7: ncurses-6.0-wildcard_for_ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%global _sysconfdir /etc %global _miscdir %{_datadir}/misc %global _incdir %{_includedir} %global root %{_tmppath}/%{name}-%{version}-store @@ -264,7 +263,6 @@ Authors: %prep %setup -q -rm -fr tack rm -f Ada95/src/terminal_interface-curses.adb rm -f Ada95/src/library.gpr rm -f mkinstalldirs @@ -272,15 +270,14 @@ tar xfj %{S:1} set +x for patch in patches/ncurses*.patch do - case "$patch" in - */ncurses-5.9-20150516.patch) - cat "$patch" | sh - esac patch -f -T -p1 -s < $patch done set -x rm -rf patches/ find -name '*.orig' | xargs -r rm -f +# replace tack from ncurses tarball with the latest version in +# separate tarball +rm -fr tack tar xfj %{S:5} mv tack-* tack %patch -P 1 -p0 -b .327x @@ -410,14 +407,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # No --enable-xmc-glitch because this seems to break yast2 # on console/konsole (no magic cookie support on those?) # -%if 0%{?suse_version} > 1310 - # - # Why the libgpm has moved to /usr/lib(64)? - # It is a standard system library for linux. - # - SO=$(rpm -ql gpm-devel|grep %{_libdir}) - SO=%{_libdir}/$(readlink $SO) -%endif touch --reference=README config.sub config.guess > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! @@ -433,7 +422,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --with-manpage-aliases \ --with-ospeed=speed_t \ %if 0%{?suse_version} > 1310 - --with-gpm=$SO \ + --with-gpm=$(readlink %{_libdir}/libgpm.so) \ %else --with-gpm \ %endif @@ -453,7 +442,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --enable-const \ --enable-hashmap \ --enable-no-padding \ - --enable-symlinks \ --enable-sigwinch \ --enable-colorfgbg \ --enable-sp-funcs \ @@ -476,7 +464,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src "${WITHCHTYPE}" \ --disable-tic-depends \ --with-cxx-shared \ - --with-ticlib=tic \ --with-pc-suffix \ --enable-pc-files \ %if 0%{?_crossbuild}