updated mew

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

m/mew/mew-vl.spec

@@ -2,9 +2,7 @@
 %define _noVersionedDependencies        1
 # %define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 
-%define _libdir %{_prefix}/lib
-
-%define       origver       6.3
+%define       origver       6.4
 %define       pkgver        %{origver}
 %define       origname      mew        
 
@@ -13,7 +11,7 @@ Summary:       Mew - Messaging in the Emacs World
 Summary(ja):   Emacs でメールを読むためのインターフェース
 Name:          %{origname}
 Version:       %{origver}
-Release:       2%{?_dist_release}
+Release:       1%{?_dist_release}
 License:       distributable
 Group:         Applications/Editors/Emacs
 URL:           http://www.mew.org/
@@ -64,9 +62,6 @@ perlが必要です。
 
     (setq mew-mail-domain-list '("your mail domain"))
 
-また、%{_docdir}/mew-common-%{version}/contrib/以下にもいくつかのMewを便利に使う
-為のelispを収録しています。
-
 
 %package -n mew-common
 Summary:     Common files/programs for Mew Emacs/XEmacs
@@ -84,53 +79,53 @@ Emacs/XEmacs 用 Mew に共通するファイル/プログラムです．
 
 %prep
 %setup -q -n mew-%{pkgver}
-%patch11 -p1
+%patch11 -p1 -b .vine
 
-cp %{SOURCE3} .
+%__cp -a %{SOURCE3} .
 
 %build
 %configure
-make PREFIX="/usr" CFLAGS="$RPM_OPT_FLAGS" bin
+%__make PREFIX=%_prefix CFLAGS="$RPM_OPT_FLAGS" bin
 
 
 %install
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+[ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
 
-mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}
-mkdir -p %{buildroot}%{_libdir}/emacsen-common/packages/install
-mkdir -p %{buildroot}%{_libdir}/emacsen-common/packages/remove
-mkdir -p %{buildroot}/usr/info
-mkdir -p %{buildroot}%{_datadir}/pixmaps/%{origname}
-# install el files
+%__mkdir_p %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}
+%__mkdir_p %{buildroot}%{emacsen_pkgdir}/install
+%__mkdir_p %{buildroot}%{emacsen_pkgdir}/remove
+%__mkdir_p %{buildroot}%{_infodir}
+%__mkdir_p %{buildroot}%{_datadir}/pixmaps/%{origname}
 
+# install el files
 
-        # Add here commands to install the package into debian/mew.
-        cp *.el %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}
-        cp %{SOURCE4} %{SOURCE5} \
-            %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}
-        make install-bin prefix=%{buildroot}%{_prefix} \
-		mandir=%{buildroot}%{_mandir}/man1 \
-		bindir=%{buildroot}%{_bindir}
+# Add here commands to install the package into debian/mew.
+%__cp -a *.el %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}
+%__cp -a %{SOURCE4} %{SOURCE5} \
+     %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}
+%__make install-bin prefix=%{buildroot}%{_prefix} \
+    mandir=%{buildroot}%{_mandir}/man1 \
+    bindir=%{buildroot}%{_bindir}
 
-        # contrib 
-        #install -m 755 contrib/mewinc contrib/incdir contrib/incmbox \
-        #         $RPM_BUILD_ROOT/%{_docdir}/%{origname}/contrib/
+# contrib 
+#install -m 755 contrib/mewinc contrib/incdir contrib/incmbox \
+# $RPM_BUILD_ROOT/%{_docdir}/%{origname}/contrib/
 
-        ## install icons
-        cp etc/*.xpm %{buildroot}/usr/share/pixmaps/%{origname}
-        cp etc/*.png %{buildroot}/usr/share/pixmaps/%{origname}
-        cp etc/*.img %{buildroot}/usr/share/pixmaps/%{origname}
+## install icons
+%__cp -a etc/*.xpm %{buildroot}/usr/share/pixmaps/%{origname}
+%__cp -a etc/*.png %{buildroot}/usr/share/pixmaps/%{origname}
+%__cp -a etc/*.img %{buildroot}/usr/share/pixmaps/%{origname}
 
-        ## install contrib
-        #cp -a contrib $(CURDIR)/debian/mew/usr/share/doc/mew
+## install contrib
+#%__cp -a contrib $(CURDIR)/debian/mew/usr/share/doc/mew
 
 
 
 
 # install {info,jinfo} for mew-emacs
-make infodir="%{buildroot}%{_infodir}" \
+%__make infodir="%{buildroot}%{_infodir}" \
     INSTALLINFO="/sbin/install-info" install-info install-jinfo
-rm -f %{buildroot}%{_infodir}/dir
+%__rm -f %{buildroot}%{_infodir}/dir
 
 gzip -9nf %{buildroot}%{_infodir}/*
 
@@ -150,10 +145,9 @@ fi
 
 %_emacsenPackageInstall %{origname}
 
-
 /sbin/install-info %{_infodir}/mew.info.gz %{_infodir}/dir \
   --section="Message User Agent"
-/sbin/install-info %{_infodir}/mew.jis.info.gz %{_infodir}/dir \
+/sbin/install-info %{_infodir}/mew.ja.info.gz %{_infodir}/dir \
   --section="Message User Agent"
 
 
@@ -167,34 +161,40 @@ if [ "$1" = 0 ]; then
 
   /sbin/install-info --delete %{_infodir}/mew.info.gz %{_infodir}/dir \
   --section="Message User Agent"
-  /sbin/install-info --delete %{_infodir}/mew.jis.info.gz %{_infodir}/dir \
+  /sbin/install-info --delete %{_infodir}/mew.ja.info.gz %{_infodir}/dir \
   --section="Message User Agent"
 fi
 
 
 %clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+[ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root)
 %{_infodir}/mew.info*
-%{_infodir}/mew.jis.info*
+%{_infodir}/mew.ja.info*
 %{_datadir}/emacs/site-lisp/%{origname}/
-%{_libdir}/emacsen-common/packages/install/%{origname}
-%{_libdir}/emacsen-common/packages/remove/%{origname}
+%{emacsen_pkgdir}/install/%{origname}
+%{emacsen_pkgdir}/remove/%{origname}
 %{_datadir}/pixmaps/%{origname}
 
 
 %files -n mew-common
 %defattr(-,root,root)
-%doc 00changes 00copyright 00copyright.jis 00diff 00readme
-%doc mew.dot.emacs vine.dot.mew
-%doc contrib/
+%doc 00api 00changes* 00copyright* 00diff 00readme
+%doc dot.emacs dot.mew dot.theme vine.dot.mew
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Tue Mar 20 2012 Munehiro Yamamoto <munepi@vinelinux.org> 6.4-1
+- new upstream release
+- apply new vine-default
+  - update mew-init.el, vine-default-mew.el
+- use %%emacsen_pkgdir macro
+- encode vine.dot.new to UTF-8
+
 * Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.3-2
 - rebuild with rpm-4.8.1
 - change pixmap directory