[meego-commits] 14693: Changes to Trunk:Testing/fontconfig

[Hao H. Li]

Hi,
I have made the following changes to fontconfig in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Hao H. Li

[This message was auto-generated]

---

Request #14693:

  submit:   home:haoli:branches:Trunk:Testing/fontconfig(r12)(cleanup) -> Trunk:Testing/fontconfig


Message:
    Update spec and move 49-sansserif.conf to backup file for fixing bmc #9024

State:   new          2011-03-10T21:48:41 haoli
Comment: None



changes files:
--------------
--- fontconfig.changes
+++ fontconfig.changes
@@ -0,0 +1,3 @@
+* Fri Mar 11 2011 Hao Li <hao.h.li at intel.com> - 2.8.0
+- Update spec and move 49-sansserif.conf to backup file for fixing bmc #9024
+

spec files:
-----------
--- fontconfig.spec
+++ fontconfig.spec
@@ -30,7 +30,6 @@
 Conflicts:   fonts-xorg-base
 Conflicts:   fonts-xorg-syriac
 
-
 %description
 Fontconfig is designed to locate fonts within the
 system and select them according to requirements specified by 
@@ -100,6 +99,7 @@
 # and own /usr/share/fonts
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts
 
+
 # Remove unpackaged files. no need when configure --disable-static
 #rm $RPM_BUILD_ROOT%{_libdir}/*.la
 #rm $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -119,6 +119,9 @@
 rm -f %{_localstatedir}/cache/fontconfig/????????????????????????????????.cache-2
 rm -f %{_localstatedir}/cache/fontconfig/stamp
 
+# move 49-sansserif.conf to backup file for fixing bmc #9024
+mv %{_sysconfdir}/fonts/conf.d/49-sansserif.conf %{_sysconfdir}/fonts/conf.d/49-sansserif.conf.bak
+
 # Force regeneration of all fontconfig cache files
 # The check for existance is needed on dual-arch installs (the second
 #  copy of fontconfig might install the binary instead of the first)
@@ -126,14 +129,12 @@
 if [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache --version 2>&1 | grep -q %{version} ; then
 HOME=/root /usr/bin/fc-cache -f
 fi
+
 # << post
 
 %postun -p /sbin/ldconfig
 
 
-
-
-
 %files
 %defattr(-,root,root,-)
 # >> files

other changes:
--------------