updated: less, man

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1889 ec354946-7b23-47d6-9f5a-488ba84defc7

l/less/less-vl.spec

@@ -1,21 +1,24 @@
-Summary: less (opposite of more) + ISO patch
-Summary(ja): 日本語対応高機能ページャ
+Summary: A text file browser similar to more, but better
+Summary(ja): more よりも高機能な日本語対応ページャ
 Name: less
 Version: 436
-Release: 1%{?_dist_release}
-License: GPLv3+
+Release: 2%{?_dist_release}
+
 Group: Applications/Text
+License: GPLv3+
+URL: http://www.greenwoodsoftware.com/less/
+
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
 Source1: lesspipe.sh
 Source2: less.sh
 Source3: less.csh
+#Source3: less-354-hlp-ja.tgz
 Patch1:	less-406-Foption.patch
 Patch4: less-394-time.patch
 Patch5: less-418-fsync.patch
 Patch6: less-436-manpage.patch
-#Source3: less-354-hlp-ja.tgz
 
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel
 BuildRequires: pcre-devel
 BuildRequires: autoconf automake libtool
@@ -28,21 +31,26 @@ Vendor: Project Vine
 Distribution: Vine Linux
 
 %description
-This is a more advanced more command with Japanese support by iso259.  
-patch.
+The less utility is a text file browser that resembles more, but has
+more capabilities.  Less allows you to move backwards in the file as
+well as forwards.  Since less doesn't have to read the entire input file
+before it starts, less starts up more quickly than text editors (for
+example, vi). 
 
-EUC/JIS/Shift-JIS are automatically distinguished.  The can set the
-Kanji code with the environment variable JLESSCHARSET. Also you can
-automatically open gzip or compress files and show them with less.
+You should install less because it is a basic utility for viewing text
+files, and you'll use it frequently.
 
 %description -l ja
-more よりも高機能なページャ less を iso259 パッチで日本語対応にしたも
-のです. EUC/JIS/Shift-JIS を自動的に判別し, 環境変数JLESSCHARSET で指
-定された任意の漢字コードで表示します. 
+less は more よりも高機能な日本語対応ページャです．less は起動時にテキスト
+ファイルを完全に読み込む必要がないので，vi などの テキストエディタに比べて
+高速に起動することができます．
 
 環境変数 LESSOPEN を "|lesspipe.sh %s" に設定することによって, gzip や 
 compress で圧縮されたファイルを自動的に展開して表示することもできます. 
 
+less はテキストファイルを表示するためによく使用する基本的なツールなので，
+インストールしておくべきでしょう．
+
 %prep
 %setup -q 
 %patch1 -p1 -b .Foption
@@ -55,19 +63,11 @@ autoreconf
 chmod -R a+w *
 chmod 644 lessecho.c lesskey.c version.c LICENSE
 
-# jless
-#patch0 -p1
-#patch1 -p1
-
-#touch configure
 
 %build
 %configure --with-regex=pcre
 make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 `pcre-config --cflags`" datadir=%{_docdir}
 
-#CFLAGS=-D_FILE_OFFSET_BITS=64
-#configure --enable-nls
-#make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,11 +83,17 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_syssbindir}/update-alternatives --install %{_bindir}/pager pager %{_bindir}/less 50
+/sbin/update-alternatives --install %{_bindir}/pager pager %{_bindir}/less 50
+
+# fix broken symlink if it's there
+if [ ! -f %{_bindir}/pager ] ; then
+    /sbin/update-alternatives --auto pager
+fi
 
 %preun
-if [ "$1" = "0" ]; then
-  %{_syssbindir}/update-alternatives --remove pager %{_bindir}/less
+if [ $1 -eq 0 ]; then
+    /sbin/update-alternatives --remove pager %{_bindir}/less
+    /sbin/update-alternatives --auto pager
 fi
 
 %files
@@ -103,6 +109,9 @@ fi
 %{_mandir}/man1/lessecho.1*
 
 %changelog
+* Sun Sep 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 436-2
+- updated japanese summary and description
+
 * Thu Jul 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 436-1
 - updated to 436
 

m/man/man-vl.spec

@@ -5,9 +5,11 @@ Summary(ja):  ドキュメンテーション・ツール: man, apropos, whatis
 
 Name:         man
 Version:      1.5o
-Release:      4%{?_dist_release}
-License:      GPL
+Release:      5%{?_dist_release}
+
 Group:        System Environment/Base
+License:      GPL
+
 Source0:      http://www.kernel.org/pub/linux/utils/man/man-%{version}.tar.bz2
 Source1:      makewhatis.cronweekly
 Source2:      makewhatis.crondaily
@@ -32,11 +34,11 @@ Patch120:     man-1.5o-convert-manpage-to-utf8.patch
 Patch130:     man-1.5o-utf8-msgs.patch
 
 Buildroot:    %{_tmppath}/%{name}-%{version}-root
+BuildRequires: bzip2, gzip
+Requires:      groff, less, findutils, coreutils
+Requires:      nkf
+Requires:      bzip2, gzip
 Requires(post): coreutils
-Requires:     groff, lv, findutils, coreutils
-Requires:     nkf
-Requires:     bzip2, gzip
-BuildPreReq:  bzip2, gzip
 
 Vendor:       Project Vine
 Distribution: Vine Linux
@@ -55,8 +57,8 @@ The man package should be installed on your system because it is the
 primary way to find documentation on a Linux system.
 
 %description -l ja
-マニュアルページを表示するためのプログラムmanの日本語対応版です.
-日本語対応のgroffパッケージが必要です. 特定のキーワードに関連する文書
+マニュアルページを表示するためのプログラム man の日本語対応版です.
+日本語対応の groffパッケージが必要です. 特定のキーワードに関連する文書
 を探すための whatis や apropos も含んでいます.
 環境変数 LANG=ja_JP.* の時には、
 
@@ -111,11 +113,10 @@ popd
 ./configure -default +fhs +lang en,ja,ja_JP.eucJP -confdir %{_sysconfdir}
 make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE"
 
-# use lv as PAGER instead of less
 pushd src
 mv man.conf man.conf.orig
-#sed -e 's/less -is/less -isMr/g' man.conf.orig > man.conf
-sed -e 's/less -is/lv -c/g' man.conf.orig > man.conf
+sed -e 's/less -is/less -isMr/g' man.conf.orig > man.conf
+#sed -e 's/less -is/lv -c/g' man.conf.orig > man.conf
 popd
 
 %install
@@ -240,6 +241,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Sep 24 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5o-5
+- used less as pager again
+- fixed SOURCE1, 2 <BTS:846>
+
 * Sun Aug 16 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5o-4
 - remove Patch120(run-groff-in-eucjp)
 - add new Patch120 to convert manpage to utf8 before formatting.