From 9a29c75db398b2f5b95f7aa869e4f963d0ba32d9f3203368c80863dba9c81f14 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 5 Feb 2015 11:21:57 +0000 Subject: [PATCH] Accepting request 284178 from home:olh:branches:M17N:fonts - Revert last pathname change because libzypp expects a fixed filename pattern. release changes have to caught in build-compare OBS-URL: https://build.opensuse.org/request/show/284178 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/fontpackages?expand=0&rev=30 --- fontpackages.changes | 6 ++++++ rpm-macros.fonts-config | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fontpackages.changes b/fontpackages.changes index 549cfef..50a205f 100644 --- a/fontpackages.changes +++ b/fontpackages.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 5 11:16:17 UTC 2015 - olaf@aepfle.de + +- Revert last pathname change because libzypp expects a fixed + filename pattern. release changes have to caught in build-compare + ------------------------------------------------------------------- Tue Feb 3 08:24:45 UTC 2015 - olaf@aepfle.de diff --git a/rpm-macros.fonts-config b/rpm-macros.fonts-config index b855d4e..f1c2b79 100644 --- a/rpm-macros.fonts-config +++ b/rpm-macros.fonts-config @@ -7,8 +7,10 @@ %_fontsconfavaildir %{_datadir}/%{name}/conf.avail # private %__fontsconfigrunflag /var/run/fontpackages/reconfigure-fonts -%__fontsupdatescript /var/adm/update-scripts/reconfigure-fonts-%{name}-%{version}-%{release} -%__fontsupdatescript_cjk /var/adm/update-scripts/reconfigure-cjk-fonts-%{name}-%{version}-%{release} +# The pattern is fixed within libzypp: +# /var/adm/update-scripts/name-version-release-anything +%__fontsupdatescript /var/adm/update-scripts/%{name}-%{version}-%{release}-reconfigure-fonts +%__fontsupdatescript_cjk /var/adm/update-scripts/%{name}-%{version}-%{release}-reconfigure-cjk-fonts # macro: link_avail_to_system_fontsconf name # (takes exactly one argument, name of configuration file)