Browse Source

fontforge: update to 20120731b

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7097 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 12 years ago
parent
commit
860c383dc7
1 changed files with 33 additions and 7 deletions
  1. 33 7
      f/fontforge/fontforge-vl.spec

+ 33 - 7
f/fontforge/fontforge-vl.spec

@@ -1,10 +1,10 @@
-%define origversion 20120101
+%define origversion 20120731-b
 
 Summary: Outline and bitmap font editor
 Summary(ja): アウトライン・ビットマップフォントエディタ
 Name: fontforge
-Version: %{origversion}
-Release: 2%{?_dist_release}
+Version: 20120731b
+Release: 1%{?_dist_release}
 License: BSD
 Group: Applications/Publishing
 URL: http://fontforge.sourceforge.net/
@@ -12,10 +12,10 @@ Source: fontforge_full-%{origversion}.tar.bz2
 Source10: %{name}.desktop
 Source20: %{name}.png
 Patch1:  fontforge-20090224-pythondl.patch
-Patch10: fontforge-browser.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libXt-devel
 BuildRequires: freetype2-devel
@@ -27,8 +27,10 @@ BuildRequires: giflib-devel
 BuildRequires: libxml2-devel
 BuildRequires: desktop-file-utils
 BuildRequires: python-devel
-BuildRequires:  pango-devel
-BuildRequires:  cairo-devel
+BuildRequires: pango-devel
+BuildRequires: cairo-devel
+BuildRequires: libspiro-devel
+
 Obsoletes: pfaedit
 Obsoletes: fontforge-devel <= 20050310
 
@@ -47,7 +49,6 @@ fonts. It supports a range of font formats, including PostScript
 %prep
 %setup -q -n %{name}-%{origversion}
 %patch1 -p1
-%patch10 -p1 -b .browser
 
 %{__cp} %{SOURCE10} %{name}.desktop
 
@@ -67,9 +68,16 @@ desktop-file-install \
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge
 
+install -Dpm 644 Packaging/icons/scalable/apps/fontforge.svg \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/fontforge.svg
+
 %{__install} -d -m0755 %{buildroot}%{_datadir}/pixmaps/
 %{__install} -m644 %{SOURCE20} %{buildroot}%{_datadir}/pixmaps/
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
+install -p Packaging/fontforge.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
+
+
 %find_lang FontForge
 
 %{__rm} -f %{buildroot}%{_libdir}/*.la
@@ -80,10 +88,22 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge
 %post
 /sbin/ldconfig 2>/dev/null
 update-desktop-database %{_datadir}/applications &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %postun
 /sbin/ldconfig 2>/dev/null
 update-desktop-database %{_datadir}/applications &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f FontForge.lang
 %defattr(-, root, root, 0755)
@@ -96,13 +116,19 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_includedir}/fontforge/*
 %{_datadir}/applications/fontforge.desktop
 %{_datadir}/pixmaps/fontforge.png
+%{_datadir}/icons/hicolor/*/apps/fontforge.*
 %{_datadir}/fontforge
+%{_datadir}/mime/packages/fontforge.xml
 %{_mandir}/man1/*.1*
 %{python_sitearch}/fontforge-1.0-py2.7.egg-info
 %{python_sitearch}/fontforge.so
 %{python_sitearch}/psMat.so
 
 %changelog
+* Sat Nov 10 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 20120731b-1
+- update to 20120731-b
+- add BR: libspiro-devel
+
 * Fri Apr 20 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 20120101-2
 - enable pyextensions