[arch-commits] Commit in hunspell-fr/trunk (PKGBUILD)
Date: Monday, January 2, 2012 @ 15:41:20
Author: guillaume
Revision: 145844
upgpkg: hunspell-fr 4.4.1-1
Upstream release
Modified:
hunspell-fr/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-02 20:31:09 UTC (rev 145843)
+++ PKGBUILD2012-01-02 20:41:20 UTC (rev 145844)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=hunspell-fr
-pkgver=4.3
+pkgver=4.4.1
pkgrel=1
pkgdesc=French (modern) hunspell dictionaries
arch=(any)
@@ -9,7 +9,7 @@
license=('GPL' 'MPL' 'LGPL')
optdepends=('hunspell: the spell checking libraries and apps')
source=(http://www.dicollecte.org/download/fr/${pkgname}-moderne-v${pkgver}.zip)
-md5sums=('57021eb1a924f4f28bd14208978a957b')
+md5sums=('21797904e86e2faa2057cca18fc90105')
package() {
cd ${srcdir}
[arch-commits] Commit in hunspell-fr/repos/extra-any (PKGBUILD PKGBUILD)
Date: Monday, January 2, 2012 @ 15:41:44
Author: guillaume
Revision: 145845
archrelease: copy trunk to extra-any
Added:
hunspell-fr/repos/extra-any/PKGBUILD
(from rev 145844, hunspell-fr/trunk/PKGBUILD)
Deleted:
hunspell-fr/repos/extra-any/PKGBUILD
--+
PKGBUILD | 80 ++---
1 file changed, 40 insertions(+), 40 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-01-02 20:41:20 UTC (rev 145844)
+++ PKGBUILD2012-01-02 20:41:44 UTC (rev 145845)
@@ -1,40 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-
-pkgname=hunspell-fr
-pkgver=4.3
-pkgrel=1
-pkgdesc=French (modern) hunspell dictionaries
-arch=(any)
-url=http://www.dicollecte.org/;
-license=('GPL' 'MPL' 'LGPL')
-optdepends=('hunspell: the spell checking libraries and apps')
-source=(http://www.dicollecte.org/download/fr/${pkgname}-moderne-v${pkgver}.zip)
-md5sums=('57021eb1a924f4f28bd14208978a957b')
-
-package() {
- cd ${srcdir}
- install -dm755 ${pkgdir}/usr/share/hunspell
- install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
- install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
-
- pushd ${pkgdir}/usr/share/hunspell/
- fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
- for lang in ${fr_FR_aliases}; do
- ln -s fr_FR.aff ${lang}.aff
- ln -s fr_FR.dic ${lang}.dic
- done
-
- popd
-
- # the symlinks
- install -dm755 ${pkgdir}/usr/share/myspell/dicts
- pushd ${pkgdir}/usr/share/myspell/dicts
-for file in ${pkgdir}/usr/share/hunspell/*; do
- ln -sv /usr/share/hunspell/$(basename ${file}) .
-done
- popd
-
- # docs
- install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
- install -m644 README_fr.txt $pkgdir/usr/share/doc/${pkgname}/README_fr.txt
-}
Copied: hunspell-fr/repos/extra-any/PKGBUILD (from rev 145844,
hunspell-fr/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-01-02 20:41:44 UTC (rev 145845)
@@ -0,0 +1,40 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+
+pkgname=hunspell-fr
+pkgver=4.4.1
+pkgrel=1
+pkgdesc=French (modern) hunspell dictionaries
+arch=(any)
+url=http://www.dicollecte.org/;
+license=('GPL' 'MPL' 'LGPL')
+optdepends=('hunspell: the spell checking libraries and apps')
+source=(http://www.dicollecte.org/download/fr/${pkgname}-moderne-v${pkgver}.zip)
+md5sums=('21797904e86e2faa2057cca18fc90105')
+
+package() {
+ cd ${srcdir}
+ install -dm755 ${pkgdir}/usr/share/hunspell
+ install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
+ install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
+
+ pushd ${pkgdir}/usr/share/hunspell/
+ fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
+ for lang in ${fr_FR_aliases}; do
+ ln -s fr_FR.aff ${lang}.aff
+ ln -s fr_FR.dic ${lang}.dic
+ done
+
+ popd
+
+ # the symlinks
+ install -dm755 ${pkgdir}/usr/share/myspell/dicts
+ pushd ${pkgdir}/usr/share/myspell/dicts
+for file in ${pkgdir}/usr/share/hunspell/*; do
+ ln -sv /usr/share/hunspell/$(basename ${file}) .
+done
+ popd
+
+ # docs
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
+ install -m644 README_fr.txt $pkgdir/usr/share/doc/${pkgname}/README_fr.txt
+}
[arch-commits] Commit in junit/trunk (PKGBUILD)
Date: Saturday, January 7, 2012 @ 15:15:31
Author: guillaume
Revision: 146272
upgpkg: junit 4.10-1
Upstream release
Modified:
junit/trunk/PKGBUILD
--+
PKGBUILD | 45 ++---
1 file changed, 22 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-07 18:45:53 UTC (rev 146271)
+++ PKGBUILD2012-01-07 20:15:31 UTC (rev 146272)
@@ -1,32 +1,31 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-# Contributor: Jan de Groot j...@archlinux.org
-
+# Maintainer: Guillaume ALAUX Guillaume at Arch Linux dot org
pkgname=junit
-pkgver=4.8.2
+pkgver=4.10
+_commit=45a4464
pkgrel=1
pkgdesc=Automated testing framework for Java
arch=('any')
url=http://www.junit.org/;
-license=('custom')
+license=('CPL')
depends=('java-runtime')
-makedepends=('fastjar' 'apache-ant')
-source=(http://github.com/downloads/KentBeck/${pkgname}/${pkgname}${pkgver}.zip
build.xml)
-md5sums=('1fea538f71f7eeae13c54a9e03469eae' 'd8bd6d5961386ce602241ed7f87dd5d2')
-sha1sums=('15209b0933816c8e940a8375459be6e61e5f1662'
'8fbc1b4c309407c778c0d82e70ad73f576b71299')
+makedepends=('apache-ant')
+source=(http://github.com/KentBeck/junit/tarball/r${pkgver})
+md5sums=('21cc48c80cab9af6e8204d00acf40a87')
+build() {
+ cd ${srcdir}/KentBeck-${pkgname}-${_commit}
+
+ ant jars
+}
+
package() {
- cd ${srcdir}/${pkgname}${pkgver}
- jar xf ${pkgname}-${pkgver}-src.jar
- rm -f ${pkgname}-${pkgver}-src.jar
- cp ${srcdir}/build.xml .
- find . -name \*.class -delete
- find . -name \*.jar -delete
- . /etc/profile.d/apache-ant.sh
- ant dist
- install -d ${pkgdir}/usr/share/java ${pkgdir}/usr/lib
- install -m644 junit4.4/junit.jar ${pkgdir}/usr/share/java
- # Do this for ant, though ant needs to have these files in /usr/share/java,
but that will get fixed later.
- ln -sf ../share/java/junit.jar ${pkgdir}/usr/lib/junit.jar
- install -D -m644 cpl-v10.html
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.html
+ cd ${srcdir}/KentBeck-${pkgname}-${_commit}/${pkgname}${pkgver}
+
+ install -dm755 ${pkgdir}/usr/share/java/${pkgname}
+ install -m644 \
+${pkgname}-${pkgver}.jar \
+${pkgname}-dep-${pkgver}.jar \
+${pkgdir}/usr/share/java/${pkgname}
+ ln -s ${pkgname}/${pkgname}-${pkgver}.jar
${pkgdir}/usr/share/java/${pkgname}.jar
+ ln -s ${pkgname}/${pkgname}-dep-${pkgver}.jar
${pkgdir}/usr/share/java/${pkgname}-dep.jar
}
[arch-commits] Commit in junit/repos/extra-any (PKGBUILD PKGBUILD build.xml build.xml)
Date: Saturday, January 7, 2012 @ 15:20:02
Author: guillaume
Revision: 146273
archrelease: copy trunk to extra-any
Added:
junit/repos/extra-any/PKGBUILD
(from rev 146272, junit/trunk/PKGBUILD)
junit/repos/extra-any/build.xml
(from rev 146272, junit/trunk/build.xml)
Deleted:
junit/repos/extra-any/PKGBUILD
junit/repos/extra-any/build.xml
---+
PKGBUILD | 63 +-
build.xml | 206 ++--
2 files changed, 134 insertions(+), 135 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-01-07 20:15:31 UTC (rev 146272)
+++ PKGBUILD2012-01-07 20:20:02 UTC (rev 146273)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-# Contributor: Jan de Groot j...@archlinux.org
-
-pkgname=junit
-pkgver=4.8.2
-pkgrel=1
-pkgdesc=Automated testing framework for Java
-arch=('any')
-url=http://www.junit.org/;
-license=('custom')
-depends=('java-runtime')
-makedepends=('fastjar' 'apache-ant')
-source=(http://github.com/downloads/KentBeck/${pkgname}/${pkgname}${pkgver}.zip
build.xml)
-md5sums=('1fea538f71f7eeae13c54a9e03469eae' 'd8bd6d5961386ce602241ed7f87dd5d2')
-sha1sums=('15209b0933816c8e940a8375459be6e61e5f1662'
'8fbc1b4c309407c778c0d82e70ad73f576b71299')
-
-package() {
- cd ${srcdir}/${pkgname}${pkgver}
- jar xf ${pkgname}-${pkgver}-src.jar
- rm -f ${pkgname}-${pkgver}-src.jar
- cp ${srcdir}/build.xml .
- find . -name \*.class -delete
- find . -name \*.jar -delete
- . /etc/profile.d/apache-ant.sh
- ant dist
- install -d ${pkgdir}/usr/share/java ${pkgdir}/usr/lib
- install -m644 junit4.4/junit.jar ${pkgdir}/usr/share/java
- # Do this for ant, though ant needs to have these files in /usr/share/java,
but that will get fixed later.
- ln -sf ../share/java/junit.jar ${pkgdir}/usr/lib/junit.jar
- install -D -m644 cpl-v10.html
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.html
-}
Copied: junit/repos/extra-any/PKGBUILD (from rev 146272, junit/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-01-07 20:20:02 UTC (rev 146273)
@@ -0,0 +1,31 @@
+# Maintainer: Guillaume ALAUX Guillaume at Arch Linux dot org
+pkgname=junit
+pkgver=4.10
+_commit=45a4464
+pkgrel=1
+pkgdesc=Automated testing framework for Java
+arch=('any')
+url=http://www.junit.org/;
+license=('CPL')
+depends=('java-runtime')
+makedepends=('apache-ant')
+source=(http://github.com/KentBeck/junit/tarball/r${pkgver})
+md5sums=('21cc48c80cab9af6e8204d00acf40a87')
+
+build() {
+ cd ${srcdir}/KentBeck-${pkgname}-${_commit}
+
+ ant jars
+}
+
+package() {
+ cd ${srcdir}/KentBeck-${pkgname}-${_commit}/${pkgname}${pkgver}
+
+ install -dm755 ${pkgdir}/usr/share/java/${pkgname}
+ install -m644 \
+${pkgname}-${pkgver}.jar \
+${pkgname}-dep-${pkgver}.jar \
+${pkgdir}/usr/share/java/${pkgname}
+ ln -s ${pkgname}/${pkgname}-${pkgver}.jar
${pkgdir}/usr/share/java/${pkgname}.jar
+ ln -s ${pkgname}/${pkgname}-dep-${pkgver}.jar
${pkgdir}/usr/share/java/${pkgname}-dep.jar
+}
Deleted: build.xml
===
--- build.xml 2012-01-07 20:15:31 UTC (rev 146272)
+++ build.xml 2012-01-07 20:20:02 UTC (rev 146273)
@@ -1,103 +0,0 @@
-!-- JUnit build script using ant 1.4 --
-project name=junit default=dist basedir=.
- property file=${user.home}/.junit.properties /
- property name=build.compiler value=classic /
- property name=version value=4.4 /
- property name=dist value=junit${version} /
- property name=versionfile value=junit/runner/Version.java /
- property name=zipfile value=${dist}.zip /
- target name=init
- tstamp/
- /target
-
- target name=versiontag depends=init
- filter token=version value=${version} /
- copy
- file=${versionfile}
- tofile=${versionfile}tmp
- filtering=on
- /
- move file=${versionfile}tmp tofile=${versionfile} /
- /target
-
- target name=build depends=versiontag
- javac
- srcdir=.
- destdir=.
- debug=on
- source=1.5
- target=1.5
- /
- /target
-
- target name=dist depends=build
- delete dir=${dist} /
- mkdir dir=${dist} /
- jar
- jarfile=${dist}/src.jar
- basedir=.
- excludes=**/*.jar, junit/tests/**, junit/samples/**,
**/*.class, doc/**, README.html, .classpath, .project, cpl-v10.html
- /
- jar
- jarfile=${dist}/junit.jar
- basedir
[arch-commits] Commit in tomcat7/trunk (PKGBUILD)
Date: Sunday, January 29, 2012 @ 12:41:38
Author: guillaume
Revision: 148002
upgpkg: tomcat7 7.0.25-1
Upstream release + added back tomcat-dbcp
Modified:
tomcat7/trunk/PKGBUILD
--+
PKGBUILD | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-29 16:01:17 UTC (rev 148001)
+++ PKGBUILD2012-01-29 17:41:38 UTC (rev 148002)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgbase=tomcat7
pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.23
+pkgver=7.0.25
pkgrel=1
arch=('any')
url='http://tomcat.apache.org/'
@@ -11,13 +11,11 @@
#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon'
'eclipse-ecj')
makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon'
'eclipse-ecj')
source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz
tomcat7.conf.d
tomcat7
tomcat7.install)
-md5sums=('4d78b1b115a4c3fcd079c388a8bbd0ad'
- 'bd272e9611b0d880fd02493377d4691b'
+md5sums=('12ebfd86a071184baac453eaf7c2a760'
'eea5573b0acd985bb8b630a20719db76'
'361a41c02930a4e43245ab7379a617e9'
'6c5b4ed6d71b227f305b751c349fa31b')
@@ -32,9 +30,7 @@
ant deploy \
-Dbase.path=${srcdir}/DOWN_LIBS \
-Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar \
--Dtomcat-dbcp.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4.jar \
-
-Dtomcat-dbcp-src.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4-sources.jar
+-Djdt.jar=/usr/share/java/eclipse-ecj.jar
}
#TODO add test ant test
[arch-commits] Commit in tomcat7/repos/extra-any (PKGBUILD)
Date: Sunday, January 29, 2012 @ 12:42:00
Author: guillaume
Revision: 148003
archrelease: copy trunk to extra-any
Modified:
tomcat7/repos/extra-any/PKGBUILD
--+
PKGBUILD |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-29 17:41:38 UTC (rev 148002)
+++ PKGBUILD2012-01-29 17:42:00 UTC (rev 148003)
@@ -1,8 +1,8 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgbase=tomcat7
pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.23
-pkgrel=1
+pkgver=7.0.22
+pkgrel=2
arch=('any')
url='http://tomcat.apache.org/'
license=('APACHE')
@@ -16,7 +16,7 @@
tomcat7
tomcat7.install)
-md5sums=('4d78b1b115a4c3fcd079c388a8bbd0ad'
+md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
'bd272e9611b0d880fd02493377d4691b'
'eea5573b0acd985bb8b630a20719db76'
'361a41c02930a4e43245ab7379a617e9'
@@ -68,8 +68,7 @@
package_tomcat7() {
pkgdesc=Servlet-3.0/JSP-2.2 Container
- depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj'
- java-servlet3.0-tomcat=${pkgver} java-jsp2.2-tomcat=${pkgver})
+ depends=('java-runtime=6' 'java-jsvc' 'java-servlet3.0-tomcat'
'java-jsp2.2-tomcat' 'eclipse-ecj')
optdepends=('tomcat-native: to allow optimal performance in production
environments')
backup=(etc/tomcat7/catalina.policy
etc/tomcat7/catalina.properties
[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6.conf.d)
Date: Tuesday, November 1, 2011 @ 13:45:21
Author: guillaume
Revision: 141659
upgpkg: tomcat6 6.0.33-4
Extract servlet.jar and jsp jars into their own packages and change conf for
OpenJDK7
Modified:
tomcat6/trunk/PKGBUILD
tomcat6/trunk/tomcat6.conf.d
+
PKGBUILD | 86 +--
tomcat6.conf.d |2 -
2 files changed, 66 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 14:32:15 UTC (rev 141658)
+++ PKGBUILD2011-11-01 17:45:21 UTC (rev 141659)
@@ -1,23 +1,12 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
+pkgbase=tomcat6
+pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
pkgver=6.0.33
-pkgrel=3
-pkgdesc=Servlet-2.5/JSP-2.1 Container
+pkgrel=4
arch=('any')
url='http://tomcat.apache.org/'
license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
+makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon'
'eclipse-ecj')
source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
tomcat6.conf.d
@@ -27,10 +16,14 @@
noextract=(dbcp-${pkgver}.jar)
md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
'a6ff671562c9ac91e8cc2812760df49d'
- 'b9f482437de11587d72b53ddaa2a'
+ '5a95b41d320aa455fe9cbf97a80b0953'
'8f2ccc09837577394441d29a03b0e667'
'afdb7edc5c7a7b5fa85ad110d021cad3')
+_servletver=2.5
+_jspver=2.1
+
+#FIXME ant target 'download' should not be called
build() {
cd ${srcdir}/apache-tomcat-${pkgver}-src
@@ -41,7 +34,47 @@
-Djdt.jar=/usr/share/java/eclipse-ecj.jar
}
-package() {
+package_java-servlet2.5-tomcat() {
+ pkgdesc=Servlet ${_servletver} java library implementation by Apache Tomcat
+ depends=('java-environment=5')
+
+ cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+
+ install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
+ install -m644 servlet-api.jar \
+
${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
+# ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+#${pkgdir}/usr/share/java/servlet-api.jar
+}
+
+package_java-jsp2.1-tomcat() {
+ pkgdesc=JSP 2.1 java library implementation by Apache Tomcat
+ depends=('java-environment=5')
+
+ cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+
+ install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
+ for j in el-api jsp-api; do
+install -m644 ${j}.jar \
+
${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
+#ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar
${pkgdir}/usr/share/java/${j}.jar
+ done
+}
+
+package_tomcat6() {
+ pkgdesc=Servlet-2.5/JSP-2.1 Container
+ depends=('java-runtime=5' 'java-jsvc' 'java-servlet2.5-tomcat'
'java-jsp2.1-tomcat' 'eclipse-ecj')
+ optdepends=('tomcat-native: to allow optimal performance in production
environments')
+ backup=(etc/tomcat6/catalina.policy
+ etc/tomcat6/catalina.properties
+ etc/tomcat6/context.xml
+ etc/tomcat6/logging.properties
+ etc/tomcat6/server.xml
+ etc/tomcat6/tomcat-users.xml
+ etc/tomcat6/web.xml
+ etc/conf.d/tomcat6)
+ install=tomcat6.install
+
cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
# Tomcat general files
@@ -52,9 +85,21 @@
# eclipse-ecj is packaged on its own
rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- install ${srcdir}/dbcp-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
+ install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+
+ # Provided by previous packages
+ rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
+ ln -s
/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
+
+ for j in el-api jsp-api; do
+rm ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
+ln -s /usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar \
+ ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
+ done
+
+ install -m644 ${srcdir}/dbcp-${pkgver}.jar \
+${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
ln -s tomcat
[arch-commits] Commit in tomcat6/repos/extra-any (8 files)
Date: Tuesday, November 1, 2011 @ 13:46:21
Author: guillaume
Revision: 141660
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 141659, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/tomcat6
(from rev 141659, tomcat6/trunk/tomcat6)
tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 141659, tomcat6/trunk/tomcat6.conf.d)
tomcat6/repos/extra-any/tomcat6.install
(from rev 141659, tomcat6/trunk/tomcat6.install)
Deleted:
tomcat6/repos/extra-any/PKGBUILD
tomcat6/repos/extra-any/tomcat6
tomcat6/repos/extra-any/tomcat6.conf.d
tomcat6/repos/extra-any/tomcat6.install
-+
PKGBUILD| 218 --
tomcat6 | 154 +++---
tomcat6.conf.d | 30 +++
tomcat6.install | 54 ++---
4 files changed, 250 insertions(+), 206 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 17:45:21 UTC (rev 141659)
+++ PKGBUILD2011-11-01 17:46:21 UTC (rev 141660)
@@ -1,87 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.33
-pkgrel=3
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- 'b9f482437de11587d72b53ddaa2a'
- '8f2ccc09837577394441d29a03b0e667'
- 'afdb7edc5c7a7b5fa85ad110d021cad3')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- install ${srcdir}/dbcp-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
- ln -s tomcat-dbcp-${pkgver}.jar \
-${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 141659,
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-01 17:46:21 UTC (rev 141660)
@@ -0,0 +1,131 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgbase=tomcat6
+pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
+pkgver=6.0.33
+pkgrel=4
+arch=('any')
+url='http
[arch-commits] Commit in tomcat7/trunk (PKGBUILD tomcat7.conf.d)
Date: Tuesday, November 1, 2011 @ 13:46:51
Author: guillaume
Revision: 141661
upgpkg: tomcat7 7.0.22-2
Extract servlet.jar and jsp jars into their own packages and change conf for
OpenJDK7
Modified:
tomcat7/trunk/PKGBUILD
tomcat7/trunk/tomcat7.conf.d
+
PKGBUILD | 93 ++-
tomcat7.conf.d |2 -
2 files changed, 73 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 17:46:21 UTC (rev 141660)
+++ PKGBUILD2011-11-01 17:46:51 UTC (rev 141661)
@@ -1,44 +1,85 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
+pkgbase=tomcat7
+pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
pkgver=7.0.22
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
+pkgrel=2
arch=('any')
url='http://tomcat.apache.org/'
license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
+# Does not build with JDK7. Same issue as with cassandra:
+# https://issues.apache.org/jira/browse/CASSANDRA-3275
+#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon'
'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon'
'eclipse-ecj')
source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
+
http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz
tomcat7.conf.d
tomcat7
tomcat7.install)
md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
- '0fa46eae1746d6cd564905bfb0072776'
+ 'bd272e9611b0d880fd02493377d4691b'
+ 'eea5573b0acd985bb8b630a20719db76'
'361a41c02930a4e43245ab7379a617e9'
'6c5b4ed6d71b227f305b751c349fa31b')
+_servletver=3.0
+_jspver=2.2
+
build() {
cd ${srcdir}/apache-tomcat-${pkgver}-src
. /etc/profile.d/apache-ant.sh
- ant \
+ ant deploy \
-Dbase.path=${srcdir}/DOWN_LIBS \
-Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
+-Djdt.jar=/usr/share/java/eclipse-ecj.jar \
+-Dtomcat-dbcp.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4.jar \
+
-Dtomcat-dbcp-src.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4-sources.jar
}
-package() {
+#TODO add test ant test
+
+package_java-servlet3.0-tomcat() {
+ pkgdesc=Servlet 3.0 java library implementation by Apache Tomcat
+ depends=('java-environment=5')
+
+ cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+
+ install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
+ install -m644 servlet-api.jar \
+
${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
+ ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+${pkgdir}/usr/share/java/servlet-api.jar
+}
+
+package_java-jsp2.2-tomcat() {
+ pkgdesc=JSP 2.2 java library implementation by Apache Tomcat
+ depends=('java-environment=5')
+
+ cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib
+
+ install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
+ for j in el-api jsp-api; do
+install -m644 ${j}.jar \
+
${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
+ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar
${pkgdir}/usr/share/java/${j}.jar
+ done
+}
+
+package_tomcat7() {
+ pkgdesc=Servlet-3.0/JSP-2.2 Container
+ depends=('java-runtime=6' 'java-jsvc' 'java-servlet3.0-tomcat'
'java-jsp2.2-tomcat' 'eclipse-ecj')
+ optdepends=('tomcat-native: to allow optimal performance in production
environments')
+ backup=(etc/tomcat7/catalina.policy
+ etc/tomcat7/catalina.properties
+ etc/tomcat7/context.xml
+ etc/tomcat7/logging.properties
+ etc/tomcat7/server.xml
+ etc/tomcat7/tomcat-users.xml
+ etc/tomcat7/web.xml
+ etc/conf.d/tomcat7)
+ install=tomcat7.install
+
cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
# Tomcat general files
@@ -49,7 +90,18 @@
# eclipse-ecj is packaged on its own
rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
+ install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+
+ # Provided by previous packages
+ rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
+ ln -s
/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+${pkgdir}/usr/share/java/${pkgname}/servlet
[arch-commits] Commit in tomcat7/repos/extra-any (8 files)
Date: Tuesday, November 1, 2011 @ 13:47:48
Author: guillaume
Revision: 141662
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 141661, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/tomcat7
(from rev 141661, tomcat7/trunk/tomcat7)
tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 141661, tomcat7/trunk/tomcat7.conf.d)
tomcat7/repos/extra-any/tomcat7.install
(from rev 141661, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/tomcat7
tomcat7/repos/extra-any/tomcat7.conf.d
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 211 +-
tomcat7 | 154 +++
tomcat7.conf.d | 30 +++
tomcat7.install | 54 ++---
4 files changed, 250 insertions(+), 199 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 17:46:51 UTC (rev 141661)
+++ PKGBUILD2011-11-01 17:47:48 UTC (rev 141662)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.22
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 141661,
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-01 17:47:48 UTC (rev 141662)
@@ -0,0 +1,131 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgbase=tomcat7
+pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
+pkgver=7.0.22
+pkgrel=2
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+# Does not build with JDK7. Same issue as with cassandra:
+# https://issues.apache.org/jira/browse/CASSANDRA-3275
+#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon'
'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon'
'eclipse-ecj')
+source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat
[arch-commits] Commit in wireshark/trunk (PKGBUILD)
Date: Wednesday, November 2, 2011 @ 16:33:47
Author: guillaume
Revision: 141894
upgpkg: wireshark 1.6.3-1
Upstream release
Modified:
wireshark/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-02 20:16:08 UTC (rev 141893)
+++ PKGBUILD2011-11-02 20:33:47 UTC (rev 141894)
@@ -3,7 +3,7 @@
# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
pkgname=(wireshark-cli wireshark-gtk)
pkgbase=wireshark
-pkgver=1.6.2
+pkgver=1.6.3
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -11,7 +11,7 @@
url=http://www.wireshark.org/;
options=(!libtool)
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('301677b5f8150265315632fb6247e06e')
+md5sums=('5012c75c379ffd47fbcf395d9a6e417e')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
[arch-commits] Commit in wireshark/repos (12 files)
Date: Wednesday, November 2, 2011 @ 16:35:14
Author: guillaume
Revision: 141895
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
wireshark/repos/extra-i686/PKGBUILD
(from rev 141894, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-i686/wireshark-gtk.install
(from rev 141894, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-i686/wireshark.install
(from rev 141894, wireshark/trunk/wireshark.install)
wireshark/repos/extra-x86_64/PKGBUILD
(from rev 141894, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-x86_64/wireshark-gtk.install
(from rev 141894, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-x86_64/wireshark.install
(from rev 141894, wireshark/trunk/wireshark.install)
Deleted:
wireshark/repos/extra-i686/PKGBUILD
wireshark/repos/extra-i686/wireshark-gtk.install
wireshark/repos/extra-i686/wireshark.install
wireshark/repos/extra-x86_64/PKGBUILD
wireshark/repos/extra-x86_64/wireshark-gtk.install
wireshark/repos/extra-x86_64/wireshark.install
+
extra-i686/PKGBUILD| 114 +--
extra-i686/wireshark-gtk.install | 22 +++---
extra-i686/wireshark.install | 36 +--
extra-x86_64/PKGBUILD | 114 +--
extra-x86_64/wireshark-gtk.install | 22 +++---
extra-x86_64/wireshark.install | 36 +--
6 files changed, 172 insertions(+), 172 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-02 20:33:47 UTC (rev 141894)
+++ extra-i686/PKGBUILD 2011-11-02 20:35:14 UTC (rev 141895)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guillaume at alaux dot net
-# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
-pkgname=(wireshark-cli wireshark-gtk)
-pkgbase=wireshark
-pkgver=1.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
'libgcrypt' 'lua')
-url=http://www.wireshark.org/;
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('301677b5f8150265315632fb6247e06e')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- ./configure \
- --prefix=/usr \
- --with-ssl \
- --with-zlib=yes \
- --with-lua
- make all
-}
-
-package_wireshark-cli() {
- pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - CLI
version
- depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
- install=wireshark.install
- conflicts=(wireshark)
-
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- #wireshark uid group is 150
- chgrp 150 ${pkgdir}/usr/bin/dumpcap
- chmod 754 ${pkgdir}/usr/bin/dumpcap
- rm $pkgdir/usr/bin/wireshark
-}
-
-package_wireshark-gtk() {
- pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - GTK
frontend
- depends=('gtk2' 'wireshark-cli')
- install=wireshark-gtk.install
- replaces=(wireshark)
- conflicts=(wireshark)
-
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- install -Dm755 .libs/wireshark $pkgdir/usr/bin/wireshark
- for d in 16 32 48; do
- install -Dm644 image/hi${d}-app-wireshark.png
${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
- done
- install -Dm644 wireshark.desktop
${pkgdir}/usr/share/applications/wireshark.desktop
-}
Copied: wireshark/repos/extra-i686/PKGBUILD (from rev 141894,
wireshark/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-02 20:35:14 UTC (rev 141895)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guillaume at alaux dot net
+# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
+pkgname=(wireshark-cli wireshark-gtk)
+pkgbase=wireshark
+pkgver=1.6.3
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
'libgcrypt' 'lua')
+url=http://www.wireshark.org/;
+options=(!libtool)
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('5012c75c379ffd47fbcf395d9a6e417e')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --with-ssl \
+ --with-zlib=yes \
+ --with-lua
+ make all
+}
+
+package_wireshark-cli() {
+ pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - CLI
version
+ depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
+ install=wireshark.install
+ conflicts=(wireshark)
+
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+
+ #wireshark uid group is 150
+ chgrp 150 ${pkgdir}/usr/bin/dumpcap
+ chmod 754 ${pkgdir}/usr/bin/dumpcap
+ rm $pkgdir/usr/bin/wireshark
+}
+
+package_wireshark-gtk() {
+ pkgdesc=A free
[arch-commits] Commit in eclipse-ecj/trunk (PKGBUILD)
Date: Monday, November 7, 2011 @ 15:43:40
Author: guillaume
Revision: 142281
upgpkg: eclipse-ecj 3.7.1-1
Upstream release
Modified:
eclipse-ecj/trunk/PKGBUILD
--+
PKGBUILD | 28 +---
1 file changed, 17 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 20:42:30 UTC (rev 142280)
+++ PKGBUILD2011-11-07 20:43:40 UTC (rev 142281)
@@ -1,28 +1,34 @@
# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Maintainer: Allan McRae al...@archlinux.org
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Jan de Groot j...@archlinux.org
+# Contributor: Allan McRae al...@archlinux.org
pkgname=eclipse-ecj
-pkgver=3.6.1
+pkgver=3.7.1
pkgrel=1
-_date=201009090800
+_date=201109091335
pkgdesc=Eclipse java bytecode compiler
arch=('any')
license=('EPL')
url=http://www.eclipse.org/;
depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment')
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/ecjsrc-${pkgver}.zip
- ecj)
-md5sums=('8a2b6222349dad952e7451fd47b6022b'
+makedepends=('unzip' 'apache-ant' 'java-environment')
+source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/ecjsrc-${pkgver}.jar
+ecj)
+md5sums=('038dbfa48f9ab4fffcbd4a332dfe'
'997d67f1d3e97f65e42e8ace7aba7260')
build() {
- ant
+ cd ${srcdir}
+ mkdir src
+ unzip ecjsrc-${pkgver}.jar -d src
+ cd src
+ ant build
}
package() {
- install -Dm755 ecj.jar $pkgdir/usr/share/java/eclipse-ecj.jar
- ln -s eclipse-ecj.jar $pkgdir/usr/share/java/ecj.jar
+ install -Dm644 ${srcdir}/src/ecj.jar
$pkgdir/usr/share/java/eclipse-ecj-${pkgver}.jar
+ ln -s eclipse-ecj-${pkgver}.jar $pkgdir/usr/share/java/ecj.jar
+ ln -s eclipse-ecj-${pkgver}.jar $pkgdir/usr/share/java/eclipse-ecj.jar
install -Dm755 ecj $pkgdir/usr/bin/ecj
}
[arch-commits] Commit in eclipse-ecj/repos/extra-any (PKGBUILD PKGBUILD ecj ecj)
Date: Monday, November 7, 2011 @ 15:44:02
Author: guillaume
Revision: 142282
archrelease: copy trunk to extra-any
Added:
eclipse-ecj/repos/extra-any/PKGBUILD
(from rev 142281, eclipse-ecj/trunk/PKGBUILD)
eclipse-ecj/repos/extra-any/ecj
(from rev 142281, eclipse-ecj/trunk/ecj)
Deleted:
eclipse-ecj/repos/extra-any/PKGBUILD
eclipse-ecj/repos/extra-any/ecj
--+
PKGBUILD | 62 +
ecj |8 +++
2 files changed, 38 insertions(+), 32 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-11-07 20:43:40 UTC (rev 142281)
+++ PKGBUILD2011-11-07 20:44:02 UTC (rev 142282)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Maintainer: Allan McRae al...@archlinux.org
-
-pkgname=eclipse-ecj
-pkgver=3.6.1
-pkgrel=1
-_date=201009090800
-pkgdesc=Eclipse java bytecode compiler
-arch=('any')
-license=('EPL')
-url=http://www.eclipse.org/;
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment')
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/ecjsrc-${pkgver}.zip
- ecj)
-md5sums=('8a2b6222349dad952e7451fd47b6022b'
- '997d67f1d3e97f65e42e8ace7aba7260')
-
-build() {
- ant
-}
-
-package() {
- install -Dm755 ecj.jar $pkgdir/usr/share/java/eclipse-ecj.jar
- ln -s eclipse-ecj.jar $pkgdir/usr/share/java/ecj.jar
- install -Dm755 ecj $pkgdir/usr/bin/ecj
-}
Copied: eclipse-ecj/repos/extra-any/PKGBUILD (from rev 142281,
eclipse-ecj/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-07 20:44:02 UTC (rev 142282)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Jan de Groot j...@archlinux.org
+# Contributor: Allan McRae al...@archlinux.org
+
+pkgname=eclipse-ecj
+pkgver=3.7.1
+pkgrel=1
+_date=201109091335
+pkgdesc=Eclipse java bytecode compiler
+arch=('any')
+license=('EPL')
+url=http://www.eclipse.org/;
+depends=('java-runtime')
+makedepends=('unzip' 'apache-ant' 'java-environment')
+source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/ecjsrc-${pkgver}.jar
+ecj)
+md5sums=('038dbfa48f9ab4fffcbd4a332dfe'
+ '997d67f1d3e97f65e42e8ace7aba7260')
+
+build() {
+ cd ${srcdir}
+ mkdir src
+ unzip ecjsrc-${pkgver}.jar -d src
+ cd src
+ ant build
+}
+
+package() {
+ install -Dm644 ${srcdir}/src/ecj.jar
$pkgdir/usr/share/java/eclipse-ecj-${pkgver}.jar
+ ln -s eclipse-ecj-${pkgver}.jar $pkgdir/usr/share/java/ecj.jar
+ ln -s eclipse-ecj-${pkgver}.jar $pkgdir/usr/share/java/eclipse-ecj.jar
+ install -Dm755 ecj $pkgdir/usr/bin/ecj
+}
Deleted: ecj
===
--- ecj 2011-11-07 20:43:40 UTC (rev 142281)
+++ ecj 2011-11-07 20:44:02 UTC (rev 142282)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-CLASSPATH=/usr/share/java/ecj.jar${CLASSPATH:+:}$CLASSPATH \
-java org.eclipse.jdt.internal.compiler.batch.Main $@
Copied: eclipse-ecj/repos/extra-any/ecj (from rev 142281, eclipse-ecj/trunk/ecj)
===
--- ecj (rev 0)
+++ ecj 2011-11-07 20:44:02 UTC (rev 142282)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+java org.eclipse.jdt.internal.compiler.batch.Main $@
[arch-commits] Commit in brltty/repos (16 files)
Date: Wednesday, November 9, 2011 @ 16:20:39
Author: guillaume
Revision: 142442
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
brltty/repos/extra-i686/PKGBUILD
(from rev 142441, brltty/trunk/PKGBUILD)
brltty/repos/extra-i686/brltty
(from rev 142441, brltty/trunk/brltty)
brltty/repos/extra-i686/brltty-4.2-S_ISCHR.patch
(from rev 142441, brltty/trunk/brltty-4.2-S_ISCHR.patch)
brltty/repos/extra-i686/brltty.conf
(from rev 142441, brltty/trunk/brltty.conf)
brltty/repos/extra-x86_64/PKGBUILD
(from rev 142441, brltty/trunk/PKGBUILD)
brltty/repos/extra-x86_64/brltty
(from rev 142441, brltty/trunk/brltty)
brltty/repos/extra-x86_64/brltty-4.2-S_ISCHR.patch
(from rev 142441, brltty/trunk/brltty-4.2-S_ISCHR.patch)
brltty/repos/extra-x86_64/brltty.conf
(from rev 142441, brltty/trunk/brltty.conf)
Deleted:
brltty/repos/extra-i686/PKGBUILD
brltty/repos/extra-i686/brltty
brltty/repos/extra-i686/brltty-4.2-S_ISCHR.patch
brltty/repos/extra-i686/brltty.conf
brltty/repos/extra-x86_64/PKGBUILD
brltty/repos/extra-x86_64/brltty
brltty/repos/extra-x86_64/brltty-4.2-S_ISCHR.patch
brltty/repos/extra-x86_64/brltty.conf
---+
extra-i686/PKGBUILD | 98 +++
extra-i686/brltty | 136
extra-i686/brltty-4.2-S_ISCHR.patch | 22 ++---
extra-i686/brltty.conf|4
extra-x86_64/PKGBUILD | 98 +++
extra-x86_64/brltty | 136
extra-x86_64/brltty-4.2-S_ISCHR.patch | 22 ++---
extra-x86_64/brltty.conf |4
8 files changed, 260 insertions(+), 260 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-09 21:19:49 UTC (rev 142441)
+++ extra-i686/PKGBUILD 2011-11-09 21:20:39 UTC (rev 142442)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Jan de Groot j...@archlinux.org
-# Contributor: Giovanni Scafora giova...@archlinux.org
-
-pkgname=brltty
-pkgver=4.2
-pkgrel=4
-pkgdesc=Braille display driver for Linux/Unix
-arch=('i686' 'x86_64')
-url=http://mielke.cc/brltty;
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst')
-makedepends=('pyrex' 'bluez')
-optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
-source=(http://mielke.cc/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz
-'brltty-4.2-S_ISCHR.patch'
-'brltty'
-'brltty.conf')
-md5sums=('192af5e634210616928496645e392097'
- '5954b289efaf2ff17676d06de9a88854'
- '831ebaf0c56091702929c68805d20c4f'
- 'a8ab8b3dd059e96e1734bc9cdcf844fc')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- CFLAGS+=${CFLAGS} -D_GNU_SOURCE \
- ./configure --prefix=/usr \
---sysconfdir=/etc \
---mandir=/usr/share/man \
---localstatedir=/var \
---enable-gpm \
---disable-java-bindings \
---disable-caml-bindings \
-PYTHON=/usr/bin/python2
-
- patch -Np1 -i ${srcdir}/brltty-4.2-S_ISCHR.patch
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make INSTALL_ROOT=${pkgdir} install
- install -D -m755 ${srcdir}/brltty ${pkgdir}/etc/rc.d/brltty
- install -D -m644 ${srcdir}/brltty.conf ${pkgdir}/etc/conf.d/brltty.conf
- install -D -m644 Documents/brltty.conf ${pkgdir}/etc/brltty.conf
-}
Copied: brltty/repos/extra-i686/PKGBUILD (from rev 142441,
brltty/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-09 21:20:39 UTC (rev 142442)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer:
+# Contributor: Jan de Groot j...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+
+pkgname=brltty
+pkgver=4.3
+pkgrel=1
+pkgdesc=Braille display driver for Linux/Unix
+arch=('i686' 'x86_64')
+url=http://mielke.cc/brltty;
+license=('GPL' 'LGPL')
+depends=('libxaw' 'at-spi' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst')
+makedepends=('pyrex' 'bluez')
+optdepends=('bluez: bluetooth support')
+backup=(etc/brltty.conf etc/conf.d/brltty.conf)
+options=('!makeflags' '!emptydirs')
+source=(http://mielke.cc/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz
+'brltty'
+'brltty.conf')
+#'brltty-4.2-S_ISCHR.patch'
+md5sums=('5ada573f88df32b6150db3b9a620e20b'
+ '831ebaf0c56091702929c68805d20c4f'
+ 'a8ab8b3dd059e96e1734bc9cdcf844fc')
+# '5954b289efaf2ff17676d06de9a88854'
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ CFLAGS+=${CFLAGS} -D_GNU_SOURCE \
+ ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--mandir=/usr/share/man \
+--localstatedir=/var \
+--enable-gpm \
+--disable-java-bindings \
+--disable-caml-bindings \
+
[arch-commits] Commit in wireshark/trunk (PKGBUILD)
Date: Saturday, November 19, 2011 @ 06:39:26
Author: guillaume
Revision: 142975
upgpkg: wireshark 1.6.4-1
Upstream release
Modified:
wireshark/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-19 10:42:16 UTC (rev 142974)
+++ PKGBUILD2011-11-19 11:39:26 UTC (rev 142975)
@@ -3,7 +3,7 @@
# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
pkgname=(wireshark-cli wireshark-gtk)
pkgbase=wireshark
-pkgver=1.6.3
+pkgver=1.6.4
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -11,7 +11,7 @@
url=http://www.wireshark.org/;
options=(!libtool)
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('5012c75c379ffd47fbcf395d9a6e417e')
+md5sums=('a348521c514fcdd890d974f2a0b59db3')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -37,7 +37,7 @@
#wireshark uid group is 150
chgrp 150 ${pkgdir}/usr/bin/dumpcap
chmod 754 ${pkgdir}/usr/bin/dumpcap
- rm $pkgdir/usr/bin/wireshark
+ rm ${pkgdir}/usr/bin/wireshark
}
package_wireshark-gtk() {
[arch-commits] Commit in wireshark/repos (12 files)
Date: Saturday, November 19, 2011 @ 06:40:12
Author: guillaume
Revision: 142976
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
wireshark/repos/extra-i686/PKGBUILD
(from rev 142975, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-i686/wireshark-gtk.install
(from rev 142975, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-i686/wireshark.install
(from rev 142975, wireshark/trunk/wireshark.install)
wireshark/repos/extra-x86_64/PKGBUILD
(from rev 142975, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-x86_64/wireshark-gtk.install
(from rev 142975, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-x86_64/wireshark.install
(from rev 142975, wireshark/trunk/wireshark.install)
Deleted:
wireshark/repos/extra-i686/PKGBUILD
wireshark/repos/extra-i686/wireshark-gtk.install
wireshark/repos/extra-i686/wireshark.install
wireshark/repos/extra-x86_64/PKGBUILD
wireshark/repos/extra-x86_64/wireshark-gtk.install
wireshark/repos/extra-x86_64/wireshark.install
+
extra-i686/PKGBUILD| 114 +--
extra-i686/wireshark-gtk.install | 22 +++---
extra-i686/wireshark.install | 36 +--
extra-x86_64/PKGBUILD | 114 +--
extra-x86_64/wireshark-gtk.install | 22 +++---
extra-x86_64/wireshark.install | 36 +--
6 files changed, 172 insertions(+), 172 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-19 11:39:26 UTC (rev 142975)
+++ extra-i686/PKGBUILD 2011-11-19 11:40:12 UTC (rev 142976)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guillaume at alaux dot net
-# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
-pkgname=(wireshark-cli wireshark-gtk)
-pkgbase=wireshark
-pkgver=1.6.3
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
'libgcrypt' 'lua')
-url=http://www.wireshark.org/;
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('5012c75c379ffd47fbcf395d9a6e417e')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- ./configure \
- --prefix=/usr \
- --with-ssl \
- --with-zlib=yes \
- --with-lua
- make all
-}
-
-package_wireshark-cli() {
- pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - CLI
version
- depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
- install=wireshark.install
- conflicts=(wireshark)
-
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- #wireshark uid group is 150
- chgrp 150 ${pkgdir}/usr/bin/dumpcap
- chmod 754 ${pkgdir}/usr/bin/dumpcap
- rm $pkgdir/usr/bin/wireshark
-}
-
-package_wireshark-gtk() {
- pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - GTK
frontend
- depends=('gtk2' 'wireshark-cli')
- install=wireshark-gtk.install
- replaces=(wireshark)
- conflicts=(wireshark)
-
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- install -Dm755 .libs/wireshark $pkgdir/usr/bin/wireshark
- for d in 16 32 48; do
- install -Dm644 image/hi${d}-app-wireshark.png
${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
- done
- install -Dm644 wireshark.desktop
${pkgdir}/usr/share/applications/wireshark.desktop
-}
Copied: wireshark/repos/extra-i686/PKGBUILD (from rev 142975,
wireshark/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-19 11:40:12 UTC (rev 142976)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guillaume at alaux dot net
+# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
+pkgname=(wireshark-cli wireshark-gtk)
+pkgbase=wireshark
+pkgver=1.6.4
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
'libgcrypt' 'lua')
+url=http://www.wireshark.org/;
+options=(!libtool)
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('a348521c514fcdd890d974f2a0b59db3')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --with-ssl \
+ --with-zlib=yes \
+ --with-lua
+ make all
+}
+
+package_wireshark-cli() {
+ pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - CLI
version
+ depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
+ install=wireshark.install
+ conflicts=(wireshark)
+
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+
+ #wireshark uid group is 150
+ chgrp 150 ${pkgdir}/usr/bin/dumpcap
+ chmod 754 ${pkgdir}/usr/bin/dumpcap
+ rm ${pkgdir}/usr/bin/wireshark
+}
+
+package_wireshark-gtk() {
+ pkgdesc=A free
[arch-commits] Commit in java-commons-daemon/trunk (PKGBUILD)
Date: Monday, November 28, 2011 @ 17:01:12
Author: guillaume
Revision: 143759
upgpkg: java-commons-daemon 1.0.8-1
Upstream release
Modified:
java-commons-daemon/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-28 22:00:34 UTC (rev 143758)
+++ PKGBUILD2011-11-28 22:01:12 UTC (rev 143759)
@@ -1,17 +1,16 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=('java-commons-daemon' 'java-jsvc')
pkgbase=java-commons-daemon
-pkgver=1.0.7
+pkgver=1.0.8
pkgrel=1
arch=('i686' 'x86_64')
url=http://commons.apache.org/daemon/;
license=('APACHE')
_libname=commons-daemon
source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('fb6c5e7b6544fd8400b08f0e81fc9581')
+md5sums=('323a0bd9e2786256f02c5aed4e887fed')
makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
-
build() {
# commons-daemon.jar
cd ${srcdir}/${_libname}-${pkgver}-src
[arch-commits] Commit in java-commons-daemon/repos (4 files)
Date: Monday, November 28, 2011 @ 17:01:45
Author: guillaume
Revision: 143760
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
java-commons-daemon/repos/extra-i686/PKGBUILD
(from rev 143759, java-commons-daemon/trunk/PKGBUILD)
java-commons-daemon/repos/extra-x86_64/PKGBUILD
(from rev 143759, java-commons-daemon/trunk/PKGBUILD)
Deleted:
java-commons-daemon/repos/extra-i686/PKGBUILD
java-commons-daemon/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 95 +++-
extra-x86_64/PKGBUILD | 95 +++-
2 files changed, 94 insertions(+), 96 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-28 22:01:12 UTC (rev 143759)
+++ extra-i686/PKGBUILD 2011-11-28 22:01:45 UTC (rev 143760)
@@ -1,48 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=('java-commons-daemon' 'java-jsvc')
-pkgbase=java-commons-daemon
-pkgver=1.0.7
-pkgrel=1
-arch=('i686' 'x86_64')
-url=http://commons.apache.org/daemon/;
-license=('APACHE')
-_libname=commons-daemon
-source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('fb6c5e7b6544fd8400b08f0e81fc9581')
-makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
-
-
-build() {
- # commons-daemon.jar
- cd ${srcdir}/${_libname}-${pkgver}-src
- ant
-
- # jsvc
- cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
- ./configure
- make
- docbook2man man/jsvc.1.xml
-}
-
-package_java-commons-daemon() {
- pkgdesc=Alternative invocation mechanism for unix-daemon-like java code
- depends=('java-runtime')
-
- cd ${srcdir}/${_libname}-${pkgver}-src
-
- install -Dm755 dist/${_libname}-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar
- ln -s ${_libname}-${pkgver}.jar \
-${pkgdir}/usr/share/java/${_libname}.jar
-}
-
-package_java-jsvc() {
- pkgdesc=Apache application for making Java applications run on UNIX more
easily
- depends=(java-${_libname} 'libcap')
-
- cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
-
- install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
- install -Dm644 JSVC.1 ${pkgdir}/usr/share/man/man1/JSVC.1
-}
-
Copied: java-commons-daemon/repos/extra-i686/PKGBUILD (from rev 143759,
java-commons-daemon/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-28 22:01:45 UTC (rev 143760)
@@ -0,0 +1,47 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=('java-commons-daemon' 'java-jsvc')
+pkgbase=java-commons-daemon
+pkgver=1.0.8
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://commons.apache.org/daemon/;
+license=('APACHE')
+_libname=commons-daemon
+source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
+md5sums=('323a0bd9e2786256f02c5aed4e887fed')
+makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
+
+build() {
+ # commons-daemon.jar
+ cd ${srcdir}/${_libname}-${pkgver}-src
+ ant
+
+ # jsvc
+ cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
+ ./configure
+ make
+ docbook2man man/jsvc.1.xml
+}
+
+package_java-commons-daemon() {
+ pkgdesc=Alternative invocation mechanism for unix-daemon-like java code
+ depends=('java-runtime')
+
+ cd ${srcdir}/${_libname}-${pkgver}-src
+
+ install -Dm755 dist/${_libname}-${pkgver}.jar \
+ ${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar
+ ln -s ${_libname}-${pkgver}.jar \
+${pkgdir}/usr/share/java/${_libname}.jar
+}
+
+package_java-jsvc() {
+ pkgdesc=Apache application for making Java applications run on UNIX more
easily
+ depends=(java-${_libname} 'libcap')
+
+ cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
+
+ install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
+ install -Dm644 JSVC.1 ${pkgdir}/usr/share/man/man1/JSVC.1
+}
+
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-11-28 22:01:12 UTC (rev 143759)
+++ extra-x86_64/PKGBUILD 2011-11-28 22:01:45 UTC (rev 143760)
@@ -1,48 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=('java-commons-daemon' 'java-jsvc')
-pkgbase=java-commons-daemon
-pkgver=1.0.7
-pkgrel=1
-arch=('i686' 'x86_64')
-url=http://commons.apache.org/daemon/;
-license=('APACHE')
-_libname=commons-daemon
-source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('fb6c5e7b6544fd8400b08f0e81fc9581')
-makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
-
-
-build() {
- # commons-daemon.jar
- cd ${srcdir}/${_libname}-${pkgver}-src
- ant
-
- # jsvc
- cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
- ./configure
- make
- docbook2man man/jsvc.1.xml
-}
-
-package_java-commons-daemon() {
- pkgdesc
[arch-commits] Commit in tomcat7/trunk (PKGBUILD tomcat7.install)
Date: Wednesday, September 7, 2011 @ 09:57:25
Author: guillaume
Revision: 137348
upgpkg: tomcat7 7.0.21-2
Fixed owner of /etc/tomcat7 and tomcat user dir
Modified:
tomcat7/trunk/PKGBUILD
tomcat7/trunk/tomcat7.install
-+
PKGBUILD|9 +
tomcat7.install |2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-07 13:23:24 UTC (rev 137347)
+++ PKGBUILD2011-09-07 13:57:25 UTC (rev 137348)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
pkgver=7.0.21
-pkgrel=1
+pkgrel=2
pkgdesc=Servlet-3.0/JSP-2.2 Container
arch=('any')
url='http://tomcat.apache.org/'
@@ -26,7 +26,7 @@
md5sums=('40d71249a54526ab0145fd5b41008518'
'0fa46eae1746d6cd564905bfb0072776'
'361a41c02930a4e43245ab7379a617e9'
- '1be39071bd27781c352b2d73b765e29d')
+ '6c5b4ed6d71b227f305b751c349fa31b')
build() {
cd ${srcdir}/apache-tomcat-${pkgver}-src
@@ -58,8 +58,9 @@
touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- install -dm770 ${pkgdir}/etc/${pkgname}
- install -m660 conf/* ${pkgdir}/etc/${pkgname}
+ install -dm775 ${pkgdir}/etc/${pkgname}
+ install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
+ install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
install -dm775 ${pkgdir}/var/lib/${pkgname}
Modified: tomcat7.install
===
--- tomcat7.install 2011-09-07 13:23:24 UTC (rev 137347)
+++ tomcat7.install 2011-09-07 13:57:25 UTC (rev 137348)
@@ -1,6 +1,6 @@
post_install() {
getent group tomcat /dev/null 21 || groupadd -g 66 tomcat
- getent passwd tomcat /dev/null 21 || useradd -u 66 -g tomcat -d
/usr/share/tomcat -s /bin/false tomcat
+ getent passwd tomcat /dev/null 21 || useradd -u 66 -g tomcat -d
/usr/share/tomcat7 -s /bin/false tomcat
if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
echo It appears that your current kernel has linux security
[arch-commits] Commit in tomcat7/repos/extra-any (8 files)
Date: Wednesday, September 7, 2011 @ 09:58:22
Author: guillaume
Revision: 137349
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 137348, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/tomcat7
(from rev 137348, tomcat7/trunk/tomcat7)
tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 137348, tomcat7/trunk/tomcat7.conf.d)
tomcat7/repos/extra-any/tomcat7.install
(from rev 137348, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/tomcat7
tomcat7/repos/extra-any/tomcat7.conf.d
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 159 +++---
tomcat7 | 154 ++--
tomcat7.conf.d | 30 +-
tomcat7.install | 54 +-
4 files changed, 199 insertions(+), 198 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-09-07 13:57:25 UTC (rev 137348)
+++ PKGBUILD2011-09-07 13:58:22 UTC (rev 137349)
@@ -1,79 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.21
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('40d71249a54526ab0145fd5b41008518'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm770 ${pkgdir}/etc/${pkgname}
- install -m660 conf/* ${pkgdir}/etc/${pkgname}
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 137348,
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-09-07 13:58:22 UTC (rev 137349)
@@ -0,0 +1,80 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat7
+pkgver=7.0.21
+pkgrel=2
+pkgdesc=Servlet-3.0/JSP-2.2 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
+optdepends=('tomcat-native: to allow optimal performance in production
environments')
+backup=(etc/tomcat7/catalina.policy
+etc/tomcat7/catalina.properties
+etc/tomcat7/context.xml
+etc/tomcat7/logging.properties
+etc/tomcat7/server.xml
+etc/tomcat7/tomcat-users.xml
+etc
[arch-commits] Commit in wireshark/trunk (PKGBUILD)
Date: Friday, September 9, 2011 @ 08:09:37
Author: guillaume
Revision: 137558
upgpkg: wireshark 1.6.2-1
Upstream release
Modified:
wireshark/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-09 11:37:14 UTC (rev 137557)
+++ PKGBUILD2011-09-09 12:09:37 UTC (rev 137558)
@@ -3,15 +3,15 @@
# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
pkgname=(wireshark-cli wireshark-gtk)
pkgbase=wireshark
-pkgver=1.6.1
-pkgrel=3
+pkgver=1.6.2
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
'libgcrypt' 'lua')
url=http://www.wireshark.org/;
options=(!libtool)
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('dc1e8c9800b64130674b120a183e2308')
+md5sums=('301677b5f8150265315632fb6247e06e')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
[arch-commits] Commit in wireshark/repos (12 files)
Date: Friday, September 9, 2011 @ 08:10:57
Author: guillaume
Revision: 137559
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
wireshark/repos/extra-i686/PKGBUILD
(from rev 137558, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-i686/wireshark-gtk.install
(from rev 137558, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-i686/wireshark.install
(from rev 137558, wireshark/trunk/wireshark.install)
wireshark/repos/extra-x86_64/PKGBUILD
(from rev 137558, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-x86_64/wireshark-gtk.install
(from rev 137558, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-x86_64/wireshark.install
(from rev 137558, wireshark/trunk/wireshark.install)
Deleted:
wireshark/repos/extra-i686/PKGBUILD
wireshark/repos/extra-i686/wireshark-gtk.install
wireshark/repos/extra-i686/wireshark.install
wireshark/repos/extra-x86_64/PKGBUILD
wireshark/repos/extra-x86_64/wireshark-gtk.install
wireshark/repos/extra-x86_64/wireshark.install
+
extra-i686/PKGBUILD| 114 +--
extra-i686/wireshark-gtk.install | 22 +++---
extra-i686/wireshark.install | 36 +--
extra-x86_64/PKGBUILD | 114 +--
extra-x86_64/wireshark-gtk.install | 22 +++---
extra-x86_64/wireshark.install | 36 +--
6 files changed, 172 insertions(+), 172 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-09 12:09:37 UTC (rev 137558)
+++ extra-i686/PKGBUILD 2011-09-09 12:10:57 UTC (rev 137559)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guillaume at alaux dot net
-# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
-pkgname=(wireshark-cli wireshark-gtk)
-pkgbase=wireshark
-pkgver=1.6.1
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
'libgcrypt' 'lua')
-url=http://www.wireshark.org/;
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('dc1e8c9800b64130674b120a183e2308')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- ./configure \
- --prefix=/usr \
- --with-ssl \
- --with-zlib=yes \
- --with-lua
- make all
-}
-
-package_wireshark-cli() {
- pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - CLI
version
- depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
- install=wireshark.install
- conflicts=(wireshark)
-
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- #wireshark uid group is 150
- chgrp 150 ${pkgdir}/usr/bin/dumpcap
- chmod 754 ${pkgdir}/usr/bin/dumpcap
- rm $pkgdir/usr/bin/wireshark
-}
-
-package_wireshark-gtk() {
- pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - GTK
frontend
- depends=('gtk2' 'wireshark-cli')
- install=wireshark-gtk.install
- replaces=(wireshark)
- conflicts=(wireshark)
-
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- install -Dm755 .libs/wireshark $pkgdir/usr/bin/wireshark
- for d in 16 32 48; do
- install -Dm644 image/hi${d}-app-wireshark.png
${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
- done
- install -Dm644 wireshark.desktop
${pkgdir}/usr/share/applications/wireshark.desktop
-}
Copied: wireshark/repos/extra-i686/PKGBUILD (from rev 137558,
wireshark/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-09 12:10:57 UTC (rev 137559)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guillaume at alaux dot net
+# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
+pkgname=(wireshark-cli wireshark-gtk)
+pkgbase=wireshark
+pkgver=1.6.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
'libgcrypt' 'lua')
+url=http://www.wireshark.org/;
+options=(!libtool)
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('301677b5f8150265315632fb6247e06e')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --with-ssl \
+ --with-zlib=yes \
+ --with-lua
+ make all
+}
+
+package_wireshark-cli() {
+ pkgdesc=A free network protocol analyzer for Unix/Linux and Windows - CLI
version
+ depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
+ install=wireshark.install
+ conflicts=(wireshark)
+
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+
+ #wireshark uid group is 150
+ chgrp 150 ${pkgdir}/usr/bin/dumpcap
+ chmod 754 ${pkgdir}/usr/bin/dumpcap
+ rm $pkgdir/usr/bin/wireshark
+}
+
+package_wireshark-gtk() {
+ pkgdesc=A free network
[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6.install)
Date: Wednesday, September 14, 2011 @ 12:24:46
Author: guillaume
Revision: 138024
upgpkg: tomcat6 6.0.33-3
Fixed owner of /etc/tomcat6 and tomcat user dir
Modified:
tomcat6/trunk/PKGBUILD
tomcat6/trunk/tomcat6.install
-+
PKGBUILD|9 +
tomcat6.install |2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-14 13:39:16 UTC (rev 138023)
+++ PKGBUILD2011-09-14 16:24:46 UTC (rev 138024)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat6
pkgver=6.0.33
-pkgrel=2
+pkgrel=3
pkgdesc=Servlet-2.5/JSP-2.1 Container
arch=('any')
url='http://tomcat.apache.org/'
@@ -29,7 +29,7 @@
'a6ff671562c9ac91e8cc2812760df49d'
'b9f482437de11587d72b53ddaa2a'
'8f2ccc09837577394441d29a03b0e667'
- '1be39071bd27781c352b2d73b765e29d')
+ 'afdb7edc5c7a7b5fa85ad110d021cad3')
build() {
cd ${srcdir}/apache-tomcat-${pkgver}-src
@@ -65,8 +65,9 @@
touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- install -dm770 ${pkgdir}/etc/${pkgname}
- install -m660 conf/* ${pkgdir}/etc/${pkgname}
+ install -dm775 ${pkgdir}/etc/${pkgname}
+ install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
+ install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
install -dm775 ${pkgdir}/var/lib/${pkgname}
Modified: tomcat6.install
===
--- tomcat6.install 2011-09-14 13:39:16 UTC (rev 138023)
+++ tomcat6.install 2011-09-14 16:24:46 UTC (rev 138024)
@@ -1,6 +1,6 @@
post_install() {
getent group tomcat /dev/null 21 || groupadd -g 66 tomcat
- getent passwd tomcat /dev/null 21 || useradd -u 66 -g tomcat -d
/usr/share/tomcat -s /bin/false tomcat
+ getent passwd tomcat /dev/null 21 || useradd -u 66 -g tomcat -d
/usr/share/tomcat6 -s /bin/false tomcat
if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
echo It appears that your current kernel has linux security
[arch-commits] Commit in tomcat6/repos/extra-any (8 files)
Date: Wednesday, September 14, 2011 @ 12:25:41
Author: guillaume
Revision: 138025
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 138024, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/tomcat6
(from rev 138024, tomcat6/trunk/tomcat6)
tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 138024, tomcat6/trunk/tomcat6.conf.d)
tomcat6/repos/extra-any/tomcat6.install
(from rev 138024, tomcat6/trunk/tomcat6.install)
Deleted:
tomcat6/repos/extra-any/PKGBUILD
tomcat6/repos/extra-any/tomcat6
tomcat6/repos/extra-any/tomcat6.conf.d
tomcat6/repos/extra-any/tomcat6.install
-+
PKGBUILD| 173 +++---
tomcat6 | 154
tomcat6.conf.d | 30 -
tomcat6.install | 54
4 files changed, 206 insertions(+), 205 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-09-14 16:24:46 UTC (rev 138024)
+++ PKGBUILD2011-09-14 16:25:41 UTC (rev 138025)
@@ -1,86 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.33
-pkgrel=2
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- 'b9f482437de11587d72b53ddaa2a'
- '8f2ccc09837577394441d29a03b0e667'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- install ${srcdir}/dbcp-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
- ln -s tomcat-dbcp-${pkgver}.jar \
-${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm770 ${pkgdir}/etc/${pkgname}
- install -m660 conf/* ${pkgdir}/etc/${pkgname}
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 138024,
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-09-14 16:25:41 UTC (rev 138025)
@@ -0,0 +1,87 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat6
+pkgver=6.0.33
+pkgrel=3
+pkgdesc=Servlet-2.5/JSP-2.1 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=5' 'java-jsvc
[arch-commits] Commit in swt/trunk (PKGBUILD)
Date: Monday, September 26, 2011 @ 03:59:11
Author: guillaume
Revision: 138505
upgpkg: swt 3.7.1-1
Upstream release
Modified:
swt/trunk/PKGBUILD
--+
PKGBUILD | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-25 17:23:16 UTC (rev 138504)
+++ PKGBUILD2011-09-26 07:59:11 UTC (rev 138505)
@@ -1,10 +1,10 @@
# $Id$
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=swt
-pkgver=3.7
+pkgver=3.7.1
pkgrel=1
pkgdesc=An open source widget toolkit for Java
-_date=201106131736
+_date=201109091335
arch=(i686 x86_64)
url=http://www.eclipse.org/swt/;
license=('EPL')
@@ -13,23 +13,17 @@
#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner=1.9.1'
'unzip' 'pkgconfig' 'apache-ant')
optdepends=('libgnomeui' 'mesa')
makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig'
'apache-ant')
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
-
http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
-build-swt.xml)
-md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
- '60f11408bc8db299c5406a904a665a5e'
- 'f5e548bc26a0f1f3c18131be76face40')
if [ ${CARCH} = i686 ]; then
source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
build-swt.xml)
noextract=(swt-${pkgver}-gtk-linux-x86.zip)
- md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
+ md5sums=('b7d6d24e2feb7489b0baa0ce941ea4d2'
'f5e548bc26a0f1f3c18131be76face40')
fi
if [ ${CARCH} = x86_64 ]; then
source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
build-swt.xml)
- md5sums=('60f11408bc8db299c5406a904a665a5e'
+ md5sums=('8816631e7993a783a87e98ba39da7fa6'
'f5e548bc26a0f1f3c18131be76face40')
noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
fi
[arch-commits] Commit in swt/repos (8 files)
Date: Monday, September 26, 2011 @ 04:00:12
Author: guillaume
Revision: 138506
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
swt/repos/extra-i686/PKGBUILD
(from rev 138505, swt/trunk/PKGBUILD)
swt/repos/extra-i686/build-swt.xml
(from rev 138505, swt/trunk/build-swt.xml)
swt/repos/extra-x86_64/PKGBUILD
(from rev 138505, swt/trunk/PKGBUILD)
swt/repos/extra-x86_64/build-swt.xml
(from rev 138505, swt/trunk/build-swt.xml)
Deleted:
swt/repos/extra-i686/PKGBUILD
swt/repos/extra-i686/build-swt.xml
swt/repos/extra-x86_64/PKGBUILD
swt/repos/extra-x86_64/build-swt.xml
+
extra-i686/PKGBUILD| 156 ---
extra-i686/build-swt.xml | 34 -
extra-x86_64/PKGBUILD | 156 ---
extra-x86_64/build-swt.xml | 34 -
4 files changed, 184 insertions(+), 196 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-26 07:59:11 UTC (rev 138505)
+++ extra-i686/PKGBUILD 2011-09-26 08:00:12 UTC (rev 138506)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=swt
-pkgver=3.7
-pkgrel=1
-pkgdesc=An open source widget toolkit for Java
-_date=201106131736
-arch=(i686 x86_64)
-url=http://www.eclipse.org/swt/;
-license=('EPL')
-depends=('java-runtime=6' 'gtk2=2.20.1' 'libxtst')
-#optdepends=('libgnomeui' 'xulrunner' 'mesa')
-#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner=1.9.1'
'unzip' 'pkgconfig' 'apache-ant')
-optdepends=('libgnomeui' 'mesa')
-makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig'
'apache-ant')
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
-
http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
-build-swt.xml)
-md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
- '60f11408bc8db299c5406a904a665a5e'
- 'f5e548bc26a0f1f3c18131be76face40')
-if [ ${CARCH} = i686 ]; then
-
source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
- build-swt.xml)
- noextract=(swt-${pkgver}-gtk-linux-x86.zip)
- md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
- 'f5e548bc26a0f1f3c18131be76face40')
-fi
-if [ ${CARCH} = x86_64 ]; then
-
source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
- build-swt.xml)
- md5sums=('60f11408bc8db299c5406a904a665a5e'
- 'f5e548bc26a0f1f3c18131be76face40')
- noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
-fi
-
-build() {
- cd ${srcdir}
- . /etc/profile.d/openjdk6.sh
- . /etc/profile.d/apache-ant.sh
- unzip -jqo ${srcdir}/swt-${pkgver}-gtk-linux-*.zip *src.zip
- unzip -qo src.zip
- rm -rf about_files
- mkdir src
- mv org src/
- cp build-swt.xml build.xml
-
- [ ${CARCH} = x86_64 ] export SWT_PTR_CFLAGS=-DJNI64
-
- make -f make_linux.mak make_awt
- make -f make_linux.mak make_swt
- make -f make_linux.mak make_atk
- make -f make_linux.mak make_gnome
-# XULRunner = 2.0 is not currently supported
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=327696
-#
-# export MOZILLA_INCLUDES=`pkg-config --cflags libxul`
-# export MOZILLA_LIBS=-Wl,-R`pkg-config libxul --variable=libdir`
`pkg-config libxul --libs`
-# export XULRUNNER_INCLUDES=${MOZILLA_INCLUDES}
-# export XULRUNNER_LIBS=${MOZILLA_LIBS}
-# make -f make_linux.mak make_mozilla
-# make -f make_linux.mak make_xulrunner
-
- make -f make_linux.mak make_cairo
- make -f make_linux.mak make_glx
-
- ant compile
-}
-
-package() {
- cd ${srcdir}
- cp version.txt build/version.txt
- cp src/org/eclipse/swt/internal/SWTMessages.properties
build/org/eclipse/swt/internal/
-
- ant jar
-
- install -m755 -d ${pkgdir}/usr/share/java
- install -m755 -d ${pkgdir}/usr/lib
- install -m644 swt.jar ${pkgdir}/usr/share/java/
- install -m755 *.so ${pkgdir}/usr/lib/
-}
Copied: swt/repos/extra-i686/PKGBUILD (from rev 138505, swt/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-26 08:00:12 UTC (rev 138506)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=swt
+pkgver=3.7.1
+pkgrel=1
+pkgdesc=An open source widget toolkit for Java
+_date=201109091335
+arch=(i686 x86_64)
+url=http://www.eclipse.org/swt/;
+license=('EPL')
+depends=('java-runtime=6' 'gtk2=2.20.1' 'libxtst')
+#optdepends=('libgnomeui' 'xulrunner' 'mesa')
+#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner=1.9.1'
'unzip' 'pkgconfig' 'apache-ant')
+optdepends=('libgnomeui' 'mesa')
+makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig'
'apache-ant')
+if [ ${CARCH
[arch-commits] Commit in tomcat/trunk (PKGBUILD tomcat.install)
Date: Monday, September 26, 2011 @ 08:18:42
Author: guillaume
Revision: 138507
upgpkg: tomcat 5.5.34-1
Upstream release
Modified:
tomcat/trunk/PKGBUILD
tomcat/trunk/tomcat.install
+
PKGBUILD | 10 +-
tomcat.install |9 +
2 files changed, 14 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 08:00:12 UTC (rev 138506)
+++ PKGBUILD2011-09-26 12:18:42 UTC (rev 138507)
@@ -2,7 +2,7 @@
# Maintainer: Guillaume ALAUX guillaume at archlinux dot org
# Contributor: Hugo Doria h...@archlinux.org
pkgname=tomcat
-pkgver=5.5.33
+pkgver=5.5.34
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc=Servlet-2.4/JSP-2.0 Container
@@ -15,7 +15,7 @@
source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
'tomcat'
'tomcat.conf.d')
-md5sums=('3d79cd245497b2c501b4fd64e1da641c'
+md5sums=('d09a09bc84409510574a673d35939f16'
'20e6a8e89a148e2b0ac81ca03ceea6b1'
'368322d8a51ce20cc5dbdb505706a16a')
@@ -24,7 +24,7 @@
# build jsvc
cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
tar xzf commons-daemon-native.tar.gz
- cd commons-daemon-1.0.5-native-src/unix
+ cd commons-daemon-1.0.7-native-src/unix
sh configure --with-java=/usr/lib/jvm/java-6-openjdk
make clean
make
@@ -43,7 +43,7 @@
cp -R * ${pkgdir}/opt/tomcat
install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat
install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
- chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps}
+ chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
chmod 0660
${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
- chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps}
+ chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
}
Modified: tomcat.install
===
--- tomcat.install 2011-09-26 08:00:12 UTC (rev 138506)
+++ tomcat.install 2011-09-26 12:18:42 UTC (rev 138507)
@@ -11,6 +11,15 @@
echo Also, you should add it to your MODULES array in rc.conf, so
echo it will be activated automatically at boot-up.
fi
+
+ echo
+ echo == End of life for Apache Tomcat 5.5.x ==
+ echo The Apache Tomcat team announces that support for Apache Tomcat 5.5.x
+ echo will end on 30 September 2012.
+ echo
+ echo You are thus strongly encouraged to migrate to tomcat6 or tomcat7
+ echo
+ echo See the Arch Linux wiki page for tomcat for more information.
}
post_upgrade() {
[arch-commits] Commit in tomcat/repos (16 files)
Date: Monday, September 26, 2011 @ 08:20:21
Author: guillaume
Revision: 138508
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
tomcat/repos/extra-i686/PKGBUILD
(from rev 138507, tomcat/trunk/PKGBUILD)
tomcat/repos/extra-i686/tomcat
(from rev 138507, tomcat/trunk/tomcat)
tomcat/repos/extra-i686/tomcat.conf.d
(from rev 138507, tomcat/trunk/tomcat.conf.d)
tomcat/repos/extra-i686/tomcat.install
(from rev 138507, tomcat/trunk/tomcat.install)
tomcat/repos/extra-x86_64/PKGBUILD
(from rev 138507, tomcat/trunk/PKGBUILD)
tomcat/repos/extra-x86_64/tomcat
(from rev 138507, tomcat/trunk/tomcat)
tomcat/repos/extra-x86_64/tomcat.conf.d
(from rev 138507, tomcat/trunk/tomcat.conf.d)
tomcat/repos/extra-x86_64/tomcat.install
(from rev 138507, tomcat/trunk/tomcat.install)
Deleted:
tomcat/repos/extra-i686/PKGBUILD
tomcat/repos/extra-i686/tomcat
tomcat/repos/extra-i686/tomcat.conf.d
tomcat/repos/extra-i686/tomcat.install
tomcat/repos/extra-x86_64/PKGBUILD
tomcat/repos/extra-x86_64/tomcat
tomcat/repos/extra-x86_64/tomcat.conf.d
tomcat/repos/extra-x86_64/tomcat.install
-+
extra-i686/PKGBUILD | 95 +++--
extra-i686/tomcat | 106 +-
extra-i686/tomcat.conf.d| 10 +--
extra-i686/tomcat.install | 63 ++--
extra-x86_64/PKGBUILD | 95 +++--
extra-x86_64/tomcat | 106 +-
extra-x86_64/tomcat.conf.d | 10 +--
extra-x86_64/tomcat.install | 63 ++--
8 files changed, 286 insertions(+), 262 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-i686/PKGBUILD 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX guillaume at archlinux dot org
-# Contributor: Hugo Doria h...@archlinux.org
-pkgname=tomcat
-pkgver=5.5.33
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc=Servlet container for Java Servlet and JavaServer Pages
-url=http://tomcat.apache.org/;
-license=('APACHE')
-depends=('java-environment')
-makedepends=('openjdk6')
-backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml'
'etc/conf.d/tomcat')
-install=tomcat.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
- 'tomcat'
- 'tomcat.conf.d')
-md5sums=('3d79cd245497b2c501b4fd64e1da641c'
- '20e6a8e89a148e2b0ac81ca03ceea6b1'
- '368322d8a51ce20cc5dbdb505706a16a')
-
-build() {
- unset LDFLAGS
- # build jsvc
- cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
- tar xzf commons-daemon-native.tar.gz
- cd commons-daemon-1.0.5-native-src/unix
- sh configure --with-java=/usr/lib/jvm/java-6-openjdk
- make clean
- make
- cp jsvc ../..
-
- # get rid of some cruft
- cd ${srcdir}/apache-${pkgname}-${pkgver}
- rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt
- rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src
-
- # install everything
- mkdir -p ${pkgdir}/opt/tomcat
- cp -R * ${pkgdir}/opt/tomcat
- install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat
- install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
- chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps}
- chmod 0660
${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
- chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps}
-}
Copied: tomcat/repos/extra-i686/PKGBUILD (from rev 138507,
tomcat/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Guillaume ALAUX guillaume at archlinux dot org
+# Contributor: Hugo Doria h...@archlinux.org
+pkgname=tomcat
+pkgver=5.5.34
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc=Servlet-2.4/JSP-2.0 Container
+url=http://tomcat.apache.org/;
+license=('APACHE')
+depends=('java-environment')
+makedepends=('openjdk6')
+backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml'
'etc/conf.d/tomcat')
+install=tomcat.install
+source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
+ 'tomcat'
+ 'tomcat.conf.d')
+md5sums=('d09a09bc84409510574a673d35939f16'
+ '20e6a8e89a148e2b0ac81ca03ceea6b1'
+ '368322d8a51ce20cc5dbdb505706a16a')
+
+build() {
+ unset LDFLAGS
+ # build jsvc
+ cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
+ tar xzf commons-daemon-native.tar.gz
+ cd commons-daemon-1.0.7-native-src/unix
+ sh configure --with-java=/usr/lib/jvm/java-6-openjdk
+ make clean
+ make
+ cp jsvc ../..
+}
+
+package() {
+ cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
+ # get rid of some cruft
[arch-commits] Commit in tomcat7/trunk (PKGBUILD)
Date: Saturday, October 1, 2011 @ 12:57:12
Author: guillaume
Revision: 139198
upgpkg: tomcat7 7.0.22-1
Upstream release
Modified:
tomcat7/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-01 16:36:50 UTC (rev 139197)
+++ PKGBUILD2011-10-01 16:57:12 UTC (rev 139198)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
-pkgver=7.0.21
-pkgrel=2
+pkgver=7.0.22
+pkgrel=1
pkgdesc=Servlet-3.0/JSP-2.2 Container
arch=('any')
url='http://tomcat.apache.org/'
@@ -23,7 +23,7 @@
tomcat7
tomcat7.install)
-md5sums=('40d71249a54526ab0145fd5b41008518'
+md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
'0fa46eae1746d6cd564905bfb0072776'
'361a41c02930a4e43245ab7379a617e9'
'6c5b4ed6d71b227f305b751c349fa31b')
[arch-commits] Commit in tomcat7/repos/extra-any (8 files)
Date: Saturday, October 1, 2011 @ 12:58:06
Author: guillaume
Revision: 139199
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 139198, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/tomcat7
(from rev 139198, tomcat7/trunk/tomcat7)
tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 139198, tomcat7/trunk/tomcat7.conf.d)
tomcat7/repos/extra-any/tomcat7.install
(from rev 139198, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/tomcat7
tomcat7/repos/extra-any/tomcat7.conf.d
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 160 +++---
tomcat7 | 154 +--
tomcat7.conf.d | 30 +-
tomcat7.install | 54 +-
4 files changed, 199 insertions(+), 199 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-10-01 16:57:12 UTC (rev 139198)
+++ PKGBUILD2011-10-01 16:58:06 UTC (rev 139199)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.21
-pkgrel=2
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('40d71249a54526ab0145fd5b41008518'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 139198,
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-10-01 16:58:06 UTC (rev 139199)
@@ -0,0 +1,80 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat7
+pkgver=7.0.22
+pkgrel=1
+pkgdesc=Servlet-3.0/JSP-2.2 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
+optdepends=('tomcat-native: to allow optimal performance in production
environments')
+backup=(etc/tomcat7/catalina.policy
+etc/tomcat7/catalina.properties
+etc/tomcat7/context.xml
+etc/tomcat7/logging.properties
+etc/tomcat7
[arch-commits] Commit in hunspell-fr/trunk (PKGBUILD)
Date: Sunday, October 9, 2011 @ 06:43:43
Author: guillaume
Revision: 140205
upgpkg: hunspell-fr 4.3-1
Upstream release
Modified:
hunspell-fr/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-09 10:15:48 UTC (rev 140204)
+++ PKGBUILD2011-10-09 10:43:43 UTC (rev 140205)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=hunspell-fr
-pkgver=4.2
+pkgver=4.3
pkgrel=1
pkgdesc=French (modern) hunspell dictionaries
arch=(any)
@@ -9,7 +9,7 @@
license=('GPL' 'MPL' 'LGPL')
optdepends=('hunspell: the spell checking libraries and apps')
source=(http://www.dicollecte.org/download/fr/${pkgname}-moderne-v${pkgver}.zip)
-md5sums=('d772d909a287ce28c80d9d60e3a02c37')
+md5sums=('57021eb1a924f4f28bd14208978a957b')
package() {
cd ${srcdir}
[arch-commits] Commit in hunspell-fr/repos/extra-any (PKGBUILD PKGBUILD)
Date: Sunday, October 9, 2011 @ 06:44:04
Author: guillaume
Revision: 140206
archrelease: copy trunk to extra-any
Added:
hunspell-fr/repos/extra-any/PKGBUILD
(from rev 140205, hunspell-fr/trunk/PKGBUILD)
Deleted:
hunspell-fr/repos/extra-any/PKGBUILD
--+
PKGBUILD | 80 ++---
1 file changed, 40 insertions(+), 40 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-10-09 10:43:43 UTC (rev 140205)
+++ PKGBUILD2011-10-09 10:44:04 UTC (rev 140206)
@@ -1,40 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-
-pkgname=hunspell-fr
-pkgver=4.2
-pkgrel=1
-pkgdesc=French (modern) hunspell dictionaries
-arch=(any)
-url=http://www.dicollecte.org/;
-license=('GPL' 'MPL' 'LGPL')
-optdepends=('hunspell: the spell checking libraries and apps')
-source=(http://www.dicollecte.org/download/fr/${pkgname}-moderne-v${pkgver}.zip)
-md5sums=('d772d909a287ce28c80d9d60e3a02c37')
-
-package() {
- cd ${srcdir}
- install -dm755 ${pkgdir}/usr/share/hunspell
- install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
- install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
-
- pushd ${pkgdir}/usr/share/hunspell/
- fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
- for lang in ${fr_FR_aliases}; do
- ln -s fr_FR.aff ${lang}.aff
- ln -s fr_FR.dic ${lang}.dic
- done
-
- popd
-
- # the symlinks
- install -dm755 ${pkgdir}/usr/share/myspell/dicts
- pushd ${pkgdir}/usr/share/myspell/dicts
-for file in ${pkgdir}/usr/share/hunspell/*; do
- ln -sv /usr/share/hunspell/$(basename ${file}) .
-done
- popd
-
- # docs
- install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
- install -m644 README_fr.txt $pkgdir/usr/share/doc/${pkgname}/README_fr.txt
-}
Copied: hunspell-fr/repos/extra-any/PKGBUILD (from rev 140205,
hunspell-fr/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-10-09 10:44:04 UTC (rev 140206)
@@ -0,0 +1,40 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+
+pkgname=hunspell-fr
+pkgver=4.3
+pkgrel=1
+pkgdesc=French (modern) hunspell dictionaries
+arch=(any)
+url=http://www.dicollecte.org/;
+license=('GPL' 'MPL' 'LGPL')
+optdepends=('hunspell: the spell checking libraries and apps')
+source=(http://www.dicollecte.org/download/fr/${pkgname}-moderne-v${pkgver}.zip)
+md5sums=('57021eb1a924f4f28bd14208978a957b')
+
+package() {
+ cd ${srcdir}
+ install -dm755 ${pkgdir}/usr/share/hunspell
+ install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
+ install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
+
+ pushd ${pkgdir}/usr/share/hunspell/
+ fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
+ for lang in ${fr_FR_aliases}; do
+ ln -s fr_FR.aff ${lang}.aff
+ ln -s fr_FR.dic ${lang}.dic
+ done
+
+ popd
+
+ # the symlinks
+ install -dm755 ${pkgdir}/usr/share/myspell/dicts
+ pushd ${pkgdir}/usr/share/myspell/dicts
+for file in ${pkgdir}/usr/share/hunspell/*; do
+ ln -sv /usr/share/hunspell/$(basename ${file}) .
+done
+ popd
+
+ # docs
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
+ install -m644 README_fr.txt $pkgdir/usr/share/doc/${pkgname}/README_fr.txt
+}
[arch-commits] Commit in rhino/trunk (PKGBUILD)
Date: Sunday, October 16, 2011 @ 09:18:03
Author: guillaume
Revision: 140518
upgpkg: rhino 1.7R3-1
Upstream release
Modified:
rhino/trunk/PKGBUILD
--+
PKGBUILD | 42 --
1 file changed, 32 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-16 08:44:24 UTC (rev 140517)
+++ PKGBUILD2011-10-16 13:18:03 UTC (rev 140518)
@@ -1,23 +1,45 @@
# $Id$
# Maintainer: Andreas Radke andy...@archlinux.org
-# Maintainer: Jan de Groot j...@archlinux.org
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+# Contributor: Jan de Groot j...@archlinux.org
-pkgname=rhino
+pkgbase=rhino
+pkgname=('rhino' 'rhino-javadoc')
pkgver=1.7R3
pkgrel=1
-pkgdesc=Open-source implementation of JavaScript written entirely in Java
arch=('any')
url=http://www.mozilla.org/rhino/;
license=('MPL' 'GPL2')
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino${pkgver/./_}.zip)
-md5sums=('99d94103662a8d0b571e247a77432ac5')
+makedepends=('apache-ant')
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/js/${pkgname}${pkgver/./_}.zip
+http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.5.0.tgz)
+md5sums=('99d94103662a8d0b571e247a77432ac5'
+ '982e8e3d36aa5f7839f7675adc2b0c53')
build() {
- /bin/true
+ cd ${srcdir}/${pkgname}${pkgver/./_}
+ ant \
+-Dxbean.jar=${srcdir}/xmlbeans-2.5.0/lib/xbean.jar \
+-Djsr173.jar=${srcdir}/xmlbeans-2.5.0/lib/jsr173_1.0_api.jar \
+jar \
+javadoc
}
-package() {
- cd ${srcdir}/rhino${pkgver/./_}
- install -m755 -d ${pkgdir}/usr/share/java
- install -m644 js.jar ${pkgdir}/usr/share/java/
+# As explained on the build.xml, tests are difficult to run from CLI. We skip
them.
+
+package_rhino() {
+ pkgdesc=Open-source implementation of JavaScript written entirely in Java
+ depends=('java-runtime')
+
+ cd ${srcdir}/${pkgname}${pkgver/./_}/build/${pkgname}${pkgver/./_}
+ install -Dm644 js.jar ${pkgdir}/usr/share/java/js-${pkgver}.jar
+ ln -s js-${pkgver}.jar ${pkgdir}/usr/share/java/js.jar
}
+
+package_rhino-javadoc() {
+ pkgdesc=Open-source implementation of JavaScript written entirely in Java -
Javadoc
+
+ cd ${srcdir}/${pkgbase}${pkgver/./_}/build/${pkgbase}${pkgver/./_}
+ install -m755 -d ${pkgdir}/usr/share/${pkgbase}
+ cp -r javadoc ${pkgdir}/usr/share/${pkgbase}
+}
[arch-commits] Commit in java7-openjdk/trunk (3 files)
Date: Thursday, October 20, 2011 @ 16:45:56
Author: guillaume
Revision: 140987
upgpkg: java7-openjdk 7.b147_2.0-2
Fixed #26531 - added dependency 'gsettings-desktop-schemas'
Modified:
java7-openjdk/trunk/PKGBUILD
java7-openjdk/trunk/jdk7-openjdk.profile
java7-openjdk/trunk/jre7-openjdk.install
--+
PKGBUILD | 39 +++
jdk7-openjdk.profile |2 +-
jre7-openjdk.install |2 +-
3 files changed, 21 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-20 20:16:15 UTC (rev 140986)
+++ PKGBUILD2011-10-20 20:45:56 UTC (rev 140987)
@@ -20,7 +20,7 @@
_OPENJDK_CHANGESET=0a76e5390e68
pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url=http://icedtea.classpath.org;
license=('custom')
@@ -28,8 +28,8 @@
'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant=1.6.5'
'giflib'
'libjpeg=6b' 'zlib' 'rhino' 'libpulse=0.9.11' 'zip' 'unzip'
'cpio' 'lcms2')
source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
-
http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-
http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz
# openjdk.tar.gz
+
http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
+
http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz
# openjdk.tar.gz
http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz
# corba.tar.gz
http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
# jaxp.tar.gz
http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
# jaxws.tar.gz
@@ -68,7 +68,7 @@
'f7e7a212e50abb56a6ef1a2b1bd27405'
'c195c4865b84d9e2e0fd71ac6d88eadb'
'203640d6e79e41b0065e016818c17ccd'
- 'fe39da48a62b1fdd8fc24de0e0c4b525'
+ 'b7b8996448c7b4fa7dd2d744488ed3bd'
'cdabafad0ec413d9a983888bf445a443'
'612b0fec7e0943c37a6de77c43622007'
'62443459da0cb28181feb260dc0e5ce7'
@@ -92,7 +92,7 @@
unset JAVA_HOME
unset CLASSPATH
# default is to build with first found java-environment found in our repos -
is jdk7-openjdk
- [ -f /etc/profile.d/jdk7-openjdk.sh ] . /etc/profile.d/jdk7-openjdk.sh
+ [ -f /etc/profile.d/jdk7.sh ] . /etc/profile.d/jdk7.sh
unset MAKEFLAGS
export ALT_PARALLEL_COMPILE_JOBS=${MAKEFLAGS/-j}
@@ -107,11 +107,11 @@
# autoreconf --force --install
./configure \
- --disable-bootstrap \
- --with-parallel-jobs=${MAKEFLAGS/-j} \
+--disable-bootstrap \
+--with-parallel-jobs=${MAKEFLAGS/-j} \
--disable-tests \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \
- --with-jdk-home=${JAVA_HOME} \
+--with-jdk-home=${JAVA_HOME} \
--with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
--with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
--with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
@@ -120,16 +120,15 @@
--with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
--with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
--enable-pulse-java \
-# --with-rhino #--help
+#--with-rhino #--help
#--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
#--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
#--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
-
-#--enable-systemtap Enable inclusion of SystemTap trace support
-#--enable-nssEnable inclusion of NSS security provider
-#--with-abs-install-dir The absolute path where the j2sdk-image dir
will be installed
+# --enable-systemtap Enable inclusion of SystemTap trace support
+# --enable-nssEnable inclusion of NSS security provider
+# --with-abs-install-dir The absolute path where the j2sdk-image dir will
be installed
make
}
@@ -142,14 +141,14 @@
package_jre7-openjdk() {
pkgdesc=Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing
binary plugs - runtime environment
depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst'
- 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
+ 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng'
'gsettings-desktop-schemas')
optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
'alsa-lib: for sound'
'giflib: for gif format support')
provides=('java-runtime=7')
conflicts=('java-runtime')
#
[arch-commits] Commit in java7-openjdk/repos (26 files)
Date: Thursday, October 20, 2011 @ 16:52:10 Author: guillaume Revision: 140988 archrelease: copy trunk to extra-i686, extra-x86_64 Added: java7-openjdk/repos/extra-i686/ java7-openjdk/repos/extra-i686/PKGBUILD (from rev 140987, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/extra-i686/fix_corba_cmds_path.diff (from rev 140987, java7-openjdk/trunk/fix_corba_cmds_path.diff) java7-openjdk/repos/extra-i686/fontconfig-paths.diff (from rev 140987, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/extra-i686/jconsole.desktop (from rev 140987, java7-openjdk/trunk/jconsole.desktop) java7-openjdk/repos/extra-i686/jdk7-openjdk.profile (from rev 140987, java7-openjdk/trunk/jdk7-openjdk.profile) java7-openjdk/repos/extra-i686/jdk7-openjdk.profile.csh (from rev 140987, java7-openjdk/trunk/jdk7-openjdk.profile.csh) java7-openjdk/repos/extra-i686/jre7-openjdk.install (from rev 140987, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/extra-i686/jre7-openjdk.profile (from rev 140987, java7-openjdk/trunk/jre7-openjdk.profile) java7-openjdk/repos/extra-i686/jre7-openjdk.profile.csh (from rev 140987, java7-openjdk/trunk/jre7-openjdk.profile.csh) java7-openjdk/repos/extra-i686/openjdk7_fix_jdk_cmds_path.diff (from rev 140987, java7-openjdk/trunk/openjdk7_fix_jdk_cmds_path.diff) java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff (from rev 140987, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) java7-openjdk/repos/extra-i686/policytool.desktop (from rev 140987, java7-openjdk/trunk/policytool.desktop) java7-openjdk/repos/extra-x86_64/ java7-openjdk/repos/extra-x86_64/PKGBUILD (from rev 140987, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/extra-x86_64/fix_corba_cmds_path.diff (from rev 140987, java7-openjdk/trunk/fix_corba_cmds_path.diff) java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff (from rev 140987, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/extra-x86_64/jconsole.desktop (from rev 140987, java7-openjdk/trunk/jconsole.desktop) java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile (from rev 140987, java7-openjdk/trunk/jdk7-openjdk.profile) java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile.csh (from rev 140987, java7-openjdk/trunk/jdk7-openjdk.profile.csh) java7-openjdk/repos/extra-x86_64/jre7-openjdk.install (from rev 140987, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile (from rev 140987, java7-openjdk/trunk/jre7-openjdk.profile) java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile.csh (from rev 140987, java7-openjdk/trunk/jre7-openjdk.profile.csh) java7-openjdk/repos/extra-x86_64/openjdk7_fix_jdk_cmds_path.diff (from rev 140987, java7-openjdk/trunk/openjdk7_fix_jdk_cmds_path.diff) java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff (from rev 140987, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) java7-openjdk/repos/extra-x86_64/policytool.desktop (from rev 140987, java7-openjdk/trunk/policytool.desktop) --+ extra-i686/PKGBUILD | 263 + extra-i686/fix_corba_cmds_path.diff | 33 +++ extra-i686/fontconfig-paths.diff | 134 extra-i686/jconsole.desktop | 10 extra-i686/jdk7-openjdk.profile |6 extra-i686/jdk7-openjdk.profile.csh |1 extra-i686/jre7-openjdk.install | 24 ++ extra-i686/jre7-openjdk.profile |5 extra-i686/jre7-openjdk.profile.csh |5 extra-i686/openjdk7_fix_jdk_cmds_path.diff | 24 ++ extra-i686/openjdk7_nonreparenting-wm.diff | 58 + extra-i686/policytool.desktop| 10 extra-x86_64/PKGBUILD| 263 + extra-x86_64/fix_corba_cmds_path.diff| 33 +++ extra-x86_64/fontconfig-paths.diff | 134 extra-x86_64/jconsole.desktop| 10 extra-x86_64/jdk7-openjdk.profile|6 extra-x86_64/jdk7-openjdk.profile.csh|1 extra-x86_64/jre7-openjdk.install| 24 ++ extra-x86_64/jre7-openjdk.profile|5 extra-x86_64/jre7-openjdk.profile.csh|5 extra-x86_64/openjdk7_fix_jdk_cmds_path.diff | 24 ++ extra-x86_64/openjdk7_nonreparenting-wm.diff | 58 + extra-x86_64/policytool.desktop | 10 24 files changed, 1146 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 140987:140988 to see the changes.
[arch-commits] Commit in hunspell-fr/trunk (PKGBUILD)
Date: Sunday, July 17, 2011 @ 14:04:30
Author: guillaume
Revision: 131938
upgpkg: hunspell-fr 4.2-1
Upstream release
Modified:
hunspell-fr/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-07-17 14:57:48 UTC (rev 131937)
+++ PKGBUILD2011-07-17 18:04:30 UTC (rev 131938)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=hunspell-fr
-pkgver=4.1
+pkgver=4.2
pkgrel=1
pkgdesc=French (modern) hunspell dictionaries
arch=(any)
@@ -9,7 +9,7 @@
license=('GPL' 'MPL' 'LGPL')
optdepends=('hunspell: the spell checking libraries and apps')
source=(http://www.dicollecte.org/download/fr/${pkgname}-moderne-v${pkgver}.zip)
-md5sums=('f922f8badc7baa18278ffe2362e19157')
+md5sums=('d772d909a287ce28c80d9d60e3a02c37')
package() {
cd ${srcdir}
[arch-commits] Commit in hunspell-fr/repos (extra-any)
Date: Sunday, July 17, 2011 @ 14:04:33 Author: guillaume Revision: 131939 archrelease: remove extra-any Deleted: hunspell-fr/repos/extra-any/
[arch-commits] Commit in hunspell-fr/repos (extra-any)
Date: Sunday, July 17, 2011 @ 14:04:46 Author: guillaume Revision: 131940 archrelease: copy trunk to extra-any Added: hunspell-fr/repos/extra-any/
[arch-commits] Commit in tomcat7/trunk (PKGBUILD)
Date: Tuesday, July 19, 2011 @ 16:02:48
Author: guillaume
Revision: 132071
upgpkg: tomcat7 7.0.19-1
Upstream release
Modified:
tomcat7/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-07-19 19:13:48 UTC (rev 132070)
+++ PKGBUILD2011-07-19 20:02:48 UTC (rev 132071)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
-pkgver=7.0.16
-pkgrel=2
+pkgver=7.0.19
+pkgrel=1
pkgdesc=Servlet-3.0/JSP-2.2 Container
arch=('any')
url='http://tomcat.apache.org/'
@@ -24,7 +24,7 @@
tomcat7.install)
noextract=(dbcp-${pkgver}.jar)
-md5sums=('71740312baa57ebe4d9ffef2b5d7b10d'
+md5sums=('8ff875b37e463b481b8e5c30b9368ac1'
'13eb5570b4d7dcbbe8b8372575c010c9'
'70eabcf5bbfa0978e738d95c64abb7a7'
'1be39071bd27781c352b2d73b765e29d')
[arch-commits] Commit in tomcat7/repos (extra-any)
Date: Tuesday, July 19, 2011 @ 16:03:00 Author: guillaume Revision: 132072 archrelease: remove extra-any Deleted: tomcat7/repos/extra-any/
[arch-commits] Commit in tomcat7/repos (extra-any)
Date: Tuesday, July 19, 2011 @ 16:03:20 Author: guillaume Revision: 132073 archrelease: copy trunk to extra-any Added: tomcat7/repos/extra-any/
[arch-commits] Commit in wireshark/trunk (PKGBUILD)
Date: Tuesday, July 19, 2011 @ 16:50:29
Author: guillaume
Revision: 132077
upgpkg: wireshark 1.6.1-1
Upstream release
Modified:
wireshark/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-07-19 20:24:43 UTC (rev 132076)
+++ PKGBUILD2011-07-19 20:50:29 UTC (rev 132077)
@@ -3,7 +3,7 @@
# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
pkgname=(wireshark-cli wireshark-gtk)
pkgbase=wireshark
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -11,7 +11,7 @@
url=http://www.wireshark.org/;
options=(!libtool)
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('9f9314c89bf1c8b440a7909884838cfd')
+md5sums=('dc1e8c9800b64130674b120a183e2308')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
[arch-commits] Commit in wireshark/repos (extra-i686)
Date: Tuesday, July 19, 2011 @ 16:50:33 Author: guillaume Revision: 132078 archrelease: remove extra-i686 Deleted: wireshark/repos/extra-i686/
[arch-commits] Commit in wireshark/repos (extra-i686)
Date: Tuesday, July 19, 2011 @ 16:50:49 Author: guillaume Revision: 132079 archrelease: copy trunk to extra-i686 Added: wireshark/repos/extra-i686/
[arch-commits] Commit in wireshark/repos (extra-x86_64)
Date: Tuesday, July 19, 2011 @ 16:50:53 Author: guillaume Revision: 132080 archrelease: remove extra-x86_64 Deleted: wireshark/repos/extra-x86_64/
[arch-commits] Commit in wireshark/repos (extra-x86_64)
Date: Tuesday, July 19, 2011 @ 16:51:09 Author: guillaume Revision: 132081 archrelease: copy trunk to extra-x86_64 Added: wireshark/repos/extra-x86_64/
[arch-commits] Commit in tomcat-native/trunk (PKGBUILD)
Date: Tuesday, August 9, 2011 @ 06:13:38
Author: guillaume
Revision: 134911
upgpkg: tomcat-native 1.1.22-1
Upstream release
Modified:
tomcat-native/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-08 22:40:00 UTC (rev 134910)
+++ PKGBUILD2011-08-09 10:13:38 UTC (rev 134911)
@@ -2,8 +2,8 @@
# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
pkgname=tomcat-native
-pkgver=1.1.20
-pkgrel=2
+pkgver=1.1.22
+pkgrel=1
pkgdesc=The Apache Tomcat Native Library
arch=('i686' 'x86_64')
url=http://tomcat.apache.org/;
@@ -11,7 +11,7 @@
depends=('apr' 'openssl')
makedepends=('java-environment')
source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('fb2b9d073cb6575c2d0020eda266ca0c')
+md5sums=('44d764f8d99d0454c7337ba9701558ee')
build() {
cd ${srcdir}/tomcat-native-${pkgver}-src/jni/native
[arch-commits] Commit in tomcat-native/repos (extra-i686)
Date: Tuesday, August 9, 2011 @ 06:13:49 Author: guillaume Revision: 134912 archrelease: remove extra-i686 Deleted: tomcat-native/repos/extra-i686/
[arch-commits] Commit in tomcat-native/repos (extra-i686)
Date: Tuesday, August 9, 2011 @ 06:14:06 Author: guillaume Revision: 134913 archrelease: copy trunk to extra-i686 Added: tomcat-native/repos/extra-i686/
[arch-commits] Commit in tomcat-native/repos (extra-x86_64)
Date: Tuesday, August 9, 2011 @ 06:14:10 Author: guillaume Revision: 134914 archrelease: remove extra-x86_64 Deleted: tomcat-native/repos/extra-x86_64/
[arch-commits] Commit in tomcat-native/repos (extra-x86_64)
Date: Tuesday, August 9, 2011 @ 06:14:26 Author: guillaume Revision: 134915 archrelease: copy trunk to extra-x86_64 Added: tomcat-native/repos/extra-x86_64/
[arch-commits] Commit in wireshark/repos (staging-i686)
Date: Tuesday, August 9, 2011 @ 09:31:39 Author: guillaume Revision: 134927 archrelease: copy trunk to staging-i686 Added: wireshark/repos/staging-i686/
[arch-commits] Commit in wireshark/repos (staging-x86_64)
Date: Tuesday, August 9, 2011 @ 09:31:51 Author: guillaume Revision: 134928 archrelease: copy trunk to staging-x86_64 Added: wireshark/repos/staging-x86_64/
[arch-commits] Commit in wireshark/trunk (PKGBUILD)
Date: Tuesday, August 9, 2011 @ 10:19:48
Author: guillaume
Revision: 134932
upgpkg: wireshark 1.6.1-2
Rebuild for gnutls 3.0.0
Modified:
wireshark/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-09 13:39:31 UTC (rev 134931)
+++ PKGBUILD2011-08-09 14:19:48 UTC (rev 134932)
@@ -4,7 +4,7 @@
pkgname=(wireshark-cli wireshark-gtk)
pkgbase=wireshark
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL2')
makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap'
'lua')
[arch-commits] Commit in wireshark/repos (staging-i686)
Date: Tuesday, August 9, 2011 @ 10:19:51 Author: guillaume Revision: 134933 archrelease: remove staging-i686 Deleted: wireshark/repos/staging-i686/
[arch-commits] Commit in wireshark/repos (staging-i686)
Date: Tuesday, August 9, 2011 @ 10:20:04 Author: guillaume Revision: 134934 archrelease: copy trunk to staging-i686 Added: wireshark/repos/staging-i686/
[arch-commits] Commit in wireshark/repos (staging-x86_64)
Date: Tuesday, August 9, 2011 @ 10:20:06 Author: guillaume Revision: 134935 archrelease: remove staging-x86_64 Deleted: wireshark/repos/staging-x86_64/
[arch-commits] Commit in wireshark/repos (staging-x86_64)
Date: Tuesday, August 9, 2011 @ 10:20:18 Author: guillaume Revision: 134936 archrelease: copy trunk to staging-x86_64 Added: wireshark/repos/staging-x86_64/
[arch-commits] Commit in java-commons-daemon/trunk (PKGBUILD)
Date: Friday, August 12, 2011 @ 09:22:21
Author: guillaume
Revision: 135298
upgpkg: java-commons-daemon 1.0.6-1
Upstream release
Modified:
java-commons-daemon/trunk/PKGBUILD
--+
PKGBUILD |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-12 10:01:57 UTC (rev 135297)
+++ PKGBUILD2011-08-12 13:22:21 UTC (rev 135298)
@@ -1,14 +1,14 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=('java-commons-daemon' 'java-jsvc')
pkgbase=java-commons-daemon
-pkgver=1.0.5
+pkgver=1.0.6
pkgrel=1
arch=('i686' 'x86_64')
url=http://commons.apache.org/daemon/;
license=('APACHE')
_libname=commons-daemon
source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('2fe0a35d4a9c0338ecd45dad20f33662')
+md5sums=('28dc2e0a3634b2dc3605e9e6444d079f')
makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
@@ -25,7 +25,7 @@
}
package_java-commons-daemon() {
- pkgdesc=Set of Apache libraries for making Java applications run on UNIX
more easily
+ pkgdesc=Alternative invocation mechanism for unix-daemon-like java code
depends=('java-runtime')
cd ${srcdir}/${_libname}-${pkgver}-src
@@ -40,7 +40,6 @@
pkgdesc=Apache application for making Java applications run on UNIX more
easily
depends=(java-${_libname} 'libcap')
- # jsvc
cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
[arch-commits] Commit in java-commons-daemon/repos (extra-i686)
Date: Friday, August 12, 2011 @ 09:22:33 Author: guillaume Revision: 135299 archrelease: remove extra-i686 Deleted: java-commons-daemon/repos/extra-i686/
[arch-commits] Commit in java-commons-daemon/repos (extra-i686)
Date: Friday, August 12, 2011 @ 09:22:47 Author: guillaume Revision: 135300 archrelease: copy trunk to extra-i686 Added: java-commons-daemon/repos/extra-i686/
[arch-commits] Commit in java-commons-daemon/repos (extra-x86_64)
Date: Friday, August 12, 2011 @ 09:22:51 Author: guillaume Revision: 135301 archrelease: remove extra-x86_64 Deleted: java-commons-daemon/repos/extra-x86_64/
[arch-commits] Commit in java-commons-daemon/repos (extra-x86_64)
Date: Friday, August 12, 2011 @ 09:23:05 Author: guillaume Revision: 135302 archrelease: copy trunk to extra-x86_64 Added: java-commons-daemon/repos/extra-x86_64/
[arch-commits] Commit in tomcat7/trunk (PKGBUILD)
Date: Friday, August 12, 2011 @ 09:24:00
Author: guillaume
Revision: 135303
upgpkg: tomcat7 7.0.20-1
Upstream release
Modified:
tomcat7/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-12 13:23:05 UTC (rev 135302)
+++ PKGBUILD2011-08-12 13:24:00 UTC (rev 135303)
@@ -1,6 +1,6 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
-pkgver=7.0.19
+pkgver=7.0.20
pkgrel=1
pkgdesc=Servlet-3.0/JSP-2.2 Container
arch=('any')
@@ -24,7 +24,7 @@
tomcat7.install)
noextract=(dbcp-${pkgver}.jar)
-md5sums=('8ff875b37e463b481b8e5c30b9368ac1'
+md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
'13eb5570b4d7dcbbe8b8372575c010c9'
'70eabcf5bbfa0978e738d95c64abb7a7'
'1be39071bd27781c352b2d73b765e29d')
[arch-commits] Commit in tomcat7/repos (extra-any)
Date: Friday, August 12, 2011 @ 09:24:04 Author: guillaume Revision: 135304 archrelease: remove extra-any Deleted: tomcat7/repos/extra-any/
[arch-commits] Commit in tomcat7/repos (extra-any)
Date: Friday, August 12, 2011 @ 09:24:18 Author: guillaume Revision: 135305 archrelease: copy trunk to extra-any Added: tomcat7/repos/extra-any/
[arch-commits] Commit in tomcat6/trunk (PKGBUILD)
Date: Sunday, August 21, 2011 @ 05:40:04
Author: guillaume
Revision: 136004
upgpkg: tomcat6 6.0.33-1
Upstream release
Modified:
tomcat6/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 09:18:58 UTC (rev 136003)
+++ PKGBUILD2011-08-21 09:40:04 UTC (rev 136004)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat6
-pkgver=6.0.32
-pkgrel=2
+pkgver=6.0.33
+pkgrel=1
pkgdesc=Servlet-2.5/JSP-2.1 Container
arch=('any')
url='http://tomcat.apache.org/'
@@ -25,8 +25,8 @@
tomcat6.install)
noextract=(dbcp-${pkgver}.jar)
-md5sums=('19a1eaa9c9938b520d3c360d8cf4af22'
- 'c5b7101dbe6ed66624db6eca70d7873a'
+md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
+ 'a6ff671562c9ac91e8cc2812760df49d'
'84e819ababbc8e1ac5c325d8af7febf8'
'50de34665d96f8e12d0a0d3d9a15fc1a'
'1be39071bd27781c352b2d73b765e29d')
[arch-commits] Commit in tomcat6/repos/extra-any (8 files)
Date: Sunday, August 21, 2011 @ 05:41:12
Author: guillaume
Revision: 136005
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 136004, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/tomcat6
(from rev 136004, tomcat6/trunk/tomcat6)
tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 136004, tomcat6/trunk/tomcat6.conf.d)
tomcat6/repos/extra-any/tomcat6.install
(from rev 136004, tomcat6/trunk/tomcat6.install)
Deleted:
tomcat6/repos/extra-any/PKGBUILD
tomcat6/repos/extra-any/tomcat6
tomcat6/repos/extra-any/tomcat6.conf.d
tomcat6/repos/extra-any/tomcat6.install
-+
PKGBUILD| 172 +++---
tomcat6 | 162 +-
tomcat6.conf.d | 22 +++---
tomcat6.install | 54
4 files changed, 205 insertions(+), 205 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:40:04 UTC (rev 136004)
+++ PKGBUILD2011-08-21 09:41:12 UTC (rev 136005)
@@ -1,86 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.32
-pkgrel=2
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('19a1eaa9c9938b520d3c360d8cf4af22'
- 'c5b7101dbe6ed66624db6eca70d7873a'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- install ${srcdir}/dbcp-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
- ln -s tomcat-dbcp-${pkgver}.jar \
-${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm770 ${pkgdir}/etc/${pkgname}
- install -m660 conf/* ${pkgdir}/etc/${pkgname}
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 136004,
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:41:12 UTC (rev 136005)
@@ -0,0 +1,86 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat6
+pkgver=6.0.33
+pkgrel=1
+pkgdesc=Servlet-2.5/JSP-2.1 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj
[arch-commits] Commit in tomcat6/trunk (tomcat6)
Date: Sunday, August 21, 2011 @ 13:34:31
Author: guillaume
Revision: 136024
Fixed erroneous pid retrieval
Modified:
tomcat6/trunk/tomcat6
-+
tomcat6 |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
Modified: tomcat6
===
--- tomcat6 2011-08-21 16:23:28 UTC (rev 136023)
+++ tomcat6 2011-08-21 17:34:31 UTC (rev 136024)
@@ -6,15 +6,11 @@
. /etc/rc.d/functions
. /etc/conf.d/${daemon_name}
-get_pid() {
- pidof -o %PPID ${daemon_name}
-}
-
case $1 in
start)
stat_busy Starting ${daemon_name} daemon
-PID=$(get_pid)
+PID=$(get_pid 'jsvc.exec')
if [ -z $PID ]; then
[ -f /var/run/${daemon_name}.pid ] rm -f /var/run/${daemon_name}.pid
# RUN
@@ -46,7 +42,6 @@
stop)
stat_busy Stopping ${daemon_name} daemon
-PID=$(get_pid)
# STOP
/usr/bin/jsvc \
-pidfile /var/run/${daemon_name}.pid \
[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6 tomcat6.conf.d)
Date: Sunday, August 21, 2011 @ 16:27:55
Author: guillaume
Revision: 136028
upgpkg: tomcat6 6.0.33-2
Fixed start at boot and pid number retrieval
Modified:
tomcat6/trunk/PKGBUILD
tomcat6/trunk/tomcat6
tomcat6/trunk/tomcat6.conf.d
+
PKGBUILD |6 +++---
tomcat6|1 +
tomcat6.conf.d |4
3 files changed, 8 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 18:06:36 UTC (rev 136027)
+++ PKGBUILD2011-08-21 20:27:55 UTC (rev 136028)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat6
pkgver=6.0.33
-pkgrel=1
+pkgrel=2
pkgdesc=Servlet-2.5/JSP-2.1 Container
arch=('any')
url='http://tomcat.apache.org/'
@@ -27,8 +27,8 @@
noextract=(dbcp-${pkgver}.jar)
md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
'a6ff671562c9ac91e8cc2812760df49d'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
+ 'b9f482437de11587d72b53ddaa2a'
+ '8f2ccc09837577394441d29a03b0e667'
'1be39071bd27781c352b2d73b765e29d')
build() {
Modified: tomcat6
===
--- tomcat6 2011-08-21 18:06:36 UTC (rev 136027)
+++ tomcat6 2011-08-21 20:27:55 UTC (rev 136028)
@@ -20,6 +20,7 @@
-Djava.io.tmpdir=/var/tmp/tomcat6/temp \
-cp
/usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar
\
-user tomcat \
+-java-home ${TOMCAT_JAVA_HOME} \
-wait 10 \
-pidfile /var/run/${daemon_name}.pid \
-errfile /var/log/tomcat6/catalina.err \
Modified: tomcat6.conf.d
===
--- tomcat6.conf.d 2011-08-21 18:06:36 UTC (rev 136027)
+++ tomcat6.conf.d 2011-08-21 20:27:55 UTC (rev 136028)
@@ -1,3 +1,7 @@
+# The JAVA_HOME of the JVM for Tomcat to use
+# (compulsory to enable tomcat to start at boot)
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
# Tomcat home directory
CATALINA_HOME=/usr/share/tomcat6
[arch-commits] Commit in tomcat6/repos/extra-any (8 files)
Date: Sunday, August 21, 2011 @ 16:28:55
Author: guillaume
Revision: 136029
archrelease: copy trunk to extra-any
Added:
tomcat6/repos/extra-any/PKGBUILD
(from rev 136028, tomcat6/trunk/PKGBUILD)
tomcat6/repos/extra-any/tomcat6
(from rev 136028, tomcat6/trunk/tomcat6)
tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 136028, tomcat6/trunk/tomcat6.conf.d)
tomcat6/repos/extra-any/tomcat6.install
(from rev 136028, tomcat6/trunk/tomcat6.install)
Deleted:
tomcat6/repos/extra-any/PKGBUILD
tomcat6/repos/extra-any/tomcat6
tomcat6/repos/extra-any/tomcat6.conf.d
tomcat6/repos/extra-any/tomcat6.install
-+
PKGBUILD| 172 +++---
tomcat6 | 158 -
tomcat6.conf.d | 26
tomcat6.install | 54
4 files changed, 205 insertions(+), 205 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 20:27:55 UTC (rev 136028)
+++ PKGBUILD2011-08-21 20:28:55 UTC (rev 136029)
@@ -1,86 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat6
-pkgver=6.0.33
-pkgrel=1
-pkgdesc=Servlet-2.5/JSP-2.1 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=5' 'apache-ant=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- install ${srcdir}/dbcp-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
- ln -s tomcat-dbcp-${pkgver}.jar \
-${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm770 ${pkgdir}/etc/${pkgname}
- install -m660 conf/* ${pkgdir}/etc/${pkgname}
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 136028,
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 20:28:55 UTC (rev 136029)
@@ -0,0 +1,86 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat6
+pkgver=6.0.33
+pkgrel=2
+pkgdesc=Servlet-2.5/JSP-2.1 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=5' 'java-jsvc' 'eclipse-ecj
[arch-commits] Commit in tomcat7/trunk (PKGBUILD tomcat7 tomcat7.conf.d)
Date: Sunday, August 21, 2011 @ 17:08:54
Author: guillaume
Revision: 136030
upgpkg: tomcat7 7.0.20-2
Fixed start at boot and pid number retrieval
Modified:
tomcat7/trunk/PKGBUILD
tomcat7/trunk/tomcat7
tomcat7/trunk/tomcat7.conf.d
+
PKGBUILD | 11 +--
tomcat7|8 ++--
tomcat7.conf.d |4
3 files changed, 11 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 20:28:55 UTC (rev 136029)
+++ PKGBUILD2011-08-21 21:08:54 UTC (rev 136030)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
pkgver=7.0.20
-pkgrel=1
+pkgrel=2
pkgdesc=Servlet-3.0/JSP-2.2 Container
arch=('any')
url='http://tomcat.apache.org/'
@@ -23,10 +23,9 @@
tomcat7
tomcat7.install)
-noextract=(dbcp-${pkgver}.jar)
md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
- '13eb5570b4d7dcbbe8b8372575c010c9'
- '70eabcf5bbfa0978e738d95c64abb7a7'
+ '0fa46eae1746d6cd564905bfb0072776'
+ '361a41c02930a4e43245ab7379a617e9'
'1be39071bd27781c352b2d73b765e29d')
build() {
@@ -74,7 +73,7 @@
ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
# Arch scripts
- install -Dm644 ${srcdir}/tomcat7.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
+ install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+ install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
}
Modified: tomcat7
===
--- tomcat7 2011-08-21 20:28:55 UTC (rev 136029)
+++ tomcat7 2011-08-21 21:08:54 UTC (rev 136030)
@@ -6,15 +6,11 @@
. /etc/rc.d/functions
. /etc/conf.d/${daemon_name}
-get_pid() {
- pidof -o %PPID ${daemon_name}
-}
-
case $1 in
start)
stat_busy Starting ${daemon_name} daemon
-PID=$(get_pid)
+PID=$(get_pid 'jsvc.exec')
if [ -z $PID ]; then
[ -f /var/run/${daemon_name}.pid ] rm -f /var/run/${daemon_name}.pid
# RUN
@@ -24,6 +20,7 @@
-Djava.io.tmpdir=/var/tmp/tomcat7/temp \
-cp
/usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar
\
-user tomcat \
+-java-home ${TOMCAT_JAVA_HOME} \
-wait 10 \
-pidfile /var/run/${daemon_name}.pid \
-errfile /var/log/tomcat7/catalina.err \
@@ -46,7 +43,6 @@
stop)
stat_busy Stopping ${daemon_name} daemon
-PID=$(get_pid)
# STOP
/usr/bin/jsvc \
-pidfile /var/run/${daemon_name}.pid \
Modified: tomcat7.conf.d
===
--- tomcat7.conf.d 2011-08-21 20:28:55 UTC (rev 136029)
+++ tomcat7.conf.d 2011-08-21 21:08:54 UTC (rev 136030)
@@ -1,3 +1,7 @@
+# The JAVA_HOME of the JVM for Tomcat to use
+# (compulsory to enable tomcat to start at boot)
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
# Tomcat home directory
CATALINA_HOME=/usr/share/tomcat7
[arch-commits] Commit in tomcat7/repos/extra-any (8 files)
Date: Sunday, August 21, 2011 @ 17:09:53
Author: guillaume
Revision: 136031
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 136030, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/tomcat7
(from rev 136030, tomcat7/trunk/tomcat7)
tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 136030, tomcat7/trunk/tomcat7.conf.d)
tomcat7/repos/extra-any/tomcat7.install
(from rev 136030, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/tomcat7
tomcat7/repos/extra-any/tomcat7.conf.d
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 159 ++
tomcat7 | 158 ++---
tomcat7.conf.d | 26 +---
tomcat7.install | 54 +-
4 files changed, 198 insertions(+), 199 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 21:08:54 UTC (rev 136030)
+++ PKGBUILD2011-08-21 21:09:53 UTC (rev 136031)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.20
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
- '13eb5570b4d7dcbbe8b8372575c010c9'
- '70eabcf5bbfa0978e738d95c64abb7a7'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm770 ${pkgdir}/etc/${pkgname}
- install -m660 conf/* ${pkgdir}/etc/${pkgname}
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/tomcat7.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 136030,
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 21:09:53 UTC (rev 136031)
@@ -0,0 +1,79 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat7
+pkgver=7.0.20
+pkgrel=2
+pkgdesc=Servlet-3.0/JSP-2.2 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
+optdepends=('tomcat-native: to allow optimal performance in production
environments')
+backup=(etc/tomcat7/catalina.policy
+etc/tomcat7/catalina.properties
+etc/tomcat7/context.xml
+etc/tomcat7/logging.properties
+etc/tomcat7/server.xml
+etc/tomcat7/tomcat
[arch-commits] Commit in tomcat7/trunk (PKGBUILD)
Date: Friday, September 2, 2011 @ 13:55:31
Author: guillaume
Revision: 136902
upgpkg: tomcat7 7.0.21-1
Upstream release
Modified:
tomcat7/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-02 17:44:52 UTC (rev 136901)
+++ PKGBUILD2011-09-02 17:55:31 UTC (rev 136902)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=tomcat7
-pkgver=7.0.20
-pkgrel=2
+pkgver=7.0.21
+pkgrel=1
pkgdesc=Servlet-3.0/JSP-2.2 Container
arch=('any')
url='http://tomcat.apache.org/'
@@ -23,7 +23,7 @@
tomcat7
tomcat7.install)
-md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
+md5sums=('40d71249a54526ab0145fd5b41008518'
'0fa46eae1746d6cd564905bfb0072776'
'361a41c02930a4e43245ab7379a617e9'
'1be39071bd27781c352b2d73b765e29d')
[arch-commits] Commit in tomcat7/repos/extra-any (8 files)
Date: Friday, September 2, 2011 @ 13:56:32
Author: guillaume
Revision: 136903
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 136902, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/tomcat7
(from rev 136902, tomcat7/trunk/tomcat7)
tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 136902, tomcat7/trunk/tomcat7.conf.d)
tomcat7/repos/extra-any/tomcat7.install
(from rev 136902, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/tomcat7
tomcat7/repos/extra-any/tomcat7.conf.d
tomcat7/repos/extra-any/tomcat7.install
-+
PKGBUILD| 158 +++---
tomcat7 | 154 ++--
tomcat7.conf.d | 30 +-
tomcat7.install | 54 +-
4 files changed, 198 insertions(+), 198 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2011-09-02 17:55:31 UTC (rev 136902)
+++ PKGBUILD2011-09-02 17:56:32 UTC (rev 136903)
@@ -1,79 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.20
-pkgrel=2
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src
-
- . /etc/profile.d/apache-ant.sh
- ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
- cd ${srcdir}/apache-tomcat-${pkgver}-src/output/build
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
- cp -r bin ${pkgdir}/usr/share/${pkgname}
-
- # eclipse-ecj is packaged on its own
- rm lib/eclipse-ecj.jar
- install lib/* ${pkgdir}/usr/share/java/${pkgname}
- ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm770 ${pkgdir}/etc/${pkgname}
- install -m660 conf/* ${pkgdir}/etc/${pkgname}
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-
Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 136902,
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-09-02 17:56:32 UTC (rev 136903)
@@ -0,0 +1,79 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat7
+pkgver=7.0.21
+pkgrel=1
+pkgdesc=Servlet-3.0/JSP-2.2 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
+optdepends=('tomcat-native: to allow optimal performance in production
environments')
+backup=(etc/tomcat7/catalina.policy
+etc/tomcat7/catalina.properties
+etc/tomcat7/context.xml
+etc/tomcat7/logging.properties
+etc/tomcat7/server.xml
+etc/tomcat7/tomcat-users.xml
+etc/tomcat7
[arch-commits] Commit in java-commons-daemon/trunk (PKGBUILD)
Date: Friday, September 2, 2011 @ 14:09:22
Author: guillaume
Revision: 136906
upgpkg: java-commons-daemon 1.0.7-1
Upstream release
Modified:
java-commons-daemon/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-02 18:03:15 UTC (rev 136905)
+++ PKGBUILD2011-09-02 18:09:22 UTC (rev 136906)
@@ -1,14 +1,14 @@
# Maintainer: Guillaume ALAUX guilla...@archlinux.org
pkgname=('java-commons-daemon' 'java-jsvc')
pkgbase=java-commons-daemon
-pkgver=1.0.6
+pkgver=1.0.7
pkgrel=1
arch=('i686' 'x86_64')
url=http://commons.apache.org/daemon/;
license=('APACHE')
_libname=commons-daemon
source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('28dc2e0a3634b2dc3605e9e6444d079f')
+md5sums=('fb6c5e7b6544fd8400b08f0e81fc9581')
makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
[arch-commits] Commit in java-commons-daemon/repos (4 files)
Date: Friday, September 2, 2011 @ 14:09:59
Author: guillaume
Revision: 136907
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
java-commons-daemon/repos/extra-i686/PKGBUILD
(from rev 136906, java-commons-daemon/trunk/PKGBUILD)
java-commons-daemon/repos/extra-x86_64/PKGBUILD
(from rev 136906, java-commons-daemon/trunk/PKGBUILD)
Deleted:
java-commons-daemon/repos/extra-i686/PKGBUILD
java-commons-daemon/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 96
extra-x86_64/PKGBUILD | 96
2 files changed, 96 insertions(+), 96 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-02 18:09:22 UTC (rev 136906)
+++ extra-i686/PKGBUILD 2011-09-02 18:09:59 UTC (rev 136907)
@@ -1,48 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=('java-commons-daemon' 'java-jsvc')
-pkgbase=java-commons-daemon
-pkgver=1.0.6
-pkgrel=1
-arch=('i686' 'x86_64')
-url=http://commons.apache.org/daemon/;
-license=('APACHE')
-_libname=commons-daemon
-source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('28dc2e0a3634b2dc3605e9e6444d079f')
-makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
-
-
-build() {
- # commons-daemon.jar
- cd ${srcdir}/${_libname}-${pkgver}-src
- ant
-
- # jsvc
- cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
- ./configure
- make
- docbook2man man/jsvc.1.xml
-}
-
-package_java-commons-daemon() {
- pkgdesc=Alternative invocation mechanism for unix-daemon-like java code
- depends=('java-runtime')
-
- cd ${srcdir}/${_libname}-${pkgver}-src
-
- install -Dm755 dist/${_libname}-${pkgver}.jar \
- ${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar
- ln -s ${_libname}-${pkgver}.jar \
-${pkgdir}/usr/share/java/${_libname}.jar
-}
-
-package_java-jsvc() {
- pkgdesc=Apache application for making Java applications run on UNIX more
easily
- depends=(java-${_libname} 'libcap')
-
- cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
-
- install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
- install -Dm644 JSVC.1 ${pkgdir}/usr/share/man/man1/JSVC.1
-}
-
Copied: java-commons-daemon/repos/extra-i686/PKGBUILD (from rev 136906,
java-commons-daemon/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-02 18:09:59 UTC (rev 136907)
@@ -0,0 +1,48 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=('java-commons-daemon' 'java-jsvc')
+pkgbase=java-commons-daemon
+pkgver=1.0.7
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://commons.apache.org/daemon/;
+license=('APACHE')
+_libname=commons-daemon
+source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
+md5sums=('fb6c5e7b6544fd8400b08f0e81fc9581')
+makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
+
+
+build() {
+ # commons-daemon.jar
+ cd ${srcdir}/${_libname}-${pkgver}-src
+ ant
+
+ # jsvc
+ cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
+ ./configure
+ make
+ docbook2man man/jsvc.1.xml
+}
+
+package_java-commons-daemon() {
+ pkgdesc=Alternative invocation mechanism for unix-daemon-like java code
+ depends=('java-runtime')
+
+ cd ${srcdir}/${_libname}-${pkgver}-src
+
+ install -Dm755 dist/${_libname}-${pkgver}.jar \
+ ${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar
+ ln -s ${_libname}-${pkgver}.jar \
+${pkgdir}/usr/share/java/${_libname}.jar
+}
+
+package_java-jsvc() {
+ pkgdesc=Apache application for making Java applications run on UNIX more
easily
+ depends=(java-${_libname} 'libcap')
+
+ cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
+
+ install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
+ install -Dm644 JSVC.1 ${pkgdir}/usr/share/man/man1/JSVC.1
+}
+
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2011-09-02 18:09:22 UTC (rev 136906)
+++ extra-x86_64/PKGBUILD 2011-09-02 18:09:59 UTC (rev 136907)
@@ -1,48 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=('java-commons-daemon' 'java-jsvc')
-pkgbase=java-commons-daemon
-pkgver=1.0.6
-pkgrel=1
-arch=('i686' 'x86_64')
-url=http://commons.apache.org/daemon/;
-license=('APACHE')
-_libname=commons-daemon
-source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-md5sums=('28dc2e0a3634b2dc3605e9e6444d079f')
-makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
-
-
-build() {
- # commons-daemon.jar
- cd ${srcdir}/${_libname}-${pkgver}-src
- ant
-
- # jsvc
- cd ${srcdir}/${_libname}-${pkgver}-src/src/native/unix
- ./configure
- make
- docbook2man man/jsvc.1.xml
-}
-
-package_java-commons-daemon
[arch-commits] Commit in gthumb/trunk (PKGBUILD)
Date: Sunday, October 24, 2010 @ 11:23:48
Author: guillaume
Revision: 96741
upgpkg: gthumb 2.12.0-1
Upstream release
Modified:
gthumb/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-10-24 15:23:46 UTC (rev 96740)
+++ PKGBUILD2010-10-24 15:23:48 UTC (rev 96741)
@@ -3,7 +3,7 @@
# Contributor: Tobias Kieslich tob...@justdreams.de
pkgname=gthumb
-pkgver=2.10.12
+pkgver=2.12.0
pkgrel=1
pkgdesc=Image browser and viewer for the GNOME Desktop
arch=(i686 x86_64)
@@ -13,8 +13,8 @@
makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils=0.20.1')
options=('!libtool' '!emptydirs')
install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e4f65ced6db31a3fe17ba172b3b320b581c82d34d76f38e6c7241e109580ca5a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('9bb32ee44647f3f934d41344e2c1dbbd1546bf4949824030b3b818545758118c')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in gthumb/repos (extra-i686)
Date: Sunday, October 24, 2010 @ 11:23:57 Author: guillaume Revision: 96742 archrelease: remove extra-i686 Deleted: gthumb/repos/extra-i686/
[arch-commits] Commit in gthumb/repos (extra-i686)
Date: Sunday, October 24, 2010 @ 11:24:10 Author: guillaume Revision: 96743 archrelease: copy trunk to extra-i686 Added: gthumb/repos/extra-i686/
[arch-commits] Commit in gthumb/repos (extra-x86_64)
Date: Sunday, October 24, 2010 @ 11:24:19 Author: guillaume Revision: 96744 archrelease: remove extra-x86_64 Deleted: gthumb/repos/extra-x86_64/
[arch-commits] Commit in gthumb/repos (extra-x86_64)
Date: Sunday, October 24, 2010 @ 11:24:34 Author: guillaume Revision: 96745 archrelease: copy trunk to extra-x86_64 Added: gthumb/repos/extra-x86_64/
[arch-commits] Commit in gthumb/trunk (PKGBUILD)
Date: Sunday, October 24, 2010 @ 17:06:48
Author: guillaume
Revision: 96807
upgpkg: gthumb 2.12.0-2
Fix #21454. Fix dependencies
Modified:
gthumb/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-10-24 20:19:14 UTC (rev 96806)
+++ PKGBUILD2010-10-24 21:06:48 UTC (rev 96807)
@@ -4,13 +4,13 @@
pkgname=gthumb
pkgver=2.12.0
-pkgrel=1
+pkgrel=2
pkgdesc=Image browser and viewer for the GNOME Desktop
arch=(i686 x86_64)
license=('GPL')
url=http://gthumb.sourceforge.net/;
-depends=('libgphoto2=2.4.9' 'libgnomeui=2.24.3' 'libxtst=1.1.0'
'libxxf86vm=1.1.0' 'desktop-file-utils')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils=0.20.1')
+depends=('libgphoto2=2.4.9' 'libxtst=1.1.0' 'libxxf86vm=1.1.0'
'desktop-file-utils' 'libunique=1.1.2')
+makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils=0.20.1' 'gconf' 'libsm')
options=('!libtool' '!emptydirs')
install=gthumb.install
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2)
[arch-commits] Commit in gthumb/repos (extra-i686)
Date: Sunday, October 24, 2010 @ 17:06:55 Author: guillaume Revision: 96808 archrelease: remove extra-i686 Deleted: gthumb/repos/extra-i686/
[arch-commits] Commit in gthumb/repos (extra-i686)
Date: Sunday, October 24, 2010 @ 17:07:10 Author: guillaume Revision: 96809 archrelease: copy trunk to extra-i686 Added: gthumb/repos/extra-i686/
[arch-commits] Commit in gthumb/repos (extra-x86_64)
Date: Sunday, October 24, 2010 @ 17:07:24 Author: guillaume Revision: 96810 archrelease: remove extra-x86_64 Deleted: gthumb/repos/extra-x86_64/
[arch-commits] Commit in gthumb/repos (extra-x86_64)
Date: Sunday, October 24, 2010 @ 17:07:37 Author: guillaume Revision: 96811 archrelease: copy trunk to extra-x86_64 Added: gthumb/repos/extra-x86_64/
[arch-commits] Commit in wireshark/trunk (PKGBUILD)
Date: Saturday, November 20, 2010 @ 10:47:59
Author: guillaume
Revision: 100116
upgpkg: wireshark 1.4.2-1
Upstream release
Modified:
wireshark/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-11-20 11:28:06 UTC (rev 100115)
+++ PKGBUILD2010-11-20 15:47:59 UTC (rev 100116)
@@ -3,7 +3,7 @@
# Contributor: Florian Pritz bluewind at jabber dot ccc dot de
pkgname=(wireshark-cli wireshark-gtk)
pkgbase=wireshark
-pkgver=1.4.1
+pkgver=1.4.2
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -11,7 +11,7 @@
url=http://www.wireshark.org/;
options=(!libtool)
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('1719d20a10990e7c2cb261df7021aab6')
+md5sums=('5429561935ea0d1ee572793b55446918')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
[arch-commits] Commit in wireshark/repos (extra-i686)
Date: Saturday, November 20, 2010 @ 10:48:24 Author: guillaume Revision: 100117 archrelease: remove extra-i686 Deleted: wireshark/repos/extra-i686/
[arch-commits] Commit in wireshark/repos (extra-i686)
Date: Saturday, November 20, 2010 @ 10:48:39 Author: guillaume Revision: 100118 archrelease: copy trunk to extra-i686 Added: wireshark/repos/extra-i686/
[arch-commits] Commit in wireshark/repos (extra-x86_64)
Date: Saturday, November 20, 2010 @ 10:48:55 Author: guillaume Revision: 100119 archrelease: remove extra-x86_64 Deleted: wireshark/repos/extra-x86_64/
[arch-commits] Commit in wireshark/repos (extra-x86_64)
Date: Saturday, November 20, 2010 @ 10:49:08 Author: guillaume Revision: 100120 archrelease: copy trunk to extra-x86_64 Added: wireshark/repos/extra-x86_64/
[arch-commits] Commit in (4 files)
Date: Thursday, December 30, 2010 @ 17:09:25
Author: guillaume
Revision: 104225
Initial commit
Added:
hunspell-fr/
hunspell-fr/repos/
hunspell-fr/trunk/
hunspell-fr/trunk/PKGBUILD
--+
PKGBUILD | 40
1 file changed, 40 insertions(+)
Added: hunspell-fr/trunk/PKGBUILD
===
--- hunspell-fr/trunk/PKGBUILD (rev 0)
+++ hunspell-fr/trunk/PKGBUILD 2010-12-30 22:09:25 UTC (rev 104225)
@@ -0,0 +1,40 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+
+pkgname=hunspell-fr
+pkgver=3.8
+pkgrel=1
+pkgdesc=French (modern) hunspell dictionaries
+arch=(any)
+url=http://www.dicollecte.org/;
+license=('GPL' 'MPL' 'LGPL')
+optdepends=('hunspell: the spell checking libraries and apps')
+source=(http://www.dicollecte.org/download/fr/${pkgname}-moderne-v${pkgver}.zip)
+md5sums=('960317a6160d568e41e99bf50ad138e4')
+
+package() {
+ cd ${srcdir}
+ install -dm755 ${pkgdir}/usr/share/hunspell
+ install -m644 fr-moderne.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
+ install -m644 fr-moderne.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
+
+ pushd ${pkgdir}/usr/share/hunspell/
+ fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
+ for lang in ${fr_FR_aliases}; do
+ ln -s fr_FR.aff ${lang}.aff
+ ln -s fr_FR.dic ${lang}.dic
+ done
+
+ popd
+
+ # the symlinks
+ install -dm755 ${pkgdir}/usr/share/myspell/dicts
+ pushd ${pkgdir}/usr/share/myspell/dicts
+for file in ${pkgdir}/usr/share/hunspell/*; do
+ ln -sv /usr/share/hunspell/$(basename ${file}) .
+done
+ popd
+
+ # docs
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
+ install -m644 README_fr.txt $pkgdir/usr/share/doc/${pkgname}/README_fr.txt
+}
Property changes on: hunspell-fr/trunk/PKGBUILD
___
Added: svn:keywords
+ Id
[arch-commits] Commit in (4 files)
Date: Thursday, December 30, 2010 @ 17:12:45
Author: guillaume
Revision: 104226
Initial commit
Added:
hyphen-fr/
hyphen-fr/repos/
hyphen-fr/trunk/
hyphen-fr/trunk/PKGBUILD
--+
PKGBUILD | 39 +++
1 file changed, 39 insertions(+)
Added: hyphen-fr/trunk/PKGBUILD
===
--- hyphen-fr/trunk/PKGBUILD(rev 0)
+++ hyphen-fr/trunk/PKGBUILD2010-12-30 22:12:45 UTC (rev 104226)
@@ -0,0 +1,39 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+
+pkgname=hyphen-fr
+pkgver=2.0
+pkgrel=1
+pkgdesc=French hyphenation rules
+arch=(any)
+url=http://www.dicollecte.org/;
+license=('LGPL')
+optdepends=('hyphen: offers hyphenation library functions')
+source=(http://www.dicollecte.org/download/fr/hyph_fr_${pkgver/./-}.zip)
+md5sums=('92edc6c92481600cd6c10cf42cd2cd3f')
+
+package() {
+ cd ${srcdir}
+ install -dm755 ${pkgdir}/usr/share/hyphen
+ install -m644 hyph_fr_FR.dic ${pkgdir}/usr/share/hyphen/hyph_fr_FR.dic
+
+ pushd ${pkgdir}/usr/share/hyphen/
+ fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
+ for lang in ${fr_FR_aliases}; do
+ln -s hyph_fr_FR.dic hyph_${lang}.dic
+ done
+
+ popd
+
+ # the symlinks
+ install -dm755 ${pkgdir}/usr/share/myspell/dicts
+ pushd ${pkgdir}/usr/share/myspell/dicts
+for file in ${pkgdir}/usr/share/hyphen/*; do
+ ln -sv /usr/share/hyphen/$(basename ${file}) .
+done
+ popd
+
+ # docs
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
+ install -m644 README_hyph_fr.txt \
+${pkgdir}/usr/share/doc/${pkgname}/README_hyph_fr.txt
+}
Property changes on: hyphen-fr/trunk/PKGBUILD
___
Added: svn:keywords
+ Id
[arch-commits] Commit in (4 files)
Date: Thursday, December 30, 2010 @ 17:14:54
Author: guillaume
Revision: 104227
Initial commit
Added:
mythes-fr/
mythes-fr/repos/
mythes-fr/trunk/
mythes-fr/trunk/PKGBUILD
--+
PKGBUILD | 40
1 file changed, 40 insertions(+)
Added: mythes-fr/trunk/PKGBUILD
===
--- mythes-fr/trunk/PKGBUILD(rev 0)
+++ mythes-fr/trunk/PKGBUILD2010-12-30 22:14:54 UTC (rev 104227)
@@ -0,0 +1,40 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+
+pkgname=mythes-fr
+pkgver=2.2.2
+pkgrel=1
+pkgdesc=French thesaurus
+arch=(any)
+url=http://www.dicollecte.org/;
+license=('LGPL')
+optdepends=('libmythes: offers thesaurus library functions')
+source=(http://www.dicollecte.org/download/fr/thesaurus-v${pkgver}.zip)
+md5sums=('4081b883b30a962b1f3087e55cb5a372')
+
+package() {
+ cd ${srcdir}
+ install -dm755 ${pkgdir}/usr/share/mythes
+ install -m644 thes_fr.idx ${pkgdir}/usr/share/mythes/th_fr_FR.idx
+ install -m644 thes_fr.dat ${pkgdir}/usr/share/mythes/th_fr_FR.dat
+
+ pushd ${pkgdir}/usr/share/mythes/
+ fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
+ for lang in ${fr_FR_aliases}; do
+ln -s th_fr_FR.idx th_${lang}.idx
+ln -s th_fr_FR.dat th_${lang}.dat
+ done
+ popd
+
+ # the symlinks
+ install -dm755 ${pkgdir}/usr/share/myspell/dicts
+ pushd ${pkgdir}/usr/share/myspell/dicts
+for file in ${pkgdir}/usr/share/mythes/*; do
+ ln -s /usr/share/mythes/$(basename ${file}) .
+done
+ popd
+
+ # docs
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
+ install -m644 README_thes_fr.txt \
+${pkgdir}/usr/share/doc/${pkgname}/README_th_fr.txt
+}
Property changes on: mythes-fr/trunk/PKGBUILD
___
Added: svn:keywords
+ Id
[arch-commits] Commit in hunspell-fr/repos (testing-any)
Date: Thursday, December 30, 2010 @ 17:24:34 Author: guillaume Revision: 104233 archrelease: copy trunk to testing-any Added: hunspell-fr/repos/testing-any/
[arch-commits] Commit in hyphen-fr/repos (testing-any)
Date: Thursday, December 30, 2010 @ 17:24:57 Author: guillaume Revision: 104234 archrelease: copy trunk to testing-any Added: hyphen-fr/repos/testing-any/
[arch-commits] Commit in mythes-fr/repos (testing-any)
Date: Thursday, December 30, 2010 @ 17:25:19 Author: guillaume Revision: 104235 archrelease: copy trunk to testing-any Added: mythes-fr/repos/testing-any/
[arch-commits] Commit in mythes-fr/trunk (PKGBUILD)
Date: Wednesday, January 5, 2011 @ 03:57:41
Author: guillaume
Revision: 104860
upgpkg: mythes-fr 2.2.2-2
-m
Modified:
mythes-fr/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-01-05 01:49:20 UTC (rev 104859)
+++ PKGBUILD2011-01-05 08:57:41 UTC (rev 104860)
@@ -2,7 +2,7 @@
pkgname=mythes-fr
pkgver=2.2.2
-pkgrel=1
+pkgrel=2
pkgdesc=French thesaurus
arch=(any)
url=http://www.dicollecte.org/;
@@ -14,14 +14,14 @@
package() {
cd ${srcdir}
install -dm755 ${pkgdir}/usr/share/mythes
- install -m644 thes_fr.idx ${pkgdir}/usr/share/mythes/th_fr_FR.idx
- install -m644 thes_fr.dat ${pkgdir}/usr/share/mythes/th_fr_FR.dat
+ install -m644 thes_fr.idx ${pkgdir}/usr/share/mythes/th_fr_FR_v2.idx
+ install -m644 thes_fr.dat ${pkgdir}/usr/share/mythes/th_fr_FR_v2.dat
pushd ${pkgdir}/usr/share/mythes/
fr_FR_aliases=fr_BE fr_CA fr_CH fr_LU
for lang in ${fr_FR_aliases}; do
-ln -s th_fr_FR.idx th_${lang}.idx
-ln -s th_fr_FR.dat th_${lang}.dat
+ln -s th_fr_FR_v2.idx th_${lang}_v2.idx
+ln -s th_fr_FR_v2.dat th_${lang}_v2.dat
done
popd
@@ -32,7 +32,7 @@
ln -s /usr/share/mythes/$(basename ${file}) .
done
popd
-
+
# docs
install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
install -m644 README_thes_fr.txt \
