From 923a08157cfb7bf1a9570ee833c85dee32d09b8a Mon Sep 17 00:00:00 2001
From: yaqiangchen <chenyaqiang@huawei.com>
Date: Wed, 13 Jan 2021 21:04:41 +0800
Subject: [PATCH 1/2] add openeuler-20.03/20.09 info to osinfo-db

---
 ...openeuler-20.03-20.09-info-to-osinfo.patch | 176 ++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 0001-add-openeuler-20.03-20.09-info-to-osinfo.patch

diff --git a/0001-add-openeuler-20.03-20.09-info-to-osinfo.patch b/0001-add-openeuler-20.03-20.09-info-to-osinfo.patch
new file mode 100644
index 0000000..000bd23
--- /dev/null
+++ b/0001-add-openeuler-20.03-20.09-info-to-osinfo.patch
@@ -0,0 +1,176 @@
+From 7228861c91329cbf232353fcc400a3f8423da08d Mon Sep 17 00:00:00 2001
+From: yaqiangchen <chenyaqiang@huawei.com>
+Date: Wed, 13 Jan 2021 20:54:34 +0800
+Subject: [PATCH 2/2] add openeuler-20.03/20.09 info to osinfo
+
+---
+ .../openeuler.org/openeuler-20.03.xml         | 47 +++++++++++++++++++
+ .../os/openeuler.org/openeuler-20.03.xml      | 47 +++++++++++++++++++
+ .../os/openeuler.org/openeuler-20.09.xml      | 47 +++++++++++++++++++
+ 3 files changed, 141 insertions(+)
+ create mode 100644 osinfo-db-20180920/install-script/openeuler.org/openeuler-20.03.xml
+ create mode 100644 osinfo-db-20180920/os/openeuler.org/openeuler-20.03.xml
+ create mode 100644 osinfo-db-20180920/os/openeuler.org/openeuler-20.09.xml
+
+diff --git a/osinfo-db-20180920/install-script/openeuler.org/openeuler-20.03.xml b/osinfo-db-20180920/install-script/openeuler.org/openeuler-20.03.xml
+new file mode 100644
+index 0000000..db0c53d
+--- /dev/null
++++ b/osinfo-db-20180920/install-script/openeuler.org/openeuler-20.03.xml
+@@ -0,0 +1,47 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++  <os id="http://openeuler.org/openeuler/20.03">
++    <short-id>openeuler20.03</short-id>
++    <name>openEuler 20.03</name>
++    <version>20.03</version>
++    <vendor>openEuler</vendor>
++    <vendor xml:lang="ca">openEuler</vendor>
++    <vendor xml:lang="de">openEuler</vendor>
++    <vendor xml:lang="es">openEuler</vendor>
++    <vendor xml:lang="fr">openEuler</vendor>
++    <vendor xml:lang="id">openEuler</vendor>
++    <vendor xml:lang="it">openEuler</vendor>
++    <vendor xml:lang="ja">openEuler</vendor>
++    <vendor xml:lang="pl">openEuler</vendor>
++    <vendor xml:lang="pt_BR">openEuler</vendor>
++    <vendor xml:lang="uk">openEuler</vendor>
++    <family>linux</family>
++    <distro>openeuler</distro>
++
++    <release-date>2020-03-30</release-date>
++    <eol-date>2024-03-30</eol-date>
++
++    <media arch="x86_64">
++      <url>https://repo.openeuler.org/openEuler-20.03-LTS/ISO/x86_64/openEuler-20.03-LTS-x86_64-dvd.iso</url>
++      <iso>
++        <volume-id>openEuler 20.03 x86_64</volume-id>
++        <system-id>LINUX</system-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <media arch="aarch64">
++      <url>https://repo.openeuler.org/openEuler-20.03-LTS/ISO/aarch64/openEuler-20.03-LTS-aarch64-dvd.iso</url>
++      <iso>
++        <volume-id>openEuler 20.03 aarch64</volume-id>
++        <system-id>LINUX</system-id>
++      </iso>
++    </media>
++
++    <installer>
++      <script id='http://openeuler.org/openeuler/kickstart/jeos'/>
++    </installer>
++  </os>
++</libosinfo>
+diff --git a/osinfo-db-20180920/os/openeuler.org/openeuler-20.03.xml b/osinfo-db-20180920/os/openeuler.org/openeuler-20.03.xml
+new file mode 100644
+index 0000000..db0c53d
+--- /dev/null
++++ b/osinfo-db-20180920/os/openeuler.org/openeuler-20.03.xml
+@@ -0,0 +1,47 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++  <os id="http://openeuler.org/openeuler/20.03">
++    <short-id>openeuler20.03</short-id>
++    <name>openEuler 20.03</name>
++    <version>20.03</version>
++    <vendor>openEuler</vendor>
++    <vendor xml:lang="ca">openEuler</vendor>
++    <vendor xml:lang="de">openEuler</vendor>
++    <vendor xml:lang="es">openEuler</vendor>
++    <vendor xml:lang="fr">openEuler</vendor>
++    <vendor xml:lang="id">openEuler</vendor>
++    <vendor xml:lang="it">openEuler</vendor>
++    <vendor xml:lang="ja">openEuler</vendor>
++    <vendor xml:lang="pl">openEuler</vendor>
++    <vendor xml:lang="pt_BR">openEuler</vendor>
++    <vendor xml:lang="uk">openEuler</vendor>
++    <family>linux</family>
++    <distro>openeuler</distro>
++
++    <release-date>2020-03-30</release-date>
++    <eol-date>2024-03-30</eol-date>
++
++    <media arch="x86_64">
++      <url>https://repo.openeuler.org/openEuler-20.03-LTS/ISO/x86_64/openEuler-20.03-LTS-x86_64-dvd.iso</url>
++      <iso>
++        <volume-id>openEuler 20.03 x86_64</volume-id>
++        <system-id>LINUX</system-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <media arch="aarch64">
++      <url>https://repo.openeuler.org/openEuler-20.03-LTS/ISO/aarch64/openEuler-20.03-LTS-aarch64-dvd.iso</url>
++      <iso>
++        <volume-id>openEuler 20.03 aarch64</volume-id>
++        <system-id>LINUX</system-id>
++      </iso>
++    </media>
++
++    <installer>
++      <script id='http://openeuler.org/openeuler/kickstart/jeos'/>
++    </installer>
++  </os>
++</libosinfo>
+diff --git a/osinfo-db-20180920/os/openeuler.org/openeuler-20.09.xml b/osinfo-db-20180920/os/openeuler.org/openeuler-20.09.xml
+new file mode 100644
+index 0000000..54ef0c3
+--- /dev/null
++++ b/osinfo-db-20180920/os/openeuler.org/openeuler-20.09.xml
+@@ -0,0 +1,47 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++  <os id="http://openeuler.org/openeuler/20.09">
++    <short-id>openeuler20.09</short-id>
++    <name>openEuler 20.09</name>
++    <version>20.09</version>
++    <vendor>openEuler</vendor>
++    <vendor xml:lang="ca">openEuler</vendor>
++    <vendor xml:lang="de">openEuler</vendor>
++    <vendor xml:lang="es">openEuler</vendor>
++    <vendor xml:lang="fr">openEuler</vendor>
++    <vendor xml:lang="id">openEuler</vendor>
++    <vendor xml:lang="it">openEuler</vendor>
++    <vendor xml:lang="ja">openEuler</vendor>
++    <vendor xml:lang="pl">openEuler</vendor>
++    <vendor xml:lang="pt_BR">openEuler</vendor>
++    <vendor xml:lang="uk">openEuler</vendor>
++    <family>linux</family>
++    <distro>openeuler</distro>
++
++    <release-date>2020-09-30</release-date>
++    <eol-date>2021-03-30</eol-date>
++
++    <media arch="x86_64">
++      <url>https://repo.openeuler.org/openEuler-20.09/ISO/x86_64/openEuler-20.09-x86_64-dvd.iso</url>
++      <iso>
++        <volume-id>openEuler 20.09 x86_64</volume-id>
++        <system-id>LINUX</system-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <media arch="aarch64">
++      <url>https://repo.openeuler.org/openEuler-20.09/ISO/aarch64/openEuler-20.09-aarch64-dvd.iso</url>
++      <iso>
++        <volume-id>openEuler 20.09 aarch64</volume-id>
++        <system-id>LINUX</system-id>
++      </iso>
++    </media>
++
++    <installer>
++      <script id='http://openeuler.org/openeuler/kickstart/jeos'/>
++    </installer>
++  </os>
++</libosinfo>
+-- 
+2.27.0
+
-- 
Gitee


