Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz4j

diff --git a/IDMETA b/IDMETA
index 588f179..93cd1c4 100755 (executable)
--- a/IDMETA
+++ b/IDMETA
@@ -1,2 +1,3 @@
+NAME=yaz4j
 CENTOS_DIST="centos5 centos6"
 VERSION=1.5

diff --git a/mkdist.sh b/mkdist.sh
index fb150fc..056bf6f 100755 (executable)
--- a/mkdist.sh
+++ b/mkdist.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-V=1.5
-git archive --format=tar --prefix=yaz4j-$V/ v$V |gzip >yaz4j-$V.tar.gz
+. ./IDMETA
+
+git archive --format=tar --prefix=$NAME-$VERSION/ HEAD |gzip >$NAME-$VERSION.tar.gz

diff --git a/yaz4j.spec b/yaz4j.spec
index 70dace3..9278173 100644 (file)
--- a/yaz4j.spec
+++ b/yaz4j.spec
@@ -12,7 +12,10 @@ Source0:     yaz4j-%{version}.tar.gz
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: libyaz5-devel
-BuildRequires: maven3-indexdata unzip redhat-rpm-config
+BuildRequires: redhat-rpm-config 
+BuildRequires: maven3-indexdata
+BuildRequires: swig
+
 Requires:      libyaz5
 
 %description