update emacs23-vl.spec

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

e/emacs/emacs23-vl.spec

@@ -1,4 +1,4 @@
-%define emacsversion 23.1.96
+%define emacsversion 23.2
 #% define cvsdate 20100104
 %define emacsrelease 1%{?cvsdate:.%cvsdate}%{?_dist_release}
 
@@ -7,13 +7,15 @@
 
 %define infodir %{_infodir}/emacs-%{emacsversion}
 
+%define menutreeelversion 0.94
+
 Summary:      GNU Emacs editor 
 Summary(ja):  GNU Emacs エディタ
 Name:         emacs
 Version:      %{emacsversion}
 Release:      %{emacsrelease}
-#Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?cvsdate:.cvs%cvsdate}.tar.bz2
-Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
+Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?cvsdate:.cvs%cvsdate}.tar.bz2
+#Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
 
 ## Sources from Rawhide 21.2-11
 Source10:     site-start.el.emacs23
@@ -35,8 +37,7 @@ Source50:     emacs23.desktop.in
 
 ## Enable Japanese Menu
 ## http://www11.atwiki.jp/s-irie/pages/13.html
-#Source100:    menu-tree.el
-Source100:    menu-tree.el-0.93.tar.gz
+Source100:    menu-tree-el-%{menutreeelversion}.tar.gz
 Source110:    menu-tree-init.el.emacs23
 
 ## default settings for Vine Linux
@@ -91,7 +92,6 @@ BuildRequires: gtk2-devel, cairo-devel
 BuildRequires: freetype-devel, fontconfig-devel
 BuildRequires: dbus-devel GConf2-devel
 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
-#BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel
 ##!! For vl5, m17n-lib-devel (plus)
 BuildRequires: librsvg2-devel, libotf-devel
 %if %{?_dist_release} == "vl6"
@@ -164,7 +164,7 @@ export PATH="$PATH:/sbin:/usr/sbin"
 
 
 %install
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
 
 ARCHDIR=${RPM_ARCH}-vine-linux
 
@@ -177,12 +177,12 @@ ARCHDIR=${RPM_ARCH}-vine-linux
 (cd $RPM_BUILD_ROOT%{_mandir}/man1/; mv ctags.1 gctags.1)
 (cd $RPM_BUILD_ROOT%{_bindir}/; mv ctags gctags)
 
-mkdir -p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/etc
-mkdir -p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp
+%__mkdir_p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/etc
+%__mkdir_p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp
 # cp %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
 # nkf -w %{SOURCE100} > $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree-utf8.el
-tar zxvf %{SOURCE100} \
-    -C $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
+tar zxvf %{SOURCE100}
+%__cp -a menu-tree-el-%{menutreeelversion}/menu-tree.el $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
 nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
 
 ## vine default
@@ -201,23 +201,23 @@ nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tr
 #rm -f $RPM_BUILD_ROOT%{infodir}/dir
 #gzip -9nf $RPM_BUILD_ROOT%{infodir}/*
 
-install -m 644 %{SOURCE10} \
+%__install -m 644 %{SOURCE10} \
 	$RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/site-start.el
-sed -i -e 's/EMACS_VERSION/%{version}/g' \
+%__sed -i -e 's/EMACS_VERSION/%{version}/g' \
 	$RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/site-start.el
 
 ## create site-start.d directory
-install -m 755 -d ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d
+%__install -m 755 -d ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d
 
 # install coding-system init.el
 install -m644 %{SOURCE110} \
     $RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el
