From 36ff7a2290030b3cdaa4be00608c3596a37b0f066c60bb67a885b17ba12515eb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 2 Jun 2022 06:28:20 +0000 Subject: [PATCH] Accepting request 980312 from home:dziobian:branches:M17N:fonts Add obsoletes and provides for google-{arimo,cousine,tinos}-fonts to unbreak upgrades. Delete google-croscore-fonts which is now obsoleted by this package OBS-URL: https://build.opensuse.org/request/show/980312 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/google-noto-fonts?expand=0&rev=49 --- generate-fonts-and-specfile.sh | 8 +++++++- google-noto-fonts.changes | 4 ++++ google-noto-fonts.spec | 8 +++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/generate-fonts-and-specfile.sh b/generate-fonts-and-specfile.sh index 26e7207..4ff96e4 100644 --- a/generate-fonts-and-specfile.sh +++ b/generate-fonts-and-specfile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash pkg_name="google-noto-fonts" font_dir="ttf" @@ -38,6 +38,12 @@ ls $font_dir/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc:: OBSOLETES=($packagename 'noto-sans-syriacwestern' 'noto-sans-syriacwestern-fonts' 'noto-sans-syriacestrangela' 'noto-sans-syriacestrangela-fonts' 'noto-sans-syriaceastern' 'noto-sans-syriaceastern-fonts') elif [ $packagename == "noto-sans-mono" ]; then OBSOLETES=($packagename 'noto-mono' 'noto-mono-fonts') + elif [ $packagename == "noto-arimo" ]; then + OBSOLETES=($packagename 'google-arimo') + elif [ $packagename == "noto-cousine" ]; then + OBSOLETES=($packagename 'google-cousine') + elif [ $packagename == "noto-tinos" ]; then + OBSOLETES=($packagename 'google-tinos') else OBSOLETES=($packagename) fi diff --git a/google-noto-fonts.changes b/google-noto-fonts.changes index 3336fe9..d1ab971 100644 --- a/google-noto-fonts.changes +++ b/google-noto-fonts.changes @@ -1,3 +1,7 @@ +------------------------------------------------------------------- +Wed Jun 1 08:43:48 UTC 2022 - Bruno Pitrus +- Add obsoletes and provides for google-{arimo,cousine,tinos}-fonts + ------------------------------------------------------------------- Thu May 26 23:07:18 UTC 2022 - Gordon Leung diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec index 9df7d60..2fe70c6 100644 --- a/google-noto-fonts.spec +++ b/google-noto-fonts.spec @@ -40,7 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -Noto's design goal is to achieve visual harmonization (e.g., compatible heights and stroke +Noto's design goal is to achieve visual harmonization (e.g., compatible heights and stroke thicknesses) across languages. %package doc @@ -56,6 +56,8 @@ Group: System/X11/Fonts Recommends: google-noto-fonts-doc Obsoletes: noto-arimo < %{version} Provides: noto-arimo = %{version} +Obsoletes: google-arimo-fonts < %{version} +Provides: google-arimo-fonts = %{version} %reconfigure_fonts_prereq %description -n noto-arimo-fonts @@ -69,6 +71,8 @@ Group: System/X11/Fonts Recommends: google-noto-fonts-doc Obsoletes: noto-cousine < %{version} Provides: noto-cousine = %{version} +Obsoletes: google-cousine-fonts < %{version} +Provides: google-cousine-fonts = %{version} %reconfigure_fonts_prereq %description -n noto-cousine-fonts @@ -2966,6 +2970,8 @@ Group: System/X11/Fonts Recommends: google-noto-fonts-doc Obsoletes: noto-tinos < %{version} Provides: noto-tinos = %{version} +Obsoletes: google-tinos-fonts < %{version} +Provides: google-tinos-fonts = %{version} %reconfigure_fonts_prereq %description -n noto-tinos-fonts