rpms/shortrpm/F-11 0001-Fix-rpmbuild-clean.patch, NONE, 1.1 import.log, NONE, 1.1 shortrpm.spec, 1.3, 1.4
Lubomir Rintel
lkundrak at fedoraproject.org
Sun Nov 29 10:09:24 UTC 2009
Author: lkundrak
Update of /cvs/pkgs/rpms/shortrpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6029/F-11
Modified Files:
shortrpm.spec
Added Files:
0001-Fix-rpmbuild-clean.patch import.log
Log Message:
Merge from devel
0001-Fix-rpmbuild-clean.patch:
shortrpm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE 0001-Fix-rpmbuild-clean.patch ---
>From 777c459e12a9ce269fe508ec2ca99f6d417bef9b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Tue, 3 Nov 2009 17:24:11 +0100
Subject: [PATCH] Fix rpmbuild --clean
Let's pretend we were called as rpmbuild in any case, so that rpmbuild
sees argv[0] it expects.
---
shortrpm.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/shortrpm.c b/shortrpm.c
index 5332266..8d18ea5 100644
--- a/shortrpm.c
+++ b/shortrpm.c
@@ -43,8 +43,9 @@ main (argc, argv)
return 1;
}
- /* Find out whether we're going to intercept */
- for (i = 0; i < argc; i++) {
+ /* Copy arguments, finding out whether we're going to intercept */
+ rpm_argv[0] = RPMBUILD;
+ for (i = 1; i < argc; i++) {
if (strcmp (argv[i], "--short-circuit") == 0) sc++;
else if (strcmp (argv[i], "-bb") == 0) bb++;
else if (strcmp (argv[i], "-tb") == 0) bb++;
--
1.6.2.5
--- NEW FILE import.log ---
shortrpm-1_2-2_fc13:F-11:shortrpm-1.2-2.fc13.src.rpm:1259489314
Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/shortrpm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- shortrpm.spec 9 Aug 2009 13:58:33 -0000 1.3
+++ shortrpm.spec 29 Nov 2009 10:09:23 -0000 1.4
@@ -1,12 +1,13 @@
Name: shortrpm
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Short-circuit binary RPM package build
Group: Development/Tools
License: GPLv2+
URL: http://v3.sk/~lkundrak/shortrpm
Source0: http://v3.sk/~lkundrak/shortrpm/shortrpm-%{version}.tar.gz
+Patch0: 0001-Fix-rpmbuild-clean.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rpm-build
@@ -21,6 +22,7 @@ specified.
%prep
%setup -q
+%patch0 -p1 -b .clean
%build
@@ -53,7 +55,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2-2
+* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2-3
+- Fix rpmbuild --clean (#532713)
+
+* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2-1
- New upstream release
- Fix operation with more recent rpm config
More information about the scm-commits
mailing list