rpms/ncurses/devel ncurses-5.6-20070210-nodl.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 ncurses.spec, 1.70, 1.71 sources, 1.22, 1.23

Mon Feb 12 15:01:17 UTC 2007

Author: mlichvar

Update of /cvs/dist/rpms/ncurses/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8340

Modified Files:
	.cvsignore ncurses.spec sources 
Added Files:
	ncurses-5.6-20070210-nodl.patch 
Log Message:
- update to patch 20070210
- generate separate terminfo library
- move static libraries to -static subpackage
- avoid unnecessary linking with libdl 


ncurses-5.6-20070210-nodl.patch:
 configure         |    1 +
 form/Makefile.in  |    2 +-
 menu/Makefile.in  |    2 +-
 panel/Makefile.in |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE ncurses-5.6-20070210-nodl.patch ---
--- ncurses-5.6/menu/Makefile.in.nodl	2006-10-14 22:40:36.000000000 +0200
+++ ncurses-5.6/menu/Makefile.in	2007-02-12 12:38:36.000000000 +0100
@@ -95,7 +95,7 @@
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses at LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses at LIB_SUFFIX@
 
 MK_SHARED_LIB	= @MK_SHARED_LIB@
 
--- ncurses-5.6/configure.nodl	2007-02-12 12:32:00.000000000 +0100
+++ ncurses-5.6/configure	2007-02-12 12:32:00.000000000 +0100
@@ -15000,6 +15000,7 @@
 # TICS_LIST and TINFO_LIST are needed to build the libtic.so and libterm.so
 TICS_LIST="$SHLIB_LIST"
 TINFO_LIST=`echo "$SHLIB_LIST" | sed -e 's/-ldl//'`
+LIBS=`echo "$LIBS" | sed -e 's/-ldl//'`
 
 if test "$with_ticlib" != no ; then
 
--- ncurses-5.6/panel/Makefile.in.nodl	2006-10-14 22:40:36.000000000 +0200
+++ ncurses-5.6/panel/Makefile.in	2007-02-12 12:38:58.000000000 +0100
@@ -96,7 +96,7 @@
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses at LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses at LIB_SUFFIX@
 
 MK_SHARED_LIB	= @MK_SHARED_LIB@
 
--- ncurses-5.6/form/Makefile.in.nodl	2006-10-14 22:40:36.000000000 +0200
+++ ncurses-5.6/form/Makefile.in	2007-02-12 12:38:12.000000000 +0100
@@ -95,7 +95,7 @@
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses at LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses at LIB_SUFFIX@
 
 MK_SHARED_LIB	= @MK_SHARED_LIB@
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	6 Feb 2007 12:02:16 -0000	1.22
+++ .cvsignore	12 Feb 2007 15:01:10 -0000	1.23
@@ -1,3 +1,4 @@
 ncurses-5.6.tar.gz
 ncurses-5.6-20061223-20070120.patch.bz2
 ncurses-5.6-20070127-20070203.patch.bz2
+ncurses-5.6-20070210.patch.gz


Index: ncurses.spec
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ncurses.spec	6 Feb 2007 12:02:16 -0000	1.70
+++ ncurses.spec	12 Feb 2007 15:01:10 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: A terminal handling library
 Name: ncurses
 Version: 5.6
-Release: 3.20070203%{?dist}
+Release: 4.20070210%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://invisible-island.net/ncurses/ncurses.html
@@ -9,12 +9,14 @@
 
 Patch1: ncurses-5.6-20061223-20070120.patch.bz2
 Patch2: ncurses-5.6-20070127-20070203.patch.bz2
+Patch3: ncurses-5.6-20070210.patch.gz
 
 Patch6: ncurses-5.5-20061209-tgetent.patch
 Patch8: ncurses-5.5-20061209-config.patch
 Patch9: ncurses-5.5-liblinks.patch
 Patch10: ncurses-5.5-20061209-xterm.patch
 Patch11: ncurses-5.6-20070120-urxvt.patch
