[openocd/el6] 0.5.0

[Chitlesh GOORAH]

commit bff36cc76defd40c6162fc8317fc000856a3d500
Author: Chitlesh GOORAH <chitlesh at fedoraproject.org>
Date:   Mon Dec 19 22:24:08 2011 +0100

    0.5.0

 .gitignore            |    1 +
 openocd.COPYING.patch |   11 ++++++++++
 openocd.spec          |   53 ++++++++++++++++++++++++++++++------------------
 sources               |    2 +-
 4 files changed, 46 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e0e38ed..8c3c40a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 openocd-0.2.0.tar.gz
+/openocd-0.5.0.tar.bz2
diff --git a/openocd.COPYING.patch b/openocd.COPYING.patch
new file mode 100644
index 0000000..3d4c70a
--- /dev/null
+++ b/openocd.COPYING.patch
@@ -0,0 +1,11 @@
+--- COPYING.orig	2011-12-14 21:41:38.679088677 -0600
++++ COPYING	2011-12-14 21:42:14.742637819 -0600
+@@ -2,7 +2,7 @@
+ 		       Version 2, June 1991
+ 
+  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++                       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
diff --git a/openocd.spec b/openocd.spec
index e665a84..020be37 100644
--- a/openocd.spec
+++ b/openocd.spec
@@ -1,17 +1,20 @@
-Name:		openocd
-Version:	0.4.0
-Release:	1%{?dist}
-Summary:	Debugging, in-system programming and boundary-scan testing for embedded devices
+Name:       openocd
+Version:    0.5.0
+Release:    1%{?dist}
+Summary:    Debugging, in-system programming and boundary-scan testing for embedded devices
 
-Group:		Development/Tools
-License:	GPLv2
-URL:		http://openocd.berlios.de/web/
-Source0:	http://sourceforge.net/projects/openocd/files/openocd/0.4.0/%{name}-%{version}.tar.gz
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Group:      Development/Tools
+License:    GPLv2
+URL:        http://sourceforge.net/projects/openocd
+Source0:    http://downloads.sourceforge.net/project/openocd/openocd/%{version}/%{name}-%{version}.tar.bz2
 
-BuildRequires:	chrpath, libftdi-devel
-Requires(post):	info
-Requires(preun): info
+# Patch has been applied: http://openocd.zylin.com/#change,274
+Patch0:     openocd.COPYING.patch
+BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:  chrpath, libftdi-devel
+Requires(post): info
+Requires(preun):info
 
 %description
 The Open On-Chip Debugger (OpenOCD) provides debugging, in-system programming 
@@ -23,6 +26,7 @@ debugging.
 
 %prep
 %setup -q
+%patch0
 cd doc
 iconv -f iso8859-1 -t utf-8 openocd.info > openocd.info.conv
 mv -f openocd.info.conv openocd.info
@@ -32,18 +36,24 @@ mv -f openocd.info.conv openocd.info
   --disable-werror \
   --enable-static \
   --disable-shared \
+  --enable-dummy \
+  --enable-ft2232_libftdi \
+  --enable-gw16012 \
   --enable-parport \
   --enable-parport_ppdev \
-  --enable-ft2232_libftdi \
-  --enable-usbprog \
   --enable-presto_libftdi \
+  --enable-amtjtagaccel \
+  --enable-arm-jtag-ew \
   --enable-jlink \
-  --enable-vsllink \
   --enable-rlink \
-  --enable-dummy \
-  --enable-gw16012 \
-  --enable-amtjtagaccel \
-  --enable-arm-jtag-ew
+  --enable-ulink \
+  --enable-usbprog \
+  --enable-vsllink \
+  --enable-oocd_trace \
+  --enable-ep39xx \
+  --enable-at91rm9200 \
+  --disable-doxygen-html \
+  CROSS=
 make %{?_smp_mflags}
 
 %install
@@ -58,7 +68,7 @@ chrpath --delete %{buildroot}/%{_bindir}/openocd
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
 fi
 
 %clean
@@ -76,6 +86,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Dec 14 2011 Dean Glazeski <dnglaze at gmail.com> - 0.5.0-1
+- RPM build for new release.
+
 * Sat Feb 13 2010 Dean Glazeski <dnglaze at gmail.com> - 0.4.0-1
 - RPM build for new release.
 
diff --git a/sources b/sources
index ba9be32..270647b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb91e1152e8c374fc906d1a276c21b4f  openocd-0.4.0.tar.gz
+43434c2b5353c9b853278b8bff22cb1a  openocd-0.5.0.tar.bz2