From 8e2a847f3636b158712fc13618c76a7d0e6fb2ec Mon Sep 17 00:00:00 2001
From: Roozbeh Pournader <roozbeh@fedoraproject.org>
Date: Dec 23 2006 16:32:07 +0000
Subject: - Update to upstream 20061220


---

diff --git a/.cvsignore b/.cvsignore
index 36ec8cd..0ee7e7b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-fontforge_htdocs-20061014.tar.bz2
-fontforge_full-20061025.tar.bz2
+fontforge_full-20061220.tar.bz2
+fontforge_htdocs-20061220.tar.bz2
diff --git a/fontforge-20061025-fsSel.patch b/fontforge-20061025-fsSel.patch
deleted file mode 100644
index 90c0961..0000000
--- a/fontforge-20061025-fsSel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fontforge-20061025/fontforge/tottf.c.fsSel	2006-12-09 21:36:24.000000000 +0330
-+++ fontforge-20061025/fontforge/tottf.c	2006-12-09 21:41:45.000000000 +0330
-@@ -3090,7 +3090,7 @@
-     os2->fsSel = (at->head.macstyle&1?32:0)|(at->head.macstyle&2?1:0);
-     if ( sf->fullname!=NULL && strstrmatch(sf->fullname,"outline")!=NULL )
- 	os2->fsSel |= 8;
--    if ( os2->fsSel==0 ) os2->fsSel = 64;		/* Regular */
-+    if ( os2->fsSel==0 && sf->pfminfo.weight == 400) os2->fsSel = 64;		/* Regular */
-     if ( os2->version>=4 ) {
- 	if ( strstrmatch(sf->fontname,"Obli")==0 ) {
- 	    os2->fsSel &= ~1;		/* Turn off Italic */
diff --git a/fontforge-20061025-usFirstCharIndex.patch b/fontforge-20061025-usFirstCharIndex.patch
deleted file mode 100644
index 5daf328..0000000
--- a/fontforge-20061025-usFirstCharIndex.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
-+++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
-@@ -3187,7 +3187,6 @@
- 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
- 	os2->lastcharindex  = 0xf000 + last;
-     } else {
--	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
- 	os2->firstcharindex = first;
- 	os2->lastcharindex = last;
- 	OS2FigureCodePages(sf, os2->ulCodePage);
diff --git a/fontforge.spec b/fontforge.spec
index 947aa92..0d6fe91 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -1,9 +1,9 @@
-%define docs_version 20061014
+%define docs_version 20061220
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061025
-Release:        2%{?dist}
+Version:        20061220
+Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -12,8 +12,6 @@ URL:            http://fontforge.sourceforge.net/
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
-Patch1:         fontforge-20061025-usFirstCharIndex.patch
-Patch2:         fontforge-20061025-fsSel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -41,8 +39,6 @@ fonts. It supports a range of font formats, including PostScript
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .usFirstCharIndex
-%patch2 -p1 -b .fsSel
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -116,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 22 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 20061220-1
+- Update to upstream 20061220
+
 * Sat Dec 09 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 20061025-2
 - Add patch to fix fsSelection problem with DejaVu ExtraLight
 
diff --git a/sources b/sources
index a3c14a4..92691ee 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2
-5fcfa3497d237bf68d1d388254f78448  fontforge_full-20061025.tar.bz2
+0f2354b885676fc8092a74aa9b9cb662  fontforge_full-20061220.tar.bz2
+0f7b90adb0faf4b2e353ad5df9200b88  fontforge_htdocs-20061220.tar.bz2