rpms/libXfont/FC-5 .cvsignore, 1.6, 1.7 libXfont.spec, 1.14, 1.15 sources, 1.7, 1.8 fdo-7535.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/libXfont/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7160/FC-5

Modified Files:
	.cvsignore libXfont.spec sources 
Removed Files:
	fdo-7535.patch 
Log Message:
auto-import libXfont-1.2.2-1 on branch FC-5 from libXfont-1.2.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 11:07:28 -0000	1.6
+++ .cvsignore	12 Sep 2006 18:52:21 -0000	1.7
@@ -1 +1 @@
-libXfont-1.0.0.tar.bz2
+libXfont-1.2.2.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-5/libXfont.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXfont.spec	14 Aug 2006 22:34:59 -0000	1.14
+++ libXfont.spec	12 Sep 2006 18:52:21 -0000	1.15
@@ -1,12 +1,12 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.0.0
-Release: 3
+Version: 1.2.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -30,16 +30,12 @@
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
-Patch0: fdo-7535.patch
-
 %description devel
 X.Org X11 libXfont development package
 
 %prep
 %setup -q
 
-%patch -p1 -b .fdo-7535
-
 # Disable static library creation by default.
 %define with_static 0
 
@@ -90,6 +86,8 @@
 %{_includedir}/X11/fonts/fontutil.h
 %{_includedir}/X11/fonts/fontxlfd.h
 %{_includedir}/X11/fonts/pcf.h
+%{_includedir}/X11/fonts/ft.h
+%{_includedir}/X11/fonts/ftfuncs.h
 %if %{with_static}
 %{_libdir}/libXfont.a
 %endif
@@ -98,9 +96,8 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
-* Mon Aug 14 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-3
-- fdo-7535.patch
-  Fix for FDO bug 7535, CVE-2006-3467, RH bug 202475
+* Tue Sep 12 2006 Adam Jackson <ajackson at redhat.com> - 1.2.2-1
+- Update to 1.2.2, misc security fixes.
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
 - bump again for double-long bug on ppc(64)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 22:26:05 -0000	1.7
+++ sources	12 Sep 2006 18:52:21 -0000	1.8
@@ -1 +1 @@
-36e41e5966d8ab36bf019a6d64cac878  libXfont-1.0.0.tar.bz2
+ea2bf3d122e4491ba589e8fd3576f0a1  libXfont-1.2.2.tar.bz2


--- fdo-7535.patch DELETED ---