rpms/demorse/F-8 demorse-0.9-makefile.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 demorse.spec, 1.1, 1.2 sources, 1.2, 1.3

[Robert 'Bob' Jensen (bjensen)]

Author: bjensen

Update of /cvs/pkgs/rpms/demorse/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27831

Modified Files:
	.cvsignore demorse.spec sources 
Added Files:
	demorse-0.9-makefile.patch 
Log Message:

Committing in demorse-0.9 for F-8 .

Modified Files:
 	.cvsignore demorse.spec sources 
Added Files:
 	demorse-0.9-makefile.patch 


demorse-0.9-makefile.patch:

--- NEW FILE demorse-0.9-makefile.patch ---
diff -up demorse/Makefile.orig demorse/Makefile
--- demorse/Makefile.orig	2008-02-28 20:25:14.000000000 -0600
+++ demorse/Makefile	2008-02-28 20:29:34.000000000 -0600
@@ -2,10 +2,12 @@
 
 SHELL   = /bin/sh
 PROJECT = demorse
-BINDIR  = /usr/local/bin
-DOCDIR  = /usr/local/share/
+BINDIR  = /usr/bin
+DOCDIR  = /usr/share/doc/
 CC      = gcc -Wall -O2 -march=native
 
+DESTDIR=
+
 objects = decode.o demorse.o detect.o sound.o
 
 $(PROJECT) : $(objects)
@@ -14,12 +16,11 @@ $(PROJECT) : $(objects)
 $(objects) : $(PROJECT).h
 
 install : $(PROJECT)
-	install -m 755 --strip $(PROJECT) $(BINDIR)
-	install -m 644 doc/$(PROJECT).html $(DOCDIR)
+	install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT)
 
 uninstall :
-	rm $(BINDIR)/$(PROJECT)
-	rm $(DOCDIR)/$(PROJECT).html
+	rm $(DESTDIR)$(BINDIR)/$(PROJECT)
+	rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html
 
 clean :
 	rm -f *.o *~


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/demorse/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Feb 2008 20:37:18 -0000	1.1
+++ .cvsignore	29 Feb 2008 03:42:27 -0000	1.2
@@ -0,0 +1 @@
+demorse-0.9.tar.gz


Index: demorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/demorse/F-8/demorse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demorse.spec	20 Feb 2008 01:44:24 -0000	1.1
+++ demorse.spec	29 Feb 2008 03:42:27 -0000	1.2
@@ -1,13 +1,13 @@
 Name:		demorse
-Version:	0.8
-Release:	3%{?dist}
+Version:	0.9
+Release:	2%{?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.8-makefile.patch
+Patch0:		demorse-0.9-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  
@@ -26,12 +26,12 @@
 decoded Morse signals are sent to stdout.
 
 %prep
-%setup -q
+%setup -q -n demorse
 %patch0 -p1
 
 
 %build
-make %{?_smp_mflags}
+make CC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,12 +48,20 @@
 %{_bindir}/%{name}
 
 %changelog
+* Fri Feb 29 2008 David Woodhouse <dwmw2 at infradead.org> 0.9-2
+- Fix CFLAGS
+
+* Fri Feb 29 2008 Robert 'Bob' Jensen <bob at bobjensen.com> 0.9-1
+- New Upstream Version 
+
 * Sun Feb 17 2008 Robert 'Bob' Jensen <bob at bobjensen.com> 0.8-3
 - Initial SPEC
+
 * Wed Nov 21 2007 Sindre Pedersen Bjørdal <foolish at guezz.net> 0.8-2
 - Update License tag
 - Copy of GPL is missing form upstream tarball, make note of this
 - Rewrite makefile Patch
 - include doc files
+
 * Tue May 15 2007 Robert 'Bob' Jensen <bob at bobjensen.com> 0.8-0
 - Initial SPEC


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/demorse/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Feb 2008 01:44:24 -0000	1.2
+++ sources	29 Feb 2008 03:42:27 -0000	1.3
@@ -1 +1 @@
-d96d63ba6f43b9d22ae8e910d4544d95  demorse-0.8.tar.gz
+fcdaf021351ac8507426f31f6fe062f2  demorse-0.9.tar.gz