From 5b3a8e4cb5ed6b2e810c60f951e38480bad2d474 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sep 22 2006 04:58:23 +0000 Subject: Update to 20060822 Remove unneeded patch Add flag to compile right with giflib --- diff --git a/.cvsignore b/.cvsignore index 8b9a206..6f9a09b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -fontforge_full-20060125.tar.bz2 -fontforge_htdocs-20060114.tgz +fontforge_full-20060822.tar.bz2 +fontforge_htdocs-20060822.tar.bz2 diff --git a/fontforge.spec b/fontforge.spec index 7d8cebc..403cdf6 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,9 +1,9 @@ -%define docs_version 20060114 +%define docs_version 20060822 %define gettext_package FontForge Name: fontforge -Version: 20060125 -Release: 7%{?dist} +Version: 20060822 +Release: 1%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -11,8 +11,7 @@ License: BSD URL: http://fontforge.sourceforge.net/ Source0: http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2 Source1: fontforge.desktop -Source2: http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tgz -Patch1: fontforge-20060125-glibccrash.patch +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -40,12 +39,13 @@ fonts. It supports a range of font formats, including PostScript %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .glibccrash 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 @@ -58,6 +58,7 @@ sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in %build export CPPFLAGS='-DDOCDIR=\"%{_docdir}/%{name}-%{version}/htdocs\"' +export LIBS=-lgif %configure --with-regular-link --with-freetype-bytecode=no make %{?_smp_mflags} @@ -111,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 21 2006 Kevin Fenzi - 20060822-1 +- Update to 20060822 +- Remove unneeded patch +- Add flag to compile right with giflib + * Sun Jun 18 2006 Roozbeh Pournader - 20060125-7 - Add BuildRequires on gettext, to make sure the package builds in minimal mock environments diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/sources b/sources index 52a8a90..7c66d03 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -831ac5225b1a9b00b0b7bcf622c62fee fontforge_full-20060125.tar.bz2 -78a9f24e14c3e89afb5b88622f675546 fontforge_htdocs-20060114.tgz +872a8013be82e322677f7c254101544d fontforge_full-20060822.tar.bz2 +40f374cf43d57d8e8f29e7fe25bf8f39 fontforge_htdocs-20060822.tar.bz2