rpms/amanith/devel amanith-0.3-nothirdpartystatic.patch, 1.1, 1.2 amanith-0.3-system-freetype.patch, 1.1, 1.2

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/amanith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24585

Modified Files:
	amanith-0.3-nothirdpartystatic.patch 
	amanith-0.3-system-freetype.patch 
Log Message:
fix patches to apply cleanly

amanith-0.3-nothirdpartystatic.patch:

Index: amanith-0.3-nothirdpartystatic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amanith/devel/amanith-0.3-nothirdpartystatic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amanith-0.3-nothirdpartystatic.patch	20 Dec 2007 19:48:24 -0000	1.1
+++ amanith-0.3-nothirdpartystatic.patch	26 Sep 2008 20:04:17 -0000	1.2
@@ -30,11 +30,10 @@
  win32: {
  
      !contains(DEFINES, WIN32_MINGW) {
---- amanith/plugins/fonts/build.conf.BAD	2007-05-26 18:04:44.000000000 -0500
-+++ amanith/plugins/fonts/build.conf	2007-05-26 18:05:08.000000000 -0500
-@@ -38,9 +38,9 @@ contains(DEFINES, _FONTS_PLUGIN) {
- # take into account compilation mode (debug or release)
- DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE
+diff -up amanith/plugins/fonts/build.conf.orig amanith/plugins/fonts/build.conf
+--- amanith/plugins/fonts/build.conf.orig	2005-09-26 04:18:52.000000000 -0400
++++ amanith/plugins/fonts/build.conf	2008-09-26 15:52:14.000000000 -0400
+@@ -40,7 +40,7 @@ DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG
  
  INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include
  
@@ -43,3 +42,10 @@
  win32: {
  
      !contains(DEFINES, WIN32_MINGW) {
+@@ -51,4 +51,4 @@ win32: {
+     contains(DEFINES, WIN32_MINGW) {
+         LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
+     }
+-}
+\ No newline at end of file
++}

amanith-0.3-system-freetype.patch:

Index: amanith-0.3-system-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amanith/devel/amanith-0.3-system-freetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amanith-0.3-system-freetype.patch	20 Dec 2007 19:48:24 -0000	1.1
+++ amanith-0.3-system-freetype.patch	26 Sep 2008 20:04:17 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up amanith/plugins/fonts/build.conf.BAD amanith/plugins/fonts/build.conf
---- amanith/plugins/fonts/build.conf.BAD	2007-11-15 10:18:43.000000000 -0500
-+++ amanith/plugins/fonts/build.conf	2007-11-15 10:19:10.000000000 -0500
+diff -up amanith/plugins/fonts/build.conf.orig amanith/plugins/fonts/build.conf
+--- amanith/plugins/fonts/build.conf.orig	2008-09-26 15:53:06.000000000 -0400
++++ amanith/plugins/fonts/build.conf	2008-09-26 15:54:22.000000000 -0400
 @@ -38,7 +38,7 @@ contains(DEFINES, _FONTS_PLUGIN) {
  # take into account compilation mode (debug or release)
  DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE
@@ -10,10 +10,3 @@
  
  unix: LIBS += -lfreetype -lz
  win32: {
-@@ -51,4 +51,4 @@ win32: {
-     contains(DEFINES, WIN32_MINGW) {
-         LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
-     }
--}
-\ No newline at end of file
-+}