From b2d9f5d5019d89e68e94a93b340952fc0656e56554251ade3ae626d7b3ed863f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 28 Jun 2010 21:24:08 +0000 Subject: [PATCH 1/4] Accepting request 42164 from home:jengelh:smp Copy from home:jengelh:smp/rpm via accept of submit request 42164 revision 3. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/42164 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=56 --- rpm.changes | 5 +++++ rpm.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rpm.changes b/rpm.changes index a857952..4c88ec7 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + ------------------------------------------------------------------- Fri Jun 4 16:44:29 CEST 2010 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index a66732c..cafef87 100644 --- a/rpm.spec +++ b/rpm.spec @@ -197,11 +197,11 @@ export CFLAGS="-g -O0 -fno-strict-aliasing" cp autogen.sh beecrypt pushd beecrypt ./autogen.sh --with-pic -make %{?jobs:-j%jobs} +make %{?_smp_mflags} popd ./autogen.sh --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua --with-selinux --with-internal-beecrypt --enable-shared %{?with_python: --enable-python} rm po/de.gmo -make %{?jobs:-j%jobs} +make %{?_smp_mflags} make convertdb1 %install From 6983e991365603ac7559c2e60c0ace0b4d3a698f5ae95220dbfe6678e3a801a1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 20 Jul 2010 11:47:41 +0000 Subject: [PATCH 2/4] - make suse_version 1140 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=57 --- 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 f924be7..1406145 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 1140 %sles_version 0 %ul_version 0 diff --git a/rpm.changes b/rpm.changes index 4c88ec7..89080a3 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 20 11:47:29 UTC 2010 - coolo@novell.com + +- make suse_version 1140 + ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de From e4c07305105ec0655eeb4aa35b73eaebe0f09f5a01bc67d2f00f5c0b03e31f97 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Jul 2010 18:12:08 +0000 Subject: [PATCH 3/4] checked in (request 43488) OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=58 --- rpm-suse_macros | 2 +- rpm.changes | 10 ---------- rpm.spec | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index 1406145..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 1140 +%suse_version 1130 %sles_version 0 %ul_version 0 diff --git a/rpm.changes b/rpm.changes index 89080a3..a857952 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Jul 20 11:47:29 UTC 2010 - coolo@novell.com - -- make suse_version 1140 - -------------------------------------------------------------------- -Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de - -- use %_smp_mflags - ------------------------------------------------------------------- Fri Jun 4 16:44:29 CEST 2010 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index cafef87..a66732c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -197,11 +197,11 @@ export CFLAGS="-g -O0 -fno-strict-aliasing" cp autogen.sh beecrypt pushd beecrypt ./autogen.sh --with-pic -make %{?_smp_mflags} +make %{?jobs:-j%jobs} popd ./autogen.sh --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua --with-selinux --with-internal-beecrypt --enable-shared %{?with_python: --enable-python} rm po/de.gmo -make %{?_smp_mflags} +make %{?jobs:-j%jobs} make convertdb1 %install From 61bb170fcb9b022081fadfc6e2dd8a4ebddc3eaf2bb575c985b8882ff063dd91 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 20 Jul 2010 18:12:09 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/rpm revision 101.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=ff69dad0a563210958fe7bd1980e4287 --- rpm-python.spec | 2 +- rpm-suse_macros | 2 +- rpm.changes | 10 ++++++++++ rpm.spec | 6 +++--- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index a5637f3..f32ca50 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -25,7 +25,7 @@ License: GPLv2+ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.8.0 -Release: 4 +Release: 5 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm-suse_macros b/rpm-suse_macros index f924be7..1406145 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 1140 %sles_version 0 %ul_version 0 diff --git a/rpm.changes b/rpm.changes index a857952..89080a3 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 20 11:47:29 UTC 2010 - coolo@novell.com + +- make suse_version 1140 + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + ------------------------------------------------------------------- Fri Jun 4 16:44:29 CEST 2010 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index a66732c..6b35817 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.8.0 -Release: 4 +Release: 5 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -197,11 +197,11 @@ export CFLAGS="-g -O0 -fno-strict-aliasing" cp autogen.sh beecrypt pushd beecrypt ./autogen.sh --with-pic -make %{?jobs:-j%jobs} +make %{?_smp_mflags} popd ./autogen.sh --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua --with-selinux --with-internal-beecrypt --enable-shared %{?with_python: --enable-python} rm po/de.gmo -make %{?jobs:-j%jobs} +make %{?_smp_mflags} make convertdb1 %install