- added patch 5.7-20081129 from upstream

[packages/compat-ncurses5.git] / ncurses.spec

diff --git a/ncurses.spec b/ncurses.spec
index eb07328bcf69de5c20d1b233fd47df0c2e135835..20b7ff9cd3f077224c1ca3ba21bb03081172a4d2 100644 (file)
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -15,24 +15,20 @@ Summary(ru.UTF-8):  ncurses - новая библиотека управлени
 Summary(tr.UTF-8):     Terminal kontrol kitaplığı
 Summary(uk.UTF-8):     ncurses - нова бібліотека керування терміналами
 Name:          ncurses
-Version:       5.6
-Release:       4
+Version:       5.7
+Release:       3
 License:       distributable
 Group:         Libraries
 Source0:       ftp://dickey.his.com/ncurses/%{name}-%{version}.tar.gz
-# Source0-md5: b6593abe1089d6aab1551c105c9300e3
+# Source0-md5: cce05daf61a64501ef6cd8da1f727ec6
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3b05ee835dc20c306e9af2a9d3fbf1f1
-Patch0:                ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20061223.patch.gz
-Patch1:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20061230.patch.gz
-Patch2:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20070106.patch.gz
-Patch3:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20070113.patch.gz
-Patch4:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20070120.patch.gz
-Patch5:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20070127.patch.gz
-Patch6:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20070128.patch.gz
-Patch7:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20070203.patch.gz
-Patch8:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20070210.patch.gz
-Patch9:         ftp://dickey.his.com/ncurses/5.6/%{name}-5.6-20070217.patch.gz
+
+# source: ftp://dickey.his.com/ncurses/5.7/
+Patch0:                %{name}-5.7-20081115.patch.gz
+Patch1:                %{name}-5.7-20081122.patch.gz
+Patch2:                %{name}-5.7-20081129.patch.gz
+
 Patch100:      %{name}-screen_hpa_fix.patch
 Patch101:      %{name}-xterm_hpa_fix.patch
 Patch102:      %{name}-meta.patch
@@ -44,7 +40,6 @@ Patch105:     %{name}-gnome-terminal.patch
 Patch106:      %{name}-xterm-kbs.patch
 # disable rain demo; triggers gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14998
 Patch107:      %{name}-no-rain-demo.patch
-Patch108:      %{name}-linking.patch
 URL:           http://dickey.his.com/ncurses/ncurses.html
 BuildRequires: automake
 %{?with_ada:BuildRequires:     gcc-ada}
@@ -138,7 +133,7 @@ Requires:   %{name} = %{version}-%{release}
 Obsoletes:     ncurses-extraterms
 
 %description -n terminfo
-This package contains cmplet terminfo database. If you just use the
+This package contains complete terminfo database. If you just use the
 Linux console, xterm and VT100, you probably will not need this this -
 a minimal %{_datadir}/terminfo tree for these terminal is already
 included in the ncurses package.
@@ -296,6 +291,7 @@ Summary:    Header files for develop Ada95 ncurses based application
 Summary(pl.UTF-8):     Pliki nagłówkowe do biblioteki Ada95 ncurses
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
+%requires_eq   gcc-ada
 
 %description ada-devel
 This package includes the header files and libraries necessary to
@@ -310,13 +306,7 @@ tworzenia aplikacji używających ncurses w języku Ada95.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -325,10 +315,11 @@ tworzenia aplikacji używających ncurses w języku Ada95.
 %patch105 -p1
 %patch106 -p1
 %patch107 -p1
-%patch108 -p1
 
 %build
 unset TERMINFO || :
+gcc_target=$(gcc -dumpmachine)
+gcc_version=$(gcc -dumpversion)
 CFLAGS="%{rpmcflags} -DPURE_TERMINFO -D_FILE_OFFSET_BITS=64"
 cp -f /usr/share/automake/config.sub .
 for t in narrowc widec; do
@@ -352,12 +343,13 @@ cd obj-$t
        --with-manpage-aliases \
        --with-manpage-format=normal \
        --without-manpage-symlinks \
-       --with-ada-include=%{_libdir}/ada/adainclude/ \
-       --with-ada-objects=%{_libdir}/ada/adalib/ \
+       --with-ada-include=%{_libdir}/gcc/$gcc_target/$gcc_version/adainclude/ \
+       --with-ada-objects=%{_libdir}/gcc/$gcc_target/$gcc_version/adalib/ \
        `[ "$t" != "widec" ] && echo --with-termlib=tinfo` \
        `[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --includedir=%{_includedir}w`
-%{__make} \
-       CC="%{__cc}"
+
+%{__make}
+
 cd ..
 done
 
@@ -372,22 +364,24 @@ done
 
 ln -sf ../l/linux $RPM_BUILD_ROOT%{_datadir}/terminfo/c/console
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.so.*.* $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libncurses.so.*.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/`cd $RPM_BUILD_ROOT/%{_lib} ; echo libtinfo.so.*.*` $RPM_BUILD_ROOT%{_libdir}/libtinfo.so
-ln -sf /%{_lib}/`cd $RPM_BUILD_ROOT/%{_lib} ; echo libncurses.so.*.*` $RPM_BUILD_ROOT%{_libdir}/libcurses.so
-ln -sf /%{_lib}/`cd $RPM_BUILD_ROOT/%{_lib} ; echo libncurses.so.*.*` $RPM_BUILD_ROOT%{_libdir}/libncurses.so
+mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.so.* $RPM_BUILD_ROOT/%{_lib}
+mv -f $RPM_BUILD_ROOT%{_libdir}/libncurses.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libtinfo.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libtinfo.so
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libcurses.so
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libncurses.so
+ln -sf libncursesw.a $RPM_BUILD_ROOT%{_libdir}/libcursesw.a
+ln -sf libncursesw.so $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
-%post   ext -p /sbin/ldconfig
-%postun ext -p /sbin/ldconfig
+%post  ext -p /sbin/ldconfig
+%postun        ext -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -397,15 +391,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/infocmp
 %attr(755,root,root) %{_bindir}/infotocap
 %attr(755,root,root) %{_bindir}/reset
-%attr(755,root,root) %{_bindir}/tack
+%attr(755,root,root) %{_bindir}/tabs
 %attr(755,root,root) %{_bindir}/tic
 %attr(755,root,root) %{_bindir}/toe
 %attr(755,root,root) %{_bindir}/tput
 %attr(755,root,root) %{_bindir}/tset
-%attr(755,root,root) /%{_lib}/libncurses.so.*
-%attr(755,root,root) /%{_lib}/libtinfo.so.*
-%attr(755,root,root) %{_libdir}/libncursesw.so.*
-%attr(755,root,root) %{_libdir}/libtinfow.so.*
+%attr(755,root,root) /%{_lib}/libncurses.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libncurses.so.5
+%attr(755,root,root) /%{_lib}/libtinfo.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libtinfo.so.5
+%attr(755,root,root) %{_libdir}/libncursesw.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libncursesw.so.5
+%attr(755,root,root) %{_libdir}/libtinfow.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtinfow.so.5
 
 %{_datadir}/tabset
 
@@ -556,6 +554,7 @@ rm -rf $RPM_BUILD_ROOT
 %files ada-devel
 %defattr(644,root,root,755)
 %doc Ada95/{README,TODO}
-%{_libdir}/ada/adainclude/*
-%{_libdir}/ada/adalib/*
+%attr(755,root,root) %{_bindir}/adacurses-config
+%{_libdir}/gcc/*/*/adainclude/*
+%{_libdir}/gcc/*/*/adalib/*
 %endif