Accepting request 235074 from hardware

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/235074
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openocd?expand=0&rev=2

_service

@@ -3,7 +3,8 @@
     <param name="url">git://git.code.sf.net/p/openocd/code</param>
     <param name="scm">git</param>
     <param name="filename">openocd</param>
-    <param name="versionformat">0.7.99+git%cd</param>
+    <param name="revision">v0.8.0</param>
+    <param name="versionformat">0.8.0</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>

openocd-0.7.99+git20140317.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b59d6ff54a034d7c5dac49a435191eafc41b93be79dc7796f4b0072d8e02971c
-size 3215398

openocd-0.8.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b076c324400ef0198ce6e21616e17f7a1a12f749362821ce0b03ec62c3cd32f
+size 3768447

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
 

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
@@ -64,15 +74,24 @@ This package provides hardware description files and documentation.
 
 %prep
 %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 \