[arch-commits] Commit in emacs/trunk (PKGBUILD emacs.install)

[Eric Bélanger]

    Date: Saturday, August 20, 2011 @ 22:29:35
  Author: eric
Revision: 135952

upgpkg: emacs 23.3.a-2

	Improve description, Update license, Clean up depends, Add desktop-file-utils depends to run update-desktop-database in install scriptlet, Update list of info pages in install scriptlet, Remove docs option, Remove cdet replace array

Modified:
  emacs/trunk/PKGBUILD
  emacs/trunk/emacs.install

---------------+
 PKGBUILD      |   17 +++++++----------
 emacs.install |   12 ++++++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-20 21:33:41 UTC (rev 135951)
+++ PKGBUILD	2011-08-21 02:29:35 UTC (rev 135952)
@@ -8,24 +8,21 @@
 # upstream uses "23.3a", which is a bit silly and interpreted as alpha.
 pkgver=$_majorver.$_minorver
 _realver=$_majorver$_minorver
-pkgrel=1
-pkgdesc="The Emacs Editor"
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
-license=('GPL')
-options=(docs)
-replaces=(cedet)
-depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff'  'libxpm' 'libjpeg' 'libxft' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf')
+license=('GPL3')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils')
+install=emacs.install
 source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop)
 md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
          '8af038d2ba4561271e935bb444ceb4e3')
-install=emacs.install
 
 build() {
   cd "$srcdir"/$pkgname-$_majorver
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --mandir=/usr/share/man --without-sound \
-    --with-x-toolkit=gtk --with-xft
+    --localstatedir=/var --without-sound --with-x-toolkit=gtk --with-xft
   make
 }
 

Modified: emacs.install
===================================================================
--- emacs.install	2011-08-20 21:33:41 UTC (rev 135951)
+++ emacs.install	2011-08-21 02:29:35 UTC (rev 135952)
@@ -1,15 +1,17 @@
-ICON_PATH=/usr/share/icons/hicolor
-INFO_DIR=/usr/share/info
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
 
 INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
 forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
-org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve smtpmail
+org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
 speedbar tramp url vip viper widget woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
 
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
     install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
   done
@@ -21,7 +23,9 @@
 
 pre_remove() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
 
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
     install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
   done