From a501bf67ec5427bde3b1b17025425cecb79c62c8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 10 Jan 2006 06:10:36 +0000 Subject: [PATCH] fix obsoletes of fonts-xorg-ISO8859-X-{75,100}dpi packages (#177377) --- xorg-x11-fonts.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index 95ff435..b0d2334 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -30,7 +30,7 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts Version: 1.0.0 -Release: 1 +Release: 2 License: Various licenses Group: User Interface/X URL: http://www.x.org @@ -276,7 +276,7 @@ Requires(post): mkfontdir, chkfontpath Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-2-75dpi-fonts Obsoletes: xorg-x11-ISO8859-2-75dpi-fonts -Obsoletes: fonts-xorg-ISO8859-2-75dpi-fonts +Obsoletes: fonts-xorg-ISO8859-2-75dpi %description ISO8859-2-75dpi Contains a set of 75dpi fonts for Central European languages. @@ -288,7 +288,7 @@ Requires(post): mkfontdir, chkfontpath Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-2-100dpi-fonts Obsoletes: xorg-x11-ISO8859-2-100dpi-fonts -Obsoletes: fonts-xorg-ISO8859-2-100dpi-fonts +Obsoletes: fonts-xorg-ISO8859-2-100dpi %description ISO8859-2-100dpi Contains a set of 100dpi fonts for Central European languages. @@ -300,7 +300,7 @@ Requires(post): mkfontdir, chkfontpath Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-9-75dpi-fonts Obsoletes: xorg-x11-ISO8859-9-75dpi-fonts -Obsoletes: fonts-xorg-ISO8859-9-75dpi-fonts +Obsoletes: fonts-xorg-ISO8859-9-75dpi %description ISO8859-9-75dpi Contains a set of 75dpi fonts for the Turkish language. @@ -312,7 +312,7 @@ Requires(post): mkfontdir, chkfontpath Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-9-100dpi-fonts Obsoletes: xorg-x11-ISO8859-9-100dpi-fonts -Obsoletes: fonts-xorg-ISO8859-9-100dpi-fonts +Obsoletes: fonts-xorg-ISO8859-9-100dpi %description ISO8859-9-100dpi Contains a set of 100dpi fonts for the Turkish language. @@ -324,7 +324,7 @@ Requires(post): mkfontdir, chkfontpath Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-14-75dpi-fonts Obsoletes: xorg-x11-ISO8859-14-75dpi-fonts -Obsoletes: fonts-xorg-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 @@ -337,7 +337,7 @@ Requires(post): mkfontdir, chkfontpath Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-14-100dpi-fonts Obsoletes: xorg-x11-ISO8859-14-100dpi-fonts -Obsoletes: fonts-xorg-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 @@ -350,7 +350,7 @@ Requires(post): mkfontdir, chkfontpath Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-15-75dpi-fonts Obsoletes: xorg-x11-ISO8859-15-75dpi-fonts -Obsoletes: fonts-xorg-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 @@ -363,7 +363,7 @@ Requires(post): mkfontdir, chkfontpath Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-15-100dpi-fonts Obsoletes: xorg-x11-ISO8859-15-100dpi-fonts -Obsoletes: fonts-xorg-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 @@ -1494,6 +1494,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Tue Jan 10 2006 Bill Nottingham 1.0.0-2 +- fix obsoletes (#177377) + * Thu Dec 15 2005 Mike A. Harris 1.0.0-1 - Updated all font packages to X11R7 RC4 versions. - Added perl hack to build section to massage all of the configure.ac files