[fontforge/el5: 18/18] Merge ../fontforge into el5

[Jon Ciesla]

commit f547f2cff8396f40b67c8561c86fa2405cb6b43b
Merge: 08378e8 52bff30
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Sep 5 07:13:38 2012 -0500

    Merge ../fontforge into el5
    
    Conflicts:
    	.gitignore
    	fontforge.spec
    	sources

 .gitignore        |    4 +-
 fontforge.desktop |    1 +
 fontforge.spec    |  130 ++++++++++++++++++++++++++++++++++++++++------------
 fontforge.xml     |   11 +++++
 sources           |    4 +-
 5 files changed, 116 insertions(+), 34 deletions(-)
---
diff --cc fontforge.spec
index 4dbd365,a354e1c..1289976
--- a/fontforge.spec
+++ b/fontforge.spec
@@@ -2,22 -2,21 +2,22 @@@
  %define gettext_package FontForge
  
  Name:           fontforge
- Version:        20061025
- Release:        3%{?dist}
+ Version:        20080828
 -Release:        1%{?dist}
++Release:        1.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-%{version}.tar.bz2
+ Source0:        http://downloads.sourceforge.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
- Patch3:		fontforge-20061025-CVE-2010-4259.patch
+ Source2:        http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+ Source3:	fontforge.xml
++Patch0:		fontforge-20061025-CVE-2010-4259.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
- Requires:       htmlview
+ Requires:       xdg-utils
+ Requires:	autotrace
  
  BuildRequires:  libjpeg-devel
  BuildRequires:  libtiff-devel
@@@ -30,6 -29,6 +30,7 @@@ BuildRequires:  libuninameslist-deve
  BuildRequires:  libXt-devel
  BuildRequires:  xorg-x11-proto-devel
  BuildRequires:  gettext
++BuildRequires:  python-devel
  
  Obsoletes:      pfaedit
  Provides:       pfaedit
@@@ -40,10 -39,18 +41,19 @@@ fonts. It supports a range of font form
  (ASCII and binary Type 1, some Type 3 and Type 0), TrueType, OpenType
  (Type2) and CID-keyed fonts.
  
+ %package devel
+ Summary: Development tools for fontforge
+ Group: Development/Libraries
+ Requires: %{name} = %{version}-%{release}
+ Requires: pkgconfig
+ 
+ %description devel
+ This package includes the libraries and header files you will need
+ to compile applications against fontforge.
+ 
  %prep
  %setup -q -n %{name}-%{version}
- %patch1 -p1 -b .usFirstCharIndex
- %patch2 -p1 -b .fsSel
++%patch0 -p1 -b .CVE-2010-4259
  
  mkdir htdocs
  tar xjf %{SOURCE2} -C htdocs
@@@ -114,11 -127,60 +130,65 @@@ update-mime-database %{_datadir}/mime &
  %{_datadir}/fontforge
  %{_datadir}/pixmaps/fontforge.png
  %{_mandir}/man1/*.1*
+ %{_datadir}/mime/packages/fontforge.xml
  
+ %files devel
+ %defattr(-,root,root,-)
+ %{_includedir}/fontforge/
+ %{_libdir}/lib*.so
+ %{_libdir}/pkgconfig/*.pc
  
  %changelog
- * Sat Dec 04 2010 Kevin Fenzi <kevin at tummy.com> - 20061025-3
++* Mon Aug 20 2012 Jonathan Ciesla <limburgher at gmail.com> - 20080828-1.1
 +- Add patch to fix CVE-2010-4259 (fixes #659359)
++- Added python-requires BuildRequires.
++
+ * Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 20080828-1
+ - Upgrade to 20080828
+ - Add Requires on autotrace. Fixes 460668
+ - Confirm patch from 459451 is upstream here. 
+ 
+ * Fri May 16 2008 Kevin Fenzi <kevin at tummy.com> - 20080429-1
+ - Upgrade to 20080429
+ 
+ * Mon Mar 24 2008 Kevin Fenzi <kevin at tummy.com> - 20080309-2
+ - Add mime info for .sfd files. Fixes 240669
+ 
+ * Mon Mar 17 2008 Kevin Fenzi <kevin at tummy.com> - 20080309-1
+ - Upgrade to 20080309
+ - Fixes bug 437833
+ 
+ * Mon Mar 03 2008 Kevin Fenzi <kevin at tummy.com> - 20080302-2
+ - Commit new sources
+ 
+ * Mon Mar 03 2008 Kevin Fenzi <kevin at tummy.com> - 20080302-1
+ - Update to upstream 20080302
+ 
+ * Sun Mar 02 2008 Kevin Fenzi <kevin at tummy.com> - 20080203-2
+ - Change Requires from htmlview to xdg-utils (bz 312691)
+ 
+ * Sat Mar 01 2008 Kevin Fenzi <kevin at tummy.com> - 20080203-1
+ - Update to upstream 20080203
+ - Add new devel subpackage
+ 
+ * Sun Dec 02 2007 Roozbeh Pournader <roozbeh at farsiweb.info> - 20071110-1
+ - Update to upstream 20071110
+ 
+ * Sun Oct 21 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+ ☢ 20071002-1
+ ⚠ quick & dirty version bump to start working on F9 font packages
+ 
+ * Sun Aug 26 2007 Kevin Fenzi <kevin at tummy.com> - 20070511-2
+ - Rebuild for BuildID 
+ 
+ * Thu Jun  7 2007 Kevin Fenzi <kevin at tummy.com> - 20070511-1
+ - Update to upstream 20070511
+ - Remove some leftover CVS bits
+ - Remove useless .pc file.
+ 
+ * Fri Dec 22 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20061220-1
+ - Update to upstream 20061220
++>>>>>>> 52bff30f7a8e5bf074279795bc62f2ab720eb1e3
  
  * Sat Dec 09 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20061025-2
  - Add patch to fix fsSelection problem with DejaVu ExtraLight