diff --git a/RPM-GPG-KEY-generic b/RPM-GPG-KEY-generic new file mode 100644 index 0000000..a4399b2 --- /dev/null +++ b/RPM-GPG-KEY-generic @@ -0,0 +1,36 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +TaxhI5TkXbUYDXarb5NSmVU25sFtVQ== +=zbZz +-----END PGP PUBLIC KEY BLOCK----- diff --git a/RPM-GPG-KEY-openEuler b/RPM-GPG-KEY-openEuler deleted file mode 100644 index cf495f4..0000000 --- a/RPM-GPG-KEY-openEuler +++ /dev/null @@ -1,53 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -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 -V0LxfHPetl99jvJK2g== -=AN48 ------END PGP PUBLIC KEY BLOCK----- - diff --git a/openEuler-repos.spec b/generic-repos.spec similarity index 52% rename from openEuler-repos.spec rename to generic-repos.spec index bba38e1..172321f 100644 --- a/openEuler-repos.spec +++ b/generic-repos.spec @@ -1,26 +1,28 @@ -Name: openEuler-repos +%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} + +Name: %{vendor}-repos Version: 1.0 -Release: 2.2 -Summary: openEuler package repositories +Release: 2.5 +Summary: %{vendor} package repositories License: Mulan PSL v1 -Provides: openEuler-repos(%{version}) -Provides: euleros-repos(%{version}) -Provides: system-repos(%{version}) -Requires: openEuler-gpg-keys = %{version}-%{release} +Provides: system-repos +Provides: %{vendor}-repos +Requires: %{vendor}-gpg-keys = %{version}-%{release} -Source2: openEuler_aarch64.repo +Source2: generic_aarch64.repo Source3: RPM-GPG-KEY -Source7: RPM-GPG-KEY-openEuler +Source4: generic_x86_64.repo +Source7: RPM-GPG-KEY-generic Source8: LICENSE %description -openEuler package repository files for yum and dnf along with gpg public keys +%{vendor} package repository files for yum and dnf along with gpg public keys -%package -n openEuler-gpg-keys -Summary: openEuler RPM keys +%package -n %{vendor}-gpg-keys +Summary: %{vendor} RPM keys -%description -n openEuler-gpg-keys +%description -n %{vendor}-gpg-keys This package provides the RPM signature keys. @@ -32,23 +34,44 @@ This package provides the RPM signature keys. # Install the keys install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg 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}/openEuler_aarch64.repo $RPM_BUILD_ROOT/etc/yum.repos.d +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_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/openEuler_aarch64.repo +%config(noreplace) /etc/yum.repos.d/%{vendor}_aarch64.repo %endif -%files -n openEuler-gpg-keys + +%ifarch x86_64 +%config(noreplace) /etc/yum.repos.d/%{vendor}_x86_64.repo +%endif + +%files -n %{vendor}-gpg-keys /etc/pki/rpm-gpg/ - %changelog -* Sun Sep 29 2019 wangcheng - 1.0-1.2 +* Mon Dec 23 2019 openEuler Buildteam - 1.0-2.4 +- Type:NA +- ID:NA +- SUG:NA +- DESC: delete unneeded provides + +* Tue Oct 15 2019 fanghuiyu - 1.0-2.3 +- Type:NA +- ID:NA +- SUG:NA +- DESC: change to generic-repos + +* Sun Sep 29 2019 wangcheng - 1.0-2.2 - Type:NA - ID:NA - SUG:NA diff --git a/openEuler_aarch64.repo b/generic_aarch64.repo similarity index 89% rename from openEuler_aarch64.repo rename to generic_aarch64.repo index 32a743e..3f13f3a 100644 --- a/openEuler_aarch64.repo +++ b/generic_aarch64.repo @@ -1,5 +1,5 @@ #Copyright (c) [2019] Huawei Technologies Co., Ltd. -#openEuler-repos is licensed under the Mulan PSL v1. +#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 diff --git a/generic_x86_64.repo b/generic_x86_64.repo new file mode 100644 index 0000000..3f13f3a --- /dev/null +++ b/generic_x86_64.repo @@ -0,0 +1,9 @@ +#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.