[packages/openocd] - up to 0.6.1; enable libusb only ftdi driver, too; use system jimtcl

[arekm]

commit c6cb3f68985b857ce444043cd485adc58bb1a360
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Oct 24 22:06:11 2012 +0200

    - up to 0.6.1; enable libusb only ftdi driver, too; use system jimtcl

 openocd-build.patch | 58 -----------------------------------------------------
 openocd.spec        | 13 +++++-------
 2 files changed, 5 insertions(+), 66 deletions(-)
---
diff --git a/openocd.spec b/openocd.spec
index 57b03a9..93aaa57 100644
--- a/openocd.spec
+++ b/openocd.spec
@@ -1,21 +1,19 @@
 # https://sourceforge.net/apps/trac/openocd/ticket/51
 %bcond_without	libftdi	# use libftdi instead of libftd2xx
-%bcond_with	system_jimtcl
+%bcond_without	system_jimtcl
 Summary:	Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 Name:		openocd
-Version:	0.5.0
+Version:	0.6.1
 Release:	1
 License:	GPL
 Group:		Applications
 Source0:	http://downloads.sourceforge.net/openocd/%{name}-%{version}.tar.bz2
-# Source0-md5:	43434c2b5353c9b853278b8bff22cb1a
-Patch0:		%{name}-build.patch
+# Source0-md5:	946421efc2414ff89bdaf3f588b230f8
 URL:		http://openocd.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %if %{with system_jimtcl}
-# http://sourceforge.net/apps/trac/openocd/ticket/50
-BuildRequires:	jimtcl-devel < 0.73
+BuildRequires:	jimtcl-devel
 %endif
 %if %{with libftdi}
 BuildRequires:	libftdi-devel
@@ -46,7 +44,6 @@ the LPC3180's NAND flash controller is included.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -58,6 +55,7 @@ the LPC3180's NAND flash controller is included.
 %configure \
 	--disable-werror \
 	%{?with_system_jimtcl:--disable-internal-jimtcl} \
+	--enable-ftdi \
 %if %{with libftdi}
 	--enable-ft2232_libftdi \
 	--enable-usb_blaster_libftdi \
@@ -100,5 +98,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_infodir}/%{name}.info*
-%{_libdir}/%{name}
 %{_mandir}/man1/%{name}.1*
diff --git a/openocd-build.patch b/openocd-build.patch
deleted file mode 100644
index 34ab8e5..0000000
--- a/openocd-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -urN openocd-0.5.0.org/src/jtag/drivers/Makefile.am openocd-0.5.0/src/jtag/drivers/Makefile.am
---- openocd-0.5.0.org/src/jtag/drivers/Makefile.am	2011-08-09 07:34:19.000000000 +0200
-+++ openocd-0.5.0/src/jtag/drivers/Makefile.am	2012-03-25 11:23:44.876960535 +0200
-@@ -5,7 +5,8 @@
- libocdjtagdrivers_la_SOURCES = \
- 	$(DRIVERFILES)
- 
--nobase_dist_pkglib_DATA =
-+pkgprgdir = $(libdir)/@PACKAGE@
-+nobase_dist_pkgprg_DATA =
- 
- ULINK_FIRMWARE = $(srcdir)/OpenULINK
- 
-@@ -64,7 +65,7 @@
- endif
- if ULINK
- DRIVERFILES += ulink.c
--nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
-+nobase_dist_pkgprg_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
- endif
- if VSLLINK
- DRIVERFILES += vsllink.c
-diff -urN openocd-0.5.0.org/src/target/Makefile.am openocd-0.5.0/src/target/Makefile.am
---- openocd-0.5.0.org/src/target/Makefile.am	2011-08-09 07:34:19.000000000 +0200
-+++ openocd-0.5.0/src/target/Makefile.am	2012-03-25 11:23:59.447310533 +0200
-@@ -165,7 +165,8 @@
- 	avr32_mem.h \
- 	avr32_regs.h
- 
--nobase_dist_pkglib_DATA =
--nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
-+pkgprgdir = $(libdir)/@PACKAGE@
-+nobase_dist_pkgprg_DATA =
-+nobase_dist_pkgprg_DATA += ecos/at91eb40a.elf
- 
- MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
---- openocd-0.5.0/jimtcl/autosetup/find-tclsh~	2011-08-09 07:42:11.000000000 +0200
-+++ openocd-0.5.0/jimtcl/autosetup/find-tclsh	2012-03-25 11:36:36.158741432 +0200
-@@ -3,7 +3,7 @@
- # If not found, builds a bootstrap jimsh from source
- d=$(dirname "$0")
- PATH="$PATH:$d"
--for tclsh in jimsh tclsh8.5 tclsh8.6 jimsh0; do
-+for tclsh in jimsh tclsh tclsh8.5 tclsh8.6 jimsh0; do
- 	$tclsh "$d/test-tclsh" 2>/dev/null && exit 0
- done
- echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
---- openocd-0.5.0/jimtcl/autosetup/autosetup~	2011-08-09 07:42:11.000000000 +0200
-+++ openocd-0.5.0/jimtcl/autosetup/autosetup	2012-03-25 12:37:08.090464220 +0200
-@@ -146,7 +146,7 @@
- 			dict set autosetup(cmdline) $n $v
- 			define $n $v
- 		} else {
--			user-error "Unexpected parameter: $arg"
-+			user-notice "Unexpected parameter: $arg"
- 		}
- 	}
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openocd.git/commitdiff/c6cb3f68985b857ce444043cd485adc58bb1a360