From 2024d0372cfe89acfac12a6cc3c843996d3b7e28f58896b5b63f4fe9c75308f6 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 6 Aug 2012 12:07:58 +0000
Subject: [PATCH 1/2] Accepting request 130046 from home:pgajdos

- prepare spec file for dropping SuSEconfig.fonts (openFATE#313536)

OBS-URL: https://build.opensuse.org/request/show/130046
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=42
---
 xterm.changes | 5 +++++
 xterm.spec    | 8 +++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/xterm.changes b/xterm.changes
index dd90d77..54dbabc 100644
--- a/xterm.changes
+++ b/xterm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  6 09:53:04 UTC 2012 - pgajdos@suse.com
+
+- prepare spec file for dropping SuSEconfig.fonts (openFATE#313536)
+
 -------------------------------------------------------------------
 Tue Jul 17 15:13:06 UTC 2012 - pcerny@suse.com
 
diff --git a/xterm.spec b/xterm.spec
index 3847e5a..bc6a947 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -17,6 +17,7 @@
 
 
 Name:           xterm
+BuildRequires:  fontpackages-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  update-desktop-files
@@ -44,6 +45,7 @@ Provides:       xorg-x11:/usr/X11R6/bin/xterm
 %if 0%{?suse_version} > 1210
 Requires:       luit
 %endif
+%reconfigure_fonts_prereq
 Version:        281
 Release:        0
 Summary:        The basic X terminal program
@@ -152,11 +154,7 @@ mkdir -p $RPM_BUILD_ROOT%{xfontsd}/misc/
 install -m 644 *.pcf.gz $RPM_BUILD_ROOT%{xfontsd}/misc/
 %suse_update_desktop_file -i xterm TerminalEmulator
 
-%post
-%run_suseconfig_fonts
-
-%postun
-%run_suseconfig_fonts
+%reconfigure_fonts_scriptlets
 
 %files
 %defattr(-,root,root)

From 03e3de7cd598b3abbf787cd48693c9adaa06d33938559315160dc667c9be1298 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 7 Aug 2012 06:45:53 +0000
Subject: [PATCH 2/2] moved reconfigure_fonts where service localrun download
 is not confused

OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=43
---
 xterm.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xterm.spec b/xterm.spec
index bc6a947..e76b505 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -45,7 +45,6 @@ Provides:       xorg-x11:/usr/X11R6/bin/xterm
 %if 0%{?suse_version} > 1210
 Requires:       luit
 %endif
-%reconfigure_fonts_prereq
 Version:        281
 Release:        0
 Summary:        The basic X terminal program
@@ -73,6 +72,7 @@ Patch5:         xterm-disallow-window-and-fonts-ops.patch
 Patch6:         libtinfo.diff
 Patch293793:    bugzilla-293793-do-not-insist-on-iso8859-fonts-for-the-menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%reconfigure_fonts_prereq
 
 %description
 This package contains the basic X.Org terminal program.