rpms/dump/devel dump-0.4b41-libtinfo.patch, NONE, 1.1 dump.spec, 1.42, 1.43

Adam Tkac (atkac) fedora-extras-commits at redhat.com
Fri Jan 11 11:51:04 UTC 2008


Author: atkac

Update of /cvs/pkgs/rpms/dump/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15808

Modified Files:
	dump.spec 
Added Files:
	dump-0.4b41-libtinfo.patch 
Log Message:
- use libtinfo instead libncurses
- use autoreconf (=> add BuildRequires: automake - for aclocal)


dump-0.4b41-libtinfo.patch:

--- NEW FILE dump-0.4b41-libtinfo.patch ---
diff -up dump-0.4b41/configure.in.libtinfo dump-0.4b41/configure.in
--- dump-0.4b41/configure.in.libtinfo	2008-01-11 12:31:37.000000000 +0100
+++ dump-0.4b41/configure.in	2008-01-11 12:32:31.000000000 +0100
@@ -477,13 +477,16 @@ dnl Check for ncurses or termcap librari
 dnl
 AC_CHECK_LIB(ncurses, tgetent, [ncurses_lib=yes], [ncurses_lib=no])
 AC_CHECK_LIB(termcap, tgetent, [termcap_lib=yes], [termcap_lib=no])
+AC_CHECK_LIB(tinfo, tgetent, [tinfo_lib=yes], [tinfo_lib=no])
 
-if test "$ncurses_lib" = no -a "$termcap_lib" = no; then
+if test "$ncurses_lib" = no -a "$termcap_lib" = no -a "$tinfo_lib" = no; then
 	if test "$READLINE" = "yes"; then
 		AC_MSG_ERROR(You need to install the ncurses or termcap library or configure without --enable-readline)
 	fi
 fi
-if test "$ncurses_lib" = yes; then
+if test "$tinfo_lib" = yes; then
+	rdllib="-ltinfo"
+elif test "$ncurses_lib" = yes; then
 	rdllib="-lncurses"
 elif test "$termcap_lib" = yes; then
 	rdllib="-ltermcap"


Index: dump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dump/devel/dump.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- dump.spec	22 Aug 2007 11:34:01 -0000	1.42
+++ dump.spec	11 Jan 2008 11:50:29 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: Programs for backing up and restoring ext2/ext3 filesystems
 Name: dump
 Version: 0.4b41
-Release: 6%{?dist}
+Release: 6.1%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -12,10 +12,11 @@
 Patch1: dump-dmfix.patch
 Patch2: dump-immutable.patch
 Patch3: dump-0.4b37-2TB.patch
+Patch4: dump-0.4b41-libtinfo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2
-BuildRequires: zlib-devel, bzip2-devel, ncurses-devel
-BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel, autoconf
+BuildRequires: zlib-devel, bzip2-devel, ncurses-devel, autoconf, automake
+BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
 # This Requires is now mandatory because we only ship static binaries, and
 # need to ensure the "disk" group is created before installation (#60461)
 Requires: setup, e2fsprogs-libs, zlib, bzip2-libs, device-mapper
@@ -50,8 +51,10 @@
 %patch1 -p1 -b .dmfix
 %patch2 -p1 -b .orig
 %patch3 -p1 -b .2TB
+%patch4 -p1 -b .libtinfo
 
 %build
+autoreconf -fiv
 
 # XXX --enable-kerberos needs krcmd
 %configure --disable-static \
@@ -121,6 +124,10 @@
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Fri Jan 11 2008 Adam Tkac <atkac redhat com> 0.4b41-6.1
+- use libtinfo instead libncurses
+- use autoreconf (=> add BuildRequires: automake - for aclocal)
+
 * Wed Aug 22 2007 Adam Tkac <atkac redhat com> 0.4b41-6
 - rebuild (BuildID feature)
 - use device-mapper-devel instead device-mapper in BuildRequires




More information about the fedora-extras-commits mailing list