Accepting request 560084 from home:dimstar:Factory

- Revert last change: reconfigure_post_* does not know a -n
  parameter, which in turn results in warnings (rpm < 4.14) or
  errors (rpm >= 4.14).
  > reconfigure_fonts_post: invalid option -- 'n'
  > error: Unknown option n in reconfigure_fonts_post(c)


From /etc/rpm/macros.fonts-config, only reconfigure_fonts_scriptlets knows a -n parameter.

OBS-URL: https://build.opensuse.org/request/show/560084
OBS-URL: https://build.opensuse.org/package/show/Printing/ghostscript-fonts?expand=0&rev=16
This commit is contained in:
Johannes Meixner 2018-01-10 12:06:35 +00:00 committed by Git OBS Bridge
parent f3e36ba356
commit 5eb4d6bf7c
2 changed files with 19 additions and 39 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Dec 27 10:54:48 UTC 2017 - dimstar@opensuse.org
- Revert last change: reconfigure_post_* does not know a -n
parameter, which in turn results in warnings (rpm < 4.14) or
errors (rpm >= 4.14).
> reconfigure_fonts_post: invalid option -- 'n'
> error: Unknown option n in reconfigure_fonts_post(c)
-------------------------------------------------------------------
Mon Dec 18 14:18:10 CET 2017 - jsmeix@suse.de

View File

