9c684c3a57
Add support for sle12sp1 and other upstream patches. OBS-URL: https://build.opensuse.org/request/show/317805 OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=37
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
Subject: fedora: Fix fedora-unknown regexp
|
|
From: Christophe Fergeau cfergeau@redhat.com Thu Jul 16 17:55:01 2015 +0200
|
|
Date: Fri Jul 17 09:43:08 2015 +0200:
|
|
Git: a563ad22b34963a1c0a5364efea9e17c62d16909
|
|
|
|
It's currently matching fedora 21 and fedora 22, causing make distcheck
|
|
failures.
|
|
|
|
diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
|
|
index 0fc2cfe..b81f3c9 100644
|
|
--- a/data/oses/fedora.xml.in
|
|
+++ b/data/oses/fedora.xml.in
|
|
@@ -4263,13 +4263,13 @@
|
|
|
|
<media arch="i686">
|
|
<iso>
|
|
- <volume-id>Fedora.*-([2-9][1-9]|[0-9]{3,}).*-i386</volume-id>
|
|
+ <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386</volume-id>
|
|
<system-id>LINUX</system-id>
|
|
</iso>
|
|
</media>
|
|
<media arch="x86_64">
|
|
<iso>
|
|
- <volume-id>Fedora.*-([2-9][1-9]|[0-9]{3,}).*-x86_64</volume-id>
|
|
+ <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64</volume-id>
|
|
<system-id>LINUX</system-id>
|
|
</iso>
|
|
<kernel>isolinux/vmlinuz</kernel>
|
|
@@ -4278,13 +4278,13 @@
|
|
|
|
<media arch="i686" live="true">
|
|
<iso>
|
|
- <volume-id>Fedora-Live-.*-i686-([2-9][1-9]|[0-9]{3,})</volume-id>
|
|
+ <volume-id>Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,})</volume-id>
|
|
<system-id>LINUX</system-id>
|
|
</iso>
|
|
</media>
|
|
<media arch="x86_64" live="true">
|
|
<iso>
|
|
- <volume-id>Fedora-Live-.*-x86_64-([2-9][1-9]|[0-9]{3,})</volume-id>
|
|
+ <volume-id>Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,})</volume-id>
|
|
<system-id>LINUX</system-id>
|
|
</iso>
|
|
</media>
|