diff --git a/fontpackages-drop-fccache.patch b/fontpackages-drop-fccache.patch new file mode 100644 index 0000000..dc1ca4d --- /dev/null +++ b/fontpackages-drop-fccache.patch @@ -0,0 +1,22 @@ +diff -pruN fontpackages-1.44.orig/rpm/macros.fonts fontpackages-1.44/rpm/macros.fonts +--- fontpackages-1.44.orig/rpm/macros.fonts 2010-06-13 23:43:19.000000000 +0900 ++++ fontpackages-1.44/rpm/macros.fonts 2015-09-07 11:19:25.787718394 +0900 +@@ -74,18 +74,6 @@ print(meld(meld(pkgname,fontname),subnam + + %_font_pkg(n:f:) \ + %define spn %_font_pkg_name %{-n:%{-n*}} \ +-%post -n %{spn} \ +-if [ -x %{_bindir}/fc-cache ]; then \ +- %{_bindir}/fc-cache %{_fontdir} || : \ +-fi \ +-\ +-\ +-%postun -n %{spn} \ +-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \ +- %{_bindir}/fc-cache %{_fontdir} || : \ +-fi\ +-\ +-\ + %files -n %{spn} \ + %defattr(0644,root,root,0755) \ + \ diff --git a/fontpackages.spec b/fontpackages.spec index db2016a..a9c011d 100644 --- a/fontpackages.spec +++ b/fontpackages.spec @@ -7,7 +7,7 @@ Name: fontpackages Version: 1.44 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Common directory and macro definitions used by font packages Group: Development/System @@ -17,6 +17,7 @@ License: LGPLv3+ URL: http://fedoraproject.org/wiki/fontpackages Source0: http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.xz Patch0: dnf.patch +Patch1: %{name}-drop-fccache.patch BuildArch: noarch @@ -72,6 +73,7 @@ This package contains tools used to check fonts and font packages. %prep %setup -q %patch0 -p1 +%patch1 -p1 %if 0%{?rhel} sed -i 's|/usr/bin/fedoradev-pkgowners|""|g' bin/repo-font-audit @@ -144,6 +146,9 @@ EOF %{_bindir}/* %changelog +* Mon Sep 7 2015 Akira TAGOH - 1.44-15 +- Drop fc-cache from %%post/un in rpm macro. + * Tue Aug 18 2015 Parag Nemade - 1.44-14 - Port yum to dnf patch by Michael Mráka (rh#1156554)