[xorg-x11-fonts/f21] Fix up Obsolets/Provides

Simone Caronni slaanesh at fedoraproject.org
Sun Nov 9 17:59:44 UTC 2014


commit 40a15a597bcdfaa8dc8447e1802b51b305eecdcf
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Sun Nov 9 11:10:18 2014 +0100

    Fix up Obsolets/Provides

 xorg-x11-fonts.spec |   50 +-------------------------------------------------
 1 files changed, 1 insertions(+), 49 deletions(-)
---
diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index d7bbb66..593d7e0 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -94,9 +94,7 @@ Summary: misc bitmap fonts for the X Window System
 Group: User Interface/X
 Requires(post): mkfontdir, fontconfig
 Requires(postun): mkfontdir, fontconfig
-Obsoletes: XFree86-base-fonts
-Obsoletes: xorg-x11-base-fonts
-Obsoletes: fonts-xorg-base
+# Still required by xfig-common, xosd, xtide
 Obsoletes: xorg-x11-fonts-base
 Provides: xorg-x11-fonts-base
 
@@ -109,9 +107,6 @@ Summary: Type1 fonts provided by the X Window System
 Group: User Interface/X
 Requires(post): mkfontdir, fontconfig, ttmkfdir
 Requires(postun): mkfontdir, fontconfig, ttmkfdir
-Obsoletes: XFree86-base-fonts
-Obsoletes: xorg-x11-base-fonts
-Obsoletes: fonts-xorg-base
 
 %description Type1
 A collection of Type1 fonts which are part of the core X Window System
@@ -133,9 +128,6 @@ Summary: A set of 75dpi resolution fonts for the X Window System.
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-75dpi-fonts
-Obsoletes: xorg-x11-75dpi-fonts
-Obsoletes: fonts-xorg-75dpi
 
 %description 75dpi
 A set of 75 dpi fonts used by the X window system.
@@ -145,9 +137,6 @@ Summary: A set of 100dpi resolution fonts for the X Window System.
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-100dpi-fonts
-Obsoletes: xorg-x11-100dpi-fonts
-Obsoletes: fonts-xorg-100dpi
 
 %description 100dpi
 A set of 100 dpi fonts used by the X window system.
@@ -157,11 +146,6 @@ Summary: A set of 75dpi ISO-8859-1 fonts for X.
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-75dpi-fonts
-Obsoletes: xorg-x11-75dpi-fonts
-# The ISO8859-1 fonts used to be coupled with the UCS fonts.
-Obsoletes: fonts-xorg-75dpi
-Conflicts: fonts-xorg-75dpi
 
 %description ISO8859-1-75dpi
 Contains a set of 75dpi fonts for ISO-8859-1.
@@ -171,11 +155,6 @@ Summary: A set of 100dpi ISO-8859-1 fonts for X.
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-100dpi-fonts
-Obsoletes: xorg-x11-100dpi-fonts
-# The ISO8859-1 fonts used to be coupled with the UCS fonts.
-Obsoletes: fonts-xorg-100dpi
-Conflicts: fonts-xorg-100dpi
 
 %description ISO8859-1-100dpi
 Contains a set of 100dpi fonts for ISO-8859-1.
@@ -185,9 +164,6 @@ Summary: A set of 75dpi Central European language fonts for X.
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-ISO8859-2-75dpi-fonts
-Obsoletes: xorg-x11-ISO8859-2-75dpi-fonts
-Obsoletes: fonts-xorg-ISO8859-2-75dpi
 
 %description ISO8859-2-75dpi
 Contains a set of 75dpi fonts for Central European languages.
@@ -197,9 +173,6 @@ Summary: A set of 100dpi Central European language fonts for X.
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-ISO8859-2-100dpi-fonts
-Obsoletes: xorg-x11-ISO8859-2-100dpi-fonts
-Obsoletes: fonts-xorg-ISO8859-2-100dpi
 
 %description ISO8859-2-100dpi
 Contains a set of 100dpi fonts for Central European languages.
@@ -209,9 +182,6 @@ Summary: ISO8859-9-75dpi fonts
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-ISO8859-9-75dpi-fonts
-Obsoletes: xorg-x11-ISO8859-9-75dpi-fonts
-Obsoletes: fonts-xorg-ISO8859-9-75dpi
 
 %description ISO8859-9-75dpi
 Contains a set of 75dpi fonts for the Turkish language.
@@ -221,9 +191,6 @@ Summary: ISO8859-9-100dpi fonts
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-ISO8859-9-100dpi-fonts
-Obsoletes: xorg-x11-ISO8859-9-100dpi-fonts
-Obsoletes: fonts-xorg-ISO8859-9-100dpi
 
 %description ISO8859-9-100dpi
 Contains a set of 100dpi fonts for the Turkish language.
@@ -233,9 +200,6 @@ Summary: ISO8859-14-75dpi fonts
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-ISO8859-14-75dpi-fonts
-Obsoletes: xorg-x11-ISO8859-14-75dpi-fonts
-Obsoletes: fonts-xorg-ISO8859-14-75dpi
 
 %description ISO8859-14-75dpi
 Contains a set of 75dpi fonts in the ISO8859-14 encoding which
@@ -246,9 +210,6 @@ Summary: ISO8859-14-100dpi fonts
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-ISO8859-14-100dpi-fonts
-Obsoletes: xorg-x11-ISO8859-14-100dpi-fonts
-Obsoletes: fonts-xorg-ISO8859-14-100dpi
 
 %description ISO8859-14-100dpi
 Contains a set of 100dpi fonts in the ISO8859-14 encoding which
@@ -259,9 +220,6 @@ Summary: ISO8859-15-75dpi fonts
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-ISO8859-15-75dpi-fonts
-Obsoletes: xorg-x11-ISO8859-15-75dpi-fonts
-Obsoletes: fonts-xorg-ISO8859-15-75dpi
 
 %description ISO8859-15-75dpi
 Contains a set of 75dpi fonts in the ISO8859-15 encoding which
@@ -272,9 +230,6 @@ Summary: ISO8859-15-100dpi fonts
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-ISO8859-15-100dpi-fonts
-Obsoletes: xorg-x11-ISO8859-15-100dpi-fonts
-Obsoletes: fonts-xorg-ISO8859-15-100dpi
 
 %description ISO8859-15-100dpi
 Contains a set of 100dpi fonts in the ISO8859-15 encoding which
@@ -285,9 +240,6 @@ Summary: Cyrillic fonts for X.
 Group: User Interface/X
 Requires(post): mkfontdir
 Requires(postun): mkfontdir
-Obsoletes: XFree86-cyrillic-fonts
-Obsoletes: xorg-x11-cyrillic-fonts
-Obsoletes: fonts-xorg-cyrillic
 
 %description cyrillic
 Contains a set of Cyrillic fonts.


More information about the scm-commits mailing list