#1 Update scriptlets and requirements
Merged 4 years ago by tagoh. Opened 4 years ago by scfc.

file modified
+6 -7
@@ -5,7 +5,7 @@

  Summary:	Font configuration and customization library

  Name:		fontconfig

  Version:	2.13.91

- Release:	1%{?dist}

+ Release:	2%{?dist}

  # src/ftglue.[ch] is in Public Domain

  # src/fccache.c contains Public Domain code

  # fc-case/CaseFolding.txt is in the UCD
@@ -28,9 +28,8 @@

  BuildRequires:	gperf

  

  Requires:	fontpackages-filesystem freetype

- Requires(pre):	freetype >= 2.9.1-6

+ PreReq:		freetype >= 2.9.1-6

  Requires(post):	grep coreutils

- Requires(postun):	/sbin/ldconfig

  Requires:	font(:lang=en)

  Suggests:	font(dejavusans)

  
@@ -104,8 +103,6 @@

  make check

  

  %post

- %{?ldconfig}

- 

  umask 0022

  

  mkdir -p /usr/lib/fontconfig/cache
@@ -120,8 +117,6 @@

    HOME=/root /usr/bin/fc-cache -f

  fi

  

- %ldconfig_postun

- 

  %transfiletriggerin -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts

  HOME=/root /usr/bin/fc-cache -s

  
@@ -165,6 +160,10 @@

  %doc fontconfig-devel.txt fontconfig-devel

  

  %changelog

+ * Sun Jun 16 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 2.13.91-2

+ - Remove calls to ldconfig from scriptlets

+ - Use "PreReq" instead of "Requires(pre)" for freetype

+ 

  * Mon Jun 10 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.91-1

  - New upstream release.

  

Since Fedora 28, ldconfig is automatically run as a file trigger, so
it is no longer necessary to call it from package scriptlets
(cf. https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets).

Also, in commit 89aa83a, "PreReq:
freetype" was replaced with "Requires(pre): freetype". While this is
effectively the same, the latter suggests that a "%pre" scriptlet
exists that needs freetype to run. As fontconfig does not have a
"%pre" scriptlet, this change replaces it again with a "PreReq" tag.

Pull-Request has been merged by tagoh

4 years ago