[packages/less] - updated to 481 - updated shell patch - configure handles LFS now (by AC_SYS_LARGEFILE)

qboosh qboosh at pld-linux.org
Fri Oct 30 21:51:10 CET 2015


commit 212390225d518a7fb0309d154a4fa2cc26b2ce6c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Oct 30 21:51:14 2015 +0100

    - updated to 481
    - updated shell patch
    - configure handles LFS now (by AC_SYS_LARGEFILE)

 less-shell.patch | 11 +++++------
 less.spec        | 17 ++++++++---------
 2 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/less.spec b/less.spec
index 3012b5d..1729db6 100644
--- a/less.spec
+++ b/less.spec
@@ -8,13 +8,13 @@ Summary(ru.UTF-8):	Программа для просмотра текстовы
 Summary(tr.UTF-8):	Metin dosyası görüntüleyici - more benzeri
 Summary(uk.UTF-8):	Програма для перегляду текстових файлів схожа на more, але краща
 Name:		less
-Version:	451
-Release:	3
+Version:	481
+Release:	1
 License:	GPL v3+
 Group:		Applications/Text
 #Source0Download: http://www.greenwoodsoftware.com/less/download.html
 Source0:	http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
-# Source0-md5:	765f082658002b2b46b86af4a0da1842
+# Source0-md5:	50ef46065c65257141a7340123527767
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	07bb76556307ab4cecba7abd3933bad2
 Source2:	%{name}echo.1
@@ -82,8 +82,7 @@ значно швидше ніж текстові редактори (напри
 %{__autoconf}
 %configure
 
-%{__make} \
-	CPPFLAGS="-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,14 +91,14 @@ install -d $RPM_BUILD_ROOT{%{_mandir},/etc/env.d}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
-
 # Prepare env files
 echo '#LESS="i m q s X -M"' > $RPM_BUILD_ROOT/etc/env.d/LESS
 echo '#PAGER=less' > $RPM_BUILD_ROOT/etc/env.d/PAGER
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.less-non-english-man-pages*
+bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
+
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.less-non-english-man-pages*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/less-shell.patch b/less-shell.patch
index 9b56388..625febe 100644
--- a/less-shell.patch
+++ b/less-shell.patch
@@ -1,6 +1,6 @@
---- less-394/filename.c~	2006-02-23 01:49:12.000000000 +0200
-+++ less-394/filename.c	2006-02-23 01:50:36.000000000 +0200
-@@ -557,37 +557,7 @@
+--- less-481/filename.c.orig	2015-10-30 20:54:28.100188419 +0100
++++ less-481/filename.c	2015-10-30 21:16:14.293494525 +0100
+@@ -582,37 +582,7 @@
  {
  	FILE *fd;
  
@@ -23,7 +23,7 @@
 -			fd = popen(cmd, "r");
 -		} else
 -		{
--			int len = strlen(shell) + strlen(esccmd) + 5;
+-			int len = (int) (strlen(shell) + strlen(esccmd) + 5);
 -			scmd = (char *) ecalloc(len, sizeof(char));
 -			SNPRINTF3(scmd, len, "%s %s %s", shell, shell_coption(), esccmd);
 -			free(esccmd);
@@ -33,9 +33,8 @@
 -	} else
 -#endif
 -	{
--		fd = popen(cmd, "r");
+ 		fd = popen(cmd, "r");
 -	}
-+	fd = popen(cmd, "r");
  	/*
  	 * Redirection in `popen' might have messed with the
  	 * standard devices.  Restore binary input mode.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/less.git/commitdiff/212390225d518a7fb0309d154a4fa2cc26b2ce6c



More information about the pld-cvs-commit mailing list