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

[Antonio Rojas]

    Date: Saturday, December 3, 2016 @ 22:23:00
  Author: arojas
Revision: 282808

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  avogadrolibs/repos/extra-i686/PKGBUILD
    (from rev 282807, avogadrolibs/trunk/PKGBUILD)
  avogadrolibs/repos/extra-x86_64/PKGBUILD
    (from rev 282807, avogadrolibs/trunk/PKGBUILD)
Deleted:
  avogadrolibs/repos/extra-i686/PKGBUILD
  avogadrolibs/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |   70 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   40 ---------------------------
 extra-x86_64/PKGBUILD |   40 ---------------------------
 3 files changed, 70 insertions(+), 80 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-12-03 22:21:54 UTC (rev 282807)
+++ extra-i686/PKGBUILD	2016-12-03 22:23:00 UTC (rev 282808)
@@ -1,40 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=avogadrolibs
-pkgver=0.9.0
-pkgrel=2
-pkgdesc="An advanced molecular editor"
-arch=(i686 x86_64)
-url="http://www.openchemistry.org/"
-license=(custom)
-depends=(openbabel qt5-base glew)
-makedepends=(cmake eigen python2 boost)
-source=("http://downloads.sourceforge.net/project/avogadro/avogadro2/$pkgver/$pkgname-$pkgver.tar.gz"
-        avogadrolibs-gcc6.patch::"https://github.com/OpenChemistry/molequeue/commit/5d57279d.patch")
-md5sums=('af5c0a0c782cfa528d1c203840c69cf6'
-         'd57372453ba647ea741b0efb7e50dc50')
-
-prepare() {
-  mkdir -p build
-
-# Fix GCC6 detection
-  cd $pkgname-$pkgver
-  patch -p1 -i ../avogadrolibs-gcc6.patch
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_SHARED_LIBS=ON \
-    -DUSE_QT=ON \
-    -DUSE_OPENGL=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}

Copied: avogadrolibs/repos/extra-i686/PKGBUILD (from rev 282807, avogadrolibs/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-12-03 22:23:00 UTC (rev 282808)
@@ -0,0 +1,35 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=avogadrolibs
+pkgver=1.90.0
+pkgrel=1
+pkgdesc="An advanced molecular editor"
+arch=(i686 x86_64)
+url="http://www.openchemistry.org/"
+license=(custom)
+depends=(molequeue openbabel glew spglib)
+makedepends=(cmake eigen python2 boost)
+source=($pkgname-$pkgver.tar.gz::"https://github.com/OpenChemistry/avogadrolibs/archive/$pkgver.tar.gz")
+md5sums=('f2b7014f48da5b2a72d49c01dafaf225')
+
+prepare() {
+  mkdir -p build
+
+# Find spglib
+  sed -e 's|NAMES spglib|NAMES spglib symspg|' -i $pkgname-$pkgver/cmake/FindSpglib.cmake
+
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-12-03 22:21:54 UTC (rev 282807)
+++ extra-x86_64/PKGBUILD	2016-12-03 22:23:00 UTC (rev 282808)
@@ -1,40 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=avogadrolibs
-pkgver=0.9.0
-pkgrel=2
-pkgdesc="An advanced molecular editor"
-arch=(i686 x86_64)
-url="http://www.openchemistry.org/"
-license=(custom)
-depends=(openbabel qt5-base glew)
-makedepends=(cmake eigen python2 boost)
-source=("http://downloads.sourceforge.net/project/avogadro/avogadro2/$pkgver/$pkgname-$pkgver.tar.gz"
-        avogadrolibs-gcc6.patch::"https://github.com/OpenChemistry/molequeue/commit/5d57279d.patch")
-md5sums=('af5c0a0c782cfa528d1c203840c69cf6'
-         'd57372453ba647ea741b0efb7e50dc50')
-
-prepare() {
-  mkdir -p build
-
-# Fix GCC6 detection
-  cd $pkgname-$pkgver
-  patch -p1 -i ../avogadrolibs-gcc6.patch
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_SHARED_LIBS=ON \
-    -DUSE_QT=ON \
-    -DUSE_OPENGL=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}

Copied: avogadrolibs/repos/extra-x86_64/PKGBUILD (from rev 282807, avogadrolibs/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-12-03 22:23:00 UTC (rev 282808)
@@ -0,0 +1,35 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=avogadrolibs
+pkgver=1.90.0
+pkgrel=1
+pkgdesc="An advanced molecular editor"
+arch=(i686 x86_64)
+url="http://www.openchemistry.org/"
+license=(custom)
+depends=(molequeue openbabel glew spglib)
+makedepends=(cmake eigen python2 boost)
+source=($pkgname-$pkgver.tar.gz::"https://github.com/OpenChemistry/avogadrolibs/archive/$pkgver.tar.gz")
+md5sums=('f2b7014f48da5b2a72d49c01dafaf225')
+
+prepare() {
+  mkdir -p build
+
+# Find spglib
+  sed -e 's|NAMES spglib|NAMES spglib symspg|' -i $pkgname-$pkgver/cmake/FindSpglib.cmake
+
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}