rpms/mock/devel mock-0.4-unpackaged-files-fix.patch, NONE, 1.1 mock.spec, 1.8, 1.9

Daniel Williams (dcbw) fedora-extras-commits at redhat.com
Wed Jan 18 22:10:58 UTC 2006


Author: dcbw

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25062

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-unpackaged-files-fix.patch 
Log Message:
* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
- Add unpackaged files fix from RH#163576 (Adrian Reber)



mock-0.4-unpackaged-files-fix.patch:

--- NEW FILE mock-0.4-unpackaged-files-fix.patch ---
--- mock-0.4/mock.py.rpmbuild-fix	2006-01-18 17:05:43.000000000 -0500
+++ mock-0.4/mock.py	2006-01-18 17:06:14.000000000 -0500
@@ -311,7 +311,7 @@
         srpmfn = os.path.basename(srpm_in)
         # run with --nodeps b/c of the check above we know we have our build
         # deps satisfied.
-        cmd = "%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
+        cmd = "cd /;%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
              self.config['runuser'], self.target_arch, srpm_in, 
              self.config['chrootuser'])
         


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mock.spec	16 Aug 2005 16:40:28 -0000	1.8
+++ mock.spec	18 Jan 2006 22:10:57 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: mock-0.4-unpackaged-files-fix.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -17,6 +18,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .unpackaged-files-fix
+
 %build
 make
 
@@ -65,6 +68,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
+- Add unpackaged files fix from RH#163576 (Adrian Reber)
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 0.4-2
 - Fix ?fedora check when not defined (would fail to parse).
 




More information about the fedora-extras-commits mailing list