updated emacsen-common: fixed show-vine-default.sh

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

e/emacsen-common/emacsen-common-vl.spec

@@ -1,13 +1,13 @@
 %define name emacsen-common
 %define origname emacsen-common
 %define version 0.4
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'Requires(post):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define _libdir %{_prefix}/lib
 
 Summary: Common facilities for all emacsen.
 Name: %{name}
 Version: %{version}
-Release: 4%{?_dist_release}
+Release: 6%{?_dist_release}
 License: GPL
 Vendor: %{_vendor}
 Group: Development/Languages
@@ -18,11 +18,11 @@ Packager: Kazuhisa TAKEI <takei@vinelinux.org>
 URL: http://vinelinux.org/
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
-PreReq: rpm
-PreReq: gzip
+Requires: rpm
+Requires: gzip
 Requires: ruby
 %prereq_ge alternatives
-BuildPreReq: alternatives
+BuildRequires: alternatives
 
 %description
 This package contains code that is needed by all the (x)emacs packages.
@@ -48,13 +48,18 @@ This package contains code that is needed by all the (x)emacs packages.
 %__mkdir_p $RPM_BUILD_ROOT/%{_datadir}/%{origname}/site-list
 %__mkdir_p $RPM_BUILD_ROOT/%{_var}/lib/emacs
 
-echo "/usr/bin/etags
-/usr/bin/rcs-checkin
+echo "/usr/bin/b2m
+/usr/bin/ctags
+/usr/bin/ebrowse
 /usr/bin/emacsclient
+/usr/bin/etags
 /usr/bin/gctags
-/usr/bin/b2m
 /usr/bin/gnuclient
-/usr/bin/ootags" > $RPM_BUILD_ROOT%{_var}/lib/emacs/alternative-filelist
+/usr/bin/grep-changelog
+/usr/bin/ootags
+/usr/bin/rcs-checkin
+/usr/share/icons/hicolor/scalable/apps/emacs.svg
+/usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg" > $RPM_BUILD_ROOT%{_var}/lib/emacs/alternative-filelist
 
 %__cp %{SOURCE10} $RPM_BUILD_ROOT/%{_libdir}/%{origname}/
 
@@ -154,6 +159,12 @@ fi
 
 
 %changelog 
+* Sun Mar 03 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4-6
+- fixed show-vine-default.sh
+
+* Sat Jan 29 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4-5
+- added grep-changelog, emacs{,-document}.svg to emacs's slave
+
 * Sun Dec 05 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.4-4
 - added show-vine-default.sh
 

e/emacsen-common/show-vine-default.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# 	$Id: show-vine-default.sh,v 1.2 2009/05/20 15:31:29 munepi Exp munepi $	
 
 if [ $# -ne 1 ]; then
     cat<<EOF
@@ -25,13 +24,15 @@ ORDER="${ORDER} $(ls /etc/${FLAVOR}/site-start.d/*-init.el | \
 LIST="$(find /usr/share/${FLAVOR}/site-lisp/ \
     -regex '.*/vine-default.*\.el')"
 
-for PKG in $ORDER; do
-    if [ $(echo "$LIST" | egrep $PKG) ]; then
-	EL=$(echo "$LIST" | egrep $PKG | head -1)
-	echo ";;; Begin $EL"
-	cat $EL
-	echo ";;; End of $EL"
-	echo ""
+for pkg in $ORDER; do
+    ELS=$(echo "$LIST" | egrep -e "/${pkg}")
+    if [ ! -z "${ELS}" ]; then
+	for el in ${ELS}; do
+	    echo ";;; Begin ${el}"
+	    cat ${el}
+	    echo ";;; End of ${el}"
+	    echo ""
+	done
     fi
 done