[yash] 2.26.1

[Mamoru Tasaka]

commit ae70e2b0385ea38a4b53554e9ffe6561dd3750be
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Fri Feb 18 04:30:25 2011 +0900

    2.26.1

 .gitignore                         |    2 +
 sources                            |    4 +-
 yash-2.25-check-tty-for-test.patch |  109 ------------------------------------
 yash.spec                          |   34 ++++++-----
 4 files changed, 22 insertions(+), 127 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2f43af..1254410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ yash-doc-2.23-ja.tar.gz
 /yash-doc-2.24-ja.tar.gz
 /yash-2.25.tar.gz
 /yash-doc-2.25-ja.tar.gz
+/yash-2.26.1.tar.gz
+/yash-doc-2.26-ja.tar.gz
diff --git a/sources b/sources
index 46fc36a..310a6db 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b7978634cb263985bd5448c6ffb98c5a  yash-2.25.tar.gz
-2effc36bac28a864cfe66be70690ce80  yash-doc-2.25-ja.tar.gz
+6f7d9546e1014e3440b0da9f2a45184b  yash-2.26.1.tar.gz
+1db320b1d8e7566129c092bc89c106c5  yash-doc-2.26-ja.tar.gz
diff --git a/yash.spec b/yash.spec
index db64e84..8ec3215 100644
--- a/yash.spec
+++ b/yash.spec
@@ -2,25 +2,23 @@
 # Upstream is currently using SVN
 # SVN path: http://svn.sourceforge.jp/svnroot/yash/yash/trunk
 
-%global		repoid		49809
+%global		repoid		50970
+%global		mainver	2.26.1
+%global		docver		2.26
 
-%global		mainver		3
+%global		mainrel		1
 %undefine		minorver
 
 Name:		yash
-Version:	2.25
-Release:	%{?minorver:0.}%{mainver}%{?minorver:.%{minorver}}%{?dist}
+Version:	%{mainver}
+Release:	%{?minorver:0.}%{mainrel}%{?minorver:.%{minorver}}%{?dist}
 Summary:	Yet Another SHell
 
 Group:		System Environment/Shells
 License:	GPLv2+
 URL:		http://yash.sourceforge.jp/
 Source0:	http://dl.sourceforge.jp/yash/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-Source1:	http://dl.sourceforge.jp/yash/%{repoid}/%{name}-doc-%{version}%{?minorver}-ja.tar.gz
-# Patches
-# Check the status of tty for job.y test
-# Provided by the upstream
-Patch0:		yash-2.25-check-tty-for-test.patch
+Source1:	http://dl.sourceforge.jp/yash/%{repoid}/%{name}-doc-%{docver}%{?minorver}-ja.tar.gz
 
 BuildRequires:	ncurses-devel
 # Write needed Requires for scriptlets explicitly
@@ -44,16 +42,18 @@ Yash also has its own features beyond POSIX, such as:
 %package	doc
 Summary:	Documentation for %{name}
 Group:		Documentation
+Version:	%{docver}
+Release:	%{release}
 License:	CC-BY-SA
 BuildArch:	noarch
-Requires:	%{name} = %{version}-%{release}
+#Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} >= %{version}
 
 %description	doc
 This package contains document files for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}%{?minorver} -a 1
-%patch0 -p1 -b .tty
+%setup -q -n %{name}-%{mainver}%{?minorver} -a 1
 
 %build
 # This package use configure not based on autotools...
@@ -75,8 +75,7 @@ make install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	CPPROG="cp -p"
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang %{name}
 
 %check
 make test || { sleep 3 ; cat tests/test.log ; sleep 3; exit 1; }
@@ -96,7 +95,7 @@ exit 0
 sed -i -e '\@/bin/yash$@d' %{_sysconfdir}/shells
 exit 0
 
-%files
+%files -f %name.lang
 %defattr(-,root,root,-)
 %doc	COPYING
 %doc	NEWS
@@ -111,9 +110,12 @@ exit 0
 
 %files	doc
 %defattr(-,root,root,-)
-%lang(ja)	%doc	%{name}-doc-%{version}%{?minorver}/*
+%lang(ja)	%doc	%{name}-doc-%{docver}%{?minorver}/*
 
 %changelog
+* Fri Feb 18 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.26.1-1
+- 2.26.1
+
 * Thu Feb 10 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.25-3
 - Patch from the upstream to check the status of /dev/tty for job.y test