Browse code

Update google-daemon, google-start-scripts, rpm-ostree-toolbox.pycrypto.

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

xiaolin-vmware authored on 2016/02/24 08:31:16
Showing 3 changed files
... ...
@@ -1,12 +1,12 @@
1 1
 Summary:	Google Daemon
2 2
 Name:		google-daemon
3
-Version:	1.3.1
3
+Version:	1.3.3
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
-Source0:	google-daemon-%{version}.tar.gz
9
-%define sha1 google-daemon=c55ad60bd29a46afb12d70158d6fa2c5569ec2b4
8
+Source0:	compute-image-packages-%{version}.tar.gz
9
+%define sha1 compute-image-packages=dd115b7d56c08a3c62180a9b72552a54f7babd4f
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12 12
 Provides:	google-daemon
... ...
@@ -20,7 +20,7 @@ Configures ssh to accept the accounts' public keys from the instance metadata.
20 20
 
21 21
 
22 22
 %prep
23
-%setup -q
23
+%setup -q -n compute-image-packages-%{version}/%{name}
24 24
 
25 25
 %build
26 26
 
... ...
@@ -43,6 +43,8 @@ rm -rf $RPM_BUILD_ROOT
43 43
 %exclude /LICENSE
44 44
 
45 45
 %changelog
46
+*   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 1.3.3-1
47
+-   Updated to version 1.3.3
46 48
 *   Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 1.3.1-1
47 49
 -   Upgrade version
48 50
 *   Mon Aug 10 2015 Anish Swaminathan <anishs@vmware.com> 1.2.7-1
... ...
@@ -1,12 +1,12 @@
1 1
 Summary:	Google Startup Scripts
2 2
 Name:		google-startup-scripts
3
-Version:	1.3.1
3
+Version:	1.3.3
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
-Source0:	google-startup-scripts-%{version}.tar.gz
9
-%define sha1 google-startup-scripts=e96f19d98fd43856e1a40622b32c61284c77b2b6
8
+Source0:	compute-image-packages-%{version}.tar.gz
9
+%define sha1 compute-image-packages=dd115b7d56c08a3c62180a9b72552a54f7babd4f
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12 12
 Provides:	google-startup-scripts
... ...
@@ -21,7 +21,7 @@ in the instance metadata under startup-script or, if the metadata is in a small
21 21
 or a downloadable file, it can be specified via startup-script-url.
22 22
 
23 23
 %prep
24
-%setup -q
24
+%setup -q -n compute-image-packages-%{version}/%{name}
25 25
 
26 26
 %build
27 27
 
... ...
@@ -45,6 +45,8 @@ rm -rf $RPM_BUILD_ROOT
45 45
 %exclude /LICENSE
46 46
 
47 47
 %changelog
48
+*   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 1.3.3-1
49
+-   Updated to version 1.3.3
48 50
 *   Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 1.3.1-1
49 51
 -   Upgrade version
50 52
 *   Mon Aug 10 2015 Anish Swaminathan <anishs@vmware.com> 1.2.7-1
... ...
@@ -1,6 +1,6 @@
1 1
 Summary: 	Extra tools for rpm-ostree
2 2
 Name: 		rpm-ostree-toolbox
3
-Version: 	2015.3
3
+Version: 	2015.12
4 4
 Release: 	1%{?dist}
5 5
 #VCS: https://github.com/cgwalters/rpm-ostree-toolbox
6 6
 # This tarball is generated via "make -C packaging -f Makefile.dist-packaging dist-snapshot"
... ...
@@ -8,7 +8,7 @@ Release: 	1%{?dist}
8 8
 # It doesn't follow the Github guidelines because they only work for
9 9
 # github; the infrastructure above is generic for any git repository.
10 10
 Source0:	%{name}-%{version}.tar.gz
11
-%define sha1 rpm-ostree-toolbox=bd8e4b5da029990845233bceac765322c62db848
11
+%define sha1 rpm-ostree-toolbox=6dd8680d90992942f775596c98d6dfbd9465e47f
12 12
 License: 	LGPLv2+
13 13
 URL: 		https://github.com/cgwalters/rpm-ostree-toolbox
14 14
 Vendor:		VMware, Inc.
... ...
@@ -105,10 +105,6 @@ getent passwd %{unprivileged_user} >/dev/null || \
105 105
 %files
106 106
 %doc COPYING README.md src/py/config.ini.sample
107 107
 %{_bindir}/rpm-ostree-toolbox
108
-%{_bindir}/rpm-ostree-toolbox-kinit
109
-%{_bindir}/rpm-ostree-toolbox-build-monitor
110
-%{_bindir}/rpm-ostree-toolbox-git-monitor
111
-%{_bindir}/rpm-ostree-toolbox-watch
112 108
 %{_libdir}/%{name}/
113 109
 %{_datadir}/%{name}/
114 110
 %{_mandir}/man1/%{name}*.gz
... ...
@@ -116,16 +112,9 @@ getent passwd %{unprivileged_user} >/dev/null || \
116 116
 %dir %{_localstatedir}/lib/%{name}
117 117
 %attr(0755,%{unprivileged_user},%{unprivileged_group}) %{_localstatedir}/lib/%{name}
118 118
 
119
-%config %{_sysconfdir}/sysconfig/%{name}-template
120
-
121
-/usr/lib/systemd/system/rpm-ostree-toolbox-build-monitor@.service
122
-/usr/lib/systemd/system/rpm-ostree-toolbox-git-monitor.service
123
-/usr/lib/systemd/system/rpm-ostree-toolbox-kinit@.service
124
-/usr/lib/systemd/system/rpm-ostree-toolbox-kinit@.timer
125
-/usr/lib/systemd/system/rpm-ostree-toolbox-watch@.service
126
-
127
-
128 119
 %changelog
120
+*   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 2015.12-1
121
+-   Updated to version 2015.12
129 122
 * Sat May 24 2014 Colin Walters <walters@verbum.org> - 2014.11-1
130 123
 - Initial package
131 124