Update to 20100501

.cvsignore

@@ -1,2 +1,2 @@
-fontforge_full-20090923.tar.bz2
+fontforge_htdocs-20100429.tar.bz2
-fontforge_htdocs-20090914.tar.bz2
+fontforge_full-20100501.tar.bz2

fontforge-20090923-rel-path.patch

@@ -1,47 +0,0 @@
-diff -Nur fontforge-20090923.orig/gutils/fsys.c fontforge-20090923/gutils/fsys.c
---- fontforge-20090923.orig/gutils/fsys.c	2009-01-25 11:06:49.000000000 -0700
-+++ fontforge-20090923/gutils/fsys.c	2009-12-31 09:59:54.000000000 -0700
-@@ -41,6 +41,15 @@
- 
- static char dirname_[1024];
- 
-+static void savestrcpy(char *dest,const char *src) {
-+    forever {
-+       *dest = *src;
-+       if ( *dest=='\0' )
-+    break;
-+       ++dest; ++src;
-+    }
-+}
-+
- char *GFileGetAbsoluteName(char *name, char *result, int rsiz) {
-     /* result may be the same as name */
-     char buffer[1000];
-@@ -62,13 +71,13 @@
- 	    if ( *spt=='/' ) ++spt;
- 	    for ( pt = spt; *pt!='\0' && *pt!='/'; ++pt );
- 	    if ( pt==spt )	/* Found // in a path spec, reduce to / (we've*/
--		strcpy(spt,pt); /*  skipped past the :// of the machine name) */
--	    else if ( pt==spt+1 && spt[0]=='.' )	/* Noop */
--		strcpy(spt,pt);
--	    else if ( pt==spt+2 && spt[0]=='.' && spt[1]=='.' ) {
-+               savestrcpy(spt,spt+1); /*  skipped past the :// of the machine name) */
-+            else if ( pt==spt+1 && spt[0]=='.' ) {      /* Noop */
-+               savestrcpy(spt,spt+2);
-+            } else if ( pt==spt+2 && spt[0]=='.' && spt[1]=='.' ) {
- 		for ( bpt=spt-2 ; bpt>rpt && *bpt!='/'; --bpt );
- 		if ( bpt>=rpt && *bpt=='/' ) {
--		    strcpy(bpt,pt);
-+                    savestrcpy(bpt,pt);
- 		    spt = bpt;
- 		} else {
- 		    rpt = pt;
-@@ -99,7 +108,7 @@
- 
-     if ( dir==NULL || *dir=='\0' ) {
- 	if ( strlen( fname )<size-1 )		/* valgrind didn't like my strncpies but this complication makes it happy */
--	    strcpy(buffer,fname);
-+            savestrcpy(buffer,fname);
- 	else {
- 	    strncpy(buffer,fname,size-1);
- 	    buffer[size-1]='\0';

fontforge.spec

@@ -1,11 +1,11 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%global docs_version 20090914
+%global docs_version 20100429
 %global gettext_package FontForge
 
 Name:           fontforge
-Version:        20090923
+Version:        20100501
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -16,7 +16,6 @@ Source1:        fontforge.desktop
 Source2:        http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
 Source3:        fontforge.xml
 Patch1:         fontforge-20090224-pythondl.patch
-Patch2:		fontforge-20090923-rel-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       xdg-utils
@@ -58,7 +57,6 @@ to compile applications against fontforge.
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1
-%patch2 -p1
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -149,6 +147,12 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed May 19 2010 Kevin Fenzi <kevin@tummy.com> - 20100501-1
+- Update to 20100501
+
+* Fri Apr 30 2010 Kevin Fenzi <kevin@tummy.com> - 20100429-1
+- Update to 20100429
+
 * Sat Mar 20 2010 Kevin Fenzi <kevin@tummy.com> - 20090923-3
 - Fix patch to fix python module (fixes #560277)
 

sources

@@ -1,2 +1,2 @@
-ea9d8dc38de79235fbe6add725b38ffe  fontforge_full-20090923.tar.bz2
+7ff67bcb694b673dbe0b8ca3dfd4675e  fontforge_htdocs-20100429.tar.bz2
-8979b8b38e3653c452dbe310f17a996d  fontforge_htdocs-20090914.tar.bz2
+5f3d20d645ec1aa2b7b4876386df8717  fontforge_full-20100501.tar.bz2