[demorse] New version

[Jaroslav Škarvada]

commit 4be4db38206424a9c768a2a3681f2e202b23f165
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Jul 10 11:49:52 2012 +0200

    New version
    
      Resolves: rhbz#837243

 .gitignore                                         |    2 +-
 demorse-0.8-makefile.patch                         |   34 --------------------
 ....9-makefile.patch => demorse-1.0-makefile.patch |   10 +++---
 demorse.spec                                       |   18 ++++++-----
 sources                                            |    2 +-
 5 files changed, 17 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c95ea63..577b969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-demorse-0.9.tar.gz
+demorse-*.tar.bz2
diff --git a/demorse-0.9-makefile.patch b/demorse-1.0-makefile.patch
similarity index 77%
rename from demorse-0.9-makefile.patch
rename to demorse-1.0-makefile.patch
index 2a1048f..bd6f30b 100644
--- a/demorse-0.9-makefile.patch
+++ b/demorse-1.0-makefile.patch
@@ -6,18 +6,18 @@ diff -up demorse/Makefile.orig demorse/Makefile
  SHELL   = /bin/sh
  PROJECT = demorse
 -BINDIR  = /usr/local/bin
--DOCDIR  = /usr/local/share/
+-DOCDIR  = /usr/local/share/doc/
 +BINDIR  = /usr/bin
 +DOCDIR  = /usr/share/doc/
- CC      = gcc -Wall -O2 -march=native
+ CC      = gcc -Wall -O2 -march=native -D_FORTIFY_CODE=2
  
 +DESTDIR=
 +
- objects = decode.o demorse.o detect.o sound.o
+ objects = main.o decode.o detect.o sound.o
  
  $(PROJECT) : $(objects)
-@@ -14,12 +16,11 @@ $(PROJECT) : $(objects)
- $(objects) : $(PROJECT).h
+@@ -18,12 +20,11 @@ $(PROJECT) : $(objects)
+ sound.o : sound.h
  
  install : $(PROJECT)
 -	install -m 755 --strip $(PROJECT) $(BINDIR)
diff --git a/demorse.spec b/demorse.spec
index 6e50836..bca1ce0 100644
--- a/demorse.spec
+++ b/demorse.spec
@@ -1,18 +1,16 @@
 Name:		demorse
-Version:	0.9
-Release:	6%{?dist}
+Version:	1.0
+Release:	1%{?dist}
 Summary:	Command line tool for decoding Morse code signals
 
 Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://5b4az.chronos.org.uk/pages/morse.html
-Source0:	http://5b4az.chronos.org.uk/pkg/morse/%{name}/%{name}-%{version}.tar.gz
-Patch0:		demorse-0.9-makefile.patch
+Source0:	http://5b4az.chronos.org.uk/pkg/morse/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		demorse-1.0-makefile.patch
+BuildRequires:	alsa-lib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  
-#Requires:       
-
 %description
 demorse is a non-interactive command line tool for decoding Morse code signals 
 into text. demorse detects the "dihs" and "dahs" that make a Morse code 
@@ -27,7 +25,7 @@ decoded Morse signals are sent to stdout.
 
 %prep
 %setup -q -n demorse
-%patch0 -p1
+%patch0 -p1 -b .makefile
 
 
 %build
@@ -48,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Tue Jul 10 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.0-1
+- New version
+  Resolves: rhbz#837243
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 5031cbe..7334624 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fcdaf021351ac8507426f31f6fe062f2  demorse-0.9.tar.gz
+e9ba07d5bb31f2a0ba115ea4826592e4  demorse-1.0.tar.bz2