rpms/quilt/F-10 quilt-rpm-4.6-setup.patch, NONE, 1.1 quilt.spec, 1.18, 1.19

Joshua W. Boyer jwboyer at fedoraproject.org
Mon Jan 12 13:38:36 UTC 2009


Author: jwboyer

Update of /cvs/pkgs/rpms/quilt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191/F-10

Modified Files:
	quilt.spec 
Added Files:
	quilt-rpm-4.6-setup.patch 
Log Message:
* Tue Jan 13 2009 - jwboyer at gmail.com - 0.47-2
- Fix 'quilt setup' for rpm 4.6 (bug 473557)


quilt-rpm-4.6-setup.patch:

--- NEW FILE quilt-rpm-4.6-setup.patch ---
Index: quilt/scripts/inspect.in
===================================================================
RCS file: /sources/quilt/quilt/quilt/scripts/inspect.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- quilt/scripts/inspect.in	8 Aug 2007 10:20:52 -0000	1.6
+++ quilt/scripts/inspect.in	29 Nov 2008 15:00:50 -0000	1.7
@@ -245,6 +245,8 @@ export PATH="$tmpdir/bin:$PATH"
 rpmbuild --eval "%define _sourcedir $sourcedir" \
 	 --eval "%define _specdir   $specdir" \
 	 --eval "%define _builddir  $tmpdir/build" \
+	 --eval "%define __patch    $tmpdir/bin/patch" \
+	 --eval "%define __tar      $tmpdir/bin/tar" \
 	 --nodeps \
 	 -bp "$specdir/$specfile" < /dev/null >&2
 status=$?


Index: quilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quilt/F-10/quilt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- quilt.spec	22 Aug 2008 14:23:01 -0000	1.18
+++ quilt.spec	12 Jan 2009 13:38:05 -0000	1.19
@@ -7,7 +7,7 @@
 License:	GPLv2
 Group:		Development/Tools
 Version:	0.47
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz
 URL:		http://savannah.nongnu.org/projects/quilt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +23,7 @@
 Requires: util-linux-ng
 Requires: tar
 Requires: rpm-build
+Patch0:   quilt-rpm-4.6-setup.patch
 
 %description
 These scripts allow one to manage a series of patches by keeping track of the
@@ -33,6 +34,7 @@
 
 %prep
 %setup
+%patch0 -p0
 
 %build
 %configure --with-mta=%{_sbindir}/sendmail --with-diffstat=%{_bindir}/diffstat
@@ -62,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 13 2009 - jwboyer at gmail.com - 0.47-2
+- Fix 'quilt setup' for rpm 4.6 (bug 473557)
+
 * Thu Aug 21 2008 - jwboyer at gmail.com 0.47-1
 - Update to latest release
 




More information about the fedora-extras-commits mailing list