packages: util-linux/util-linux.spec - no more separated libtinfo(w) - use ...

[lisu]

Author: lisu                         Date: Tue Jan 10 15:44:37 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no more separated libtinfo(w)
- use sed macro

---- Files affected:
packages/util-linux:
   util-linux.spec (1.334 -> 1.335) 

---- Diffs:

================================================================
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.334 packages/util-linux/util-linux.spec:1.335
--- packages/util-linux/util-linux.spec:1.334	Sat Dec  3 19:46:48 2011
+++ packages/util-linux/util-linux.spec	Tue Jan 10 16:44:32 2012
@@ -638,10 +638,6 @@
 %endif
 %patch12 -p1
 
-%if "%{pld_release}" != "ac"
-sed -i -e 's/-lncursesw/-lncursesw -ltinfow/' configure.ac
-%endif
-
 %{__rm} po/stamp-po
 
 %build
@@ -679,9 +675,9 @@
 	--without-selinux
 
 # configure gets it unconditionally wrong
-sed -i -e 's/#define HAVE_WIDECHAR 1//' config.h
+%{__sed} -i -e 's/#define HAVE_WIDECHAR 1//' config.h
 
-sed -i -e 's/ cal\$(EXEEXT) / /; s/ lsblk\$(EXEEXT)//' misc-utils/Makefile
+%{__sed} -i -e 's/ cal\$(EXEEXT) / /; s/ lsblk\$(EXEEXT)//' misc-utils/Makefile
 
 for dir in libblkid libuuid disk-utils misc-utils fsck fdisk schedutils hwclock; do
 	%{__make} -C $dir \
@@ -728,7 +724,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-sed -i -e 's,/usr/spool/mail,/var/mail,g' $RPM_BUILD_ROOT%{_mandir}/man1/login.1
+%{__sed} -i -e 's,/usr/spool/mail,/var/mail,g' $RPM_BUILD_ROOT%{_mandir}/man1/login.1
 
 %if %{with partx}
 mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
@@ -1435,6 +1431,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.335  2012/01/10 15:44:32  lisu
+- no more separated libtinfo(w)
+- use sed macro
+
 Revision 1.334  2011/12/03 18:46:48  arekm
 - rel 4; add util-linux strict R libblkid
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.334&r2=1.335&f=u