rpms/fontconfig/devel .cvsignore, 1.16, 1.17 fontconfig.spec, 1.60, 1.61 sources, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17400

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
newer cvs snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	24 Jan 2006 20:52:34 -0000	1.16
+++ .cvsignore	31 Jan 2006 13:44:03 -0000	1.17
@@ -1,2 +1,4 @@
 fontconfig-2.3.93.tar.gz
 fontconfig-2.3.93.cvs20060124.tar.gz
+fontconfig-2.3.93.cvs20060129.tar.gz
+fontconfig-2.3.93.cvs20060131.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- fontconfig.spec	24 Jan 2006 20:52:34 -0000	1.60
+++ fontconfig.spec	31 Jan 2006 13:44:03 -0000	1.61
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.3.93.cvs20060124
+Version: 2.3.93.cvs20060131
 Release: 1
 License: MIT
 Group: System Environment/Libraries
@@ -13,10 +13,6 @@
 Source2: 50-no-hint-fonts.conf
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
-# fix globar dir handling (Mike Fabian)
-Patch2: fontconfig-2.3.93-globaldir.patch
-# normalize path in fc-cache (Mike Fabian)
-Patch4: fontconfig-2.3.93-normalize.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -53,8 +49,6 @@
 %setup -q
 
 %patch1 -p1 -b .defaultconfig
-%patch2 -p1 -b .globaldir
-%patch4 -p1 -b .normalize
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -67,6 +61,7 @@
 echo "set protocol.file.allow_special_files = 1" > $ELINKS_CONFDIR/elinks.conf
 
 make
+make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,7 +82,7 @@
 
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_localstatedir}/cache/fontconfig/stamp
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,12 +128,14 @@
 %defattr(-, root, root)
 %doc fontconfig-devel.txt fontconfig-devel
 %{_libdir}/libfontconfig.so
-%{_libdir}/libfontconfig.a
 %{_libdir}/pkgconfig
 %{_includedir}/fontconfig
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060131-1
+- Newer cvs snapshot
+
 * Tue Jan 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060124-1
 - Newer cvs snapshot
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	24 Jan 2006 20:52:34 -0000	1.17
+++ sources	31 Jan 2006 13:44:03 -0000	1.18
@@ -1 +1 @@
-b365d99c503ed19dbe2019f3df90945d  fontconfig-2.3.93.cvs20060124.tar.gz
+a95a7de00ffbcf4e6f0bc2c8a94d9d93  fontconfig-2.3.93.cvs20060131.tar.gz