[fontmatrix/f16] update to latest upstream commit 1218

pnemade pnemade at fedoraproject.org
Tue Oct 4 06:06:33 UTC 2011


commit a2f8e6d89ed6a62f8bb5b5417bd5f24d48a37f7d
Author: Parag Nemade <pnemade at redhat.com>
Date:   Tue Oct 4 11:36:19 2011 +0530

    update to latest upstream commit 1218

 fontmatrix.spec |   35 ++++++++++++++++-------------------
 sources         |    2 +-
 2 files changed, 17 insertions(+), 20 deletions(-)
---
diff --git a/fontmatrix.spec b/fontmatrix.spec
index 139e6bc..3d1a1cf 100644
--- a/fontmatrix.spec
+++ b/fontmatrix.spec
@@ -1,9 +1,9 @@
-%define svnrev 1073
+%define svnrev 1218
 
 Name: fontmatrix
 Summary: A fonts manager
-Version: 0.6.99
-Release: 15.r%{svnrev}%{?dist}
+Version: 0.9.99
+Release: 1.r%{svnrev}%{?dist}
 License: GPLv2+
 Group: User Interface/X
 ##### svn checkout HOWTO #####
@@ -16,8 +16,6 @@ URL: http://www.fontmatrix.net/
 ## Official stable releases can be downloaded from http://www.fontmatrix.net/archives/
 Source0: %{name}-%{version}-Source.tar.gz
 Patch0: bug_564904_fix-missing-DSO-icuuc.patch 
-Patch1: bug_561044_532882_remove-broken-fontmatrix-shaper.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: qt-devel freetype-devel qt-webkit-devel
 BuildRequires: desktop-file-utils cmake python-devel
 BuildRequires: openssl-devel podofo-devel libicu-devel
@@ -30,7 +28,6 @@ A powerful and well designed fonts manager
 %prep
 %setup -q -n  %{name}-%{version}-Source
 %patch0 -p0
-%patch1 -p0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -44,7 +41,6 @@ make VERBOSE=1 %{?_smp_mflags}
 ctest
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 #rpmlint complains Zero-length file
@@ -54,25 +50,20 @@ desktop-file-install --vendor="fedora" --delete-original  \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING TODO INSTALL
 %{_bindir}/fontmatrix
 %{_datadir}/fontmatrix
@@ -82,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 03 2011 Parag Nemade <pnemade AT redhat DOT com> - 0.9.99-1.r1218
+- update to latest upstream commit 1218
+
+* Sun Sep 11 2011 Parag Nemade <pnemade AT redhat DOT com> - 0.6.99-16.r1073
+- Rebuild against icu 4.8
+
 * Wed May 04 2011 Dan Horák <dan at danny.cz> - 0.6.99-15.r1073
 - rebuilt against podofo 0.9.1
 
diff --git a/sources b/sources
index 43dfaab..044796c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3184a944e38e034a3c7a6e1eadc47951  fontmatrix-0.6.99-Source.tar.gz
+fbfb10aa0111557a5ee0fd3d6c821e5b  fontmatrix-0.9.99-Source.tar.gz


More information about the fonts-bugs mailing list