1. photon
  2. Commit d4ac92920ca07f4fa297076e166577b0bf22f660
Browse code

Update google packages, add missing requires to dbus-glib

Change-Id: I4f8ea543810eca9de81aa1e32dbb5968f3bf0e7a
Reviewed-on: http://photon-jenkins.eng.vmware.com/485
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>

suezzelur authored on 2016/02/01 18:33:54
Showing 4 changed files
SPECS/WALinuxAgent/WALinuxAgent.spec
History View file @ d4ac929
... ... 
@@ -1,20 +1,21 @@
1 1 
 Name:           WALinuxAgent
2 2 
 Summary:        The Windows Azure Linux Agent
3 3 
 Version:        2.0.14
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        Apache License Version 2.0
6 6 
 Group:          System/Daemons
7 7 
 Url:            http://go.microsoft.com/fwlink/?LinkId=250998
8 8 
 Source0:        %{name}-%{version}.tar.gz
9 9 
 Patch0:         photondistroadd.patch
10 10 
 %define sha1 WALinuxAgent=90448cc3f48f21a23a0932d1cf05e75d5a5bf158
11 
+Vendor:		VMware, Inc.
12 
+Distribution:	Photon
11 13
12 14 
 BuildRequires:  python2
13 15 
 BuildRequires:  python2-libs
14 16 
 BuildRequires:  python-setuptools
15 17 
 Requires:       python2
16 18 
 Requires:       python2-libs
17 
-Requires:       python-setuptools
18 19 
 Requires:       python-pyasn1
19 20 
 Requires:       openssh
20 21 
 Requires:       openssl
... ... 
@@ -26,7 +27,6 @@ Requires:       iptables
26 26
27 27 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
28 28 
 BuildArch:      noarch
29 
-Vendor:         Microsoft Corporation
30 29
31 30 
 %description
32 31 
 The Windows Azure Linux Agent supports the provisioning and running of Linux
... ... 
@@ -79,6 +79,8 @@ fi
79 79
80 80
81 81 
 %changelog
82 
+* Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 2.0.14-3
83 
+- Removed redundant requires
82 84 
 * Thu Aug 6 2015 Anish Swaminathan <anishs@vmware.com>
83 85 
 - Added sha1sum
84 86 
 * Fri Mar 13 2015 - mbassiouny@vmware.com
SPECS/dbus-glib/dbus-glib.spec
History View file @ d4ac929
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Glib interfaces to D-Bus API
2 2 
 Name:		dbus-glib
3 3 
 Version:	0.104
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License: 	AFL and GPLv2+
6 6 
 Group: 		System Environment/Libraries
7 7 
 Source0:	http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
... ... 
@@ -20,6 +20,7 @@ The D-Bus GLib package contains GLib interfaces to the D-Bus API.
20 20 
 %package devel
21 21 
 Summary:	Libraries and headers for the D-Bus GLib bindings
22 22 
 Requires:	glib-devel
23 
+Requires:	dbus-devel
23 24 
 Requires:	%{name} = %{version}
24 25
25 26 
 %description devel
... ... 
@@ -58,6 +59,8 @@ make DESTDIR=%{buildroot} install
58 58
59 59
60 60 
 %changelog
61 
+*   	Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 0.104-3
62 
+-   	Add requires to dbus-glib-devel
61 63 
 * 	Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.104-2
62 64 
 -	Updated build requires after creating devel package for dbus
63 65 
 *	Tue Jun 23 2015 Divya Thaluru <dthaluru@vmware.com> 0.104-1
SPECS/google-daemon/google-daemon.spec
History View file @ d4ac929
... ... 
@@ -1,12 +1,12 @@
1 1 
 Summary:	Google Daemon
2 2 
 Name:		google-daemon
3 
-Version:	1.2.7
3 
+Version:	1.3.1
4 4 
 Release:	1%{?dist}
5 5 
 License:	Apache License
6 6 
 Group:		System Environment/Base
7 7 
 URL:		https://github.com/GoogleCloudPlatform/compute-image-packages/
8 8 
 Source0:	google-daemon-%{version}.tar.gz
9 
-%define sha1 google-daemon=a38bce5383c71f7ecc41c50575fcf29ae4c55489
9 
+%define sha1 google-daemon=c55ad60bd29a46afb12d70158d6fa2c5569ec2b4
10 10 
 Vendor:		VMware, Inc.
11 11 
 Distribution:	Photon
12 12 
 Provides:	google-daemon
... ... 
@@ -28,6 +28,9 @@ Configures ssh to accept the accounts' public keys from the instance metadata.
28 28 
 rm -rf $RPM_BUILD_ROOT
29 29 
 install -d $RPM_BUILD_ROOT
30 30 
 cp -rpf * $RPM_BUILD_ROOT
31 
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
32 
+mv $RPM_BUILD_ROOT/etc/init.d/* $RPM_BUILD_ROOT/etc/rc.d/init.d/
33 
+rm -rf $RPM_BUILD_ROOT/etc/init.d/
31 34
32 35 
 %clean
33 36 
 rm -rf $RPM_BUILD_ROOT
... ... 
@@ -40,5 +43,7 @@ rm -rf $RPM_BUILD_ROOT
40 40 
 %exclude /LICENSE
41 41
42 42 
 %changelog
43 
+*   Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 1.3.1-1
44 
+-   Upgrade version
43 45 
 *   Mon Aug 10 2015 Anish Swaminathan <anishs@vmware.com> 1.2.7-1
44 46 
 -   Updated version.
SPECS/google-startup-scripts/google-startup-scripts.spec
History View file @ d4ac929
... ... 
@@ -1,12 +1,12 @@
1 1 
 Summary:	Google Startup Scripts
2 2 
 Name:		google-startup-scripts
3 
-Version:	1.2.7
3 
+Version:	1.3.1
4 4 
 Release:	1%{?dist}
5 5 
 License:	Apache License
6 6 
 Group:		System Environment/Base
7 7 
 URL:		https://github.com/GoogleCloudPlatform/compute-image-packages/
8 8 
 Source0:	google-startup-scripts-%{version}.tar.gz
9 
-%define sha1 google-startup-scripts=23511515ad691ab29d3953b948ee3afb8adcb18d
9 
+%define sha1 google-startup-scripts=e96f19d98fd43856e1a40622b32c61284c77b2b6
10 10 
 Vendor:		VMware, Inc.
11 11 
 Distribution:	Photon
12 12 
 Provides:	google-startup-scripts
... ... 
@@ -29,6 +29,9 @@ or a downloadable file, it can be specified via startup-script-url.
29 29 
 rm -rf $RPM_BUILD_ROOT
30 30 
 install -d $RPM_BUILD_ROOT
31 31 
 cp -rpf * $RPM_BUILD_ROOT
32 
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
33 
+mv $RPM_BUILD_ROOT/etc/init.d/* $RPM_BUILD_ROOT/etc/rc.d/init.d/
34 
+rm -rf $RPM_BUILD_ROOT/etc/init.d/
32 35
33 36 
 %clean
34 37 
 rm -rf $RPM_BUILD_ROOT
... ... 
@@ -42,5 +45,7 @@ rm -rf $RPM_BUILD_ROOT
42 42 
 %exclude /LICENSE
43 43
44 44 
 %changelog
45 
+*   Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 1.3.1-1
46 
+-   Upgrade version
45 47 
 *   Mon Aug 10 2015 Anish Swaminathan <anishs@vmware.com> 1.2.7-1
46 48 
 -   Updated version.