update to 6.7

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

m/mew/mew-vl.spec

@@ -2,9 +2,11 @@
 %define _noVersionedDependencies        1
 # %define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 
-%define       origver       6.5
+%define _libdir %{_prefix}/lib
+
+%define       origver       6.7
 %define       pkgver        %{origver}
-%define       origname      mew        
+%define       origname      mew
 
 
 Summary:       Mew - Messaging in the Emacs World
@@ -35,6 +37,7 @@ Requires:      mew-common = %{version}
 # PreReq:        /sbin/install-info
 
 BuildRequires: emacsen
+BuildRequires: zlib-devel
 BuildRoot:     %{_tmppath}/%{name}-%{origver}-root
 
 Vendor:        Project Vine
@@ -62,6 +65,10 @@ 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
@@ -79,53 +86,53 @@ Emacs/XEmacs 用 Mew に共通するファイル/プログラムです．
 
 %prep
 %setup -q -n mew-%{pkgver}
-%patch11 -p1 -b .vine
+%patch11 -p1
 
-%__cp -a %{SOURCE3} .
+cp %{SOURCE3} .
 
 %build
 %configure
-%__make PREFIX=%_prefix CFLAGS="$RPM_OPT_FLAGS" bin
+make PREFIX="/usr" CFLAGS="$RPM_OPT_FLAGS" bin
 
 
 %install
-[ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
-
-%__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}
+[ "%{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
 
-# 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/
+        # 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}
+
+        # contrib 
+        #install -m 755 contrib/mewinc contrib/incdir contrib/incmbox \
+        #         $RPM_BUILD_ROOT/%{_docdir}/%{origname}/contrib/
 
-## 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 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 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}/*
 
@@ -145,6 +152,7 @@ fi
 
 %_emacsenPackageInstall %{origname}
 
+
 /sbin/install-info %{_infodir}/mew.info.gz %{_infodir}/dir \
   --section="Message User Agent"
 /sbin/install-info %{_infodir}/mew.ja.info.gz %{_infodir}/dir \
@@ -167,7 +175,7 @@ fi
 
 
 %clean
-[ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 
 %files
@@ -175,28 +183,25 @@ fi
 %{_infodir}/mew.info*
 %{_infodir}/mew.ja.info*
 %{_datadir}/emacs/site-lisp/%{origname}/
-%{emacsen_pkgdir}/install/%{origname}
-%{emacsen_pkgdir}/remove/%{origname}
+%{_libdir}/emacsen-common/packages/install/%{origname}
+%{_libdir}/emacsen-common/packages/remove/%{origname}
 %{_datadir}/pixmaps/%{origname}
 
 
 %files -n mew-common
 %defattr(-,root,root)
-%doc 00api 00changes* 00copyright* 00diff 00readme
-%doc dot.emacs dot.mew dot.theme vine.dot.mew
+%doc 00changes.* 00copyright 00copyright.ja 00diff 00readme
+%doc dot.emacs vine.dot.mew
+# %doc contrib/
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
-* Tue May 08 2012 KOBAYASHI Taizo <tkoba@vinelinux.org> 6.5-1
-- new upstream release
-
-* Tue Mar 20 2012 Munehiro Yamamoto <munepi@vinelinux.org> 6.4-1
+* Thu Nov 03 2016 Toshiaki Ara <ara_t@384.jp> 6.7-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
+- add BuildRequires: zlib-devel
+- change %%{_infodir}/mew.jis.info* to %%{_infodir}/mew.ja.info*
+- change encoding of vine.dot.mew to utf-8
 
 * Fri Apr 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.3-2
 - rebuild with rpm-4.8.1