From 16859282b6fa16e1e0f56a896bc1cfca03a200cf02059af51d79d10fcb4cface Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Oct 2009 19:53:26 +0000 Subject: [PATCH] Accepting request 23035 from Base:System Copy from Base:System/rpm based on submit request 23035 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/23035 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=90 --- rpm-python.spec | 2 +- rpm-suse_macros | 1 + rpm.changes | 5 +++++ rpm.spec | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index bcd5348..1b799b4 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: 5 +Release: 6 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm-suse_macros b/rpm-suse_macros index dae65b8..79b0e01 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -14,6 +14,7 @@ %_defaultdocdir %{_usr}/share/doc/packages # package build macros +%make_install make install DESTDIR=%{?buildroot} %makeinstall make DESTDIR=%{?buildroot:%{buildroot}} install %rb_arch %(echo %{_host_cpu}-linux | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/") %rb_ver %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/, "")') diff --git a/rpm.changes b/rpm.changes index e92d7e1..ecd8782 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 23 17:56:28 CEST 2009 - mls@suse.de + +- add make_install macro definition for real + ------------------------------------------------------------------- Tue Sep 8 02:40:55 CEST 2009 - crrodriguez@suse.de diff --git a/rpm.spec b/rpm.spec index 8065717..fd27cb5 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: 5 +Release: 6 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2