!2 openEuler-repos

Merge pull request !2 from syyhao/init

generic-repos.spec

@@ -2,7 +2,7 @@
 
 Name:           %{vendor}-repos
 Version:        1.0
-Release:        2.5
+Release:        2.6
 Summary:        %{vendor} package repositories
 License:        Mulan PSL v1
 
@@ -10,11 +10,10 @@ Provides:       system-repos
 Provides:       %{vendor}-repos
 Requires:       %{vendor}-gpg-keys = %{version}-%{release}
 
-Source2:        generic_aarch64.repo
+Source2:        generic.repo
 Source3:        RPM-GPG-KEY
-Source4:        generic_x86_64.repo
+Source4:        RPM-GPG-KEY-generic
-Source7:        RPM-GPG-KEY-generic
+Source5:        LICENSE
-Source8:        LICENSE
 
 %description
 %{vendor} package repository files for yum and dnf along with gpg public keys
@@ -37,28 +36,23 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 mv $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-generic $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-%{vendor}
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
-%ifarch aarch64
-install -m 644 %{_sourcedir}/generic_aarch64.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vendor}_aarch64.repo
-%endif
 
-%ifarch x86_64
+install -m 644 %{_sourcedir}/generic.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vendor}.repo
-install -m 644 %{_sourcedir}/generic_x86_64.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vendor}_x86_64.repo
-%endif
 
 %files
 %dir /etc/yum.repos.d
-%ifarch aarch64
+%config(noreplace) /etc/yum.repos.d/%{vendor}.repo
-%config(noreplace) /etc/yum.repos.d/%{vendor}_aarch64.repo
-%endif
-
-%ifarch x86_64
-%config(noreplace) /etc/yum.repos.d/%{vendor}_x86_64.repo
-%endif
 
 %files -n %{vendor}-gpg-keys
 /etc/pki/rpm-gpg/
 
 %changelog
+* Tue Mar 31 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.0-2.5
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:add default repo for openEuler-20.03-LTS
+
 * Mon Dec 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.0-2.4
 - Type:NA
 - ID:NA

generic.repo

@@ -0,0 +1,51 @@
+#Copyright (c) [2019] Huawei Technologies Co., Ltd.
+#generic-repos is licensed under the Mulan PSL v1.
+#You can use this software according to the terms and conditions of the Mulan PSL v1.
+#You may obtain a copy of Mulan PSL v1 at:
+#    http://license.coscl.org.cn/MulanPSL
+#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+#PURPOSE.
+#See the Mulan PSL v1 for more details.
+
+[OS]
+name=OS
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler
+
+[everything]
+name=everything
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/RPM-GPG-KEY-openEuler
+
+[EPOL]
+name=EPOL
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler
+
+[debuginfo]
+name=debuginfo
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/RPM-GPG-KEY-openEuler
+
+[source]
+name=source
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/source/
+enabled=1
+gpgcheck=1
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/source/RPM-GPG-KEY-openEuler
+
+[update]
+name=update
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/update/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler

generic_aarch64.repo

@@ -1,9 +0,0 @@
-#Copyright (c) [2019] Huawei Technologies Co., Ltd.
-#generic-repos is licensed under the Mulan PSL v1.
-#You can use this software according to the terms and conditions of the Mulan PSL v1.
-#You may obtain a copy of Mulan PSL v1 at:
-#    http://license.coscl.org.cn/MulanPSL
-#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-#PURPOSE.
-#See the Mulan PSL v1 for more details.

generic_x86_64.repo

@@ -1,9 +0,0 @@
-#Copyright (c) [2019] Huawei Technologies Co., Ltd.
-#generic-repos is licensed under the Mulan PSL v1.
-#You can use this software according to the terms and conditions of the Mulan PSL v1.
-#You may obtain a copy of Mulan PSL v1 at:
-#    http://license.coscl.org.cn/MulanPSL
-#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-#PURPOSE.
-#See the Mulan PSL v1 for more details.