[yash] 2.32.1

[Mamoru Tasaka]

commit f4afdcac7c3a9f66a512bb09e93ea26eb6ed18c4
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Wed Sep 26 22:44:29 2012 +0900

    2.32.1

 .gitignore |    1 +
 sources    |    3 +--
 yash.spec  |   33 +++++++++++++++++++++++----------
 3 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95081ed..4ed388e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ yash-doc-2.23-ja.tar.gz
 /yash-doc-2.30-ja.tar.gz
 /yash-2.31.tar.gz
 /yash-doc-2.31-ja.tar.gz
+/yash-2.32.1.tar.gz
diff --git a/sources b/sources
index bb332a4..58c6852 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4771fc74695f1e3699584bb4a1d55e37  yash-2.31.tar.gz
-0c3aefd81407562c947d2d3cb2baf5bd  yash-doc-2.31-ja.tar.gz
+a36df569194e56eec66ab3692d068065  yash-2.32.1.tar.gz
diff --git a/yash.spec b/yash.spec
index 8d43742..ccb8576 100644
--- a/yash.spec
+++ b/yash.spec
@@ -2,23 +2,25 @@
 # Upstream is currently using SVN
 # SVN path: http://svn.sourceforge.jp/svnroot/yash/yash/trunk
 
-%global		repoid		56285
-%global		mainver	2.31
-%global		docver		2.31
+%global		repoid		56905
+%global		mainver	2.32.1
+%global		docver		%{mainver}
+
+%global		yashdocdir		%{_datadir}/doc/%{name}-doc-%{version}
 
 %global		mainrel		1
 %undefine		minorver
 
 Name:		yash
 Version:	%{mainver}
-Release:	%{?minorver:0.}%{mainrel}%{?minorver:.%{minorver}}%{?dist}.1
+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-%{docver}%{?minorver}-ja.tar.gz
+#Source1:	http://dl.sourceforge.jp/yash/%{repoid}/%{name}-doc-%{docver}%{?minorver}-ja.tar.gz
 
 BuildRequires:	ncurses-devel
 %if 0%{?fedora} >= 17
@@ -49,14 +51,15 @@ Version:	%{docver}
 Release:	%{release}
 License:	CC-BY-SA
 BuildArch:	noarch
-#Requires:	%{name} = %{version}-%{release}
-Requires:	%{name} >= %{version}
+Requires:	%{name} = %{version}-%{release}
+#Requires:	%{name} >= %{version}
 
 %description	doc
 This package contains document files for %{name}.
 
 %prep
-%setup -q -n %{name}-%{mainver}%{?minorver} -a 1
+#%%setup -q -n %{name}-%{mainver}%{?minorver} -a 1
+%setup -q
 
 %build
 # This package use configure not based on autotools...
@@ -74,11 +77,12 @@ env \
 	--bindir=/bin \
 %endif
 	--datarootdir=%{_datarootdir} \
+	--docdir=%{yashdocdir}/ \
 
 make -k %{?_smp_mflags}
 
 %install
-make install \
+make install install-html \
 	DESTDIR=$RPM_BUILD_ROOT \
 	INSTALL="install -p" \
 	CPPROG="cp -p"
@@ -120,11 +124,20 @@ exit 0
 %dir	%{_datadir}/%{name}
 %{_datadir}/%{name}/completion/
 
+%{_mandir}/man1/yash.1*
+%lang(ja)	%{_mandir}/ja/man1/yash.1*
+
 %files	doc
 %defattr(-,root,root,-)
-%lang(ja)	%doc	%{name}-doc-%{docver}%{?minorver}/*
+%dir	%{yashdocdir}/
+%{yashdocdir}/*.html
+%{yashdocdir}/*.css
+%lang(ja)	%{yashdocdir}/ja/
 
 %changelog
+* Wed Sep 26 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.32.1-1
+- 2.32.1
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.31-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild