rpm/osinfo-db
SHA256
1
0
Fork 0
forked from pool/osinfo-db
Code Pull Requests Activity

Accepting request 819040 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/819040
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osinfo-db?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2020-07-13 07:03:39 +00:00 committed by Git OBS Bridge
commit a0177eeda7
3 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
fix-tumbleweed-order.patch Normal file
View File

@ -0,0 +1,55 @@
Index: osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml
===================================================================
--- osinfo-db-20200529.orig/os/opensuse.org/opensuse-tumbleweed.xml 2020-05-29 13:07:41.000000000 +0200
+++ osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml 2020-07-01 09:04:20.344096387 +0200
@@ -51,16 +51,6 @@
</variant>
- <media arch="i686">
- <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso</url>
- <iso>
- <volume-id>openSUSE-Tumbleweed-DVD-i586*</volume-id>
- <system-id>LINUX</system-id>
- <publisher-id>SUSE LINUX GmbH</publisher-id>
- </iso>
- <kernel>boot/i386/loader/linux</kernel>
- <initrd>boot/i386/loader/initrd</initrd>
- </media>
<media arch="x86_64">
<url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso</url>
<iso>
@@ -71,13 +61,10 @@
<kernel>boot/x86_64/loader/linux</kernel>
<initrd>boot/x86_64/loader/initrd</initrd>
</media>
-
-
<media arch="i686">
- <variant id="netinst"/>
- <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-i586-Current.iso</url>
+ <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso</url>
<iso>
- <volume-id>openSUSE-Tumbleweed-NET-i586*</volume-id>
+ <volume-id>openSUSE-Tumbleweed-DVD-i586*</volume-id>
<system-id>LINUX</system-id>
<publisher-id>SUSE LINUX GmbH</publisher-id>
</iso>
@@ -95,6 +84,17 @@
<kernel>boot/x86_64/loader/linux</kernel>
<initrd>boot/x86_64/loader/initrd</initrd>
</media>
+ <media arch="i686">
+ <variant id="netinst"/>
+ <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-i586-Current.iso</url>
+ <iso>
+ <volume-id>openSUSE-Tumbleweed-NET-i586*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX GmbH</publisher-id>
+ </iso>
+ <kernel>boot/i386/loader/linux</kernel>
+ <initrd>boot/i386/loader/initrd</initrd>
+ </media>
<media arch="x86_64">

7
osinfo-db.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 1 07:06:24 UTC 2020 - Frederic Crozat <fcrozat@suse.com>
- Add fix-tumbleweed-order.patch: ensure x86_64 is listed before
i686, to have x86_64 selected by default in GNOME Boxes
- Update url with gitlab home for osinfo-db.
-------------------------------------------------------------------
Mon Jun 1 12:47:43 MDT 2020 - carnold@suse.com

4
osinfo-db.spec
View File

@ -23,7 +23,7 @@ Summary: Osinfo database files
License: LGPL-2.1+ and GPL-2.0+
Group: System/Management
BuildArch: noarch
Url: https://releases.pagure.org/libosinfo/
Url: https://gitlab.com/libosinfo/osinfo-db
Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
Patch21: add-oes-support.patch
Patch22: add-caasp40-support.patch
@ -32,6 +32,7 @@ Patch24: add-win-2k19-media-info.patch
Patch25: fix-sle15sp1-volume-id-string.patch
Patch26: SLE-add-info-about-UEFI-support.patch
Patch27: add-opensuse-leap-15.2-support.patch
Patch28: fix-tumbleweed-order.patch
BuildRequires: intltool
BuildRequires: osinfo-db-tools
@ -49,6 +50,7 @@ provisioning of new virtual machines
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch28 -p1
%build
cd %{_builddir}