Revisor: use qubes-release.rpm for DVD root dir (#176)

This commit is contained in:
Joanna Rutkowska 2011-04-04 01:07:07 +02:00
parent e86b3c03cd
commit a760e258df
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff -ur revisor-2.2/revisor/cfg.py revisor-2.2-qubes/revisor/cfg.py
--- revisor-2.2/revisor/cfg.py 2010-06-04 15:36:03.000000000 +0200
+++ revisor-2.2-qubes/revisor/cfg.py 2011-04-04 00:19:59.098202616 +0200
@@ -1063,7 +1063,7 @@
self.pkgorder_style = ""
# Use fedora-release by default
- self.release_pkgs = "^fedora-release.*$"
+ self.release_pkgs = "^qubes-release.*$"
self.release_files = "eula.txt fedora.css GPL README-BURNING-ISOS-en_US.txt RELEASE-NOTES-en_US.html ^RPM-GPG img images stylesheet-images"
# Installation Media Options
diff -ur revisor-2.2/revisor/splittree.py revisor-2.2-qubes/revisor/splittree.py
--- revisor-2.2/revisor/splittree.py 2010-06-04 15:33:36.000000000 +0200
+++ revisor-2.2-qubes/revisor/splittree.py 2011-04-04 00:20:36.876202697 +0200
@@ -85,7 +85,7 @@
self.src_list = []
self.shared_list = []
self.reverse_sort_srpms=None
- self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-fedora']
+ self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-fedora', 'RPM-GPG-KEY-qubes']
self.logfile = []
def getSize(self, path, blocksize=None):

View File

@ -19,7 +19,7 @@
Summary: Fedora "Spin" Graphical User Interface Summary: Fedora "Spin" Graphical User Interface
Name: revisor Name: revisor
Version: 2.2 Version: 2.2
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/System Group: Applications/System
URL: http://fedorahosted.org/revisor URL: http://fedorahosted.org/revisor
@ -131,6 +131,7 @@ Provides: revisor-wui = %{version}-%{release}
Source100: F13-buildinstall Source100: F13-buildinstall
Patch100: revisor-2.2-comps.patch Patch100: revisor-2.2-comps.patch
Patch101: revisor-2.2-release.patch
%description cli %description cli
Revisor provides a set of graphical tools for building customized, updated Revisor provides a set of graphical tools for building customized, updated
@ -352,6 +353,7 @@ This is the Revisor Web User Interface package
%prep %prep
%setup -q %setup -q
%patch100 -p1 %patch100 -p1
%patch101 -p1
%build %build
%configure %configure