pool/fontpackages
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 540431 from home:tiwai:branches:M17N:fonts

Browse Source 
Revert the previous change, it was false-positive.

OBS-URL: https://build.opensuse.org/request/show/540431
OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/fontpackages?expand=0&rev=38
This commit is contained in:
Takashi Iwai 2017-11-10 09:56:53 +00:00 committed by Git OBS Bridge
parent 4369faa552
commit 3f143167f6
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fontpackages.changes
View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Wed Nov 8 15:43:41 UTC 2017 - rbrown@suse.com
- As update-scripts are never triggered, remove them.
Rely instead on the rpm post install trigger
[boo#1067213] [bsc#1066187]
-------------------------------------------------------------------
Mon Mar 14 14:30:28 UTC 2016 - pgajdos@suse.com

44
rpm-macros.fonts-config
View File

@ -101,12 +101,40 @@ Requires(posttrans): coreutils \
# options:
# -c (the fonts are CJK fonts, also do setup which is only needed
# for CJK)
# The pattern is fixed within libzypp:
# /var/adm/update-scripts/name-version-release-anything
# (place version-release at the end of a line to help build-compare)
%reconfigure_fonts_post(c) \
mkdir -p `dirname %{__fontsconfigrunflag}` \
touch %{__fontsconfigrunflag} \
%{-c: \
touch %{__fontsconfigrunflag}-cjk \
} \
if [ -n "$ZYPP_IS_RUNNING" ]; then \
__fontsupdatescript=/var/adm/update-scripts/%{name}-%{version}-%{release}\
__fontsupdatescript="${__fontsupdatescript}-reconfigure-fonts" \
echo 'if [ -e %{__fontsconfigrunflag} ]; then' > "${__fontsupdatescript}" \
echo ' if [ -x /usr/sbin/fonts-config ]; then' >> "${__fontsupdatescript}" \
echo ' /usr/sbin/fonts-config --quiet' >> "${__fontsupdatescript}" \
echo ' fi' >> "${__fontsupdatescript}" \
echo ' rm %{__fontsconfigrunflag}' >> "${__fontsupdatescript}" \
echo 'fi' >> "${__fontsupdatescript}" \
echo "rm ${__fontsupdatescript}" >> "${__fontsupdatescript}" \
%{-c: \
__fontsupdatescript_cjk=/var/adm/update-scripts/%{name}-%{version}-%{release}\
__fontsupdatescript_cjk="${__fontsupdatescript_cjk}-reconfigure-cjk-fonts" \
echo 'if [ -e %{__fontsconfigrunflag}-cjk ]; then' > "${__fontsupdatescript_cjk}" \
echo ' if [ -x /usr/sbin/acroread-cidfont-config ]; then' >> "${__fontsupdatescript_cjk}" \
echo ' /usr/sbin/acroread-cidfont-config' >> "${__fontsupdatescript_cjk}" \
echo ' fi' >> "${__fontsupdatescript_cjk}" \
echo ' if [ -x /usr/sbin/ghostscript-cjk-config ]; then' >> "${__fontsupdatescript_cjk}" \
echo ' /usr/sbin/ghostscript-cjk-config' >> "${__fontsupdatescript_cjk}" \
echo ' fi' >> "${__fontsupdatescript_cjk}" \
echo ' rm %{__fontsconfigrunflag}-cjk' >> "${__fontsupdatescript_cjk}" \
echo 'fi' >> "${__fontsupdatescript_cjk}" \
echo "rm ${__fontsupdatescript_cjk}" >> "${__fontsupdatescript_cjk}" \
} \
fi \
%nil
# macro: reconfigure_fonts_postun
@ -129,13 +157,15 @@ Requires(posttrans): coreutils \
# -c (the fonts are CJK fonts, also do setup which is only needed
# for CJK)
%reconfigure_fonts_posttrans \
if [ -e %{__fontsconfigrunflag} ]; then \
%reconfigure_fonts \
rm %{__fontsconfigrunflag} \
fi \
if [ -e %{__fontsconfigrunflag}-cjk ]; then \
%reconfigure_fonts_cjk \
rm %{__fontsconfigrunflag}-cjk \
if [ -z "$ZYPP_IS_RUNNING" ]; then \
if [ -e %{__fontsconfigrunflag} ]; then \
%reconfigure_fonts \
rm %{__fontsconfigrunflag} \
fi \
if [ -e %{__fontsconfigrunflag}-cjk ]; then \
%reconfigure_fonts_cjk \
rm %{__fontsconfigrunflag}-cjk \
fi \
fi \
%nil