1. photon
  2. Commit 85c433d77fd2e625f4af8d5ce2fac88e9551c971
Browse code

Modified %check for SPEC files - 18

Change-Id: I10c69edbc38e3bbc24abb916d85d07c840dee65a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1412
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: rongrong qiu <rqiu@vmware.com>

Chang authored on 2016/09/17 09:49:05
Showing 10 changed files
SPECS/shadow/shadow.spec
History View file @ 85c433d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Programs for handling passwords in a secure way
2 2 
 Name:		shadow
3 3 
 Version:	4.2.1
4 
-Release:	8%{?dist}
4 
+Release:	9%{?dist}
5 5 
 URL:		http://pkg-shadow.alioth.debian.org/
6 6 
 License:	BSD
7 7 
 Group:		Applications/System
... ... 
@@ -85,6 +85,10 @@ do
85 85 
     sed -i "s/chage/$PROGRAM/" %{buildroot}%{_sysconfdir}/pam.d/${PROGRAM}
86 86 
 done
87 87 
 %find_lang %{name}
88 
+
89 
+%check
90 
+make %{?_smp_mflags} check
91 
+
88 92 
 %post
89 93 
 %{_sbindir}/pwconv
90 94 
 %{_sbindir}/grpconv
... ... 
@@ -101,6 +105,8 @@ done
101 101 
 %{_mandir}/*/*
102 102 
 %config(noreplace) %{_sysconfdir}/pam.d/*
103 103 
 %changelog
104 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 4.2.1-9
105 
+-       Modified %check
104 106 
 *       Tue Jun 21 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.1-8
105 107 
 -	Added logic to not replace pam.d conf files in upgrade scenario
106 108 
 *       Fri May 27 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.1-7
SPECS/slang/slang.spec
History View file @ 85c433d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	An interpreted language that may be embedded into an application to make the application extensible.
2 2 
 Name:		slang
3 3 
 Version:	2.3.0
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GNU General Public License
6 6 
 URL:		http://www.jedsoft.org/slang/index.html
7 7 
 Group:		Development/Languages
... ... 
@@ -42,6 +42,9 @@ make DESTDIR=%{buildroot} install_doc_dir=%{_docdir}/slang-2.3.0   \
42 42 
 chmod -v 755 %{buildroot}%{_libdir}/libslang.so.2.3.0 \
43 43 
              %{buildroot}%{_libdir}/slang/v2/modules/*.so
44 44
45 
+%check
46 
+make %{?_smp_mflags} check
47 
+
45 48 
 %files
46 49 
 %defattr(-,root,root)
47 50 
 %{_sysconfdir}/*
... ... 
@@ -58,6 +61,8 @@ chmod -v 755 %{buildroot}%{_libdir}/libslang.so.2.3.0 \
58 58
59 59
60 60 
 %changelog
61 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 2.3.0-3
62 
+-       Modified %check
61 63 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.3.0-2
62 64 
 -	GA - Bump release of all rpms
63 65 
 *   	Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 2.3.0-1
SPECS/sqlite-autoconf/sqlite-autoconf.spec
History View file @ 85c433d
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:	A portable, high level programming interface to various calling conventions
3 3 
 Name:		sqlite-autoconf
4 4 
 Version:	3.11.0
5 
-Release:	2%{?dist}
5 
+Release:	3%{?dist}
6 6 
 License:	Public Domain
7 7 
 URL:		http://www.sqlite.org
8 8 
 Group:		System Environment/GeneralLibraries
... ... 
@@ -37,8 +37,10 @@ install -D -m644 sqlite3.1 %{buildroot}/%{_mandir}/man1/sqlite3.1
37 37 
 find %{buildroot}/%{_libdir} -name '*.la' -delete
38 38 
 rm -rf %{buildroot}/%{_infodir}
39 39 
 %{_fixperms} %{buildroot}/*
40 
+
40 41 
 %check
41 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
42 
+make %{?_smp_mflags} check
43 
+
42 44 
 %post	-p /sbin/ldconfig
43 45 
 %postun	-p /sbin/ldconfig
44 46 
 %clean
... ... 
@@ -51,6 +53,8 @@ rm -rf %{buildroot}/*
51 51 
 %{_libdir}/pkgconfig/*
52 52 
 %{_mandir}/man1/*
53 53 
 %changelog
54 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.11.0-3
55 
+-       Modified %check
54 56 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.11.0-2
55 57 
 -	GA - Bump release of all rpms
56 58 
 *   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 3.11.0-1
SPECS/sshpass/sshpass.spec
History View file @ 85c433d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Noninteractive ssh password provider
2 2 
 Name:		sshpass
3 3 
 Version:	1.05
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://sourceforge.net/projects/sshpass/
7 7 
 Source0:	http://downloads.sourceforge.net/project/sshpass/sshpass/1.05/sshpass-1.05.tar.gz
... ... 
@@ -21,9 +21,6 @@ make %{?_smp_mflags}
21 21 
 rm -rf %{buildroot}
22 22 
 make prefix=%{_prefix}	DESTDIR=%{buildroot} install
23 23
24 
-%check
25 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
26 
-
27 24 
 %clean
28 25 
 rm -rf %{buildroot}/*
29 26
... ... 
@@ -34,6 +31,8 @@ rm -rf %{buildroot}/*
34 34 
 %{_mandir}/man1
35 35
36 36 
 %changelog
37 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 1.05-4
38 
+-       Modified %check
37 39 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.05-3
38 40 
 -	GA - Bump release of all rpms
39 41 
 *	Thu Apr 28 2016 Anish Swaminathan <anishs@vmware.com> 1.05-2
SPECS/sudo/sudo.spec
History View file @ 85c433d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Sudo
2 2 
 Name:		sudo
3 3 
 Version:	1.8.15
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	ISC
6 6 
 URL:		https://www.kernel.org/pub/linux/libs/pam/
7 7 
 Group:		System Environment/Security
... ... 
@@ -55,8 +55,10 @@ EOF
55 55
56 56 
 %find_lang %{name}
57 57 
 %{_fixperms} %{buildroot}/*
58 
+
58 59 
 %check
59 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
60 
+make %{?_smp_mflags} check
61 
+
60 62 
 %post
61 63 
 /sbin/ldconfig
62 64 
 if [ $1 -eq 1 ] ; then
... ... 
@@ -80,6 +82,8 @@ rm -rf %{buildroot}/*
80 80 
 %{_docdir}/%{name}-%{version}/*
81 81 
 %{_datarootdir}/locale/*
82 82 
 %changelog
83 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 1.8.15-4
84 
+-       Modified %check
83 85 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-3
84 86 
 -	GA - Bump release of all rpms
85 87 
 *   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-2
SPECS/swig/swig.spec
History View file @ 85c433d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Connects C/C++/Objective C to some high-level programming languages
2 2 
 Name:		swig
3 3 
 Version:	3.0.8
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv3+ and BSD
6 6 
 URL:		http://swig.sourceforge.net/
7 7 
 Source0:	http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
... ... 
@@ -42,12 +42,17 @@ make DESTDIR=%{buildroot} install
42 42 
 mkdir -p %{buildroot}%{_libdir}/ccache
43 43 
 ln -fs ../../bin/ccache-swig %{buildroot}%{_libdir}/ccache/swig
44 44
45 
+%check
46 
+make %{?_smp_mflags} check
47 
+
45 48 
 %files
46 49 
 %{_bindir}/*
47 50 
 %{_datadir}/swig
48 51 
 %{_libdir}/ccache
49 52
50 53 
 %changelog
54 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.0.8-3
55 
+-       Modified %check
51 56 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0.8-2
52 57 
 -	GA - Bump release of all rpms
53 58 
 * 	Tue Feb 23 2016 Anish Swaminathan <anishs@vmware.com>  3.0.8-1
SPECS/syslog-ng/syslog-ng.spec
History View file @ 85c433d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Next generation system logger facilty
2 2 
 Name:		syslog-ng
3 3 
 Version:	3.6.4
4 
-Release:	5%{?dist}
4 
+Release:	6%{?dist}
5 5 
 License:	GPL + LGPL
6 6 
 URL:		https://www.balabit.com/network-security/syslog-ng/opensource-logging-system
7 7 
 Group:		System Environment/Daemons
... ... 
@@ -72,7 +72,7 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
72 72 
 %{_fixperms} %{buildroot}/*
73 73
74 74 
 %check
75 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
75 
+make %{?_smp_mflags} check
76 76
77 77 
 %post
78 78 
 if [ $1 -eq 1 ] ; then
... ... 
@@ -120,6 +120,8 @@ rm -rf %{buildroot}/*
120 120 
 /usr/lib/pkgconfig/syslog-ng.pc
121 121
122 122 
 %changelog
123 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.6.4-6
124 
+-       Modified %check
123 125 
 *   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  3.6.4-5
124 126 
 -   Fixed logic to restart the active services after upgrade
125 127 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.4-4
SPECS/systemtap/systemtap.spec
History View file @ 85c433d
... ... 
@@ -8,7 +8,7 @@
8 8
9 9 
 Name:          systemtap
10 10 
 Version:       3.0
11 
-Release:       1%{?dist}
11 
+Release:       2%{?dist}
12 12 
 Summary:       Programmable system-wide instrumentation system
13 13 
 Group:         Development/System
14 14 
 Vendor:	       VMware, Inc.
... ... 
@@ -172,6 +172,9 @@ install -m 644 initscript/logrotate.stap-server %{buildroot}%{_sysconfdir}/logro
172 172
173 173 
 %find_lang %{name}
174 174
175 
+%check
176 
+make %{?_smp_mflags} check
177 
+
175 178 
 %clean
176 179 
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
177 180
... ... 
@@ -329,17 +332,19 @@ fi
329 329 
 %{_mandir}/man8/stap-server.8*
330 330
331 331 
 %changelog
332 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.0-2
333 
+-       Modified %check
332 334 
 * 	Fri Jul 22 2016 Divya Thaluru <dthaluru@vmware.com> 3.0-1
333 335 
 -	Updated version to 3.0
334 336 
 -	Removing patch to enable kernel (fix is present in upstream)
335 337 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-5
336 338 
 -	GA - Bump release of all rpms
337 
-*   Mon May 23 2016 Harish Udaiya KUmar <hudaiyakumar@vmware.com> 2.9-4
339 
+*       Mon May 23 2016 Harish Udaiya KUmar <hudaiyakumar@vmware.com> 2.9-4
338 340 
 -	Added the patch to enable kernel building with Kernel 4.4
339 341 
 * 	Fri May 20 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-3
340 342 
 -	Fixed the stap-prep script to be compatible with Photon
341 
-*   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-2
342 
--   Fix for upgrade issues
343 
+*       Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-2
344 
+-       Fix for upgrade issues
343 345 
 * 	Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.9-1
344 346 
 -	Updated version to 2.9
345 347 
 *	Fri Dec 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7-2
SPECS/tcpdump/tcpdump.spec
History View file @ 85c433d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Packet Analyzer
2 2 
 Name:		tcpdump
3 3 
 Version:	4.7.4
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		http://www.tcpdump.org
7 7 
 Source0:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
... ... 
@@ -26,15 +26,18 @@ make DESTDIR=%{buildroot} install
26 26 
 find %{buildroot} -name '*.la' -delete
27 27
28 28 
 %check
29 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
29 
+make %{?_smp_mflags} check
30 
+
30 31 
 %files
31 32 
 %defattr(-,root,root)
32 33 
 %{_sbindir}/*
33 34 
 %{_mandir}/man1/*
34 35 
 %changelog
36 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 4.7.4-3
37 
+-       Modified %check
35 38 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.7.4-2
36 39 
 -	GA - Bump release of all rpms
37 
-*   Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 4.7.4-1
38 
--   Upgrade version.
40 
+*       Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 4.7.4-1
41 
+-       Upgrade version.
39 42 
 *   Mon Apr 6  2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 4.7.3-1
40 43 
 -   Updating version to 4.7.3
SPECS/texinfo/texinfo.spec
History View file @ 85c433d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Reading, writing, and converting info pages
2 2 
 Name:		texinfo
3 3 
 Version:	6.1
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv3+
6 6 
 URL:		http://ftp.gnu.org/gnu/texinfo/texinfo-6.1.tar.xz
7 7 
 Group:		Applications/System
... ... 
@@ -28,7 +28,7 @@ rm -rf %{buildroot}%{_infodir}
28 28 
 %find_lang %{name} --all-name
29 29
30 30 
 %check
31 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
31 
+make %{?_smp_mflags} check
32 32
33 33 
 %post
34 34 
 /sbin/ldconfig
... ... 
@@ -47,12 +47,14 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
47 47 
 %{_libdir}/texinfo/*
48 48
49 49 
 %changelog
50 
+*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 6.1-4
51 
+-       Modified %check
50 52 
 *	Wed Jun 27 2016 Divya Thaluru <dthaluru@vmware.com> 6.1-3
51 53 
 -	Removed packaging of debug files
52 54 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.1-2
53 55 
 -	GA - Bump release of all rpms
54 
-*   Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 6.1-1
55 
--   Updated to version 6.1
56 
+*       Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 6.1-1
57 
+-       Updated to version 6.1
56 58 
 *	Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 5.2-3
57 59 
 -	Handled locale files with macro find_lang
58 60 
 *	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 5.2-2