From 59f9fd013587b398152d688d2a344333ca6e3d13c3aeb7372da7de9206621544 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 4 Nov 2009 09:42:49 +0000 Subject: [PATCH 1/4] Accepting request 23850 from home:coolo:branches:openSUSE:Factory Copy from home:coolo:branches:openSUSE:Factory/rpm via accept of submit request 23850 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/23850 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=32 --- macrosin.diff | 11 +---------- rpm.changes | 6 ++++++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/macrosin.diff b/macrosin.diff index 02b3480..def6639 100644 --- a/macrosin.diff +++ b/macrosin.diff @@ -47,19 +47,10 @@ Index: macros.in # #%_source_payload w9.gzdio -#%_binary_payload w9.gzdio -+%_binary_payload w2.lzdio ++%_binary_payload w5.lzdio # Algorithm to use for generating file checksum digests on build. # If not specified or 0, MD5 is used. -@@ -357,7 +357,7 @@ package or when debugging this package.\ - #%vendor - - # Default fuzz level for %patch in spec file. --%_default_patch_fuzz 0 -+%_default_patch_fuzz 2 - - # Default patch flags - %_default_patch_flags -s @@ -420,7 +420,7 @@ package or when debugging this package.\ # diff --git a/rpm.changes b/rpm.changes index ecd8782..5b15667 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 4 08:52:48 UTC 2009 - coolo@novell.com + +- do not overwrite the default fuzz factor any longer +- change the payload compression to 5 + ------------------------------------------------------------------- Fri Oct 23 17:56:28 CEST 2009 - mls@suse.de From b62e350d2f1b7bb2ffbb7f0e584f9073092e97e1543395e8e77a5ae4b1d526fc Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 4 Nov 2009 09:43:54 +0000 Subject: [PATCH 2/4] - set suse_version to 1130 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=33 --- rpm-suse_macros | 2 +- rpm.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index 79b0e01..f924be7 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -359,7 +359,7 @@ %supplements_kernel_module() \ %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)} -%suse_version 1120 +%suse_version 1130 %sles_version 0 %ul_version 0 diff --git a/rpm.changes b/rpm.changes index 5b15667..a612488 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 4 09:43:43 UTC 2009 - coolo@novell.com + +- set suse_version to 1130 + ------------------------------------------------------------------- Wed Nov 4 08:52:48 UTC 2009 - coolo@novell.com From 0989f505c9f17888fbf0262ec7b5819b976a0bb8424e04608b5a438be3371a08 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 10 Nov 2009 08:46:32 +0000 Subject: [PATCH 3/4] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=34 --- macrosin.diff | 11 ++++++++++- rpm-suse_macros | 2 +- rpm.changes | 11 ----------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/macrosin.diff b/macrosin.diff index def6639..02b3480 100644 --- a/macrosin.diff +++ b/macrosin.diff @@ -47,10 +47,19 @@ Index: macros.in # #%_source_payload w9.gzdio -#%_binary_payload w9.gzdio -+%_binary_payload w5.lzdio ++%_binary_payload w2.lzdio # Algorithm to use for generating file checksum digests on build. # If not specified or 0, MD5 is used. +@@ -357,7 +357,7 @@ package or when debugging this package.\ + #%vendor + + # Default fuzz level for %patch in spec file. +-%_default_patch_fuzz 0 ++%_default_patch_fuzz 2 + + # Default patch flags + %_default_patch_flags -s @@ -420,7 +420,7 @@ package or when debugging this package.\ # diff --git a/rpm-suse_macros b/rpm-suse_macros index f924be7..79b0e01 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -359,7 +359,7 @@ %supplements_kernel_module() \ %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)} -%suse_version 1130 +%suse_version 1120 %sles_version 0 %ul_version 0 diff --git a/rpm.changes b/rpm.changes index a612488..ecd8782 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Wed Nov 4 09:43:43 UTC 2009 - coolo@novell.com - -- set suse_version to 1130 - -------------------------------------------------------------------- -Wed Nov 4 08:52:48 UTC 2009 - coolo@novell.com - -- do not overwrite the default fuzz factor any longer -- change the payload compression to 5 - ------------------------------------------------------------------- Fri Oct 23 17:56:28 CEST 2009 - mls@suse.de From a3c5105b33e85b8c9ff7ac4e37389897c88e50037093b44c0df5ac19b761dd42 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 10 Nov 2009 08:46:33 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/rpm revision 91.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=5ef07fdf041eb3e176a0ea3b68692ec7 --- macrosin.diff | 11 +---------- rpm-python.spec | 2 +- rpm-suse_macros | 2 +- rpm.changes | 11 +++++++++++ rpm.spec | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/macrosin.diff b/macrosin.diff index 02b3480..def6639 100644 --- a/macrosin.diff +++ b/macrosin.diff @@ -47,19 +47,10 @@ Index: macros.in # #%_source_payload w9.gzdio -#%_binary_payload w9.gzdio -+%_binary_payload w2.lzdio ++%_binary_payload w5.lzdio # Algorithm to use for generating file checksum digests on build. # If not specified or 0, MD5 is used. -@@ -357,7 +357,7 @@ package or when debugging this package.\ - #%vendor - - # Default fuzz level for %patch in spec file. --%_default_patch_fuzz 0 -+%_default_patch_fuzz 2 - - # Default patch flags - %_default_patch_flags -s @@ -420,7 +420,7 @@ package or when debugging this package.\ # diff --git a/rpm-python.spec b/rpm-python.spec index 1b799b4..40d24ae 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -25,7 +25,7 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.7.1 -Release: 6 +Release: 7 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm-suse_macros b/rpm-suse_macros index 79b0e01..f924be7 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -359,7 +359,7 @@ %supplements_kernel_module() \ %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)} -%suse_version 1120 +%suse_version 1130 %sles_version 0 %ul_version 0 diff --git a/rpm.changes b/rpm.changes index ecd8782..a612488 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Nov 4 09:43:43 UTC 2009 - coolo@novell.com + +- set suse_version to 1130 + +------------------------------------------------------------------- +Wed Nov 4 08:52:48 UTC 2009 - coolo@novell.com + +- do not overwrite the default fuzz factor any longer +- change the payload compression to 5 + ------------------------------------------------------------------- Fri Oct 23 17:56:28 CEST 2009 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index fd27cb5..262b0ba 100644 --- a/rpm.spec +++ b/rpm.spec @@ -28,7 +28,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.7.1 -Release: 6 +Release: 7 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2