diff --git a/_service b/_service
index 42fcfe3..9d3bb36 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,8 @@
git://git.code.sf.net/p/openocd/code
git
openocd
- 0.7.99+git%cd
+ v0.8.0
+ 0.8.0
*.tar
diff --git a/openocd-0.7.99+git20140317.tar.bz2 b/openocd-0.7.99+git20140317.tar.bz2
deleted file mode 100644
index f88ee63..0000000
--- a/openocd-0.7.99+git20140317.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b59d6ff54a034d7c5dac49a435191eafc41b93be79dc7796f4b0072d8e02971c
-size 3215398
diff --git a/openocd-0.8.0.tar.bz2 b/openocd-0.8.0.tar.bz2
new file mode 100644
index 0000000..57d55c6
--- /dev/null
+++ b/openocd-0.8.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b076c324400ef0198ce6e21616e17f7a1a12f749362821ce0b03ec62c3cd32f
+size 3768447
diff --git a/openocd.changes b/openocd.changes
index f7e5a36..177ecc1 100644
--- a/openocd.changes
+++ b/openocd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 13 18:11:26 UTC 2014 - ralf@rdoering.net
+
+- Update to openOCD 0.8 instead of git
+- Build with external jimtcl only for factory, use included
+ jimtcl for openSUSE 13.1 and older
+- make it build with included jimtcl, so it builds for
+ openSUSE 12.3 and 13.1
+
-------------------------------------------------------------------
Sat May 10 07:10:46 UTC 2014 - matwey.kornilov@gmail.com
diff --git a/openocd.spec b/openocd.spec
index 9cc427d..ec64912 100644
--- a/openocd.spec
+++ b/openocd.spec
@@ -16,9 +16,15 @@
#
+%if 0%{?suse_version} < 1320
+%define external_jimtcl 0
+%else
+%define external_jimtcl 1
+%endif
+
%define _udevdir %(pkg-config --variable udevdir udev)
Name: openocd
-Version: 0.7.99+git20140317
+Version: 0.8.0
Release: 0
Summary: Debugging, in-system programming and boundary-scan testing for embedded devices
License: GPL-2.0
@@ -26,11 +32,15 @@ Group: Development/Tools/Debuggers
Url: http://openocd.sourceforge.net/
Source0: %{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE fix-jim_cmdproc.patch matwey.kornilov@gmail.com -- fix for jimtcl 0.75
+%if %{external_jimtcl}
Patch0: fix-jim_cmdproc.patch
+%endif
BuildRequires: autoconf >= 2.64
BuildRequires: automake
BuildRequires: fdupes
+%if %{external_jimtcl}
BuildRequires: jimtcl-devel
+%endif
BuildRequires: libftdi1-devel
BuildRequires: libhidapi-devel
BuildRequires: libtool
@@ -63,16 +73,25 @@ and boundary-scan testing for embedded devices.
This package provides hardware description files and documentation.
%prep
-%setup -q
+%setup -q
+%if %{external_jimtcl}
%patch0 -p1
+%endif
%build
-./bootstrap nosubmodule
+#./bootstrap nosubmodule
+%if !%{external_jimtcl}
+# set this explicitely, else the configure from included jimtcl
+# won't find a compiler :(
+export CC=gcc
+%endif
%configure \
+%if %{external_jimtcl}
+ --disable-internal-jimtcl \
+%endif
--disable-werror \
--enable-static \
--disable-shared \
- --disable-internal-jimtcl \
--disable-doxygen-html \
--enable-sysfsgpio \
--enable-ioutil \