From cf6abe89f480e054687ffe8dfbd20ccc8c137ac8 Mon Sep 17 00:00:00 2001
From: sxt1001 <shixuantong@huawei.com>
Date: Mon, 17 Aug 2020 14:23:33 +0800
Subject: [PATCH] roll back to solve the libosinfo compilation failure problem

---
 0001-Add-openEuler-info-to-osinfo-db.patch | 84 ----------------------
 osinfo-db.spec                             |  8 ++-
 2 files changed, 5 insertions(+), 87 deletions(-)
 delete mode 100644 0001-Add-openEuler-info-to-osinfo-db.patch

diff --git a/0001-Add-openEuler-info-to-osinfo-db.patch b/0001-Add-openEuler-info-to-osinfo-db.patch
deleted file mode 100644
index 7f10958..0000000
--- a/0001-Add-openEuler-info-to-osinfo-db.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -urN osinfo-db-20180920/os/openEuler.org/openEuler-20.03-LTS.xml osinfo-db-20180920_new/os/openEuler.org/openEuler-20.03-LTS.xml
---- osinfo-db-20180920/os/openEuler.org/openEuler-20.03-LTS.xml	1970-01-01 00:00:00.000000000 +0000
-+++ osinfo-db-20180920_new/os/openEuler.org/openEuler-20.03-LTS.xml	2020-08-06 12:41:00.000000000 +0000
-@@ -0,0 +1,80 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="http://openeuler.org/openeuler-20.03-LTS">
-+    <short-id>openEuler-20.03-LTS</short-id>
-+    <name>openEuler-20.03-LTS</name>
-+    <name xml:lang="ca">openEuler-20.03-LTS</name>
-+    <name xml:lang="es">openEuler-20.03-LTS</name>
-+    <name xml:lang="fr">openEuler-20.03-LTS</name>
-+    <name xml:lang="id">openEuler-20.03-LTS</name>
-+    <name xml:lang="it">openEuler-20.03-LTS</name>
-+    <name xml:lang="pl">openEuler-20.03-LTS</name>
-+    <name xml:lang="pt_BR">openEuler-20.03-LTS</name>
-+    <name xml:lang="uk">openEuler-20.03-LTS</name>
-+    <version>20.03-LTS</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>
-+    <upgrades id="http://openeuler.org/openeuler-20.03-LTS"/>
-+    <derives-from id="http://openeuler.org/openeuler-20.03-LTS"/>
-+
-+    <release-date>2020-03-26</release-date>
-+	
-+	<variant id="server">
-+      <name>openEuler-20.03-LTS Server</name>
-+    </variant>
-+
-+    <media arch="x86_64">
-+	<variant id="server"/>
-+      <url>https://repo.openeuler.org/openEuler-20.03-LTS/ISO/x86_64/openEuler-20.03-LTS-x86_64-dvd.iso</url>
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>openEuler-20.03-LTS-x86_64-dvd</volume-id>
-+		<system-id>LINUX</system-id>
-+        <publisher-id>openEuler LINUX</publisher-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+
-+    <media arch="aarch64">
-+	<variant id="server"/>
-+      <url>https://repo.openeuler.org/openEuler-20.03-LTS/ISO/aarch64/openEuler-20.03-LTS-aarch64-dvd.iso</url>
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>openEuler-20.03-LTS-aarch64-dvd</volume-id>
-+		<system-id>LINUX</system-id>
-+        <publisher-id>openEuler LINUX</publisher-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+
-+    <resources arch="all">
-+      <minimum>
-+        <n-cpus>1</n-cpus>
-+        <cpu>1000000000</cpu>
-+        <ram>1073741824</ram>
-+        <storage>10737418240</storage>
-+      </minimum>
-+
-+      <recommended>
-+        <cpu>1000000000</cpu>
-+        <ram>1073741824</ram>
-+        <storage>10737418240</storage>
-+      </recommended>
-+    </resources>
-+	
-+  </os>
-+</libosinfo>
diff --git a/osinfo-db.spec b/osinfo-db.spec
index 70f2a93..d7e6149 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -1,12 +1,11 @@
 Name: osinfo-db
 Version: 20180920
 Summary: osinfo database files
-Release: 3
+Release: 4
 License: LGPLv2+
 URL: http://libosinfo.org/
 Source0: https://gitlab.com/libosinfo/osinfo-db/-/archive/%{name}-%{version}.tar.xz
 Source1: https://gitlab.com/libosinfo/osinfo-db/-/archive/%{name}-%{version}.tar.xz.asc
-patch0001: 0001-Add-openEuler-info-to-osinfo-db.patch
 
 BuildRequires: intltool osinfo-db-tools
 Requires: hwdata
@@ -35,7 +34,10 @@ osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
 %{_datadir}/osinfo/LICENSE
 
 %changelog
-*  Sat 08 2020 chenyaqiang <chenyaqiang@huawei.com> - 20180920-3
+* Mon Aug 17 2020 shixuantong <shixuantong@huawei.com> - 20180920-4
+- roll back to solve the libosinfo compilation failure problem 
+
+* Sat Aug 08 2020 chenyaqiang <chenyaqiang@huawei.com> - 20180920-3
 - add openEuler osinfo files
 
 * Mon Aug 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 20180920-2