rpms/libXfont/devel .cvsignore, 1.12, 1.13 libXfont.spec, 1.30, 1.31 sources, 1.13, 1.14 built-in-scalable.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: ajackson

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

Modified Files:
	.cvsignore libXfont.spec sources 
Removed Files:
	built-in-scalable.patch 
Log Message:
auto-import libXfont-1.2.8-1.fc7 on branch devel from libXfont-1.2.8-1.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Jan 2007 03:57:24 -0000	1.12
+++ .cvsignore	6 Apr 2007 18:01:44 -0000	1.13
@@ -1 +1 @@
-libXfont-1.2.6.tar.bz2
+libXfont-1.2.8.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libXfont.spec	17 Jan 2007 21:42:15 -0000	1.30
+++ libXfont.spec	6 Apr 2007 18:01:44 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.2.6
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,7 +9,6 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 Patch0: libXfont-1.2.3-namespace-pollution.patch
-Patch1: built-in-scalable.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -41,16 +40,9 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .hidden
-%patch1 -p1 -b built-in-scalable.patch
-
-# Disable static library creation by default.
-%define with_static 0
 
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make 
 
 %install
@@ -95,13 +87,13 @@
 %{_includedir}/X11/fonts/pcf.h
 %{_includedir}/X11/fonts/ft.h
 %{_includedir}/X11/fonts/ftfuncs.h
-%if %{with_static}
-%{_libdir}/libXfont.a
-%endif
 %{_libdir}/libXfont.so
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.8-1
+- libXfont 1.2.8.
+
 * Wed Jan 17 2007 Kristian Høgsberg <krh at redhat.com> 1.2.6-2
 - Add built-in-scalable.patch to prevent crash when trying to scale
   built-in bitmap fonts.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Jan 2007 03:57:24 -0000	1.13
+++ sources	6 Apr 2007 18:01:44 -0000	1.14
@@ -1 +1 @@
-9f2c956b9a01f20a247a155d75270737  libXfont-1.2.6.tar.bz2
+83b8e21f6ee22512a8f72ba51e2d74f6  libXfont-1.2.8.tar.bz2


--- built-in-scalable.patch DELETED ---