Kiril Nesenko has uploaded a new change for review. Change subject: Provide a public key with ovirt-release rpms. ......................................................................
Provide a public key with ovirt-release rpms. Change-Id: Ib7c2b558d5d78c9d23dabf9a5dbfc06da3c1a5bb Signed-off-by: Kiril Nesenko <knese...@redhat.com> --- R .gitignore A ovirt-release-3.3/RPM-GPG-ovirt.public M ovirt-release-3.3/configure.ac M ovirt-release-3.3/ovirt-release.spec.in D ovirt-release-3.4/.gitignore A ovirt-release-3.4/RPM-GPG-ovirt.public M ovirt-release-3.4/configure.ac M ovirt-release-3.4/ovirt-release.spec.in M ovirt-release-3.4/ovirt.repo.in 9 files changed, 80 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/86/27186/1 diff --git a/ovirt-release-3.3/.gitignore b/.gitignore similarity index 93% rename from ovirt-release-3.3/.gitignore rename to .gitignore index ee4adc5..98602c7 100644 --- a/ovirt-release-3.3/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ ovirt-release.spec *.tar.gz *.repo +rpmbuild diff --git a/ovirt-release-3.3/RPM-GPG-ovirt.public b/ovirt-release-3.3/RPM-GPG-ovirt.public new file mode 100644 index 0000000..790ecf5 --- /dev/null +++ b/ovirt-release-3.3/RPM-GPG-ovirt.public @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.13 (GNU/Linux) + +mQENBFM3+3YBCADTLqGw5hI0whRPeN0hSjpaZ2yNNtVzgqj8/EFQ9IfR7GasHz/4 +kkT3cpKXZygo0AIVEe5dkrcYXF+9C6bowiuGZG+9G6j8MXneunRv7S0mv1mnx7MW +7S1A6MUJ9tyW+4SukDfXYuhTB4o+GrrXJFfZNZza9LoZ7JLVQiqbZFH8qGfnCKuH +0c8u8LOnmYIgzPIlFlYpCOSu6TmETjcif+YLWzJlgrg3DMpnxVLQGDYFlAcxKw1g +MB3IV4s3cYtyAPcH5alKa4VKZ0SZgjvZQb7zs7dm6z2EVUcAyz7Yb6lQpvAM4vKj +blwjwhOTd0WFpTWhNHLG9cev/aQein+hT2NvABEBAAG0F29WaXJ0IDxpbmZyYUBv +dmlydC5vcmc+iQE+BBMBAgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUC +Uz137gUJA8fjWQAKCRCrjE+d/lkMt9W1CAC4rTJ+ExFeFSSzd/CatyCF+ldcmY1x +VRGzuzgVunOiXEwNLu79gCe1lE6GKElv2IWkZovCWCi8ne4dldDNaZuUw4ihqHeY +yeRqcMBnlPoFHAW5dOM+YZlPlwb7UDFWVU7silC5DaKeAhVYNYdgHXgTRDdFq9sh +Sx+6dd4qc1uNajMebTF0TlY8wwhGewkJNBotEYm9ry3a5RgvV1k+JNtQDDC6sgRO +qBheEAoh/nwMETNhaupXbYtoErB+hSY+FO7VLLpnVCNnnU7VZsiCWSUslHCXAiRt +tVtSa3G7pSPOBg071h4U7ZHUa4N2LMW/O+rmzWeqTBY9a5rGJMr6B2KxuQENBFM3 ++3YBCADW+3urGrfjX7PKteKlaHZxQdg4t2XEyB3u/HG9W/yCwqxE2zc7m+DymIyi +jOEHattXBMSgp1CXvJICMhqJDCCtqe3EhHfVAUgJOij/vAX6EAU+vi7j/b6OQyuj +qzSyfZineQLswpuO3nGqH0dXzlQR5DmK+Pkqxi1VQUJWrY/+JvmZ1lhfBdV2NxKY +UMmbBpD1huh/Y/Qm+7zjUm76Z86NdIWBGYTJlqo7znqusInH2/Ar3z4ie6Rhh6e0 +I2BI7PpL/VWhrL2TKOQrU1XUK3JbEun9iYEX2sTBg88AiYfs+dxI6Gv6oYO2pLsv +WiJa3kWBBh8g0tG3V59RL5qQY1bbABEBAAGJAR8EGAECAAkFAlM3+3YCGwwACgkQ +q4xPnf5ZDLe5OAgAqcxzuu6MmEz6HoDZsj57mLoellmGjr6qnCovjzJ8FVPD73z0 +GARPjMeYVGtXB0eZ7WxnpMKroXyrSpHRYky4XYhx73J9iDbZRdO7UUjpQarIRl24 +bW61cMmK7uAxVadpDkJlxlncuukCk7VS3l+3EUK3sus9ChpubPTCWIoyI1/zkNXx +8C964Rih3DcVHIbApaapqKA1C2pyTsWi6mUBVConpDw3wwfiwmj/Kx7yzaK+mmPh ++GVHu66abA6y9KoRhPboJWg4zReZVpQS5JOoy7bEoOuSIu8TRsmB40dVtI5int5z +5cIS/KrfrABkIuGOKpTqnRTsMuSlZSsPwcms6Q== +=EjRa +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ovirt-release-3.3/configure.ac b/ovirt-release-3.3/configure.ac index 14aa5b1..392d66a 100644 --- a/ovirt-release-3.3/configure.ac +++ b/ovirt-release-3.3/configure.ac @@ -28,7 +28,7 @@ AC_INIT([ovirt-release][]OVIRT_VERSION_MAJOR[]OVIRT_VERSION_MINOR, VERSION_NUMBER[]VERSION_SUFFIX, [in...@ovirt.org]) PACKAGE_RPM_VERSION="VERSION_NUMBER" -PACKAGE_RPM_RELEASE="0.1.$(echo VERSION_SUFFIX | sed 's/^_//')" +PACKAGE_RPM_RELEASE="0.2.$(echo VERSION_SUFFIX | sed 's/^_//')" OVIRT_SLOT="OVIRT_VERSION_MAJOR.OVIRT_VERSION_MINOR" AC_SUBST([PACKAGE_RPM_VERSION]) AC_SUBST([PACKAGE_RPM_RELEASE]) diff --git a/ovirt-release-3.3/ovirt-release.spec.in b/ovirt-release-3.3/ovirt-release.spec.in index 4c2a557..4080194 100644 --- a/ovirt-release-3.3/ovirt-release.spec.in +++ b/ovirt-release-3.3/ovirt-release.spec.in @@ -31,6 +31,7 @@ License: ASL 2.0 URL: http://www.ovirt.org Source0: http://resources.ovirt.org/pub/src/%{package_name}/%{package_name}-%{package_version}.tar.gz +Source1: RPM-GPG-ovirt.public BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildArch: noarch @@ -45,8 +46,8 @@ %prep -%setup -q -n %{package_name}-%{package_version} - +%setup -q -n "%{package_name}-%{package_version}" +install -pm 644 "%{SOURCE1}" "%{package_name}-%{package_version}" %build %configure @@ -58,6 +59,7 @@ %make_install #Allow ghost files install -d 755 "%{buildroot}%{_sysconfdir}/yum.repos.d" +install -Dpm 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt.public" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}.repo" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" @@ -83,6 +85,7 @@ %files %defattr(-,root,root,-) %{_datadir}/%{package_name}/ +%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt.public # We do not know what distribution we are installed at, # we copy the actual files at %post, but still wants this package to own them. # %ghost in this case solves that issue @@ -90,5 +93,8 @@ %ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo %changelog +* Tue Apr 29 2014 Kiril Nesenko <knese...@redhat.com> - 1.0.0-0.2.master +- Add public key + * Thu Apr 10 2014 Kiril Nesenko <knese...@redhat.com> - 1.0.0-0.1.master - Split into two packages diff --git a/ovirt-release-3.4/.gitignore b/ovirt-release-3.4/.gitignore deleted file mode 100644 index ee4adc5..0000000 --- a/ovirt-release-3.4/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -config.log -config.status -configure -install-sh -missing -ovirt-release.spec -*.tar.gz -*.repo diff --git a/ovirt-release-3.4/RPM-GPG-ovirt.public b/ovirt-release-3.4/RPM-GPG-ovirt.public new file mode 100644 index 0000000..790ecf5 --- /dev/null +++ b/ovirt-release-3.4/RPM-GPG-ovirt.public @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.13 (GNU/Linux) + +mQENBFM3+3YBCADTLqGw5hI0whRPeN0hSjpaZ2yNNtVzgqj8/EFQ9IfR7GasHz/4 +kkT3cpKXZygo0AIVEe5dkrcYXF+9C6bowiuGZG+9G6j8MXneunRv7S0mv1mnx7MW +7S1A6MUJ9tyW+4SukDfXYuhTB4o+GrrXJFfZNZza9LoZ7JLVQiqbZFH8qGfnCKuH +0c8u8LOnmYIgzPIlFlYpCOSu6TmETjcif+YLWzJlgrg3DMpnxVLQGDYFlAcxKw1g +MB3IV4s3cYtyAPcH5alKa4VKZ0SZgjvZQb7zs7dm6z2EVUcAyz7Yb6lQpvAM4vKj +blwjwhOTd0WFpTWhNHLG9cev/aQein+hT2NvABEBAAG0F29WaXJ0IDxpbmZyYUBv +dmlydC5vcmc+iQE+BBMBAgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUC +Uz137gUJA8fjWQAKCRCrjE+d/lkMt9W1CAC4rTJ+ExFeFSSzd/CatyCF+ldcmY1x +VRGzuzgVunOiXEwNLu79gCe1lE6GKElv2IWkZovCWCi8ne4dldDNaZuUw4ihqHeY +yeRqcMBnlPoFHAW5dOM+YZlPlwb7UDFWVU7silC5DaKeAhVYNYdgHXgTRDdFq9sh +Sx+6dd4qc1uNajMebTF0TlY8wwhGewkJNBotEYm9ry3a5RgvV1k+JNtQDDC6sgRO +qBheEAoh/nwMETNhaupXbYtoErB+hSY+FO7VLLpnVCNnnU7VZsiCWSUslHCXAiRt +tVtSa3G7pSPOBg071h4U7ZHUa4N2LMW/O+rmzWeqTBY9a5rGJMr6B2KxuQENBFM3 ++3YBCADW+3urGrfjX7PKteKlaHZxQdg4t2XEyB3u/HG9W/yCwqxE2zc7m+DymIyi +jOEHattXBMSgp1CXvJICMhqJDCCtqe3EhHfVAUgJOij/vAX6EAU+vi7j/b6OQyuj +qzSyfZineQLswpuO3nGqH0dXzlQR5DmK+Pkqxi1VQUJWrY/+JvmZ1lhfBdV2NxKY +UMmbBpD1huh/Y/Qm+7zjUm76Z86NdIWBGYTJlqo7znqusInH2/Ar3z4ie6Rhh6e0 +I2BI7PpL/VWhrL2TKOQrU1XUK3JbEun9iYEX2sTBg88AiYfs+dxI6Gv6oYO2pLsv +WiJa3kWBBh8g0tG3V59RL5qQY1bbABEBAAGJAR8EGAECAAkFAlM3+3YCGwwACgkQ +q4xPnf5ZDLe5OAgAqcxzuu6MmEz6HoDZsj57mLoellmGjr6qnCovjzJ8FVPD73z0 +GARPjMeYVGtXB0eZ7WxnpMKroXyrSpHRYky4XYhx73J9iDbZRdO7UUjpQarIRl24 +bW61cMmK7uAxVadpDkJlxlncuukCk7VS3l+3EUK3sus9ChpubPTCWIoyI1/zkNXx +8C964Rih3DcVHIbApaapqKA1C2pyTsWi6mUBVConpDw3wwfiwmj/Kx7yzaK+mmPh ++GVHu66abA6y9KoRhPboJWg4zReZVpQS5JOoy7bEoOuSIu8TRsmB40dVtI5int5z +5cIS/KrfrABkIuGOKpTqnRTsMuSlZSsPwcms6Q== +=EjRa +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ovirt-release-3.4/configure.ac b/ovirt-release-3.4/configure.ac index a5fd864..02c5cd2 100644 --- a/ovirt-release-3.4/configure.ac +++ b/ovirt-release-3.4/configure.ac @@ -28,7 +28,7 @@ AC_INIT([ovirt-release][]OVIRT_VERSION_MAJOR[]OVIRT_VERSION_MINOR, VERSION_NUMBER[]VERSION_SUFFIX, [in...@ovirt.org]) PACKAGE_RPM_VERSION="VERSION_NUMBER" -PACKAGE_RPM_RELEASE="0.1.$(echo VERSION_SUFFIX | sed 's/^_//')" +PACKAGE_RPM_RELEASE="0.2.$(echo VERSION_SUFFIX | sed 's/^_//')" OVIRT_SLOT="OVIRT_VERSION_MAJOR.OVIRT_VERSION_MINOR" AC_SUBST([PACKAGE_RPM_VERSION]) AC_SUBST([PACKAGE_RPM_RELEASE]) diff --git a/ovirt-release-3.4/ovirt-release.spec.in b/ovirt-release-3.4/ovirt-release.spec.in index 063f8d5..ada5334 100644 --- a/ovirt-release-3.4/ovirt-release.spec.in +++ b/ovirt-release-3.4/ovirt-release.spec.in @@ -31,6 +31,7 @@ License: ASL 2.0 URL: http://www.ovirt.org Source0: http://resources.ovirt.org/pub/src/%{package_name}/%{package_name}-%{package_version}.tar.gz +Source1: RPM-GPG-ovirt.public BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildArch: noarch @@ -45,8 +46,8 @@ %prep -%setup -q -n %{package_name}-%{package_version} - +%setup -q -n "%{package_name}-%{package_version}" +install -pm 644 "%{SOURCE1}" "%{package_name}-%{package_version}" %build %configure @@ -58,6 +59,7 @@ %make_install #Allow ghost files install -d 755 "%{buildroot}%{_sysconfdir}/yum.repos.d" +install -Dpm 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt.public" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}.repo" touch "%{buildroot}%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" @@ -85,6 +87,7 @@ %files %defattr(-,root,root,-) %{_datadir}/%{package_name}/ +%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-ovirt.public # We do not know what distribution we are installed at, # we copy the actual files at %post, but still wants this package to own them. # %ghost in this case solves that issue @@ -92,5 +95,8 @@ %ghost %config(noreplace) %{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo %changelog +* Tue Apr 29 2014 Kiril Nesenko <knese...@redhat.com> - 1.0.0-0.2.master +- Add public key + * Thu Apr 10 2014 Kiril Nesenko <knese...@redhat.com> - 1.0.0-0.1.master - Split into two packages diff --git a/ovirt-release-3.4/ovirt.repo.in b/ovirt-release-3.4/ovirt.repo.in index 20960f7..1a8bfe7 100644 --- a/ovirt-release-3.4/ovirt.repo.in +++ b/ovirt-release-3.4/ovirt.repo.in @@ -4,3 +4,4 @@ enabled=1 skip_if_unavailable=1 gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-ovirt.public -- To view, visit http://gerrit.ovirt.org/27186 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7c2b558d5d78c9d23dabf9a5dbfc06da3c1a5bb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-release Gerrit-Branch: master Gerrit-Owner: Kiril Nesenko <knese...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