+Patch12: ncurses-5.6-20070210-nodl.patch
 BuildRequires: gpm-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +46,14 @@
 -I %{_includedir}/ncursesw -lncursesw
 (compile and link against the wide-character, UTF-8, library)
 
+%package static
+Summary: Static libraries for the ncurses library
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+The ncurses-static package includes static libraries of the ncurses library.
+
 %prep
 %setup -q
 
@@ -51,12 +61,14 @@
 %patch2 -p1
 # tack isn't in ncurses tree since 20070203
 rm -rf tack
+%patch3 -p1
 
 %patch6 -p1 -b .tgetent
 %patch8 -p1 -b .config
 %patch9 -p1 -b .liblinks
 %patch10 -p1 -b .xterm
 %patch11 -p1 -b .urxvt
+%patch12 -p1 -b .nodl
 
 # this will be in documentation, drop executable bits
 chmod 644 test/*
@@ -74,7 +86,7 @@
 mkdir narrowc widec
 cd narrowc
 ln -s ../configure .
-%configure %{ncurses_options} --with-ticlib
+%configure %{ncurses_options} --with-termlib --with-ticlib
 make %{?_smp_mflags} libs
 make %{?_smp_mflags} -C progs
 
@@ -93,10 +105,10 @@
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
 
-# move libncurses.so.* to /lib*
+# move lib{ncurses,tinfo}.so.* to /lib*
 mkdir $RPM_BUILD_ROOT/%{_lib}
-mv $RPM_BUILD_ROOT%{_libdir}/libncurses.so.* $RPM_BUILD_ROOT/%{_lib}
-for l in $RPM_BUILD_ROOT%{_libdir}/libncurses.so; do
+mv $RPM_BUILD_ROOT%{_libdir}/lib{ncurses,tinfo}.so.* $RPM_BUILD_ROOT/%{_lib}
+for l in $RPM_BUILD_ROOT%{_libdir}/lib{ncurses,tinfo}.so; do
     ln -sf $(echo %{_libdir} | \
         sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
 done
@@ -141,7 +153,7 @@
 %files
 %defattr(-,root,root)
 %doc ANNOUNCE AUTHORS README TO-DO
-/%{_lib}/libncurses*.so.*
+/%{_lib}/lib*.so.*
 %{_libdir}/lib*.so.*
 %dir %{_sysconfdir}/terminfo
 %{rootdatadir}/terminfo
@@ -159,7 +171,6 @@
 %doc doc/html/ncurses-intro.html
 %doc c++/README*
 %{_bindir}/ncurses*-config
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %dir %{_includedir}/ncurses
 %dir %{_includedir}/ncursesw
@@ -175,11 +186,20 @@
 %{_includedir}/unctrl.h
 %{_mandir}/man3/*
 
+%files static
+%defattr(-,root,root)
+%{_libdir}/lib*.a
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Mon Feb 12 2007 Miroslav Lichvar <mlichvar at redhat.com> 5.6-4.20070210
+- update to patch 20070210
+- generate separate terminfo library
+- move static libraries to -static subpackage
+- avoid unnecessary linking with libdl 
+
 * Tue Feb 06 2007 Miroslav Lichvar <mlichvar at redhat.com> 5.6-3.20070203
 - update to patch 20070203
 - spec cleanup (#226188)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	6 Feb 2007 12:02:16 -0000	1.22
+++ sources	12 Feb 2007 15:01:10 -0000	1.23
@@ -1,3 +1,4 @@
 b6593abe1089d6aab1551c105c9300e3  ncurses-5.6.tar.gz
 f66addc615259d75eaf2b7143246f516  ncurses-5.6-20061223-20070120.patch.bz2
 e38f33a9da9b3010d1ab5d22a5325b36  ncurses-5.6-20070127-20070203.patch.bz2
+f8ec00b5c7304271d779e7e4c21548c3  ncurses-5.6-20070210.patch.gz


