From b5c4d894c42acf7a6dfa557d2fde8635975f5b46 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Jul 25 2010 14:44:00 +0000
Subject: - 2.22


---

diff --git a/.cvsignore b/.cvsignore
index a19703d..bcc8913 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-yash-2.22b0.tar.gz
-yash-doc-2.22b0-ja.tar.gz
+yash-2.22.tar.gz
+yash-doc-2.22-ja.tar.gz
diff --git a/sources b/sources
index ab91840..791e87d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c05a0bf6a5a6ae0a6c15d1401bcfeeed  yash-2.22b0.tar.gz
-a1be011e63f94f4a2c3df802815b17e5  yash-doc-2.22b0-ja.tar.gz
+86bf421eaab0c8a016ff055593ba4ad0  yash-2.22.tar.gz
+4ea8abcb0425ef99f7f16279fde04927  yash-doc-2.22-ja.tar.gz
diff --git a/yash.spec b/yash.spec
index aa64f8f..cb0d099 100644
--- a/yash.spec
+++ b/yash.spec
@@ -2,10 +2,10 @@
 # Upstream is currently using SVN
 # SVN path: http://svn.sourceforge.jp/svnroot/yash/yash/trunk
 
-%global		repoid		48168
+%global		repoid		48417
 
-%global		mainver		4
-%global		minorver	b0
+%global		mainver		1
+%undefine		minorver
 
 Name:		yash
 Version:	2.22
@@ -35,6 +35,8 @@ Yash also has its own features beyond POSIX, such as:
   * random numbers
   * socket redirections and other special redirections
   * right prompt
+  * command completion
+
 
 %package	doc
 Summary:	Documentation for %{name}
@@ -59,19 +61,15 @@ env \
 	./configure \
 	--prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
+	--bindir=/bin \
 	--datarootdir=%{_datarootdir} \
 
 make -k %{?_smp_mflags}
 
 %install
 make install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT/bin
-mv -f $RPM_BUILD_ROOT%{_bindir}/yash \
-	$RPM_BUILD_ROOT/bin
-rmdir $RPM_BUILD_ROOT%{_bindir}/
+	DESTDIR=$RPM_BUILD_ROOT \
+	CPPROG="cp -p"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,11 +102,17 @@ exit 0
 
 /bin/%{name}
 
+%dir	%{_datadir}/%{name}
+%{_datadir}/%{name}/completion/
+
 %files	doc
 %defattr(-,root,root,-)
 %lang(ja)	%doc	%{name}-doc-%{version}%{?minorver}/*
 
 %changelog
+* Sun Jul 25 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.22-1
+- 2.22
+
 * Tue Jul 13 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.22-0.4.b0
 - Fix scriplet error