commit e551ab05c1f7818559fffbf1aca4bd99fb3020d3
Author: Parag Nemade <pnemade(a)redhat.com>
Date: Mon Oct 3 15:29:11 2011 +0530
update to latest upstream commit 1218
.gitignore | 1 +
fontmatrix.spec | 27 ++++++++++++++-------------
sources | 2 +-
3 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b88262f..99792fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
fontmatrix-0.6.99-Source.tar.gz
+/fontmatrix-0.9.99-Source.tar.gz
diff --git a/fontmatrix.spec b/fontmatrix.spec
index b4aed4d..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: 16.r%{svnrev}%{?dist}
+Version: 0.9.99
+Release: 1.r%{svnrev}%{?dist}
License: GPLv2+
Group: User Interface/X
##### svn checkout HOWTO #####
@@ -16,7 +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
BuildRequires: qt-devel freetype-devel qt-webkit-devel
BuildRequires: desktop-file-utils cmake python-devel
BuildRequires: openssl-devel podofo-devel libicu-devel
@@ -29,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"
@@ -52,19 +50,19 @@ 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
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%doc COPYING TODO INSTALL
%{_bindir}/fontmatrix
@@ -75,6 +73,9 @@ fi
%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
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