[saphire/f13/master] 1.4.0 Prefer less over lv for help pager

Mamoru Tasaka mtasaka at fedoraproject.org
Wed Apr 13 15:35:11 UTC 2011


commit f22762e70890350c5a119bf6fa0c0a5df1562f1b
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Thu Apr 14 00:35:14 2011 +0900

    1.4.0
    Prefer less over lv for help pager

 .gitignore   |    1 +
 saphire.spec |   20 +++++++++++++++-----
 sources      |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb2f5ed..e47adde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /saphire-1.3.5.tgz
 /saphire-1.3.7.tgz
 /saphire-1.3.8.tgz
+/saphire-1.4.0.tgz
diff --git a/saphire.spec b/saphire.spec
index a05fbf3..142ad7f 100644
--- a/saphire.spec
+++ b/saphire.spec
@@ -1,8 +1,8 @@
-%global	repoid		51614
+%global	repoid		51639
 
 
 Name:		saphire
-Version:	1.3.8
+Version:	1.4.0
 Release:	1%{?dist}
 Summary:	Yet another shell
 
@@ -33,7 +33,7 @@ developing applications that use %{name}.
 # Patches
 
 # Don't strip binary
-sed -i.strip -e 's|install -s|install |' Makefile.in
+sed -i.strip -e 's|\$(INSTALL) -s|\$(INSTALL) |' Makefile.in
 # cp -> ln for library
 sed -i.ln -e '/libsaphire.so/s|cp |ln -s -f |' Makefile.in
 # Add current directory to library search path
@@ -42,8 +42,8 @@ sed -i.libpath -e '/^LIBS[2]*=/s|^\(.*\)$|\1 -L.|' Makefile.in
 sed -i.all -e '/^all:/s|lib-install||' Makefile.in
 # Keep timestamp
 sed -i.stamp \
-	-e 's| -m 0755| -p -m 0755|g' \
-	-e 's| -m 0644| -p -m 0644|g' \
+	-e 's| -m 755| -p -m 0755|g' \
+	-e 's| -m 644| -p -m 0644|g' \
 	Makefile.in
 # Umm...
 sed -i.soname \
@@ -59,6 +59,12 @@ do
 	rm $file.dos
 done
 
+# Prefer less over lv
+sed -i.pager \
+	-e 's| lv| less|' \
+	-e 's|lv |less |' \
+	saphire.sa
+
 %build
 # Move maybe-arch-dependent file out of %%sysconfdir
 # --docdir is needed
@@ -112,6 +118,10 @@ make -j1 \
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Wed Apr 13 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.4.0-1
+- 1.4.0
+- Prefer less over lv for help pager
+
 * Sat Apr  9 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.3.8-1
 - 1.3.8
 
diff --git a/sources b/sources
index aebef2c..b365353 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09cf599585abe739b228dfe81beda910  saphire-1.3.8.tgz
+38c1131cf25fdb6aeb11fd738dfa437f  saphire-1.4.0.tgz


More information about the scm-commits mailing list