Merge ../fontforge into el5
Conflicts: .gitignore fontforge.spec sources
This commit is contained in:
Jon Ciesla
commit
f547f2cff8
|
|
@ -1,2 +1,2 @@
|
|||
fontforge_htdocs-20061014.tar.bz2
|
||||
fontforge_full-20061025.tar.bz2
|
||||
fontforge_full-20080828.tar.bz2
|
||||
fontforge_htdocs-20080824.tar.bz2
|
||||
|
|
|
|||
|
|
@ -7,3 +7,4 @@ Terminal=false
|
|||
Type=Application
|
||||
Categories=Application;Graphics;
|
||||
Encoding=UTF-8
|
||||
MimeType=application/vnd.font-fontforge-sfd
|
||||
|
|
|
|||
130
fontforge.spec
130
fontforge.spec
|
|
@ -1,23 +1,23 @@
|
|||
%define docs_version 20061014
|
||||
%define docs_version 20080824
|
||||
%define gettext_package FontForge
|
||||
|
||||
Name: fontforge
|
||||
Version: 20061025
|
||||
Release: 3%{?dist}
|
||||
Version: 20080828
|
||||
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 +30,7 @@ BuildRequires: libuninameslist-devel
|
|||
BuildRequires: libXt-devel
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: python-devel
|
||||
|
||||
Obsoletes: pfaedit
|
||||
Provides: pfaedit
|
||||
|
|
@ -40,10 +41,19 @@ fonts. It supports a range of font formats, including PostScript
|
|||
(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
|
||||
|
|
@ -51,29 +61,24 @@ rm -rf htdocs/scripts
|
|||
chmod 644 htdocs/*.gif
|
||||
chmod 644 htdocs/*.html
|
||||
chmod 644 htdocs/*.png
|
||||
mkdir cidmaps
|
||||
tar xzf htdocs/cidmaps.tgz -C cidmaps
|
||||
|
||||
sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in
|
||||
rm -rf htdocs/flags/CVS
|
||||
|
||||
# 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
|
||||
%configure --with-freetype-bytecode=no
|
||||
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# make install DESTDIR=$RPM_BUILD_ROOT fails.
|
||||
%makeinstall
|
||||
install -p -m 644 cidmaps/Adobe* $RPM_BUILD_ROOT%{_datadir}/fontforge
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so}
|
||||
|
||||
install -Dpm 644 htdocs/ffanvil32.png \
|
||||
|
|
@ -85,40 +90,105 @@ desktop-file-install \
|
|||
--add-category X-Fedora \
|
||||
%{SOURCE1}
|
||||
|
||||
chmod -x $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontforge.pc
|
||||
|
||||
# The fontforge makefiles install htdocs as well, but we
|
||||
# prefer to have them under the standard RPM location, so
|
||||
# remove the extra copy
|
||||
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge
|
||||
|
||||
# remove unneeded .la and .a files
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||
|
||||
# Find translations
|
||||
%find_lang %{gettext_package}
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
|
||||
|
||||
install -p %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%post
|
||||
update-desktop-database &> /dev/null || :
|
||||
update-mime-database %{_datadir}/mime &> /dev/null || :
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
%postun
|
||||
update-desktop-database &> /dev/null || :
|
||||
update-mime-database %{_datadir}/mime &> /dev/null || :
|
||||
/sbin/ldconfig
|
||||
|
||||
|
||||
%files -f %{gettext_package}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS LICENSE htdocs
|
||||
%{_bindir}/*
|
||||
%{_libdir}/libg*.so.*
|
||||
%{_libdir}/pkgconfig/fontforge.pc
|
||||
%{_libdir}/lib*.so.*
|
||||
%{_datadir}/applications/*fontforge.desktop
|
||||
%{_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@tummy.com> - 20061025-3
|
||||
* Mon Aug 20 2012 Jonathan Ciesla <limburgher@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@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@tummy.com> - 20080429-1
|
||||
- Upgrade to 20080429
|
||||
|
||||
* Mon Mar 24 2008 Kevin Fenzi <kevin@tummy.com> - 20080309-2
|
||||
- Add mime info for .sfd files. Fixes 240669
|
||||
|
||||
* Mon Mar 17 2008 Kevin Fenzi <kevin@tummy.com> - 20080309-1
|
||||
- Upgrade to 20080309
|
||||
- Fixes bug 437833
|
||||
|
||||
* Mon Mar 03 2008 Kevin Fenzi <kevin@tummy.com> - 20080302-2
|
||||
- Commit new sources
|
||||
|
||||
* Mon Mar 03 2008 Kevin Fenzi <kevin@tummy.com> - 20080302-1
|
||||
- Update to upstream 20080302
|
||||
|
||||
* Sun Mar 02 2008 Kevin Fenzi <kevin@tummy.com> - 20080203-2
|
||||
- Change Requires from htmlview to xdg-utils (bz 312691)
|
||||
|
||||
* Sat Mar 01 2008 Kevin Fenzi <kevin@tummy.com> - 20080203-1
|
||||
- Update to upstream 20080203
|
||||
- Add new devel subpackage
|
||||
|
||||
* Sun Dec 02 2007 Roozbeh Pournader <roozbeh@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@tummy.com> - 20070511-2
|
||||
- Rebuild for BuildID
|
||||
|
||||
* Thu Jun 7 2007 Kevin Fenzi <kevin@tummy.com> - 20070511-1
|
||||
- Update to upstream 20070511
|
||||
- Remove some leftover CVS bits
|
||||
- Remove useless .pc file.
|
||||
|
||||
* Fri Dec 22 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 20061220-1
|
||||
- Update to upstream 20061220
|
||||
>>>>>>> 52bff30f7a8e5bf074279795bc62f2ab720eb1e3
|
||||
|
||||
* Sat Dec 09 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 20061025-2
|
||||
- Add patch to fix fsSelection problem with DejaVu ExtraLight
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
|
||||
<mime-type type="application/vnd.font-fontforge-sfd">
|
||||
<sub-class-of type="text/plain"/>
|
||||
<comment>Fontforge Spline Font Database</comment>
|
||||
<glob pattern="*.sfd"/>
|
||||
<magic>
|
||||
<match type="string" offset="0" value="SplineFontDB"/>
|
||||
</magic>
|
||||
</mime-type>
|
||||
</mime-info>
|
||||
Loading…
Reference in New Issue