-ln -sf %{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el \
+%__ln_s -f %{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el \
     ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d/60menu-tree-init.el
 
 ## install system-wide configure file
-install -m 755 -d ${RPM_BUILD_ROOT}/etc/emacs
-install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs-23-local.el
+%__install -m 755 -d ${RPM_BUILD_ROOT}/etc/emacs
+%__install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs-23-local.el
 
 ## Python mode, php mode and rpm-spec mode
 
@@ -225,21 +225,22 @@ install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs-23-local.el
 strip $RPM_BUILD_ROOT%{_bindir}/* || :
 
 # install desktop file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/applications
 #install -m644  %{SOURCE50} $RPM_BUILD_ROOT%{_datadir}/applications
 %__sed -e "s/@@EMACS_VERSION@@/%{emacsversion}/g" %{SOURCE50} > \
     $RPM_BUILD_ROOT%{_datadir}/applications/$(basename %{SOURCE50} .in)
 
 # install icons
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons
-cp -a etc/images/icons/hicolor $RPM_BUILD_ROOT%{_datadir}/icons/
+%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/icons
+%__cp -a etc/images/icons/hicolor $RPM_BUILD_ROOT%{_datadir}/icons/
 
 # Remove ctags
 #rm -f $RPM_BUILD_ROOT/usr/bin/ctags
 #rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/*ctags*
-#rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/etc/ctags*
+#rm -f $RPM_BUILD_ROOT/%{_datadir}/emacs/%{version}/etc/ctags*
 
-DIR="${RPM_BUILD_ROOT}/usr/share/emacs ${RPM_BUILD_ROOT}/usr/share/emacs-%{version}"
+DIR="${RPM_BUILD_ROOT}%{_datadir}/emacs \
+     ${RPM_BUILD_ROOT}%{_datadir}/emacs-%{version}"
 BIN=${RPM_BUILD_ROOT}%{_bindir}
 LIB=${RPM_BUILD_ROOT}%{_libdir}
 EL="*.el"
@@ -276,17 +277,17 @@ echo "/usr/bin/b2m
 
 
 find $DIR $BIN $LIB -type d |
-  sed -e "s#^${RPM_BUILD_ROOT}#%dir #" > rpm-files
+  %__sed -e "s#^${RPM_BUILD_ROOT}#%dir #" > rpm-files
 
 find $DIR $BIN $LIB -type f |
-  sed -e "
+  %__sed -e "
     s#^${RPM_BUILD_ROOT}\(.*movemail\)#%attr(2755, root, mail) \1#
     s#^${RPM_BUILD_ROOT}##
   " >> rpm-files
 
 
 %clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
 
 
 %define info_files ccmode cl dired-x ediff emacs forms gnus info message mh-e reftex sc vip viper widget
@@ -294,13 +295,13 @@ find $DIR $BIN $LIB -type f |
 
 %pre
 
-if [ -L /usr/share/emacs-%{version}/site-lisp ] ; then
-    rm -f /usr/share/emacs-%{version}/site-lisp
+if [ -L %{_datadir}/emacs-%{version}/site-lisp ] ; then
+    %__rm -f %{_datadir}/emacs-%{version}/site-lisp
 fi
 
-if [ -d /usr/share/emacs/%{version}/site-lisp ] ; then
-    find /usr/share/emacs/%{version}/site-lisp/* -maxdepth 0 | grep -v subdirs.el | \
-	xargs rm -rf
+if [ -d %{_datadir}/emacs/%{version}/site-lisp ] ; then
+    find %{_datadir}/emacs/%{version}/site-lisp/* -maxdepth 0 | grep -v subdirs.el | \
+	xargs %__rm -rf
 fi
 
 
@@ -354,7 +355,7 @@ export PRIORITY=40
 
 unset PRIORITY
 
-rm -rf /var/lib/emacsen-common/doinstaflavor-emacs
+%__rm -rf /var/lib/emacsen-common/doinstaflavor-emacs
 
 fi
 
@@ -385,6 +386,7 @@ unset PRIORITY
 %files -f rpm-files 
 %defattr(-,root,root)
 %doc INSTALL README BUGS ChangeLog
+%dir /etc/emacs-%{version}
 %dir /etc/emacs-%{version}/site-start.d
 /etc/emacs-%{version}/site-start.d/*.el
 %config(noreplace) /etc/emacs/emacs-23-local.el
@@ -397,6 +399,12 @@ unset PRIORITY
 %{_localstatedir}/games/emacs/*
 
 %changelog
+* Mon May 31 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.2-1
+- new upstream release
+- updated menu-tree.el to version 0.94
+- updated menu-tree-init.el.emacs23
+  - used prefer-coding-system
+
 * Wed Apr 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.1.96-1
 - updated to 23.1.96 (23.2 pretest)