Add a patch to fix sha1 ordering
This commit is contained in:
parent
1b6436d18b
commit
fafdc92b30
|
@ -0,0 +1,24 @@
|
|||
--- ./pypungi/pungi.py.sha1 2007-03-12 15:00:43.000000000 -0400
|
||||
+++ ./pypungi/pungi.py 2007-03-12 15:01:10.000000000 -0400
|
||||
@@ -176,10 +176,10 @@
|
||||
isodir,
|
||||
isoname,
|
||||
os.path.join('%s-disc%s' % (self.topdir, disc))))
|
||||
- os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
|
||||
# implant md5 for mediacheck on all but source arches
|
||||
if not self.config.get('default', 'arch') == 'source':
|
||||
os.system('/usr/lib/anaconda-runtime/implantisomd5 %s' % os.path.join(isodir, isoname))
|
||||
+ os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
|
||||
|
||||
# We've asked for more than one disc, and we're not srpms, so make a DVD image
|
||||
if self.config.getint('default', 'discs') > 1 and not self.config.get('default', 'arch') == 'source':
|
||||
@@ -215,8 +215,8 @@
|
||||
isodir,
|
||||
isoname,
|
||||
self.topdir))
|
||||
- os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
|
||||
os.system('/usr/lib/anaconda-runtime/implantisomd5 %s' % os.path.join(isodir, isoname))
|
||||
+ os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
|
||||
|
||||
shutil.move(os.path.join(self.config.get('default', 'destdir'), '.discinfo-%s' % self.config.get('default', 'arch')), discinfofile)
|
||||
|
|
@ -2,13 +2,14 @@
|
|||
|
||||
Name: pungi
|
||||
Version: 0.1.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Distribution compose tool
|
||||
|
||||
Group: Development/Tools
|
||||
License: GPL
|
||||
URL: http://hosted.fedoraproject.org/projects/pungi
|
||||
Source0: http://linux.duke.edu/projects/%{name}/release/%{name}-%{version}.tar.gz
|
||||
Patch0: pungi-sha1order.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires: anaconda-runtime, yum >= 3.0.3
|
||||
BuildRequires: python-devel
|
||||
|
@ -21,6 +22,7 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
|
||||
|
||||
%build
|
||||
|
@ -46,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 12 2007 Jesse Keating <jkeating@redhat.com> - 0.1.2-3
|
||||
- Add a patch to fix the sha1 ordering
|
||||
|
||||
* Tue Jan 16 2007 Jesse Keating <jkeating@redhat.com> - 0.1.2-2
|
||||
- Require the new yum (now that it landed in updates)
|
||||
|
||||
|
|
Loading…
Reference in New Issue