From 067e8ebe8fb0df7f1b68291e9a5224d7e6eacd9fc416cc315f35411983d1ce62 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 25 Jan 2008 15:54:57 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=31

---
 build.diff      | 11 ++---------
 rpm-python.spec |  2 +-
 rpm.changes     |  5 +++++
 rpm.spec        |  8 +++++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.diff b/build.diff
index b050cfd..1b61524 100644
--- a/build.diff
+++ b/build.diff
@@ -297,23 +297,16 @@ Index: configure.ac
  *)		RPMCANONCOLOR=0; RPMCANONARCH=unknown ;;
  esac
  case "${build_os_noversion}" in
-@@ -1290,7 +1287,7 @@ mint)		RPMCANONARCH=m68kmint ;;
+@@ -1290,7 +1287,8 @@ mint)		RPMCANONARCH=m68kmint ;;
  esac
  RPMCANONVENDOR="$build_vendor"
  case "${build_vendor}" in
 -unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos)
 +unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse)
++	RPMCANONVENDOR=suse
  	test -f /etc/redhat-release &&		RPMCANONVENDOR=redhat
  	test -f /etc/pld-release &&		RPMCANONVENDOR=pld
  	test -f /etc/mandrake-release &&	RPMCANONVENDOR=mandrake
-@@ -1298,6 +1295,7 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
- 	test -f /etc/lvr-release &&		RPMCANONVENDOR=lvr
- 	test -f /etc/yellowdog-release &&	RPMCANONVENDOR=yellowdog
- 	test -f /etc/caos-release &&		RPMCANONVENDOR=caos
-+	test -f /etc/SuSE-release -o -f /.buildenv && RPMCANONVENDOR=suse
- 	;;
- esac
- RPMCANONOS="$build_os_noversion"
 @@ -1372,7 +1370,7 @@ dnl XXX this causes popt to depend on zl
  dnl # XXX Propagate -lucb to popt ...
  dnl export LIBS INCPATH CONFIG_SITE
diff --git a/rpm-python.spec b/rpm-python.spec
index 95f874b..770b6a0 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -16,7 +16,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        196
+Release:        199
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
diff --git a/rpm.changes b/rpm.changes
index 48c3824..ec0b39d 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 21 12:27:18 CET 2008 - mls@suse.de
+
+- change vendor detection so that it works in build service, too
+
 -------------------------------------------------------------------
 Sat Jan 19 17:14:55 CET 2008 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index b56464d..3dc354c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        159
+Release:        161
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -345,7 +345,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        387
+Release:        389
 #
 
 %description -n popt
@@ -368,7 +368,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        387
+Release:        389
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -403,6 +403,8 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Mon Jan 21 2008 mls@suse.de
+- change vendor detection so that it works in build service, too
 * Sat Jan 19 2008 mls@suse.de
 - update rpm-suse_macros so that the build service can build, too
 * Thu Jan 17 2008 wberrier@suse.de