[arch-commits] Commit in mozilla-common/repos (4 files)

[Jan de Groot]

    Date: Sunday, June 29, 2008 @ 06:43:22
  Author: jgc
Revision: 3686

Merged revisions 2-3685 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/mozilla-common/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r3676 | jgc | 2008-06-28 19:55:41 +0000 (Sat, 28 Jun 2008) | 4 lines
  
  upgpkg: mozilla-common 1.2-1
      Remove unused file
  Remove all references to /opt/mozilla for pkgconfig and path environment vars
  Leave /opt/mozilla/lib/plugins in the mozilla plugin path for compatibility for now
........

Modified:
  mozilla-common/repos/extra-i686/	(properties)
  mozilla-common/repos/extra-i686/PKGBUILD
  mozilla-common/repos/extra-i686/mozilla-common.sh
Deleted:
  mozilla-common/repos/extra-i686/mozilla-plugins.sh

--------------------+
 PKGBUILD           |   13 ++++++-------
 mozilla-common.sh  |    4 +---
 mozilla-plugins.sh |    1 -
 3 files changed, 7 insertions(+), 11 deletions(-)


Property changes on: mozilla-common/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /mozilla-common/trunk:1
   + /mozilla-common/trunk:1-3685

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-28 21:05:49 UTC (rev 3685)
+++ extra-i686/PKGBUILD	2008-06-29 10:43:22 UTC (rev 3686)
@@ -2,17 +2,16 @@
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=mozilla-common
-pkgver=1.1
-pkgrel=2
+pkgver=1.2
+pkgrel=1
 pkgdesc="Common Initialization Profile for Mozilla.org products"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.mozilla.org/"
 source=(mozilla-common.sh)
+md5sums=('2ecf5090ce1170c7e280e8d726952f8a')
 
 build() {
-  mkdir -p ${startdir}/pkg/etc/profile.d
-  mkdir -p ${startdir}/pkg/opt/mozilla/lib/plugins
-  mkdir -p ${startdir}/pkg/opt/mozilla/lib/pkgconfig
-  install -m755 ${startdir}/src/mozilla-common.sh ${startdir}/pkg/etc/profile.d
+  install -m755 -d ${startdir}/pkg/etc/profile.d
+  install -m755 ${startdir}/src/mozilla-common.sh ${startdir}/pkg/etc/profile.d/ || return 1
 }
-md5sums=('909841d1f6c09bd8d3641abfc88bb20a')

Modified: extra-i686/mozilla-common.sh
===================================================================
--- extra-i686/mozilla-common.sh	2008-06-28 21:05:49 UTC (rev 3685)
+++ extra-i686/mozilla-common.sh	2008-06-29 10:43:22 UTC (rev 3686)
@@ -1,3 +1 @@
-export PATH="${PATH}:/opt/mozilla/bin"
-export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/mozilla/lib/pkgconfig"
-export MOZ_PLUGIN_PATH="/opt/mozilla/lib/plugins:/usr/lib/mozilla/plugins"
+export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins:/opt/mozilla/lib/plugins"

Deleted: extra-i686/mozilla-plugins.sh
===================================================================
--- extra-i686/mozilla-plugins.sh	2008-06-28 21:05:49 UTC (rev 3685)
+++ extra-i686/mozilla-plugins.sh	2008-06-29 10:43:22 UTC (rev 3686)
@@ -1 +0,0 @@
-export MOZ_PLUGIN_PATH=/opt/mozilla-plugins