packages: ncurses/ncurses.spec - reversed

[lisu]

Author: lisu                         Date: Tue Sep 13 09:49:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reversed

---- Files affected:
packages/ncurses:
   ncurses.spec (1.234 -> 1.235) 

---- Diffs:

================================================================
Index: packages/ncurses/ncurses.spec
diff -u packages/ncurses/ncurses.spec:1.234 packages/ncurses/ncurses.spec:1.235
--- packages/ncurses/ncurses.spec:1.234	Mon Sep 12 16:23:58 2011
+++ packages/ncurses/ncurses.spec	Tue Sep 13 11:48:55 2011
@@ -418,7 +418,8 @@
 	--with-ada-include=%{_libdir}/gcc/$gcc_target/$gcc_version/adainclude/ \
 	--with-ada-objects=%{_libdir}/gcc/$gcc_target/$gcc_version/adalib/ \
 %if "%{pld_release}" == "ti"
-	`[ "$t" = "widec" ] && echo --enable-widec --includedir=%{_includedir}w`
+	`[ "$t" != "widec" ] && echo --with-termlib=tinfo` \
+	`[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --includedir=%{_includedir}w`
 %else
 	`[ "$t" = "wideclowcolor" ] && echo --enable-widec --disable-ext-colors --includedir=%{_includedir}wlc` \
 	`[ "$t" = "widec" ] && echo --enable-widec --enable-ext-colors --includedir=%{_includedir}w`
@@ -450,8 +451,9 @@
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libncursesw.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
 %else
+mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfow.so.5* $RPM_BUILD_ROOT/%{_lib}
 mv -f $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.5* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.so
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libtinfow.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libncursesw.so
 %endif
@@ -504,6 +506,7 @@
 %attr(755,root,root) %{_libdir}/libncursesw.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libncursesw.so.5
 %else
+%attr(755,root,root) %ghost /%{_lib}/libtinfow.so.5
 %attr(755,root,root) %ghost /%{_lib}/libncursesw.so.5
 %endif
 
@@ -697,6 +700,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.235  2011/09/13 09:48:55  lisu
+- reversed
+
 Revision 1.234  2011/09/12 14:23:58  lisu
 - drop separate libtinfo for Titanium
 - rel 5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncurses/ncurses.spec?r1=1.234&r2=1.235&f=u