packages: dump/dump-as_needed-fix.patch, dump/dump.spec - updated to 0.4b43...

qboosh qboosh at pld-linux.org
Thu Feb 3 19:47:10 CET 2011


Author: qboosh                       Date: Thu Feb  3 18:47:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.4b43
- updated as_needed-fix patch

---- Files affected:
packages/dump:
   dump-as_needed-fix.patch (1.1 -> 1.2) , dump.spec (1.81 -> 1.82) 

---- Diffs:

================================================================
Index: packages/dump/dump-as_needed-fix.patch
diff -u packages/dump/dump-as_needed-fix.patch:1.1 packages/dump/dump-as_needed-fix.patch:1.2
--- packages/dump/dump-as_needed-fix.patch:1.1	Wed Aug  2 02:09:47 2006
+++ packages/dump/dump-as_needed-fix.patch	Thu Feb  3 19:47:04 2011
@@ -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

================================================================
Index: packages/dump/dump.spec
diff -u packages/dump/dump.spec:1.81 packages/dump/dump.spec:1.82
--- packages/dump/dump.spec:1.81	Sat Jan 29 01:06:20 2011
+++ packages/dump/dump.spec	Thu Feb  3 19:47:04 2011
@@ -9,12 +9,12 @@
 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
@@ -157,8 +157,8 @@
 
 %build
 %{__autoconf}
-MYNAME=`id -ru` \
-MYGRP=`id -rg`; \
+MYNAME=`id -ru`
+MYGRP=`id -rg`
 %configure \
 	--enable-ermt \
 	--enable-rmt \
@@ -180,7 +180,7 @@
 %{__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
 
@@ -193,10 +193,14 @@
 %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)
@@ -206,7 +210,7 @@
 
 %files -n ermt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_prefix}%{_sbindir}/ermt
+%attr(755,root,root) %{_prefix}/sbin/ermt
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -214,6 +218,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.82  2011/02/03 18:47:04  qboosh
+- updated to 0.4b43
+- updated as_needed-fix patch
+
 Revision 1.81  2011/01/29 00:06:20  sparky
 - dropped pre-cvs changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dump/dump-as_needed-fix.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dump/dump.spec?r1=1.81&r2=1.82&f=u



More information about the pld-cvs-commit mailing list