1.14.1

2 files changed, 9 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b470a0a1554..c72dad30c9de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openmodelica-omc
 	pkgdesc = The Open Source Modelica Suite - OpenModelica Compiler
-	pkgver = 1.13.2
+	pkgver = 1.14.1
 	pkgrel = 1
 	url = https://openmodelica.org
 	arch = i686
@@ -32,10 +32,7 @@ pkgbase = openmodelica-omc
 	depends = coin-or-ipopt
 	depends = suitesparse
 	depends = boost-libs
-	conflicts = openmodelica-dev
-	conflicts = openmodelica-dev-omc
-	conflicts = openmodelica-git
-	source = git+https://github.com/OpenModelica/OMCompiler.git#tag=v1.13.2
+	source = git+https://github.com/OpenModelica/OpenModelica.git#tag=v1.14.1
 	sha1sums = SKIP
 
 pkgname = openmodelica-omc
diff --git a/PKGBUILD b/PKGBUILD
index 92a4ec65a96a..a9ff95ecb640 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,26 @@
 pkgname=openmodelica-omc
-pkgver=1.13.2
+pkgver=1.14.1
 pkgrel=1
-
 pkgdesc="The Open Source Modelica Suite - OpenModelica Compiler"
 arch=('i686' 'x86_64')
 url="https://openmodelica.org"
 license=('OSMC-PL')
 groups=(openmodelica)
-
-_group=OpenModelica
-_name=OMCompiler
-_tag=v${pkgver}
-
 depends=('java-environment' 'lpsolve' 'hdf5-openmpi' 'omniorb' 'openscenegraph' 'sundials' 'libatomic_ops' 'python' 'gtkglext' 'ruby' 'coin-or-ipopt' 'suitesparse' 'boost-libs')
-
 makedepends=('gcc-fortran' 'boost' 'clang' 'cmake' 'java-environment' 'antlr2' 'git' 'expat' 'ncurses' 'readline' 'opencl-headers' 'imagemagick')
-
-conflicts=('openmodelica-dev' 'openmodelica-dev-omc' 'openmodelica-git')
-
-source=(  "git+https://github.com/${_group}/${_name}.git#tag=${_tag}")
+source=("git+https://github.com/OpenModelica/OpenModelica.git#tag=v${pkgver}")
 sha1sums=('SKIP')
 
 prepare() {
-  cd "$srcdir/$_name"
-  git checkout "tags/${_tag}"
-  sed -i "s,../,https://github.com/${_group}/,g" .gitmodules
+  cd "$srcdir/OpenModelica"
+  git checkout "tags/v${pkgver}"
+  sed -i "s,\.\./,https://github.com/OpenModelica/,g" .gitmodules
   git submodule sync
   git submodule update --init --recursive
 }
 
 build() {
-  cd "$srcdir/$_name"
+  cd "$srcdir/OpenModelica/OMCompiler"
   autoconf
   export CPPFLAGS="$CPPFLAGS -DH5_USE_18_API"
   ./configure --prefix=/usr/ --without-omc --with-omniORB  --with-cppruntime --with-lapack='-llapack -lblas'
@@ -38,7 +28,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_name/build"
+  cd "$srcdir/OpenModelica/OMCompiler/build"
   mkdir -p ${pkgdir}/usr
   cp -r * ${pkgdir}/usr
 }