update: rdtool 0.6.22-1

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

r/rdtool/rdtool-vl.spec

@@ -1,6 +1,3 @@
-%define ruby     /usr/bin/ruby
-%define rbindir  %(%{ruby} -r rbconfig -e 'print Config::CONFIG["bindir"]')
-
 %define emacsen_pkg	1
 %{?without_emacsen: %define emacsen_pkg	0}
 
@@ -15,16 +12,15 @@
 Summary: RD document formatter
 Name: rdtool
 Version: 0.6.22
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: distributable
 Group: Development/Tools
 Source0: http://www.moonwolf.com/ruby/archive/rdtool-%{version}.tar.gz
-%if %{emacsen_pkg}
 Source1: %{rdmode_el}-install.sh
 Source2: %{rdmode_el}-remove.sh
-%endif
-URL: http://www2.pos.to/~tosh/ruby/rdtool/
-Prefix: /usr
+Source3: vine-default-%{rdmode_el}.el
+Source4: %{rdmode_el}-init.el
+URL: http://rubyforge.org/projects/rdtool/
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ruby, ruby-devel >= 1.8.0
@@ -38,18 +34,23 @@ RD is Ruby's POD. RDtool is formatter for RD.
 RD は Ruby においての POD です．RDtool は RD ドキュメントを
 様々な形式に変換するためのツールです．
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
+
 %if %{emacsen_pkg}
 %package -n %{rdmode_el}
-Summary: Emacs-lisp rd-mode for RD documents
+Summary: Emacsen major-mode for RD documents
+Summary: RDドキュメントのためのEmacsen用メジャーモード
 Group: Applications/Editors/Emacs
 PreReq: emacsen, emacsen-common >= 0.1
-URL: http://www2.pos.to/~tosh/ruby/rdtool/
 
 %description -n %{rdmode_el}
-Emacs-lisp rd-mode for the RD documents
+Emacsen major mode rd-mode for the RD documents
 
 %description -n %{rdmode_el} -l ja
-Emacs 上で RD ドキュメントを書くのに便利なモードです。
+RDドキュメントのためのEmacsen用メジャーモード: rd-mode
+
 %endif
 
 %prep
@@ -59,7 +60,7 @@ Emacs 上で RD ドキュメントを書くのに便利なモードです。
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{ruby} setup.rb all --bindir=%{buildroot}%{rbindir} \
+%{__ruby} setup.rb all --bindir=%{buildroot}%{rbindir} \
                      --rbdir=%{buildroot}%{rlibdir}
 # fix missing rd/dot.rd2rc
 install -m 0644 lib/rd/dot.rd2rc %{buildroot}%{rlibdir}/rd
@@ -79,31 +80,31 @@ done
 
 # installing rd-mode
 %if %{emacsen_pkg}
-cp utils/*.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{rdmode}
+cp utils/*.el %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{rdmode}
 
-%{?emacsen_pkg: %_installemacsenscript %{rdmode} %{SOURCE1}}
+%_installemacsenscript %{rdmode} %{SOURCE1}
 
-%{?emacsen_pkg: %_removeemacsenscript  %{rdmode} %{SOURCE2}}
+%_removeemacsenscript  %{rdmode} %{SOURCE2}
 
 %endif
 
 %if %{emacsen_pkg}
 %post -n %{rdmode_el}
 if [ "$1" = 2 ]; then
-  %{?emacsen_pkg: %_emacsenPackageRemove %{rdmode}}
+  %_emacsenPackageRemove %{rdmode}
 
 fi
 
-%{?emacsen_pkg: %_addemacsenlist %{rdmode}}
+%_addemacsenlist %{rdmode}
 
-%{?emacsen_pkg: %_emacsenPackageInstall %{rdmode}}
+%_emacsenPackageInstall %{rdmode}
 
 
 %preun -n %{rdmode_el}
 if [ "$1" = 0 ]; then
-  %{?emacsen_pkg: %_emacsenPackageRemove %{rdmode}}
+%_emacsenPackageRemove %{rdmode}
 
-  %{?emacsen_pkg: %_removeemacsenlist %{rdmode}}
+%_removeemacsenlist %{rdmode}
 
 fi
 %endif
@@ -128,11 +129,24 @@ rm -rf ${RPM_BUILD_ROOT}
 %files -n %{rdmode_el}
 %defattr(-, root, root)
 %{_datadir}/emacs/site-lisp/%{rdmode}
-%{_libdir}/emacsen-common/packages/install/%{rdmode}
-%{_libdir}/emacsen-common/packages/remove/%{rdmode}
+%{emacsen_pkgdir}/install/%{rdmode}
+%{emacsen_pkgdir}/remove/%{rdmode}
 %endif
 
 %changelog
+* Fri Mar 19 2010 IWAI, Masaharu <iwai@alib.jp> 0.6.22-2
+- apply vine-default
+  - update rd-mode-{install,remove}.sh
+  - add vine-default-rd-mode.el (Source3)
+  - add rd-mode-init.el (Source4)
+- using emacsen_pkgdir macro
+- update Summary and description for rd-mode package
+- update URL
+- add Tags: Vendor, Distribution and Packager
+- drop unnecessary defined variable: ruby, rbindir
+- drop unnecessary if routine: Source1,2
+- drop unnecessary Prefix tag
+
 * Sat Nov  7 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.6.22-1
 - new upstream release
 - applied new versioning policy, spec in UTF-8