1. photon
  2. Commit 52d2668a7f5564c1e81e8ea988c616a3f1df05bd
Browse code

fix requires

Change-Id: Idf41d2d03a502f21b8251c1a08958991e9a41be5
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1726
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Priyesh Padmavilasom authored on 2016/11/22 08:38:16
Showing 6 changed files
SPECS/bindutils/bindutils.spec
History View file @ 52d2668
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Domain Name System software
2 2 
 Name:		bindutils
3 3 
 Version:	9.10.4
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	ISC
6 6 
 URL:		http://www.isc.org/downloads/bind/
7 7 
 Source0:	ftp://ftp.isc.org/isc/bind9/%{version}-P1/bind-%{version}-P1.tar.gz
... ... 
@@ -10,6 +10,7 @@ Group:		Development/Tools
10 10 
 Vendor:		VMware, Inc.
11 11 
 Distribution:	Photon
12 12 
 Requires:	openssl
13 
+Requires:	shadow
13 14 
 BuildRequires:	openssl-devel
14 15 
 %description
15 16 
 BIND is open source software that implements the Domain Name System (DNS) protocols
... ... 
@@ -67,6 +68,8 @@ fi
67 67
68 68
69 69 
 %changelog
70 
+*	Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.10.4-2
71 
+-	add shadow to requires
70 72 
 *	Mon Jun 06 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 9.10.4-1
71 73 
 -	Upgraded the version to 9.10.4
72 74 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.10.3-3
SPECS/fleet/fleet.spec
History View file @ 52d2668
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	A Distributed init System
2 2 
 Name:		fleet
3 3 
 Version:	0.11.5
4 
-Release:	4%{?dist}
4 
+Release:	5%{?dist}
5 5 
 License:	Apache 2.0
6 6 
 URL:		https://coreos.com/using-coreos/clustering/
7 7 
 Group:		OS/ClusterManagement
... ... 
@@ -12,6 +12,7 @@ Source0:	https://github.com/coreos/%{name}/archive/%{name}-%{version}.tar.gz
12 12 
 %define sha1 fleet=df90c76e7c6458a05a77078993d9bd705a25b8c5
13 13 
 Source1:	fleet.conf
14 14 
 Source2:	fleet.rules
15 
+Requires:	shadow
15 16 
 Requires:	systemd
16 17 
 BuildRequires:	systemd
17 18
... ... 
@@ -85,6 +86,8 @@ getent passwd fleet >/dev/null || /usr/sbin/useradd -c "fleet user" -s /sbin/nol
85 85 
 /usr/share/polkit-1/rules.d/fleet.rules
86 86
87 87 
 %changelog
88 
+*	Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.11.5-5
89 
+-	add shadow to requires
88 90 
 *       Thu Oct 06 2016 ChangLee <changlee@vmware.com> 0.11.5-4
89 91 
 -       Modified %check
90 92 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.11.5-3
SPECS/nfs-utils/nfs-utils.spec
History View file @ 52d2668
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	NFS client utils
2 2 
 Name:		nfs-utils
3 3 
 Version:	1.3.3
4 
-Release:	4%{?dist}
4 
+Release:	5%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://sourceforge.net/projects/nfs
7 7 
 Group:		Applications/Nfs-utils-client
... ... 
@@ -19,6 +19,7 @@ BuildRequires:  libtirpc-devel
19 19 
 Requires:   python2-libs
20 20 
 Requires:   libtirpc
21 21 
 Requires:   rpcbind
22 
+Requires:   shadow
22 23
23 24 
 %description
24 25 
 The nfs-utils package contains simple nfs client service
