rpms/freetype/devel .cvsignore, 1.24, 1.25 freetype-2.3.11-more-demos.patch, 1.1, 1.2 freetype.spec, 1.78, 1.79 sources, 1.24, 1.25 ft2demos-2.1.9-mathlib.patch, 1.1, NONE

Behdad Esfahbod behdad at fedoraproject.org
Tue Feb 23 19:50:55 UTC 2010


Author: behdad

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

Modified Files:
	.cvsignore freetype-2.3.11-more-demos.patch freetype.spec 
	sources 
Removed Files:
	ft2demos-2.1.9-mathlib.patch 
Log Message:
* Thu Feb 23 2010 Behdad Esfahbod <behdad at redhat.com> 2.3.12-1 
- Update to 2.3.12 
- Drop mathlib patch 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	22 Oct 2009 20:07:57 -0000	1.24
+++ .cvsignore	23 Feb 2010 19:50:55 -0000	1.25
@@ -1,3 +1,3 @@
-freetype-doc-2.3.11.tar.bz2
-ft2demos-2.3.11.tar.bz2
-freetype-2.3.11.tar.bz2
+ft2demos-2.3.12.tar.bz2
+freetype-doc-2.3.12.tar.bz2
+freetype-2.3.12.tar.bz2

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

Index: freetype-2.3.11-more-demos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/freetype-2.3.11-more-demos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freetype-2.3.11-more-demos.patch	22 Oct 2009 20:07:58 -0000	1.1
+++ freetype-2.3.11-more-demos.patch	23 Feb 2010 19:50:55 -0000	1.2
@@ -1,6 +1,6 @@
-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
+diff -up ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile
+--- ft2demos-2.3.11/Makefile.more-demos	2009-10-22 16:02:26.000000000 -0400
++++ 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.


Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- freetype.spec	3 Dec 2009 22:43:53 -0000	1.78
+++ freetype.spec	23 Feb 2010 19:50:55 -0000	1.79
@@ -6,8 +6,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.11
-Release: 2%{?dist}
+Version: 2.3.12
+Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -15,8 +15,6 @@ Source:  http://download.savannah.gnu.or
 Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
 Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
 
-# Add -lm when linking X demos
-Patch5: ft2demos-2.1.9-mathlib.patch
 Patch20:  freetype-2.1.10-enable-ft2-bci.patch
 Patch21:  freetype-2.3.0-enable-spr.patch
 
@@ -76,10 +74,6 @@ FreeType.
 %prep
 %setup -q -b 1 -a 2
 
-pushd ft2demos-%{version}
-%patch5 -p1 -b .mathlib
-popd
-
 %patch20  -p1 -b .enable-ft2-bci
 
 %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
@@ -87,7 +81,10 @@ popd
 %endif
 
 %patch46  -p1 -b .enable-valid
+
+pushd ft2demos-%{version}
 %patch47  -p1 -b .more-demos
+popd
 
 %patch88 -p1 -b .multilib
 
@@ -222,6 +219,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu Feb 23 2010 Behdad Esfahbod <behdad at redhat.com> 2.3.12-1
+- Update to 2.3.12
+- Drop mathlib patch
+
 * Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-2
 - Drop upstreamed patch.
 - Enable patented bytecode interpretter now that the patents are expired.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	22 Oct 2009 20:07:58 -0000	1.24
+++ sources	23 Feb 2010 19:50:55 -0000	1.25
@@ -1,3 +1,3 @@
-c9d75b659382aef80a8f86efcde08629  freetype-doc-2.3.11.tar.bz2
-7e3df8813fdbad22e996a5dfed7f7361  ft2demos-2.3.11.tar.bz2
-519c7cbf5cbd72ffa822c66844d3114c  freetype-2.3.11.tar.bz2
+ce2811161e779de4eff39bd9d5d916ba  ft2demos-2.3.12.tar.bz2
+2788beb4e1ee01bad8ed9978c0630e86  freetype-doc-2.3.12.tar.bz2
+e974a82e5939be8e05ee65f07275d7c5  freetype-2.3.12.tar.bz2


--- ft2demos-2.1.9-mathlib.patch DELETED ---



More information about the fonts-bugs mailing list