From 9375ce439f9469788d5dcde3b70d81599e3cefe56769f3c9159d6ed4d53418ff Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sat, 19 Feb 2011 17:30:04 +0000
Subject: [PATCH] Accepting request 62145 from home:vuntz:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/62145
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=87
---
 rpm-python.spec | 6 +++---
 rpm-suse_macros | 3 ---
 rpm.changes     | 7 +++++++
 rpm.spec        | 6 +++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/rpm-python.spec b/rpm-python.spec
index df32e4d..4942a4b 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package rpm-python (Version 4.8.0)
+# spec file for package rpm-python
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@ License:        GPLv2+
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.8.0
-Release:        17
+Release:        18
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
diff --git a/rpm-suse_macros b/rpm-suse_macros
index bde23c6..37237e0 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -98,9 +98,6 @@
   if test -x /sbin/conf.d/SuSEconfig.fonts ; then \
     %run_suseconfig -m fonts \
   fi \
-  if test -x /sbin/conf.d/SuSEconfig.pango ; then \
-    %run_suseconfig -m pango \
-  fi \
   %{-c:if test -x /sbin/conf.d/SuSEconfig.ghostscript-cjk ; then \
          %run_suseconfig -m ghostscript-cjk \
        fi} \
diff --git a/rpm.changes b/rpm.changes
index 79c86f6..45a71a9 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Feb 19 12:39:31 CET 2011 - vuntz@opensuse.org
+
+- Don't call /sbin/conf.d/SuSEconfig.pango in
+  %run_suseconfig_fonts: it has been removed during 11.4
+  development.
+
 -------------------------------------------------------------------
 Fri Jan 14 08:58:40 UTC 2011 - coolo@novell.com
 
diff --git a/rpm.spec b/rpm.spec
index c852773..c12a48f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package rpm (Version 4.8.0)
+# spec file for package rpm
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.8.0
-Release:        17
+Release:        18
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2