From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 24 Apr 2008 09:44:18 +0000 (+0000)
Subject: - upstream in 1.108
X-Git-Tag: auto/th/apport-0_108_2-1~14
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapport.git;a=commitdiff_plain;h=83cdc84ab0fdd1b81baaf285162d4928b3f71c17

- upstream in 1.108

Changed files:
    apport-rpm-deps.patch -> 1.2
    apport-rpm-platform.patch -> 1.2
---

diff --git a/apport-rpm-deps.patch b/apport-rpm-deps.patch
deleted file mode 100644
index 6d47d28..0000000
--- a/apport-rpm-deps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ubuntu/backends/packaging_rpm.py~	2008-04-06 21:05:21.000000000 +0200
-+++ ubuntu/backends/packaging_rpm.py	2008-04-06 21:15:26.310825923 +0200
-@@ -52,7 +52,7 @@
-         # parse this package's Requires
-         reqs=[]
-         for r in hdr['requires']:
--            if r.startswith('rpmlib'):
-+            if r.startswith('rpmlib') or r.startswith('uname('):
-                 continue # we've got rpmlib, thanks
-             if r[0] == '/': # file requires
-                 req_heads = self._get_headers_by_tag('basenames',r)
diff --git a/apport-rpm-platform.patch b/apport-rpm-platform.patch
deleted file mode 100644
index d11d67f..0000000
--- a/apport-rpm-platform.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ubuntu/backends/packaging_rpm.py~	2007-07-14 16:59:17.000000000 +0200
-+++ ubuntu/backends/packaging_rpm.py	2008-04-06 20:39:31.675388970 +0200
-@@ -145,6 +145,8 @@
-         # XXX is there an rpmlib method for this?
-         f = open('/etc/rpm/platform')
-         line = f.readline()
-+        while line == '' or line[0] == '#':
-+            line = f.readline()
-         f.close()
-         (arch,vendor,os) = line.split('-')
-         return arch