[arch-commits] CVS update of extra/system/jre (PKGBUILD jre.install)

Paul Mattal paul at archlinux.org
Sat Jan 12 03:46:14 UTC 2008


    Date: Friday, January 11, 2008 @ 22:46:14
  Author: paul
    Path: /home/cvs-extra/extra/system/jre

Modified: PKGBUILD (1.14 -> 1.15) jre.install (1.1 -> 1.2)

upgpkg: jre 6u3-2
jre.install modified to fix #6801


-------------+
 PKGBUILD    |    4 ++--
 jre.install |   18 ++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)


Index: extra/system/jre/PKGBUILD
diff -u extra/system/jre/PKGBUILD:1.14 extra/system/jre/PKGBUILD:1.15
--- extra/system/jre/PKGBUILD:1.14	Thu Oct  4 15:45:59 2007
+++ extra/system/jre/PKGBUILD	Fri Jan 11 22:46:14 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.14 2007/10/04 19:45:59 daniel Exp $
+# $Id: PKGBUILD,v 1.15 2008/01/12 03:46:14 paul Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=jre
 pkgver=6u3
-pkgrel=1
+pkgrel=2
 pkgdesc="Sun's java runtime environment"
 arch=(i686 x86_64)
   [ "$CARCH" = "i686" ]   && _arch=i586
Index: extra/system/jre/jre.install
diff -u extra/system/jre/jre.install:1.1 extra/system/jre/jre.install:1.2
--- extra/system/jre/jre.install:1.1	Thu Jul 20 03:36:40 2006
+++ extra/system/jre/jre.install	Fri Jan 11 22:46:14 2008
@@ -7,32 +7,18 @@
 	echo "You MUST read and agree to the license stored in"
 	echo "/opt/java/jre/LICENSE before using it."
 	if [ -f /etc/mailcap ] ; then
-		mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
-		echo $mailcap >/etc/mailcap
+		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
 	fi
 	echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
-		
-	if [ -f /etc/mime.types ] ; then
-		mime=$(grep -v 'application/x-java-jnlp-file' /etc/mime.types)
-		echo $mime>/etc/mime.types
-	fi
-	echo 'application/x-java-jnlp-file jnlp' >>/etc/mime.types 
-	
 }
 
 post_remove() {
 	mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
 	if [ "$mailcap" != "" ] ; then
-		echo $mailcap >/etc/mailcap
+		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
 	else
 		rm /etc/mailcap
 	fi
-	mime=$(grep -v 'application/x-java-jnlp-file' /etc/mime.types)
-	if [ "$mime" != "" ] ; then
-		echo $mime>/etc/mime.types
-	else
-		rm /etc/mime.types
-	fi
 }
 
 op=$1




More information about the arch-commits mailing list