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

[Gaetan Bisson]

    Date: Thursday, September 13, 2012 @ 21:47:49
  Author: bisson
Revision: 166637

upstream update, large cleanup

Added:
  djvulibre/trunk/install
    (from rev 166636, djvulibre/trunk/djvulibre.install)
Modified:
  djvulibre/trunk/PKGBUILD
Deleted:
  djvulibre/trunk/djvulibre.install

-------------------+
 PKGBUILD          |   51 ++++++++++++++++++++++++---------------------------
 djvulibre.install |   13 -------------
 install           |   13 +++++++++++++
 3 files changed, 37 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-13 23:21:14 UTC (rev 166636)
+++ PKGBUILD	2012-09-14 01:47:49 UTC (rev 166637)
@@ -1,41 +1,38 @@
 # $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: mgushee
 
 pkgname=djvulibre
-pkgver=3.5.24
-pkgrel=3
+pkgver=3.5.25.3
+_major=3.5.25
+pkgrel=1
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://djvu.sourceforge.net/"
-depends=('gcc-libs' 'libtiff>=4.0.0' 'bash' 'hicolor-icon-theme')
-makedepends=('pkg-config')
+url='http://djvu.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+options=('!libtool')
+makedepends=('librsvg')
+depends=('libtiff' 'hicolor-icon-theme')
+source=("http://downloads.sourceforge.net/project/djvu/DjVuLibre/${_major}/djvulibre-${pkgver}.tar.gz")
+sha1sums=('ad35056aabb1950f385360ff59520a82a6f779ec')
+
+conflicts=('libdjvu')
 provides=("libdjvu=${pkgver}")
 replaces=('libdjvu')
-conflicts=('libdjvu')
-optdepends=('djview4: Viewer application')
-options=('!libtool')
-install=djvulibre.install
-source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz
-        git-fixes.patch)
-md5sums=('af83d27af5083198432a178d22b259c5'
-         'ff3798e383e9c3fae407455d8a51deec')
 
+install=install
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr --disable-desktopfiles
-  make
+	cd "${srcdir}/${pkgname}-${_major}"
+	./configure --prefix=/usr --disable-desktopfiles
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  #Install icons for mime-types.
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48,64x64}/mimetypes
-  for sz in 22 32 48 64; do
-    install -m644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png"
-  done
+	cd "${srcdir}/${pkgname}-${_major}"
+	make DESTDIR="${pkgdir}" install
+	for sz in 22 32 48 64; do
+		install -Dm644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png"
+	done
 }

Deleted: djvulibre.install
===================================================================
--- djvulibre.install	2012-09-13 23:21:14 UTC (rev 166636)
+++ djvulibre.install	2012-09-14 01:47:49 UTC (rev 166637)
@@ -1,13 +0,0 @@
-post_install() {
-  if [ -x usr/bin/gtk-update-icon-cache ]; then  
-    gtk-update-icon-cache -q -f usr/share/icons/hicolor
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: djvulibre/trunk/install (from rev 166636, djvulibre/trunk/djvulibre.install)
===================================================================
--- install	                        (rev 0)
+++ install	2012-09-14 01:47:49 UTC (rev 166637)
@@ -0,0 +1,13 @@
+post_install() {
+	if [[ -x usr/bin/gtk-update-icon-cache ]]; then	
+		gtk-update-icon-cache -q -f usr/share/icons/hicolor
+	fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}