- updated to 0.4b43

- updated as_needed-fix patch

Changed files:
    dump-as_needed-fix.patch -> 1.2
    dump.spec -> 1.82

2 files changed, 32 insertions, 36 deletions

diff --git a/dump-as_needed-fix.patch b/dump-as_needed-fix.patch
index 7713a9d..f1b5bac 100644
--- a/dump-as_needed-fix.patch
+++ b/dump-as_needed-fix.patch
@@ -1,28 +1,20 @@
-diff -Nur dump-0.4b41/configure.in dump-0.4b41.as_needed-fix/configure.in
---- dump-0.4b41/configure.in	2006-08-02 02:05:37.000000000 +0200
-+++ dump-0.4b41.as_needed-fix/configure.in	2006-08-02 02:05:37.000000000 +0200
-@@ -450,18 +450,18 @@
- AC_SUBST(BLKID)
- 
+--- dump-0.4b43/configure.in.orig	2011-02-03 19:33:01.000000000 +0100
++++ dump-0.4b43/configure.in	2011-02-03 19:37:25.852692227 +0100
+@@ -510,7 +510,7 @@
  dnl
--dnl Check for ncurses or termcap libraries
-+dnl Check for tinfo or termcap libraries
+ dnl Check for rl_completion_matches
  dnl
--AC_CHECK_LIB(ncurses, tgetent, [ncurses_lib=yes], [ncurses_lib=no])
-+AC_CHECK_LIB(tinfo, tgetent, [tinfo_lib=yes], [tinfo_lib=no])
- AC_CHECK_LIB(termcap, tgetent, [termcap_lib=yes], [termcap_lib=no])
- 
--if test "$ncurses_lib" = no -a "$termcap_lib" = no; then
-+if test "$tinfo_lib" = no -a "$termcap_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)
-+		AC_MSG_ERROR(You need to install the tinfo or termcap library or configure without --enable-readline)
- 	fi
+-AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], "-ltermcap")
++AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], "$rdllib")
+ if test "$rlcm" = yes; then
+ 	AC_DEFINE([HAVE_READLINE_RLCM],1,[Define this if your readline libs have the rl_completion_matches library.])
  fi
--if test "$ncurses_lib" = yes; then
--	rdllib="-lncurses"
-+if test "$tinfo_lib" = yes; then
-+	rdllib="-ltinfo"
- elif test "$termcap_lib" = yes; then
- 	rdllib="-ltermcap"
+@@ -518,7 +518,7 @@
+ dnl
+ dnl Check for rl_completion_append_character
+ dnl
+-AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], "-ltermcap")
++AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], "$rdllib")
+ if test "$rcac" = yes; then
+ 	AC_DEFINE([HAVE_READLINE_CAC],1,[Define this if your readline libs have the rl_completion_append_character variable.])
  fi
diff --git a/dump.spec b/dump.spec
index 6b95fb7..8705d35 100644
--- a/dump.spec
+++ b/dump.spec
@@ -8,12 +8,12 @@ Summary(ru.UTF-8):	Программы для резервного копиров
 Summary(tr.UTF-8):	dump/restore yedekleme sistemi
 Summary(uk.UTF-8):	Програми для резервного копіювання та відновлення файлових систем
 Name:		dump
-Version:	0.4b41
-Release:	3
+Version:	0.4b43
+Release:	1
 License:	BSD
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/dump/%{name}-%{version}.tar.gz
-# Source0-md5:	f89bb42d860c58b86b05d0734c9f3649
+Source0:	http://downloads.sourceforge.net/dump/%{name}-%{version}.tar.gz
+# Source0-md5:	a708cbac8a0f69dd55aecbb80bb290ca
 Patch0:		%{name}-autoconf.patch
 Patch1:		%{name}-llh.patch
 Patch2:		%{name}-as_needed-fix.patch
@@ -156,8 +156,8 @@ ermt to wersja programu rmt z szyfrowaniem.
 
 %build
 %{__autoconf}
-MYNAME=`id -ru` \
-MYGRP=`id -rg`; \
+MYNAME=`id -ru`
+MYGRP=`id -rg`
 %configure \
 	--enable-ermt \
 	--enable-rmt \
@@ -179,7 +179,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},%{_mandir}/man8,%{_prefix}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install rmt/ermt $RPM_BUILD_ROOT%{_prefix}%{_sbindir}
+install rmt/ermt $RPM_BUILD_ROOT%{_prefix}/sbin
 
 > $RPM_BUILD_ROOT%{_sysconfdir}/dumpdates
 
@@ -192,10 +192,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYRIGHT KNOWNBUGS README THANKS TODO CHANGES
 %attr(664,root,disk) %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/dumpdates
-%attr(755,root,root) %{_sbindir}/*dump
-%attr(755,root,root) %{_sbindir}/*restore
-%{_mandir}/man8/*dump.8*
-%{_mandir}/man8/*restore.8*
+%attr(755,root,root) %{_sbindir}/dump
+%attr(755,root,root) %{_sbindir}/rdump
+%attr(755,root,root) %{_sbindir}/restore
+%attr(755,root,root) %{_sbindir}/rrestore
+%{_mandir}/man8/dump.8*
+%{_mandir}/man8/rdump.8*
+%{_mandir}/man8/restore.8*
+%{_mandir}/man8/rrestore.8*
 
 %files -n rmt
 %defattr(644,root,root,755)
@@ -205,4 +209,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ermt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_prefix}%{_sbindir}/ermt
+%attr(755,root,root) %{_prefix}/sbin/ermt