From 888fc50d0d758f277c9aa0d1a9d82932b0242c269bac023c228e8ca057c2902b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 8 Aug 2012 10:07:03 +0000 Subject: [PATCH 1/2] - fixed build for openSUSE <= 12.1 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-fonts?expand=0&rev=79 --- xorg-x11-fonts.changes | 5 +++++ xorg-x11-fonts.spec | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/xorg-x11-fonts.changes b/xorg-x11-fonts.changes index b1c3260..a6c68d0 100644 --- a/xorg-x11-fonts.changes +++ b/xorg-x11-fonts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 8 09:30:02 UTC 2012 - sndirsch@suse.com + +- fixed build for openSUSE <= 12.1 + ------------------------------------------------------------------- Mon Aug 6 10:31:44 UTC 2012 - pgajdos@suse.com diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index df18f62..ec3df96 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -18,7 +18,9 @@ Name: xorg-x11-fonts BuildRequires: bdftopcf +%if 0%{?suse_version} > 01210 BuildRequires: fontpackages-devel +%endif BuildRequires: mkfontdir BuildRequires: mkfontscale # ucs2any @@ -147,9 +149,23 @@ rm -rf $RPM_BUILD_ROOT/usr/etc %clean rm -rf "$RPM_BUILD_ROOT" +%if 0%{?suse_version} > 01210 %reconfigure_fonts_scriptlets %reconfigure_fonts_scriptlets -n xorg-x11-fonts-core +%else +%post +%run_suseconfig_fonts + +%postun +%run_suseconfig_fonts + +%post core +%run_suseconfig_fonts + +%postun core +%run_suseconfig_fonts +%endif %files %defattr(-,root,root) From 2c3eab29d6e330abe2beea97cfa0ccc6b3fcd96ed5d24dd24f5e3f02f80aea2c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 9 Aug 2012 07:47:02 +0000 Subject: [PATCH 2/2] Accepting request 130439 from home:klausi123:X11 fontpackages-devel not available in 12.2 OBS-URL: https://build.opensuse.org/request/show/130439 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-fonts?expand=0&rev=81 --- xorg-x11-fonts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index ec3df96..41560df 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -18,7 +18,7 @@ Name: xorg-x11-fonts BuildRequires: bdftopcf -%if 0%{?suse_version} > 01210 +%if 0%{?suse_version} > 01220 BuildRequires: fontpackages-devel %endif BuildRequires: mkfontdir @@ -149,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT/usr/etc %clean rm -rf "$RPM_BUILD_ROOT" -%if 0%{?suse_version} > 01210 +%if 0%{?suse_version} > 01220 %reconfigure_fonts_scriptlets %reconfigure_fonts_scriptlets -n xorg-x11-fonts-core