[meego-commits] 8633: Changes to MeeGo:1.1:Core/meego-release

[Peter Zhu]

Hi,
I have made the following changes to meego-release in project MeeGo:1.1:Core. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #8633:

  submit:   MeeGo:1.1:Core:Testing/meego-release(r5) -> MeeGo:1.1:Core/meego-release


Message:
    * Mon Oct 18 2010 Ryan R Ware <ryan.r.ware at intel.com> - 1.0.99
- Falling back to a single key until we understand signing issues with OBS
* Sat Oct 16 2010 Anas Nashif <nashif at linux.intel.com> - 1.0.99
- Fixed link to primary key
* Fri Oct 15 2010 Ryan R Ware <ryan.r.ware at intel.com> - 1.0.99
- Removed the generic OBS key (RPM-GPG-KEY-meego) and added
the two 1.1 release keys (RPM-GPG-KEY-meego01 & RPM-GPG-KEY-meego02).

State:   new          2010-10-19T05:22:25 peter
Comment: None



changes files:
--------------
--- meego-release.changes
+++ meego-release.changes
@@ -0,0 +1,10 @@
+* Mon Oct 18 2010 Ryan R Ware <ryan.r.ware at intel.com> - 1.0.99
+- Falling back to a single key until we understand signing issues with OBS
+
+* Sat Oct 16 2010 Anas Nashif <nashif at linux.intel.com> - 1.0.99
+- Fixed link to primary key
+
+* Fri Oct 15 2010 Ryan R Ware <ryan.r.ware at intel.com> - 1.0.99
+- Removed the generic OBS key (RPM-GPG-KEY-meego) and added
+the two 1.1 release keys (RPM-GPG-KEY-meego01 & RPM-GPG-KEY-meego02).
+

old:
----
  RPM-GPG-KEY-meego

new:
----
  RPM-GPG-KEY-meego01

spec files:
-----------
--- meego-release.spec
+++ meego-release.spec
@@ -12,7 +12,7 @@
 Provides:   moblin-release = 2.2
 Obsoletes:  moblin-release <= 2.1.92-4.6
 BuildArch:	noarch
-Source0:    RPM-GPG-KEY-meego
+Source0:    RPM-GPG-KEY-meego01
 
 %description
 MeeGo release files such as various /etc/ files that define the release.
@@ -36,18 +36,11 @@
 
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
-cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
-# dist macros.
-
-#%%meego2	%{dist_version}
-%%dist		.meego	
-%%meego	1.0
-EOF
 # Install the MeeGo GPG RPM pubkey
 mkdir -p $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 cp %{SOURCE0} $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-ln -sf RPM-GPG-KEY-meego RPM-GPG-KEY-meego-2-primary
+ln -sf RPM-GPG-KEY-meego01 RPM-GPG-KEY-meego-1.1-primary
 popd
 
 %clean
@@ -60,5 +53,6 @@
 /etc/moblin-release
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
-%config %attr(0644,root,root) /etc/rpm/macros.dist
 /etc/pki/rpm-gpg
+%config %attr(0644,root,root) /etc/pki/rpm-gpg/RPM-GPG-KEY-meego01
+

other changes:
--------------

++++++ RPM-GPG-KEY-meego01 (new)
--- RPM-GPG-KEY-meego01
+++ RPM-GPG-KEY-meego01
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+mQENBEy7rToBCADGXVJ5zEoVpYvSTPeLEJfvw3l+6fnvsdgzoLXd43tyU0qO7WVK
+Vk5ymN9xrypaQ2sJJFkxJQNErymUVH4S9qXiOIPpkJgdt/fuRoewTKG1HUZPHS+/
+5Trr8dMIGksvzre6V7Ff2hcdfO5aX4hBIBVTb5iV1U6C9fhmEUocOlnPCVRxZkPF
+7fkXuB7sfn8G4SacWlwvagYRwabMZwm46oLFTFnnVKy4XePckGdLFK68xPA8OO3B
+zhlHtuhWeiPbMd/5qaWzhbP1MyFa3aAoDb+wYGdK9uwklVsAixptrCc4USPyss37
+bdmZDkpWJn03DYRnKfu9OhHFJPnNGfSWk0UHABEBAAG0KU1lZUdvIFNpZ25pbmcg
+S2V5IDAxIDxzZWN1cml0eUBtZWVnby5jb20+iQE+BBMBAgAoBQJMu606AhsDBQkJ
+ZgGABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDsUev7cKbcbbmUB/0Sr0hh
+4+oiwE0FrEu1cHyNhJswYz52l0tWlIFUkujq7vhcyeqAnZzh+KvsaFhopxSZ5p5l
+IGHuSy4blmm++zNyQVRpf8s5f3nnSF9mOgCP9Kapw6hr4pfkubwFtHQrtE1v/7vQ
+Ea0SNo+/pv1rICrgjtSppYcCF8JjkbrF0V9Ys4bLNhIUvj+liDdgqGhYrFx/gFW5
+o9vwXyyTtvCt4MoN3cumjlEIAyXdjRCvxnPfOl9dvyNJGcdnzexhf9y4RsBB1Eww
+7slwNwEh6YFD4kCaIl+jEEiy2SFaUC9s6zJ5mMoZd6JPBQeNV8AUhkFP2zCLv+72
+AlRHThq08z+g5cUHuQENBEy7rToBCAC+4yWNdG3P7/G0ryEqXpJBCgCgn84N9eZw
+LNhOaxrNt8dy+ITDUxzjj11jPVKhcS1ouvrAgbFn8HlJbRmS3cyTevUtN6L2gya1
+kElSKx44S0HuYIVFo37MoOEEcjAHdYjErECqNzrIT+XQoxHR+KnO89owL2GiOMT6
+pjeW6MIdaRPXBUkqCmyVqTZpVJrhO/j7cNTxoV6nljiXIhXC9ivUj8gcHreQ/iSC
+vGfBTu1jImtuu0BOgWtRZW2WXgDmW8LQBnuSTL9w8mc7OyyVKdOYNill26/PSXL7
+F4ndREZqBX8XxNSKXGDbevy9yXwSyF/UWZvXyBS0NJtnO9xgkRRLABEBAAGJASUE
+GAECAA8FAky7rToCGwwFCQlmAYAACgkQ7FHr+3Cm3G01dggAp4eueowy0urs162d
+lVoExeH/6MZ/wX8r+qUBLj/4ewFNlzu4EGSZ1hvA7P7Xftg3tj0pl7dxyqpLJIT+
+/acUbTH0F3LSuElJiEAp8FLt8hry9xuqO5z+r7OiUCZLWBM+HOkqYc8YNtmcZM9B
+h8Dxypr1Szz4qaCxJPkmFpMiaD7OUQE/FiTNwZ+jaYdpL1qub5x4Y4QueAauo6+r
+6/ZmSNogcXkc3V7PKq+21nXDhxcdv2/fBW0WxfBgr2A/Cnn2f6M4q+O6OS9FGgNI
+OQfT9a3OX7X/UtxTXYMnllH6e4lIQFxRq9aD3HJt6MOhCfxSfOsfbjf0Opyn/hmn
+49x3gQ==
+=zbti
+-----END PGP PUBLIC KEY BLOCK-----

++++++ deleted files:
--- RPM-GPG-KEY-meego