Date: Thursday, February 28, 2013 @ 14:14:12 Author: guillaume Revision: 178898
archrelease: copy trunk to extra-i686, extra-x86_64 Added: icedtea-web-java7/repos/extra-i686/PKGBUILD (from rev 178897, icedtea-web-java7/trunk/PKGBUILD) icedtea-web-java7/repos/extra-i686/icedtea-web-java7.install (from rev 178897, icedtea-web-java7/trunk/icedtea-web-java7.install) icedtea-web-java7/repos/extra-x86_64/PKGBUILD (from rev 178897, icedtea-web-java7/trunk/PKGBUILD) icedtea-web-java7/repos/extra-x86_64/icedtea-web-java7.install (from rev 178897, icedtea-web-java7/trunk/icedtea-web-java7.install) Deleted: icedtea-web-java7/repos/extra-i686/PKGBUILD icedtea-web-java7/repos/extra-i686/icedtea-web-java7.install icedtea-web-java7/repos/extra-x86_64/PKGBUILD icedtea-web-java7/repos/extra-x86_64/icedtea-web-java7.install ----------------------------------------+ extra-i686/PKGBUILD | 176 +++++++++++++++---------------- extra-i686/icedtea-web-java7.install | 22 +-- extra-x86_64/PKGBUILD | 176 +++++++++++++++---------------- extra-x86_64/icedtea-web-java7.install | 22 +-- 4 files changed, 200 insertions(+), 196 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-02-28 13:12:14 UTC (rev 178897) +++ extra-i686/PKGBUILD 2013-02-28 13:14:12 UTC (rev 178898) @@ -1,87 +0,0 @@ -# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase=icedtea-web-java7 -pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.3.1 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://icedtea.classpath.org/wiki/IcedTea-Web" -license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') -noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56') - -_javaver=7 -_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - -build() { - # extract it - cd "$srcdir" - LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz - - cd "${srcdir}"/icedtea-web* - ./configure --prefix=${_jvmdir} \ - --datarootdir=/usr/share \ - --with-jdk-home=${_jvmdir} \ - --with-browser-tests \ - --with-firefox=/usr/bin/firefox \ - --with-chromium=/usr/bin/chromium \ - --with-epiphany=/usr/bin/epiphany \ - --with-gtk=2 - make -} - -check() { - cd "${srcdir}"/icedtea-web* - # as more tests have been added some are expectged to fail - # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html - make -k check || /bin/true -} - - -package_icedtea-web-java7() { - - pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" - depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') - provides=('java-web-start=7') - install=${pkgname}.install - - cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" - # possible make target (see bottom of Makefile.am: install-exec-local install-data-local - make DESTDIR="${pkgdir}" install-exec-local install-data-local - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} - install -m644 javaws.png ${pkgdir}/usr/share/pixmaps - install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications - # remove splitted doc files - rm -rf ${pkgdir}/usr/share/doc - - # link binaries into /usr/bin + jre/bin - install -m755 -d ${pkgdir}/usr/bin - install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin - pushd ${pkgdir}/${_jvmdir}/bin - for file in *; do - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin - done - popd - - # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml - install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ - ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ -} - -package_icedtea-web-java7-doc() { - - pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - - cd "${srcdir}"/icedtea-web* - make DESTDIR="${pkgdir}" install-data-local - # remove javaws about and man page - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/man - rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems -} Copied: icedtea-web-java7/repos/extra-i686/PKGBUILD (from rev 178897, icedtea-web-java7/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-02-28 13:14:12 UTC (rev 178898) @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=icedtea-web-java7 +pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') +pkgver=1.3.1 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://icedtea.classpath.org/wiki/IcedTea-Web" +license=('GPL2') +makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56') + +_javaver=7 +_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk + +build() { + # extract it + cd "$srcdir" + LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz + + cd "${srcdir}"/icedtea-web* + ./configure --prefix=${_jvmdir} \ + --datarootdir=/usr/share \ + --with-jdk-home=${_jvmdir} \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany \ + --with-gtk=2 + make +} + +check() { + cd "${srcdir}"/icedtea-web* + # as more tests have been added some are expectged to fail + # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html + make -k check || /bin/true +} + + +package_icedtea-web-java7() { + + pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" + depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') + provides=('java-web-start=7') + replaces=('icedtea-web') + install=${pkgname}.install + + cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + # possible make target (see bottom of Makefile.am: install-exec-local install-data-local + make DESTDIR="${pkgdir}" install-exec-local install-data-local + + # Install desktop files. + install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} + install -m644 javaws.png ${pkgdir}/usr/share/pixmaps + install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications + # remove splitted doc files + rm -rf ${pkgdir}/usr/share/doc + + # link binaries into /usr/bin + jre/bin + install -m755 -d ${pkgdir}/usr/bin + install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin + pushd ${pkgdir}/${_jvmdir}/bin + for file in *; do + ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin + ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin + done + popd + + # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml + install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ + ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ +} + +package_icedtea-web-java7-doc() { + + pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" + replaces=('icedtea-web-doc') + + cd "${srcdir}"/icedtea-web* + make DESTDIR="${pkgdir}" install-data-local + # remove javaws about and man page + rm -rf ${pkgdir}/usr/lib + rm -rf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems +} Deleted: extra-i686/icedtea-web-java7.install =================================================================== --- extra-i686/icedtea-web-java7.install 2013-02-28 13:12:14 UTC (rev 178897) +++ extra-i686/icedtea-web-java7.install 2013-02-28 13:14:12 UTC (rev 178898) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} Copied: icedtea-web-java7/repos/extra-i686/icedtea-web-java7.install (from rev 178897, icedtea-web-java7/trunk/icedtea-web-java7.install) =================================================================== --- extra-i686/icedtea-web-java7.install (rev 0) +++ extra-i686/icedtea-web-java7.install 2013-02-28 13:14:12 UTC (rev 178898) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-02-28 13:12:14 UTC (rev 178897) +++ extra-x86_64/PKGBUILD 2013-02-28 13:14:12 UTC (rev 178898) @@ -1,87 +0,0 @@ -# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase=icedtea-web-java7 -pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.3.1 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://icedtea.classpath.org/wiki/IcedTea-Web" -license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') -noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56') - -_javaver=7 -_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - -build() { - # extract it - cd "$srcdir" - LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz - - cd "${srcdir}"/icedtea-web* - ./configure --prefix=${_jvmdir} \ - --datarootdir=/usr/share \ - --with-jdk-home=${_jvmdir} \ - --with-browser-tests \ - --with-firefox=/usr/bin/firefox \ - --with-chromium=/usr/bin/chromium \ - --with-epiphany=/usr/bin/epiphany \ - --with-gtk=2 - make -} - -check() { - cd "${srcdir}"/icedtea-web* - # as more tests have been added some are expectged to fail - # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html - make -k check || /bin/true -} - - -package_icedtea-web-java7() { - - pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" - depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') - provides=('java-web-start=7') - install=${pkgname}.install - - cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" - # possible make target (see bottom of Makefile.am: install-exec-local install-data-local - make DESTDIR="${pkgdir}" install-exec-local install-data-local - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} - install -m644 javaws.png ${pkgdir}/usr/share/pixmaps - install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications - # remove splitted doc files - rm -rf ${pkgdir}/usr/share/doc - - # link binaries into /usr/bin + jre/bin - install -m755 -d ${pkgdir}/usr/bin - install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin - pushd ${pkgdir}/${_jvmdir}/bin - for file in *; do - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin - done - popd - - # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml - install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ - ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ -} - -package_icedtea-web-java7-doc() { - - pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - - cd "${srcdir}"/icedtea-web* - make DESTDIR="${pkgdir}" install-data-local - # remove javaws about and man page - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/man - rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems -} Copied: icedtea-web-java7/repos/extra-x86_64/PKGBUILD (from rev 178897, icedtea-web-java7/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-02-28 13:14:12 UTC (rev 178898) @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=icedtea-web-java7 +pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') +pkgver=1.3.1 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://icedtea.classpath.org/wiki/IcedTea-Web" +license=('GPL2') +makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56') + +_javaver=7 +_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk + +build() { + # extract it + cd "$srcdir" + LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz + + cd "${srcdir}"/icedtea-web* + ./configure --prefix=${_jvmdir} \ + --datarootdir=/usr/share \ + --with-jdk-home=${_jvmdir} \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany \ + --with-gtk=2 + make +} + +check() { + cd "${srcdir}"/icedtea-web* + # as more tests have been added some are expectged to fail + # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html + make -k check || /bin/true +} + + +package_icedtea-web-java7() { + + pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" + depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') + provides=('java-web-start=7') + replaces=('icedtea-web') + install=${pkgname}.install + + cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + # possible make target (see bottom of Makefile.am: install-exec-local install-data-local + make DESTDIR="${pkgdir}" install-exec-local install-data-local + + # Install desktop files. + install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} + install -m644 javaws.png ${pkgdir}/usr/share/pixmaps + install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications + # remove splitted doc files + rm -rf ${pkgdir}/usr/share/doc + + # link binaries into /usr/bin + jre/bin + install -m755 -d ${pkgdir}/usr/bin + install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin + pushd ${pkgdir}/${_jvmdir}/bin + for file in *; do + ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin + ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin + done + popd + + # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml + install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ + ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ +} + +package_icedtea-web-java7-doc() { + + pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" + replaces=('icedtea-web-doc') + + cd "${srcdir}"/icedtea-web* + make DESTDIR="${pkgdir}" install-data-local + # remove javaws about and man page + rm -rf ${pkgdir}/usr/lib + rm -rf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems +} Deleted: extra-x86_64/icedtea-web-java7.install =================================================================== --- extra-x86_64/icedtea-web-java7.install 2013-02-28 13:12:14 UTC (rev 178897) +++ extra-x86_64/icedtea-web-java7.install 2013-02-28 13:14:12 UTC (rev 178898) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} Copied: icedtea-web-java7/repos/extra-x86_64/icedtea-web-java7.install (from rev 178897, icedtea-web-java7/trunk/icedtea-web-java7.install) =================================================================== --- extra-x86_64/icedtea-web-java7.install (rev 0) +++ extra-x86_64/icedtea-web-java7.install 2013-02-28 13:14:12 UTC (rev 178898) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +}