[flterm/f19] Bug fixes

[Shakthi Kannan]

commit bbe0bf666bbf3ad7371e75aa5eaf5fed3c56984e
Author: Shakthi Kannan <shakthimaan at fedoraproject.org>
Date:   Tue Sep 10 14:55:05 2013 +0530

    Bug fixes

 ... flterm-1.2-use-rpm-opt-flags-debug-empty.patch |    4 ++--
 flterm.spec                                        |   16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/flterm-1.2-use-rpm-opt-flags.patch b/flterm-1.2-use-rpm-opt-flags-debug-empty.patch
similarity index 82%
rename from flterm-1.2-use-rpm-opt-flags.patch
rename to flterm-1.2-use-rpm-opt-flags-debug-empty.patch
index 3e7c9b5..bd2c5ce 100644
--- a/flterm-1.2-use-rpm-opt-flags.patch
+++ b/flterm-1.2-use-rpm-opt-flags-debug-empty.patch
@@ -6,11 +6,11 @@ diff -up milkymist-Release_1.2/tools/Makefile.fix milkymist-Release_1.2/tools/Ma
  
  %: %.c
 -	$(CC) -O2 -Wall -I. -s -o $@ $<
-+	$(CC) ${RPM_OPT_FLAGS} -I. -s -o $@ $<
++	$(CC) ${RPM_OPT_FLAGS} -I. -o $@ $<
  
  makeraw: makeraw.c
 -	$(CC) -O2 -Wall -s -o $@ $< -lgd
-+	$(CC) ${RPM_OPT_FLAGS} -O2 -Wall -s -o $@ $< -lgd
++	$(CC) ${RPM_OPT_FLAGS} -o $@ $< -lgd
  
  install: mkmmimg flterm
  	install -d /usr/local/bin
diff --git a/flterm.spec b/flterm.spec
index 217ae02..60bd63f 100644
--- a/flterm.spec
+++ b/flterm.spec
@@ -1,16 +1,16 @@
 Name:           flterm
 Version:        1.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Firmware download program
 
 Group:          Applications/Engineering
 License:        GPLv3
 URL:            http://milkymist.org
 Source0:        https://github.com/milkymist/milkymist/archive/milkymist-Release_%{version}.tar.gz
-Patch0:         flterm-1.2-use-rpm-opt-flags.patch
+Patch0:         flterm-1.2-use-rpm-opt-flags-debug-empty.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  clang
-ExcludeArch:    s390 s390x sparcv9
+ExcludeArch:    s390 s390x sparcv9 armv7hl
 
 %description
 %{name} is a serial terminal, and firmware download program.
@@ -21,7 +21,7 @@ ExcludeArch:    s390 s390x sparcv9
 
 %build
 cd tools
-make flterm
+make CC=gcc flterm
 
 
 %install
@@ -39,6 +39,14 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 
 %changelog
+* Tue Sep 10 2013 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 1.2-3
+- ExcludeArch arm
+- Use make CC=gcc (bz #965697)
+- Apply debug empty patch (bz #922397)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri Mar 15 2013 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 1.2-1
 - Updated package to 1.2 upstream release