From 8782890c4069a0753e516992e69667bd6016238e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=AA=E0=A5=8D=E0=A4=B0=E0=A4=B5=E0=A4=BF=E0=A4=A3=20?=
 =?UTF-8?q?=E0=A4=B8=E0=A4=BE=E0=A4=A4=E0=A4=AA=E0=A5=81=E0=A4=A4=E0=A5=87?=
 <psatpute@redhat.com>
Date: Sun, 12 Feb 2012 01:09:33 +0530
Subject: [PATCH] Upstream new source , #597403

---
 .gitignore               |  1 +
 66-ucs-miscfixed.conf    | 16 ++++++++++++++--
 readme_cleanup.patch     | 19 -------------------
 sources                  |  3 +--
 ucs-miscfixed-fonts.spec | 36 ++++++++++++++++--------------------
 5 files changed, 32 insertions(+), 43 deletions(-)
 delete mode 100644 readme_cleanup.patch

diff --git a/.gitignore b/.gitignore
index 423e047..7cd0640 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 bitmap-fonts-0.3.tar.bz2
 fixfont-3.5.tar.bz2
+/ucs-fonts.tar.gz
diff --git a/66-ucs-miscfixed.conf b/66-ucs-miscfixed.conf
index 776c153..0cb2e6e 100644
--- a/66-ucs-miscfixed.conf
+++ b/66-ucs-miscfixed.conf
@@ -4,11 +4,23 @@
   <alias>
     <family>monospace</family>
     <prefer>
-      <family>MiscFixed</family>
+      <family>Fixed</family>
     </prefer>
   </alias>
   <alias>
-    <family>MiscFixed</family>
+    <family>monospace</family>
+    <prefer>
+      <family>Clean</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Fixed</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+  <alias>
+    <family>Clean</family>
     <default>
       <family>monospace</family>
     </default>
diff --git a/readme_cleanup.patch b/readme_cleanup.patch
deleted file mode 100644
index a0347a8..0000000
--- a/readme_cleanup.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rup bitmap-fonts-0.3/README bitmap-fonts-0.3_mod/README
---- bitmap-fonts-0.3/README	2003-01-22 03:35:13.000000000 +0530
-+++ bitmap-fonts-0.3_mod/README	2009-10-07 18:01:47.000000000 +0530
-@@ -11,15 +11,6 @@ Most of these fonts are in the public do
- are under the X license. Copyright information where
- applicable can be found in the .bdf files.
- 
--The Lucida fonts are also derived from the X distribution.
--The file LU_LEGALNOTICE is the license that applies to the
--original versions of these fonts.
--
--The fangongti16.bdf fangongti24.bdf are merges of the
--Fangosong ti fonts, and the Sony 8x16/12x24 fonts of
--the same size to get full ASCII coverage. The licenses
--of these fonts can be found in the .bdf files.
--
- Owen Taylor <otaylor@redhat.com>
- June 27 2002
- August 28 2002
diff --git a/sources b/sources
index 088418f..bbb84ac 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f07548f9668f178e1a6f6ae39d595c8c  bitmap-fonts-0.3.tar.bz2
-008073dee211f94105b2ff2790aa45dc  fixfont-3.5.tar.bz2
+60c7238630be630bedc55a570dd2d5bf  ucs-fonts.tar.gz
diff --git a/ucs-miscfixed-fonts.spec b/ucs-miscfixed-fonts.spec
index 625d279..6c95335 100644
--- a/ucs-miscfixed-fonts.spec
+++ b/ucs-miscfixed-fonts.spec
@@ -3,19 +3,17 @@
 
 Name: %{fontname}-fonts
 Version: 0.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Public Domain
 URL: http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html
-Source0: bitmap-fonts-%{version}.tar.bz2
-Source1: fixfont-3.5.tar.bz2
-Source2: 66-ucs-miscfixed.conf
+Source0: http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz
+Source1: 66-ucs-miscfixed.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Group: User Interface/X
 Summary: Selected set of bitmap fonts
 BuildRequires: fontpackages-devel
 BuildRequires: xorg-x11-font-utils
-Patch1: readme_cleanup.patch
 
 %description
 The usc-fixed-fonts package provides bitmap fonts for
@@ -23,30 +21,24 @@ locations such as terminals.
 
 
 %prep
-%setup -q -n bitmap-fonts-%{version} -a1
-%patch1 -p1 -b .1-readme_cleanup
+%setup -q -c
+rm helvR12.bdf
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+install -m 0755 -d %{buildroot}%{_fontdir}
 
-cd fixfont-3.5
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-mv $RPM_BUILD_ROOT/usr/share/fonts/bitmap-fonts %{buildroot}%{_fontdir}
-
-rm %{buildroot}%{_fontdir}/lut*.pcf %{buildroot}%{_fontdir}/fang*.pcf %{buildroot}%{_fontdir}/cons*.pcf
-gzip %{buildroot}%{_fontdir}/*.pcf
+install -m 0644 -p *.bdf %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-                   %{buildroot}%{_fontconfig_confdir}
+	%{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE1} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}
 
-install -m 0644 -p %{SOURCE2} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
 ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
@@ -54,11 +46,15 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%_font_pkg -f %{fontconf} [0-9]*
+%_font_pkg -f %{fontconf} *.bdf
 
 %doc README	
 
 %changelog
+* Sun Feb 12 2012 Pravin Satpute <psatpute@redhat.com> - 0.3-8
+- removed gzip 
+- upstream new source , #597403
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild