From 629a11ab8ebad14ceb5dd6fdd703a9b1e6d87782 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: May 30 2007 05:14:00 +0000 Subject: Upgrade to 20061025-1 Initial EL build --- diff --git a/.cvsignore b/.cvsignore index 296f456..b92d232 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1,2 @@ -fontforge_full-20041231.tgz -fontforge_htdocs-20041231.tgz -fontforge_full-20050310.tgz -fontforge_htdocs-20050310.tgz -fontforge_htdocs-20050503.tgz -fontforge_full-20050502.tgz +fontforge_full-20061025.tar.bz2 +fontforge_htdocs-20061014.tar.bz2 diff --git a/fontforge-20061025-fsSel.patch b/fontforge-20061025-fsSel.patch new file mode 100644 index 0000000..90c0961 --- /dev/null +++ b/fontforge-20061025-fsSel.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..5daf328 --- /dev/null +++ b/fontforge-20061025-usFirstCharIndex.patch @@ -0,0 +1,10 @@ +--- 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 0bb2bd2..0c0f118 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,28 +1,36 @@ +%define docs_version 20061014 +%define gettext_package FontForge + Name: fontforge -Version: 0.0 -Release: 2.20050502.fc3 +Version: 20061025 +Release: 1%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://dl.sf.net/fontforge/fontforge_full-20050502.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2 Source1: fontforge.desktop -Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050503.tgz -Patch1: fontforge-20040618-docview.patch +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 + BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: libpng-devel BuildRequires: libungif-devel BuildRequires: libxml2-devel BuildRequires: freetype-devel -BuildRequires: XFree86-devel BuildRequires: desktop-file-utils BuildRequires: libuninameslist-devel +BuildRequires: XFree86-devel +BuildRequires: gettext + Obsoletes: pfaedit +Provides: pfaedit %description FontForge (former PfaEdit) is a font editor for outline and bitmap @@ -31,30 +39,32 @@ fonts. It supports a range of font formats, including PostScript (Type2) and CID-keyed fonts. %prep -%setup -q -n %{name}-20050502 -%patch1 -p2 -b .docview +%setup -q -n %{name}-%{version} +%patch1 -p1 -b .usFirstCharIndex +%patch2 -p1 -b .fsSel mkdir htdocs -tar xzf %{SOURCE2} -C htdocs +tar xjf %{SOURCE2} -C htdocs rm -rf htdocs/scripts -chmod 644 htdocs/* +chmod 644 htdocs/*.gif +chmod 644 htdocs/*.html +chmod 644 htdocs/*.png mkdir cidmaps tar xzf htdocs/cidmaps.tgz -C cidmaps -find . -name "CVS" -type d -print | xargs rm -r - -for i in fontforge/fontforge.1 fontforge/sfddiff.1 ; do - iconv -f iso-8859-1 -t utf-8 $i -o $i.utf8 ; mv $i.utf8 $i -done - sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in +# Fix bad line terminators +%{__sed} -i 's/\r//' htdocs/Big5.txt +%{__sed} -i 's/\r//' htdocs/corpchar.txt + %build export CPPFLAGS='-DDOCDIR=\"%{_docdir}/%{name}-%{version}/htdocs\"' +export LIBS=-lgif %configure --with-regular-link --with-freetype-bytecode=no -# Parallel make not working. -make + +make %{?_smp_mflags} %install @@ -80,6 +90,9 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontforge.pc # remove the extra copy rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge +# Find translations +%find_lang %{gettext_package} + %clean rm -rf $RPM_BUILD_ROOT @@ -89,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%files +%files -f %{gettext_package}.lang %defattr(-,root,root,-) %doc AUTHORS LICENSE htdocs %{_bindir}/* @@ -100,8 +113,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/fontforge.png %{_mandir}/man1/*.1* - %changelog +* Tue May 29 2007 Kevin Fenzi - 20061025-1 +- Upgrade to 20061025-1 +- Initial EL build + * Tue May 10 2005 Owen Taylor - 0.0-2.20050502.fc3 - Update to 20050502 - Fix the build to look for the docs where we install them diff --git a/sources b/sources index f028737..706ee2f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1f8de0694c7955ee8de268e70ab70e37 fontforge_htdocs-20050503.tgz -6a19fe0e0e6c1d70c49014b1f967b481 fontforge_full-20050502.tgz +5fcfa3497d237bf68d1d388254f78448 fontforge_full-20061025.tar.bz2 +c55c948e1475d2f772aba96704e4b779 fontforge_htdocs-20061014.tar.bz2