diff --git a/fontpackages.changes b/fontpackages.changes index cf8743b..549cfef 100644 --- a/fontpackages.changes +++ b/fontpackages.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 3 08:24:45 UTC 2015 - olaf@aepfle.de + +- Move version-release to reduce build-compare noise + ------------------------------------------------------------------- Thu Feb 27 15:48:37 UTC 2014 - pgajdos@suse.com diff --git a/fontpackages.spec b/fontpackages.spec index 64aacf9..a8dc33c 100644 --- a/fontpackages.spec +++ b/fontpackages.spec @@ -1,7 +1,7 @@ # # spec file for package fontpackages # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 diff --git a/rpm-macros.fonts-config b/rpm-macros.fonts-config index 5e67632..b855d4e 100644 --- a/rpm-macros.fonts-config +++ b/rpm-macros.fonts-config @@ -7,7 +7,8 @@ %_fontsconfavaildir %{_datadir}/%{name}/conf.avail # private %__fontsconfigrunflag /var/run/fontpackages/reconfigure-fonts -%__fontsupdatescript /var/adm/update-scripts/%{name}-%{version}-%{release}-reconfigure-fonts +%__fontsupdatescript /var/adm/update-scripts/reconfigure-fonts-%{name}-%{version}-%{release} +%__fontsupdatescript_cjk /var/adm/update-scripts/reconfigure-cjk-fonts-%{name}-%{version}-%{release} # macro: link_avail_to_system_fontsconf name # (takes exactly one argument, name of configuration file) @@ -117,16 +118,16 @@ Requires(posttrans): coreutils \ echo 'fi' >> %{__fontsupdatescript} \ echo 'rm %{__fontsupdatescript}' >> %{__fontsupdatescript} \ %{-c: \ - 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 \ + 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