Accepting request 799998 from home:alarrosa:branches:X11:XOrg

- Differentiate also Requires, BuildRequires, Obsoletes and more
  statements between the two flavors.

OBS-URL: https://build.opensuse.org/request/show/799998
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-fonts?expand=0&rev=101

xorg-x11-fonts.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May  4 08:29:42 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
+
+- Differentiate also Requires, BuildRequires, Obsoletes and more
+  statements between the two flavors.
+
 -------------------------------------------------------------------
 Thu Apr 30 12:34:54 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
 

xorg-x11-fonts.spec

@@ -24,29 +24,12 @@
 %endif
 
 Name:           xorg-x11-fonts%{pkgflavor}
-BuildRequires:  bdftopcf
-BuildRequires:  fontpackages-devel
-BuildRequires:  mkfontscale
-# ucs2any
-BuildRequires:  font-util
 BuildRequires:  pkgconfig
 URL:            http://xorg.freedesktop.org/
 Version:        7.6
 Release:        0
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-PreReq:         fonts-config
-Requires:       %{name}-core
-Provides:       xorg-x11-fonts-100dpi
-Provides:       xorg-x11-fonts-75dpi
-Provides:       xorg-x11-fonts-cyrillic
-Provides:       xorg-x11-fonts-scalable
-Provides:       xorg-x11-fonts-syriac
-Obsoletes:      xorg-x11-fonts-100dpi
-Obsoletes:      xorg-x11-fonts-75dpi
-Obsoletes:      xorg-x11-fonts-cyrillic
-Obsoletes:      xorg-x11-fonts-scalable
-Obsoletes:      xorg-x11-fonts-syriac
 Summary:        X.Org fonts
 License:        MIT
 Group:          System/X11/Fonts
@@ -101,6 +84,25 @@ Requires(postun): fonts-config
 # doesn't support Type1 fonts (boo#1169444)
 Supplements:    (xorg-x11-fonts and libpango-1_0-0)
 %endif
+%else
+# "%%{flavor}" != "converted"
+BuildRequires:  bdftopcf
+BuildRequires:  fontpackages-devel
+BuildRequires:  mkfontscale
+# ucs2any
+BuildRequires:  font-util
+PreReq:         fonts-config
+Requires:       %{name}-core
+Provides:       xorg-x11-fonts-100dpi
+Provides:       xorg-x11-fonts-75dpi
+Provides:       xorg-x11-fonts-cyrillic
+Provides:       xorg-x11-fonts-scalable
+Provides:       xorg-x11-fonts-syriac
+Obsoletes:      xorg-x11-fonts-100dpi
+Obsoletes:      xorg-x11-fonts-75dpi
+Obsoletes:      xorg-x11-fonts-cyrillic
+Obsoletes:      xorg-x11-fonts-scalable
+Obsoletes:      xorg-x11-fonts-syriac
 %endif
 
 %description