@ -25,8 +25,6 @@ BuildRequires: fontpackages-devel
%endif
Url: http://www.ghostscript.com/
Summary: Ghostscript's free fonts
License: GPL-2.0
Group: Productivity/Publishing/PS
# The version is the same version as the current ghostscript package.
# Reasoning: Before the Ghostscript package clean-up (see bnc#735824)
# the packages ghostscript-fonts-std and ghostscript-fonts-other
@ -37,6 +35,8 @@ Group: Productivity/Publishing/PS
# than the old ghostscript-fonts-* sub-packages, the existing versioning scheme
# is still used here. This versioning scheme makes sense because this
# ghostscript-fonts-* packages are the right ones for this Ghostscript version:
License: GPL-2.0
Group: Productivity/Publishing/PS
Version: 9.06
Release: 0
# Source0...Source9 is for sources from upstream:
@ -88,12 +88,12 @@ Incorporated, of Hamburg, Germany.
%package other
Summary: Optional Fonts for Ghostscript
Group: Productivity/Publishing/PS
# ghostscript-fonts-std contains /usr/share/ghostscript/fonts/fonts.dir
# and /usr/share/ghostscript/fonts/fonts.scale which are needed
# to map Ghostscript's font files to X logical font description (XLFD),
# see the section "Using Ghostscript fonts on X Windows displays"
# in doc/Fonts.htm in the Ghostscript sources:
Group: Productivity/Publishing/PS
Requires: ghostscript-fonts-std
%description other
@ -142,15 +142,10 @@ ln -s %{_datadir}/ghostscript/fonts %{buildroot}%{_datadir}/fonts/ghostscript
# Use traditional bash scriptlet with an explicite "exit 0" line at the end to be fail safe
# see http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets
# Only if suse_version > 1220 it BuildRequires fontpackages-devel which provides reconfigure_fonts_post.
# Since openSUSE 12.2 there is no SuSEconfig.pango (have it only in the scriptlet if suse_version < 1220).
# Call reconfigure_fonts_* -n binary_RPM_package_name on openSUSE Tumbleweed and openSUSE Leap 15.0 and SLE15 and later:
# Since openSUSE 12.2 there is no SuSEconfig.pango (have it only in the scriptlet if suse_version < 1220):
%post std
%if 0%{?suse_version} > 1220
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150000
%reconfigure_fonts_post -n ghostscript-fonts-std
%else
%reconfigure_fonts_post
%endif
%else
if test -x sbin/conf.d/SuSEconfig.fonts
then %run_suseconfig -m fonts
@ -166,15 +161,10 @@ exit 0
# Use traditional bash scriptlet with an explicite "exit 0" line at the end to be fail safe
# see http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets
# Only if suse_version > 1220 it BuildRequires fontpackages-devel which provides reconfigure_fonts_postun.
# Since openSUSE 12.2 there is no SuSEconfig.pango (have it only in the scriptlet if suse_version < 1220).
# Call reconfigure_fonts_* -n binary_RPM_package_name on openSUSE Tumbleweed and openSUSE Leap 15.0 and SLE15 and later:
# Since openSUSE 12.2 there is no SuSEconfig.pango (have it only in the scriptlet if suse_version < 1220):
%postun std
%if 0%{?suse_version} > 1220
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150000
%reconfigure_fonts_postun -n ghostscript-fonts-std
%else
%reconfigure_fonts_postun
%endif
%else
if test -x sbin/conf.d/SuSEconfig.fonts
then %run_suseconfig -m fonts
@ -190,29 +180,19 @@ exit 0
%if 0%{?suse_version} > 1220
# Use traditional bash scriptlet with an explicite "exit 0" line at the end to be fail safe
# see http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets
# Only if suse_version > 1220 it BuildRequires fontpackages-devel which provides reconfigure_fonts_posttrans.
# Call reconfigure_fonts_* -n binary_RPM_package_name on openSUSE Tumbleweed and openSUSE Leap 15.0 and SLE15 and later:
# Only if suse_version > 1220 it BuildRequires fontpackages-devel which provides reconfigure_fonts_posttrans:
%posttrans std
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150000
%reconfigure_fonts_posttrans -n ghostscript-fonts-std
%else
%reconfigure_fonts_posttrans
%endif
exit 0
%endif
# Use traditional bash scriptlet with an explicite "exit 0" line at the end to be fail safe
# see http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets
# Only if suse_version > 1220 it BuildRequires fontpackages-devel which provides reconfigure_fonts_post.
# Since openSUSE 12.2 there is no SuSEconfig.pango (have it only in the scriptlet if suse_version < 1220).
# Call reconfigure_fonts_* -n binary_RPM_package_name on openSUSE Tumbleweed and openSUSE Leap 15.0 and SLE15 and later:
# Since openSUSE 12.2 there is no SuSEconfig.pango (have it only in the scriptlet if suse_version < 1220):
%post other
%if 0%{?suse_version} > 1220
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150000
%reconfigure_fonts_post -n ghostscript-fonts-other
%else
%reconfigure_fonts_post
%endif
%else
if test -x sbin/conf.d/SuSEconfig.fonts
then %run_suseconfig -m fonts
@ -228,15 +208,10 @@ exit 0
# Use traditional bash scriptlet with an explicite "exit 0" line at the end to be fail safe
# see http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets
# Only if suse_version > 1220 it BuildRequires fontpackages-devel which provides reconfigure_fonts_postun.
# Since openSUSE 12.2 there is no SuSEconfig.pango (have it only in the scriptlet if suse_version < 1220).
# Call reconfigure_fonts_* -n binary_RPM_package_name on openSUSE Tumbleweed and openSUSE Leap 15.0 and SLE15 and later:
# Since openSUSE 12.2 there is no SuSEconfig.pango (have it only in the scriptlet if suse_version < 1220):
%postun other
%if 0%{?suse_version} > 1220
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150000
%reconfigure_fonts_postun -n ghostscript-fonts-other
%else
%reconfigure_fonts_postun
%endif
%else
if test -x sbin/conf.d/SuSEconfig.fonts
then %run_suseconfig -m fonts
@ -252,14 +227,9 @@ exit 0
%if 0%{?suse_version} > 1220
# Use traditional bash scriptlet with an explicite "exit 0" line at the end to be fail safe
# see http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets
# Only if suse_version > 1220 it BuildRequires fontpackages-devel which provides reconfigure_fonts_posttrans.
# Call reconfigure_fonts_* -n binary_RPM_package_name on openSUSE Tumbleweed and openSUSE Leap 15.0 and SLE15 and later:
# Only if suse_version > 1220 it BuildRequires fontpackages-devel which provides reconfigure_fonts_posttrans:
%posttrans other
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150000
%reconfigure_fonts_posttrans -n ghostscript-fonts-other
%else
%reconfigure_fonts_posttrans
%endif
exit 0
%endif