[openocd/f17: 2/2] update to 0.6.1 add 'BR: libusbx-devel' to enable ftdi interfaces use jimtcl from the repository; no

[Markus Mayer]

commit 9816c2b2ed519ff1674ecf8254e227804d87bc4f
Author: Markus Mayer <lotharlutz at gmx.de>
Date:   Wed May 22 14:27:14 2013 +0200

    update to 0.6.1
    add 'BR: libusbx-devel' to enable ftdi interfaces
    use jimtcl from the repository; not the bundled one

 .gitignore   |    1 +
 openocd.spec |   20 +++++++++++++++++---
 sources      |    2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0009780..6acd301 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ openocd-0.4.0.tar.gz
 /openocd-0.5.0-1.fc16.src.rpm
 /openocd-0.5.0.tar.bz2
 /openocd-0.6.0.tar.bz2
+/openocd-0.6.1.tar.bz2
diff --git a/openocd.spec b/openocd.spec
index 5d2a016..d16f004 100644
--- a/openocd.spec
+++ b/openocd.spec
@@ -1,6 +1,6 @@
 Name:       openocd
-Version:    0.6.0
-Release:    3%{?dist}
+Version:    0.6.1
+Release:    1%{?dist}
 Summary:    Debugging, in-system programming and boundary-scan testing for embedded devices
 
 Group:      Development/Tools
@@ -10,7 +10,7 @@ Source0:    http://downloads.sourceforge.net/project/openocd/openocd/%{version}/
 
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  chrpath, libftdi-devel
+BuildRequires:  chrpath, libftdi-devel, libusbx-devel, jimtcl-devel
 Requires(post): info
 Requires(preun):info
 
@@ -24,6 +24,7 @@ debugging.
 
 %prep
 %setup -q
+rm -rf jimtcl
 cd doc
 iconv -f iso8859-1 -t utf-8 openocd.info > openocd.info.conv
 mv -f openocd.info.conv openocd.info
@@ -36,6 +37,7 @@ mv -f openocd.info.conv openocd.info
   --enable-dummy \
   --enable-ft2232_libftdi \
   --enable-gw16012 \
+  --enable-usb_blaster_libftdi \
   --enable-parport \
   --enable-parport_ppdev \
   --enable-presto_libftdi \
@@ -50,6 +52,13 @@ mv -f openocd.info.conv openocd.info
   --enable-ep39xx \
   --enable-at91rm9200 \
   --enable-stlink \
+  --enable-ioutil \
+  --enable-at91rm9200 \
+  --enable-buspirate \
+  --enable-osbdm \
+  --enable-opendous \
+  --enable-remote-bitbang \
+  --disable-internal-jimtcl \
   --disable-doxygen-html \
   CROSS=
 make %{?_smp_mflags}
@@ -84,6 +93,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Thu May 02 2013 Markus Mayer <lotharlutz at gmx.de> - 0.6.1-1
+- update to upstream release 0.6.1
+- don't bundle jimtcl
+- enable additional targets
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index abd17f8..4313f84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-824cbe192ca2c79055b6ae82579123cf  openocd-0.6.0.tar.bz2
+946421efc2414ff89bdaf3f588b230f8  openocd-0.6.1.tar.bz2