From 779e3198566fb87a357357f7bf51d167294efeba Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Fri, 21 Jan 2022 11:01:34 +0800
Subject: [PATCH] add opengauss server to install software

---
 normal_aarch64.xml | 26 ++++++++++++++++++++++++++
 normal_x86_64.xml  | 25 +++++++++++++++++++++++++
 oemaker.spec       |  7 ++++++-
 rpmlist.xml        |  9 +++++++++
 4 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/normal_aarch64.xml b/normal_aarch64.xml
index eeb6b45..765624a 100644
--- a/normal_aarch64.xml
+++ b/normal_aarch64.xml
@@ -460,6 +460,31 @@
       <packagereq type="optional">open-isns</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>opengauss-server</id>
+    <name>openGauss Server</name>
+    <name xml:lang="zh_CN">openGauss数据库</name>
+    <description>openGauss is an open source relational database management system.</description>
+    <description xml:lang="zh_CN">openGauss一款开源的关系数据库管理系统。</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">lz4-devel</packagereq>
+      <packagereq type="mandatory">protobuf-devel</packagereq>
+      <packagereq type="mandatory">snappy-devel</packagereq>
+      <packagereq type="mandatory">zstd-devel</packagereq>
+      <packagereq type="mandatory">boost-devel</packagereq>
+      <packagereq type="mandatory">libcgroup-devel</packagereq>
+      <packagereq type="mandatory">unixODBC-devel</packagereq>
+      <packagereq type="mandatory">jemalloc-devel</packagereq>
+      <packagereq type="mandatory">java-1.8.0-openjdk-devel</packagereq>
+      <packagereq type="mandatory">libedit-devel</packagereq>
+      <packagereq type="mandatory">libaio-devel</packagereq>
+      <packagereq type="mandatory">numactl-devel</packagereq>
+      <packagereq type="mandatory">DCF</packagereq>
+      <packagereq type="mandatory">opengauss</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>fonts</id>
     <name>Fonts</name>
@@ -1617,6 +1642,7 @@
       <groupid>smb-server</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>web-server</groupid>
+      <groupid>opengauss-server</groupid>
     </optionlist>
   </environment>
   <environment>
diff --git a/normal_x86_64.xml b/normal_x86_64.xml
index 5aa9e29..0736c12 100644
--- a/normal_x86_64.xml
+++ b/normal_x86_64.xml
@@ -460,6 +460,30 @@
       <packagereq type="optional">open-isns</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>opengauss-server</id>
+    <name>openGauss Server</name>
+    <name xml:lang="zh_CN">openGauss数据库</name>
+    <description>openGauss is an open source relational database management system.</description>
+    <description xml:lang="zh_CN">openGauss一款开源的关系数据库管理系统。</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">lz4-devel</packagereq>
+      <packagereq type="mandatory">protobuf-devel</packagereq>
+      <packagereq type="mandatory">snappy-devel</packagereq>
+      <packagereq type="mandatory">zstd-devel</packagereq>
+      <packagereq type="mandatory">boost-devel</packagereq>
+      <packagereq type="mandatory">libcgroup-devel</packagereq>
+      <packagereq type="mandatory">unixODBC-devel</packagereq>
+      <packagereq type="mandatory">jemalloc-devel</packagereq>
+      <packagereq type="mandatory">java-1.8.0-openjdk-devel</packagereq>
+      <packagereq type="mandatory">libedit-devel</packagereq>
+      <packagereq type="mandatory">libaio-devel</packagereq>
+      <packagereq type="mandatory">DCF</packagereq>
+      <packagereq type="mandatory">opengauss</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>fonts</id>
     <name>Fonts</name>
@@ -1620,6 +1644,7 @@
       <groupid>smb-server</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>web-server</groupid>
+      <groupid>opengauss-server</groupid>
     </optionlist>
   </environment>
   <environment>
diff --git a/oemaker.spec b/oemaker.spec
index 076fd7c..964a0ea 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -11,7 +11,7 @@ Summary:        a duilding tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        2.0.0
-Release:        12
+Release:        13
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -129,6 +129,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Fri Jan 21 2022 zhang_xubo <2578876417@qq.com> - 2.0.0-13
+- ID:NA
+- SUG:NA
+- DESC: add opengauss server pakcage
+
 * Thu Jan 20 2022 yaokai13 <yaokai13@huawei.com> - 2.0.0-12
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index 3aa455f..f9d1c66 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -491,6 +491,7 @@
         <packagereq>lftp-help</packagereq>
         <packagereq>libacl</packagereq>
         <packagereq>libaio</packagereq>
+        <packagereq>libaio-devel</packagereq>
         <packagereq>libarchive</packagereq>
         <packagereq>libarchive-help</packagereq>
         <packagereq>libassuan</packagereq>
@@ -536,6 +537,7 @@
         <packagereq>libecap</packagereq>
         <packagereq>libecap-help</packagereq>
         <packagereq>libedit</packagereq>
+        <packagereq>libedit-devel</packagereq>
         <packagereq>libedit-help</packagereq>
         <packagereq>liberation-fonts</packagereq>
         <packagereq>libesmtp</packagereq>
@@ -801,6 +803,7 @@
         <packagereq>lz4</packagereq>
         <packagereq>lz4-help</packagereq>
         <packagereq>lz4-libs</packagereq>
+        <packagereq>lz4-devel</packagereq>
         <packagereq>lzo</packagereq>
         <packagereq>lzo-help</packagereq>
         <packagereq>lzo-minilzo</packagereq>
@@ -1206,6 +1209,7 @@
         <packagereq>smp_utils</packagereq>
         <packagereq>smp_utils-help</packagereq>
         <packagereq>snappy</packagereq>
+        <packagereq>snappy-devel</packagereq>
         <packagereq>snappy-help</packagereq>
         <packagereq>source-highlight</packagereq>
         <packagereq>source-highlight-help</packagereq>
@@ -1361,8 +1365,13 @@
         <packagereq>zlib-help</packagereq>
         <packagereq>zsh</packagereq>
         <packagereq>zstd-help</packagereq>
+        <packagereq>zstd-devel</packagereq>
         <packagereq>zziplib-help</packagereq>
         <packagereq>zziplib-utils</packagereq>
+        <packagereq>unixODBC-devel</packagereq>
+        <packagereq>jemalloc-devel</packagereq>
+        <packagereq>DCF</packagereq>
+        <packagereq>opengauss</packagereq>
     </packagelist>
     <packagelist type="edge_aarch64">
         <packagereq>grub2-efi-aa64</packagereq>