rpms/freetype/F-12 freetype-2.3.11-more-demos.patch, NONE, 1.1 freetype.spec, 1.77, 1.78

[Behdad Esfahbod]

Author: behdad

Update of /cvs/pkgs/rpms/freetype/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17714

Modified Files:
	freetype.spec 
Added Files:
	freetype-2.3.11-more-demos.patch 
Log Message:
Try again


freetype-2.3.11-more-demos.patch:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE freetype-2.3.11-more-demos.patch ---
diff -up freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile
--- freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos	2009-10-22 16:02:26.000000000 -0400
+++ freetype-2.3.11/ft2demos-2.3.11/Makefile	2009-10-22 16:02:32.000000000 -0400
@@ -288,10 +288,10 @@ else
   # Note that ttdebug only works if the FreeType's `truetype' driver has
   # been compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined.
   #
-  # EXES += ftchkwd
-  # EXES += ftmemchk
-  # EXES += ftpatchk
-  # EXES += fttimer
+  EXES += ftchkwd
+  EXES += ftmemchk
+  EXES += ftpatchk
+  EXES += fttimer
   # EXES += testname
   # EXES += ttdebug
 


Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/F-12/freetype.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- freetype.spec	3 Dec 2009 22:31:24 -0000	1.77
+++ freetype.spec	3 Dec 2009 22:43:12 -0000	1.78
@@ -9,7 +9,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.3.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -24,6 +24,8 @@ Patch21:  freetype-2.3.0-enable-spr.patc
 
 # Enable otvalid and gxvalid modules
 Patch46:  freetype-2.2.1-enable-valid.patch
+# Enable additional demos
+Patch47:  freetype-2.3.11-more-demos.patch
 
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
@@ -91,6 +93,7 @@ popd
 %endif
 
 %patch46  -p1 -b .enable-valid
+%patch47  -p1 -b .more-demos
 
 %patch88 -p1 -b .multilib
 
@@ -222,6 +225,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+
+* Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-3
+- Add freetype-2.3.11-more-demos.patch
+- New demo programs ftmemchk, ftpatchk, and fttimer
+
 * Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-2
 - Second try.  Drop upstreamed patches.