diff --git a/.cvsignore b/.cvsignore index 299d07a..482e342 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,5 @@ fontforge_full-20050310.tgz fontforge_htdocs-20050310.tgz fontforge_full-20050502.tgz fontforge_htdocs-20050503.tgz +fontforge_full-20050729.tgz +fontforge_htdocs-20050729.tgz diff --git a/fontforge-20040618-docview.patch b/fontforge-20040618-docview.patch deleted file mode 100644 index 829ee39..0000000 --- a/fontforge-20040618-docview.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- BUILD/fontforge-20040618/fontforge/uiutil.c.docview 2004-06-15 21:43:23.000000000 +0200 -+++ BUILD/fontforge-20040618/fontforge/uiutil.c 2004-06-30 12:23:52.320054423 +0200 -@@ -240,7 +240,7 @@ - "iexplore.exe", - /*"lynx.exe",*/ - #else -- static char *stdbrowsers[] = { "mozilla", "opera", "galeon", "kfmclient", -+ static char *stdbrowsers[] = { "htmlview", "mozilla", "opera", "galeon", "kfmclient", - "netscape", "mosaic", /*"grail",*/ "lynx", - #endif - NULL }; diff --git a/fontforge.spec b/fontforge.spec index a4b778a..691cb29 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,15 +1,14 @@ Name: fontforge Version: 0.0 -Release: 2.20050502.fc4 +Release: 2.20050729.fc5 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-20050729.tgz 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-20050729.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -31,8 +30,7 @@ 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}-20050729 mkdir htdocs tar xzf %{SOURCE2} -C htdocs @@ -102,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc5 +- Update to 20050729 +- Remove .docview patch, looking for HTMLview is upstream so no longer needed + * Tue May 10 2005 Owen Taylor - 0.0-2.20050502.fc4 - Update to 20050502 - Fix the build to look for the docs where we install them diff --git a/sources b/sources index 2e3eb9a..6535ce1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6a19fe0e0e6c1d70c49014b1f967b481 fontforge_full-20050502.tgz -1f8de0694c7955ee8de268e70ab70e37 fontforge_htdocs-20050503.tgz +81d8097c49ec559475664e6e26ecfb38 fontforge_full-20050729.tgz +3d42637f467c0344bb952cbc2b657aaa fontforge_htdocs-20050729.tgz