From 74d00a03ca16060eecd0b11225c548a148baa41d Mon Sep 17 00:00:00 2001
From: Dan Horák <sharkcz@fedoraproject.org>
Date: Nov 30 2009 14:19:32 +0000
Subject: - updated to version 1.58

- used better patch for the making the build output verbose

---

diff --git a/.cvsignore b/.cvsignore
index 50510d3..21ac280 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-atari++_1.57.tar.gz
+atari++_1.58.tar.gz
diff --git a/atari++-verbose.patch b/atari++-verbose.patch
index ede1752..893b27f 100644
--- a/atari++-verbose.patch
+++ b/atari++-verbose.patch
@@ -1,37 +1,44 @@
---- atari++/Makefile.atari.orig	2008-11-19 16:20:08.000000000 +0100
-+++ atari++/Makefile.atari	2008-11-19 16:21:07.000000000 +0100
-@@ -141,28 +141,24 @@ config.status:	configure
+diff -up atari++/Makefile.atari.SILENTose atari++/Makefile.atari
+--- atari++/Makefile.atari.SILENTose	2009-11-30 12:11:59.000000000 +0100
++++ atari++/Makefile.atari	2009-11-30 12:19:27.000000000 +0100
+@@ -71,6 +71,12 @@ INCLUDES	=	types.h $(foreach file,$(FILE
+ SOURCES		=	$(foreach file,$(FILES),$(file).cpp)
+ OBJECTS		=	$(foreach file,$(FILES),$(file).o)
+ 
++ifeq ($(V),1)
++SILENT=
++else
++SILENT=@
++endif
++
  ###################################################################################
  
- %.d: %.cpp
--	@ $(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
-+	$(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
- 		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
- 		[ -s $@ ] || rm -f $@'
+ debug	:	
+@@ -147,22 +153,22 @@ config.status:	configure
  
  %.o: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.o: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.s: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  %.s: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  atari++		:	$(OBJECTS)
 -	@ $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
-+	$(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
++	$(SILENT) $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
  
  dox		:	$(SOURCES) $(INCLUDES)
  	doxygen Doxyfile
diff --git a/atari++.spec b/atari++.spec
index 96d5524..9714640 100644
--- a/atari++.spec
+++ b/atari++.spec
@@ -1,5 +1,5 @@
 Name:           atari++
-Version:        1.57
+Version:        1.58
 Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
@@ -36,7 +36,7 @@ mv $f.new $f
 
 %build
 %configure
-make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0"
+make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0" V=1
 
 
 %install
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 30 2009 Dan Horák <dan[at]danny.cz> 1.58-1
+- updated to version 1.58
+- used better patch for the making the build output verbose
+
 * Tue Aug 25 2009 Dan Horák <dan[at]danny.cz> 1.57-1
 - update to version 1.57
 
diff --git a/sources b/sources
index f22b893..1468e57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz
+dd7237b15f778ebf3d2a58bf7e615d86  atari++_1.58.tar.gz