From 48a6391ebc5e92644f73d0e15e600078fd3aef1b Mon Sep 17 00:00:00 2001
From: yaqiangchen <chenyaqiang@huawei.com>
Date: Wed, 13 Jan 2021 21:23:49 +0800
Subject: [PATCH 2/2] update spec

---
 osinfo-db.spec | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/osinfo-db.spec b/osinfo-db.spec
index 031f90a..eb21e74 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -1,12 +1,14 @@
+%define debug_package %{nil}
+%define PatchedSource ../%{name}-%{version}-patched.tar.xz
 Name: osinfo-db
 Version: 20180920
 Summary: osinfo database files
-Release: 5
+Release: 6
 License: LGPLv2+
 URL: http://libosinfo.org/
 Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
 Source1: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz.asc
-
+patch0: 0001-add-openeuler-20.03-20.09-info-to-osinfo.patch
 BuildRequires: intltool osinfo-db-tools
 Requires: hwdata
 
@@ -16,14 +18,17 @@ library. It provides information about guest operating systems for
 use with virtualization provisioning tools.
 
 %prep
-%autosetup   -p1
-rm -rf %{_sourcedir}/%{name}-%{version}.tar.xz
-tar -cJvf %{_sourcedir}/%{name}-%{version}.tar.xz ./
+%setup   -q
+%patch0 -p1 -b .0001-add-openeuler-20.03-20.09-info-to-osinfo
+
+%build
+tar -cJvf %{PatchedSource} ../%{name}-%{version}/
 
 %install
-osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
+osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
 
 %files
+%dir %{_datadir}/osinfo/
 %{_datadir}/osinfo/datamap
 %{_datadir}/osinfo/device
 %{_datadir}/osinfo/install-script
@@ -34,6 +39,9 @@ osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
 %{_datadir}/osinfo/LICENSE
 
 %changelog
+* Tue Jan 13 2021 chenyaqiang <chenyaqiang@huawei.com> - 20210113-6
+- add openEuler-20.03/20.09 infomation
+
 * Tue Sep 8 2020 linwei <linwei54@huawei.com> - 20180920-5
 - modify the URL of Source
 
-- 
Gitee