From 90bedfe8a9a57ba1fb9da976785c5ca51b8ede44eb1d35d78eefb37dfbc27249 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 16 May 2008 19:47:05 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=44

---
 debugsource-package.diff |  8 ++++----
 remove-brp-strips.diff   | 16 ++++++++++++++++
 rpm-python.spec          |  2 +-
 rpm.changes              |  5 +++++
 rpm.spec                 | 13 +++++++------
 whatrequires-doc.diff    |  4 ++--
 6 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 remove-brp-strips.diff

diff --git a/debugsource-package.diff b/debugsource-package.diff
index 1e06af6..13b4c63 100644
--- a/debugsource-package.diff
+++ b/debugsource-package.diff
@@ -10,8 +10,8 @@ build the binary. The patches moves them into a separate package -debugsource.
 
 Index: b/macros.in
 ===================================================================
---- a/macros.in
-+++ b/macros.in
+--- macros.in
++++ macros.in
 @@ -179,6 +179,18 @@ Debug information is useful when develop
  package or when debugging this package.\
  %files debuginfo -f debugfiles.list\
@@ -33,8 +33,8 @@ Index: b/macros.in
  %_defaultdocdir		%{_usr}/doc/packages
 Index: b/scripts/find-debuginfo.sh
 ===================================================================
---- a/scripts/find-debuginfo.sh
-+++ b/scripts/find-debuginfo.sh
+--- scripts/find-debuginfo.sh
++++ scripts/find-debuginfo.sh
 @@ -7,14 +7,16 @@ else BUILDDIR=$1
  fi
  
diff --git a/remove-brp-strips.diff b/remove-brp-strips.diff
new file mode 100644
index 0000000..751f609
--- /dev/null
+++ b/remove-brp-strips.diff
@@ -0,0 +1,16 @@
+Subject: remove references to removed brp scripts
+
+Some brp-scripts are not used in openSUSE, remove references
+to it
+
+--- platform.in
++++ platform.in
+@@ -55,8 +55,6 @@
+ %__os_install_post    \
+     @RPMCONFIGDIR@/brp-compress \
+     @RPMCONFIGDIR@/brp-strip \
+-    @RPMCONFIGDIR@/brp-strip-static-archive \
+-    @RPMCONFIGDIR@/brp-strip-comment-note \
+ %{nil}
+ 
+ %__spec_install_post\
diff --git a/rpm-python.spec b/rpm-python.spec
index c152705..81ee893 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -17,7 +17,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        239
+Release:        243
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
diff --git a/rpm.changes b/rpm.changes
index 5c9bc90..ac9c00d 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 15 14:31:51 CEST 2008 - dmueller@suse.de
+
+- remove references to brp-strip-comment-note (bnc#390163)
+
 -------------------------------------------------------------------
 Tue May  6 18:01:34 CEST 2008 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 52955fc..c9c1e3c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -21,7 +21,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        193
+Release:        196
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -134,6 +134,7 @@ Patch104:       lzma-payload.diff
 Patch105:       lzma-payload-2.diff
 Patch106:       debugsource-package.diff
 Patch107:       whatrequires-doc.diff
+Patch108:       remove-brp-strips.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -206,10 +207,8 @@ rm -f rpmdb/db.h
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89
 %patch -P 90 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99
-%patch -P 100 -P 101 -P 102 -P 103
+%patch -P 100 -P 101 -P 102 -P 103 -P -P 106 -P 107 -P 108
 %patch -P 104 -P 105 -b .lzma
-%patch106 -p1
-%patch107 -p1
 chmod 755 scripts/find-supplements{,.ksyms}
 chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 tar -xjvf %{SOURCE1}
@@ -354,7 +353,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        421
+Release:        424
 #
 
 %description -n popt
@@ -377,7 +376,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        421
+Release:        424
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -412,6 +411,8 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Thu May 15 2008 dmueller@suse.de
+- remove references to brp-strip-comment-note (bnc#390163)
 * Tue May 06 2008 mls@suse.de
 - enable all parts of the noprovides patch again, making our rpm
   compatible to rpm4
diff --git a/whatrequires-doc.diff b/whatrequires-doc.diff
index ab8ce03..2ea6033 100644
--- a/whatrequires-doc.diff
+++ b/whatrequires-doc.diff
@@ -1,5 +1,5 @@
---- rpm-4.4.2/doc/rpm.8.orig	2008-04-10 12:02:59.000000000 +0200
-+++ rpm-4.4.2/doc/rpm.8	2008-04-10 12:30:16.923076000 +0200
+--- doc/rpm.8.orig	2008-04-10 12:02:59.000000000 +0200
++++ doc/rpm.8	2008-04-10 12:30:16.923076000 +0200
 @@ -584,6 +584,11 @@
  .TP
  \fB--whatrequires \fICAPABILITY\fB\fR