Accepting request 544185 from M17N:fonts

OBS-URL: https://build.opensuse.org/request/show/544185
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontpackages?expand=0&rev=15

fontpackages.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 21 15:14:15 CET 2017 - kukuk@suse.de
+
+- /var/adm/update-scripts is deprecated and will be removed at 
+  some point in the future, since %posttrans support in libzypp
+  was fixed with SLE12. Remove the workaround, only use the RPM
+  posttrans to simplify the code and testing.
+
 -------------------------------------------------------------------
 Mon Mar 14 14:30:28 UTC 2016 - pgajdos@suse.com
 

fontpackages.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package fontpackages
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

rpm-macros.fonts-config

@@ -10,7 +10,7 @@
 
 # macro: link_avail_to_system_fontsconf name
 # (takes exactly one argument, name of configuration file)
-# creates symlink pointing from /etc/fonts/conf.d/name to 
+# creates symlink pointing from /etc/fonts/conf.d/name to
 # ../../../usr/share/%{name}/conf.avail/name
 %link_avail_to_system_fontsconf() \
   if [ "x%1" == "x%%1" ]; then \
@@ -43,7 +43,7 @@
 
 # macro: files_fontsconf_availdir
 # packages /usr/share/%{name}/conf.avail directory,
-# which is intended for fontconfig files shipped by the 
+# which is intended for fontconfig files shipped by the
 # (font) package
 
 %files_fontsconf_availdir() \
@@ -52,7 +52,7 @@
 %nil
 
 # macro: files_fontsconf_file
-# takes exactly one argument; for given fontconfig file 
+# takes exactly one argument; for given fontconfig file
 # (01-fontconfig.conf) macro expands in correct %%files entry
 #
 # -l  option also packages %%{_fontsconfddir}/01-fontconfig.conf link
@@ -101,40 +101,12 @@ 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
@@ -157,15 +129,13 @@ Requires(posttrans): 	coreutils \
 #         -c  (the fonts are CJK fonts, also do setup which is only needed
 #              for CJK)
 %reconfigure_fonts_posttrans \
-  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 \
+  if [ -e %{__fontsconfigrunflag} ]; then \
+    %reconfigure_fonts \
+    rm %{__fontsconfigrunflag} \
+  fi \
+  if [ -e %{__fontsconfigrunflag}-cjk ]; then \
+    %reconfigure_fonts_cjk \
+    rm %{__fontsconfigrunflag}-cjk \
   fi \
   %nil
 
@@ -187,4 +157,3 @@ Requires(posttrans): 	coreutils \
 %reconfigure_fonts_posttrans \
 \
 %nil
-