packages: fix the binding package still using the wrong source file (…

…regression of c0d4807)
scalaris-team · Jul 10, 2015 · 871174b · 871174b
1 parent 69ccfd9
commit 871174b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contrib/packages/bindings/PKGBUILD b/contrib/packages/bindings/PKGBUILD
@@ -14,15 +14,15 @@ optdepends=('java-runtime: Java API and client'
             'python: Python3 API and client'
             'ruby: Ruby API and client')
 backup=('etc/scalaris/scalaris-java.conf' 'etc/scalaris/scalaris.properties')
-source=($pkgname-$pkgver.tar.gz)
+source=(scalaris-$pkgver.tar.gz)
 md5sums=('f188e12f4cf893022a87a1b29971aa81')
 
 build() {
   # set JAVA_HOME for ant:
   source /etc/profile.d/jre.sh
   export JAVA_HOME=/usr/lib/jvm/default
   RUBY_SITELIB=$(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/scalaris-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --with-ruby-sitelibdir=$RUBY_SITELIB
   ANT_OPTS="-Dfile.encoding=utf8 -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6" \
@@ -33,7 +33,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/scalaris-$pkgver"
   make install-java DESTDIR="$pkgdir"
   make install-java-doc DESTDIR="$pkgdir"
   make install-python DESTDIR="$pkgdir"

diff --git a/contrib/packages/bindings/scalaris-bindings.spec b/contrib/packages/bindings/scalaris-bindings.spec
@@ -165,7 +165,7 @@ Python3 bindings and Python3 command line client for scalaris
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n scalaris-%{version}
 
 %build
 export ANT_OPTS="-Dfile.encoding=utf8 -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6"
-Original file line number
+Diff line change
@@ Expand Up @@
     %endif
     %prep
-    %setup -q -n %{name}-%{version}
+    %setup -q -n scalaris-%{version}
     %build
     export ANT_OPTS="-Dfile.encoding=utf8 -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6"
@@ Expand Down @@