... ... 
@@ -65,10 +66,12 @@ install -m644 systemd/nfs-mountd.service %{buildroot}/lib/systemd/system/
65 65 
 /lib/systemd/system/*
66 66
67 67 
 %changelog
68 
+*	Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.3-5
69 
+-	add shadow to requires
68 70 
 *	Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 1.3.3-4
69 71 
 -	Removed packaging of debug files
70 72 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.3-3
71 
--	GA - Bump release of all rpms
73 
+	GA - Bump release of all rpms
72 74 
 *   Thu Apr 28 2016 Xiaolin Li <xiaolinl@vmware.com> 1.3.3-2
73 75 
 -   Add nfs-server.service to rpm.
74 76 
 * 	Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 1.3.3-1
SPECS/rpcbind/rpcbind.spec
History View file @ 52d2668
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        RPC program number mapper
2 2 
 Name:           rpcbind
3 3 
 Version:        0.2.3
4 
-Release:        8%{?dist}
4 
+Release:        9%{?dist}
5 5 
 License:        BSD
6 6 
 URL:            http://nfsv4.bullopensource.org
7 7 
 Group:          Applications/Daemons
... ... 
@@ -17,6 +17,8 @@ BuildRequires:  libtirpc-devel
17 17 
 BuildRequires:  systemd-devel
18 18 
 Requires:       libtirpc
19 19 
 Requires:       systemd
20 
+Requires:       shadow
21 
+Requires:       coreutils
20 22 
 %description
21 23 
 The rpcbind program is a replacement for portmap. It is required for import or export of Network File System (NFS) shared directories. The rpcbind utility is a server that converts RPC program numbers into universal addresses
22 24 
 %prep
... ... 
@@ -82,6 +84,8 @@ fi
82 82 
 %clean
83 83 
 rm -rf %{buildroot}/*
84 84 
 %changelog
85 
+*   Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.2.3-9
86 
+-   add shadow and coreutils to requires
85 87 
 *   Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com>  0.2.3-8
86 88 
 -   Change systemd dependency
87 89 
 *   Wed Oct 05 2016 ChangLee <changlee@vmware.com> 0.2.3-7
SPECS/sendmail/sendmail.spec
History View file @ 52d2668
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Commonly used Mail transport agent (MTA)
2 2 
 Name:           sendmail
3 3 
 Version:        8.15.2
4 
-Release:        7%{?dist}
4 
+Release:        8%{?dist}
5 5 
 URL:            http://www.sendmail.org/
6 6 
 License:        GPLv2+ and GPLv3+ and LGPLv2+
7 7 
 Group:          Email/Server/Library
... ... 
@@ -13,9 +13,13 @@ BuildRequires:  openldap
13 13 
 BuildRequires:  openssl-devel
14 14 
 BuildRequires:  db-devel
15 15 
 BuildRequires:  shadow
16 
+Requires:       coreutils
16 17 
 Requires:       systemd
17 18 
 Requires:       m4
18 19 
 Requires:       openldap
20 
+Requires:       shadow
21 
+Requires:       sed
22 
+Requires:       inetutils
19 23
20 24 
 %define sha1 sendmail=5801d4b06f4e38ef228a5954a44d17636eaa5a16
21 25
... ... 
@@ -120,11 +124,13 @@ EOF
120 120 
 make -C test check
121 121
122 122 
 %pre
123 
+if [ $1 -eq 1 ] ; then
123 124 
 groupadd -g 26 smmsp                               &&
124 125 
 useradd -c "Sendmail Daemon" -g smmsp -d /dev/null \
125 126 
         -s /bin/false -u 26 smmsp                  &&
126 127 
 chmod -v 1777 /var/mail                            &&
127 128 
 install -v -m700 -d /var/spool/mqueue
129 
+fi
128 130
129 131
130 132 
 %post
... ... 
@@ -171,6 +177,8 @@ fi
171 171
172 172
173 173 
 %changelog
174 
+*	Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-8
175 
+-	fix pre script, add coreutils,inetutils,sed,shadow to requires
174 176 
 *       Mon Oct 10 2016 ChangLee <changlee@vmware.com> 8.15.2-7
175 177 
 -       Modified %check
176 178 
 *       Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.2-6
SPECS/systemtap/systemtap.spec
History View file @ 52d2668
... ... 
@@ -8,7 +8,7 @@
8 8
9 9 
 Name:          systemtap
10 10 
 Version:       3.0
11 
-Release:       3%{?dist}
11 
+Release:       4%{?dist}
12 12 
 Summary:       Programmable system-wide instrumentation system
13 13 
 Group:         Development/System
14 14 
 Vendor:	       VMware, Inc.
... ... 
@@ -45,8 +45,9 @@ BuildRequires: rpm-devel
45 45 
 Requires:      gcc
46 46 
 Requires:      linux-devel
47 47 
 Requires:      make
48 
-Requires:	   elfutils
48 
+Requires:      elfutils
49 49 
 Requires:      %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release}
50 
+Requires:      shadow
50 51
51 52 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
52 53
... ... 
@@ -332,7 +333,9 @@ fi
332 332 
 %{_mandir}/man8/stap-server.8*
333 333
334 334 
 %changelog
335 
-*   Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 3.0-3
335 
+*   Mon Nov 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0-4
336 
+-   add shadow to requires
337 
+*   Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 3.0-3
336 338 
 -   Use sqlite-{devel,libs}
337 339 
 *   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.0-2
338 340 
 -   Modified %check