1. photon
  2. Commit 421d1f6be34382e6ad64b550b27c266f65737d17
Browse code

update rpm to 4.13.0 fix debuginfo

Change-Id: I1c249ef03a713627a14d28e43ac642d18c682568
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2531
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>

Priyesh Padmavilasom authored on 2017/04/26 12:17:43
Showing 58 changed files
SPECS/asciidoc/asciidoc.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:    AsciiDoc is a human readable text document format
2 2 
 Name:       asciidoc
3 3 
 Version:    8.6.9
4 
-Release:    2%{?dist}
4 
+Release:    3%{?dist}
5 5 
 License:    GPLv2
6 6 
 URL:        http://asciidoc.org/
7 7 
 Group:      System Environment/Development
... ... 
@@ -9,6 +9,7 @@ Vendor:     VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:    http://sourceforge.net/projects/asciidoc/files/asciidoc/%{version}/%{name}-%{version}.tar.gz
11 11 
 %define sha1 asciidoc=82e574dd061640561fa0560644bc74df71fb7305
12 
+BuildArch:  noarch
12 13
13 14 
 %description
14 15 
 AsciiDoc is a human readable text document format that can be easily converted to other document formats.
... ... 
@@ -40,6 +41,8 @@ python tests/testasciidoc.py run
40 40 
 /usr/share/man/*
41 41
42 42 
 %changelog
43 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.6.9-3
44 
+-	Fix arch
43 45 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.6.9-2
44 46 
 -	GA - Bump release of all rpms
45 47 
 *   Fri Jun 5 2015 Touseef Liaqat <tliaqat@vmware.com> 8.6.9-1
SPECS/autoconf/autoconf.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	The package automatically configure source code
2 2 
 Name:		autoconf
3 3 
 Version:	2.69
4 
-Release:	5%{?dist}
4 
+Release:	6%{?dist}
5 5 
 License:	GPLv2
6 6 
 URL:		http://www.gnu.org/software/autoconf
7 7 
 Group:		System Environment/Base
... ... 
@@ -14,6 +14,8 @@ Patch0:		autoconf-make-check.patch
14 14 
 Requires:	perl
15 15 
 BuildRequires:	m4
16 16 
 Requires:	m4
17 
+BuildArch:      noarch
18 
+
17 19 
 %description
18 20 
 The package contains programs for producing shell scripts that can
19 21 
 automatically configure source code.
... ... 
@@ -38,6 +40,8 @@ make -k check %{?_smp_mflags}  TESTSUITEFLAGS="1-500"
38 38 
 %{_mandir}/*/*
39 39 
 %{_datarootdir}/autoconf/*
40 40 
 %changelog
41 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.69-6
42 
+-	Fix arch
41 43 
 *	Tue Dec 6 2016 Dheeraj Shetty <dheerajs@vmware.com> 2.69-5
42 44 
 -	Fixed Bug 1718089 make check failure
43 45 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.69-4
SPECS/automake/automake.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Programs for generating Makefiles
2 2 
 Name:		automake
3 3 
 Version:	1.15
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://www.gnu.org/software/automake/
7 7 
 Group:		System Environment/Base
... ... 
@@ -10,6 +10,8 @@ Distribution: 	Photon
10 10 
 Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.gz
11 11 
 %define sha1 automake=b5a840c7ec4321e78fdc9472e476263fa6614ca1
12 12 
 BuildRequires:	autoconf
13 
+BuildArch:      noarch
14 
+
13 15 
 %description
14 16 
 Contains programs for generating Makefiles for use with Autoconf.
15 17 
 %prep
... ... 
@@ -39,6 +41,8 @@ make %{?_smp_mflags} check
39 39 
 %{_defaultdocdir}/%{name}-%{version}/*
40 40 
 %{_mandir}/*/*
41 41 
 %changelog
42 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.15-3
43 
+-	Fix arch
42 44 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.15-2
43 45 
 -	GA - Bump release of all rpms
44 46 
 *	Thu Jul 23 2015 Divya Thaluru <dthaluru@vmware.com> 1.15-1
SPECS/ceph-deploy/ceph-deploy.spec
History View file @ 421d1f6
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           ceph-deploy
2 2 
 Version:        1.5.37
3 
-Release:        1%{?dist}
3 
+Release:        2%{?dist}
4 4 
 Url:            http://ceph.com/
5 5 
 Summary:        Admin and deploy tool for Ceph
6 6 
 License:        MIT
... ... 
@@ -23,6 +23,7 @@ BuildRequires:  python-setuptools
23 23
24 24 
 Requires:	python2
25 25 
 Requires:	python-setuptools
26 
+BuildArch:      noarch
26 27
27 28 
 %description
28 29 
 An easy to use admin tool for deploy ceph storage clusters.
... ... 
@@ -55,6 +56,8 @@ install -m 0755 -D scripts/ceph-deploy $RPM_BUILD_ROOT/usr/bin
55 55 
 %{_bindir}/ceph-deploy
56 56
57 57 
 %changelog
58 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.37-2
59 
+-   Fix arch
58 60 
 *   Thu Mar 30 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.37-1
59 61 
 -   Upgrading to version 1.5.37
60 62 
 *   Thu Mar 9 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.36-2
SPECS/cloud-init/cloud-init.spec
History View file @ 421d1f6
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           cloud-init
2 2 
 Version:        0.7.6
3 
-Release:        16%{?dist}
3 
+Release:        17%{?dist}
4 4 
 Summary:        Cloud instance init scripts
5 5 
 Group:          System Environment/Base
6 6 
 License:        GPLv3
... ... 
@@ -31,6 +31,7 @@ Requires:       python-requests
31 31 
 Requires:       PyYAML
32 32 
 Requires:       python-jsonpatch
33 33 
 Requires:       python-jinja2
34 
+BuildArch:      noarch
34 35
35 36 
 %description
36 37 
 Cloud-init is a set of init scripts for cloud instances.  Cloud instances
... ... 
@@ -136,6 +137,8 @@ rm -rf $RPM_BUILD_ROOT
136 136
137 137
138 138 
 %changelog
139 
+*   Thu Apr 27 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.6-17
140 
+-   Fix Arch
139 141 
 *   Wed Mar 29 2017 Kumar Kaushik <kaushikk@vmware.com>  0.7.6-16
140 142 
 -   Adding support for disk partition and resize fs
141 143 
 *   Thu Dec 15 2016 Dheeraj Shetty <dheerajs@vmware.com>  0.7.6-15
SPECS/cloud-utils/cloud-utils.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Shell script to auto detect free size on disk and grow partition.
2 2 
 Name:           cloud-utils
3 3 
 Version:        0.30
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        GPLv3
6 6 
 Group:          System Environment
7 7 
 Source0:        https://launchpad.net/cloud-utils/trunk/%{version}/+download/cloud-utils-%{version}.tar.gz
... ... 
@@ -11,6 +11,7 @@ Distribution:   Photon
11 11 
 Requires:       gptfdisk
12 12 
 Requires:       gawk
13 13 
 Requires:       util-linux
14 
+BuildArch:      noarch
14 15
15 16 
 %define sha1 cloud-utils=c90ccaaac0d5e28b0a0564770af2af2d2c95f0de
16 17
... ... 
@@ -34,5 +35,7 @@ cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/
34 34 
 %doc %{_mandir}/man1/growpart.*
35 35
36 36 
 %changelog
37 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.30-2
38 
+-   Fix arch
37 39 
 *       Wed Mar 29 2017 Kumar Kaushik <kaushikk@vmware.com> 0.30-1
38 40 
 -       Initial build.  First version
SPECS/distrib-compat/distrib-compat-gen-debuginfo.patch
History View file @ 421d1f6
39 41 
new file mode 100644
... ... 
@@ -0,0 +1,17 @@
0 
+--- Makefile	2017-04-24 22:28:36.771244501 +0000
1 
+@@ -1,4 +1,4 @@
2 
+-CFLAGS=-D_GNU_SOURCE -Wall -O2
3 
++CFLAGS=-D_GNU_SOURCE -Wall -O2 -g
4 
+ PRG=proctools
5 
+ DIR=${DESTDIR}/sbin
6 
+
7 
+@@ -12,7 +12,7 @@
8 
+
9 
+ install:
10 
+ 	install -dm 0755 $(DIR)
11 
+-	install -sm 0755  $(PRG) $(DIR)
12 
++	install -m 0755  $(PRG) $(DIR)
13 
+ 	ln -sf $(PRG) ${DIR}/checkproc
14 
+ 	ln -sf $(PRG) ${DIR}/killproc
15 
+ 	ln -sf $(PRG) ${DIR}/startproc
SPECS/distrib-compat/distrib-compat.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:       Set of scripts and tools to get compatbility with other distributions.
2 2 
 Name:          distrib-compat
3 3 
 Version:       0.1
4 
-Release:       10%{?dist}
4 
+Release:       11%{?dist}
5 5 
 License:       GPLv2
6 6 
 URL:           http://photon.org
7 7 
 Group:         System Environment/Base
... ... 
@@ -13,13 +13,17 @@ Source1:      rc.status
13 13 
 Source2:      90-va-tune-up.conf
14 14 
 Source3:      ifup
15 15 
 Source4:      ifdown
16 
+Patch0:       distrib-compat-gen-debuginfo.patch
16 17 
 %description
17 18 
 Set of scripts and tools to get compatbility with other distributions.
18 19 
 It includes: rc.status, startproc, killproc, checkproc, ifup and ifdown.
19 20 
 %prep
20 21 
 %setup -q
22 
+%patch0
23 
+
21 24 
 %build
22 25 
 make %{?_smp_mflags}
26 
+
23 27 
 %install
24 28 
 make DESTDIR=%{buildroot} install
25 29 
 install -d -m 0755 %{buildroot}%{_sysconfdir}/sysctl.d
... ... 
@@ -35,6 +39,8 @@ ln -s sysctl.d/99-compat.conf %{buildroot}/%{_sysconfdir}/sysctl.conf
35 35 
 %{_sysconfdir}/*
36 36 
 /sbin/*
37 37 
 %changelog
38 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.1-11
39 
+-   Apply patch to generate debuginfo
38 40 
 *    Wed Sep 7 2016 Divya Thaluru <dthaluru@vmware.com> 0.1-10
39 41 
 -    Clean up
40 42 
 *	 Thu Aug 11 2016 Onkar Deshpande <deshpandeo@vmware.com> 0.1-9
SPECS/docbook-xml/docbook-xml.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Docbook-xml-4.5
2 2 
 Name:		docbook-xml
3 3 
 Version:	4.5
4 
-Release:	6%{?dist}
4 
+Release:	7%{?dist}
5 5 
 License:	MIT
6 6 
 URL:		http://www.docbook.org
7 7 
 Source0:	http://www.docbook.org/xml/4.5/%{name}-%{version}.zip
... ... 
@@ -14,6 +14,8 @@ Requires:   libxml2-python
14 14 
 BuildRequires: 	libxml2
15 15 
 BuildRequires:  libxml2-python
16 16 
 BuildRequires: 	unzip
17 
+BuildArch:      noarch
18 
+
17 19 
 %description
18 20 
 The DocBook XML DTD-4.5 package contains document type definitions for
19 21 
 verification of XML data files against the DocBook rule set. These are
... ... 
@@ -161,6 +163,8 @@ fi
161 161 
 /usr/share/xml/docbook/%{name}-%{version}
162 162 
 /etc/xml
163 163 
 %changelog
164 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.5-7
165 
+-   Fix arch
164 166 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.5-6
165 167 
 -	GA - Bump release of all rpms
166 168 
 *   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  4.5-5
SPECS/docbook-xsl/docbook-xsl.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Docbook-xsl-1.79.1
2 2 
 Name:		docbook-xsl
3 3 
 Version:	1.79.1
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	Apache License
6 6 
 URL:		http://www.docbook.org
7 7 
 Source0:	http://downloads.sourceforge.net/docbook/%{name}-%{version}.tar.bz2
... ... 
@@ -11,6 +11,8 @@ Vendor:		VMware, Inc.
11 11 
 Distribution:	Photon
12 12 
 Requires:	libxml2
13 13 
 BuildRequires:	libxml2
14 
+BuildArch:      noarch
15 
+
14 16 
 %description
15 17 
 The DocBook XML DTD-4.5 package contains document type definitions for
16 18 
 verification of XML data files against the DocBook rule set. These are
... ... 
@@ -78,6 +80,8 @@ fi
78 78 
 %{_docdir}/*
79 79
80 80 
 %changelog
81 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.79.1-4
82 
+-	Fix arch
81 83 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.79.1-3
82 84 
 -	GA - Bump release of all rpms
83 85 
 *       Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  1.79.1-2
SPECS/finger/finger.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	The finger client
2 2 
 Name:		finger
3 3 
 Version:	0.17
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	BSD/
6 6 
 Group:		Applications/Internet
7 7 
 Vendor:		VMware, Inc.
... ... 
@@ -41,6 +41,8 @@ system at the moment or a person.
41 41 
 %patch1 -p1
42 42
43 43 
 %build
44 
+sed -i 's/install -s/install/' finger/Makefile
45 
+sed -i 's/install -s/install/' fingerd/Makefile
44 46 
 ./configure \
45 47 
 	--prefix=%{_prefix}
46 48
... ... 
@@ -83,5 +85,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
83 83 
 %{_mandir}/man8/fingerd.8*
84 84
85 85 
 %changelog
86 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.17-2
87 
+-	Apply patch to generate debuginfo
86 88 
 *	Wed Dec 7 2016 Dheeraj Shetty <dheerajs@vmware.com> 0.17-1
87 89 
 -	initial version
SPECS/gnome-common/gnome-common.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Common development macros for GNOME
2 2 
 Name:           gnome-common
3 3 
 Version:        3.18.0
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        GPL
6 6 
 URL:            https://www.gnome.org/
7 7 
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.xz
... ... 
@@ -9,6 +9,7 @@ Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name
9 9 
 Group:          System Environment/Libraries
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
12 
+BuildArch:      noarch
12 13
13 14 
 %description
14 15 
 This provides Common development macros for GNOME.
... ... 
@@ -35,13 +36,11 @@ make %{?_smp_mflags} check
35 35 
 %files
36 36 
 %defattr(-,root,root)
37 37 
 %{_bindir}/gnome-autogen.sh
38 
-/usr/share/aclocal/ax_check_enable_debug.m4
39 
-/usr/share/aclocal/ax_code_coverage.m4
40 
-/usr/share/aclocal/gnome-code-coverage.m4
41 
-/usr/share/aclocal/gnome-common.m4
42 
-/usr/share/aclocal/gnome-compiler-flags.m4
38 
+%{_datadir}/aclocal/*.m4
43 39
44 40 
 %changelog
41 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.18.0-3
42 
+-   Fix arch
45 43 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.18.0-2
46 44 
 -	GA - Bump release of all rpms
47 45 
 * 	Tue Feb 23 2016 Anish Swaminathan <anishs@vmware.com>  3.18.0-1
SPECS/gtk-doc/gtk-doc.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Program to generate documenation
2 2 
 Name:		gtk-doc
3 3 
 Version:	1.25
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://www.gnu.org/software/%{name}
7 7 
 Source0:	http://ftp.gnome.org/pub/gnome/sources/gtk-doc/1.25/%{name}-%{version}.tar.xz
... ... 
@@ -23,6 +23,8 @@ BuildRequires:	python2
23 23 
 BuildRequires:	python2-libs
24 24 
 Requires:	python2
25 25 
 Provides:	perl(gtkdoc-common.pl)
26 
+BuildArch:      noarch
27 
+
26 28 
 %description
27 29 
 The GTK-Doc package contains a code documenter. This is useful for extracting
28 30 
 specially formatted comments from the code to create API documentation.
... ... 
@@ -44,6 +46,8 @@ cd tests && make check-TESTS
44 44 
 %{_libdir}/cmake/
45 45
46 46 
 %changelog
47 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.25-2
48 
+-   Fix arch
47 49 
 * 	Fri Mar 24 2017 Dheeraj Shetty <dheerajs@vmware.com>  1.25-1
48 50 
 - 	Upgrade to 1.25
49 51 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.24-3
SPECS/hdparm/hdparm.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	command line utility to set and view hardware parameters
2 2 
 Name:		hdparm
3 3 
 Version:	9.51
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		http://sourceforge.net/projects/%{name}/
7 7 
 Source0:	http://downloads.sourceforge.net/hdparm/%{name}-%{version}.tar.gz
... ... 
@@ -17,7 +17,9 @@ controllers and hard drives both to increase performance and sometimes to increa
17 17 
 %prep
18 18 
 %setup -q
19 19 
 %build
20 
-make %{?_smp_mflags}
20 
+sed -i 's/STRIP ?= strip/STRIP=$(STRIP)/' Makefile
21 
+sed -i 's/LDFLAGS = -s/LDFLAGS=$(LDFLAGS)/' Makefile
22 
+make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="" STRIP="/bin/true"
21 23 
 %install
22 24 
 make DESTDIR=%{buildroot} binprefix=%{_prefix} install
23 25
... ... 
@@ -29,5 +31,7 @@ make %{?_smp_mflags} check
29 29 
 %{_sbindir}/hdparm
30 30 
 %{_mandir}/man8/hdparm.8*
31 31 
 %changelog
32 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.51-2
33 
+-	Ensure non empty debuginfo
32 34 
 *	Wed Jan 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 9.51-1
33 35 
 -	Initial build. First version
SPECS/httpd-mod_jk/httpd-mod_jk.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Tomcat Connector
2 2 
 Name:		httpd-mod_jk
3 3 
 Version:	1.2.42
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://tomcat.apache.org/connectors-doc
7 7 
 Group:		Applications/System
... ... 
@@ -30,7 +30,7 @@ make %{?_smp_mflags}
30 30
31 31 
 %install
32 32 
 install -vdm 755 %{buildroot}
33 
-install -D -m 644 native/apache-2.0/mod_jk.so %{buildroot}%{_libdir}/httpd/modules/mod_jk.so
33 
+install -D -m 755 native/apache-2.0/mod_jk.so %{buildroot}%{_libdir}/httpd/modules/mod_jk.so
34 34 
 install -D -m 644 conf/workers.properties  %{buildroot}%{_sysconfdir}/httpd/conf/workers.properties
35 35 
 install -D -m 644 conf/httpd-jk.conf  %{buildroot}%{_sysconfdir}/httpd/conf/httpd_jk.conf
36 36
... ... 
@@ -44,5 +44,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
44 44 
 %config(noreplace) %{_sysconfdir}/httpd/conf/workers.properties
45 45
46 46 
 %changelog
47 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.42-2
48 
+-	Ensure non empty debuginfo
47 49 
 *	Tue Feb 21 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.42-1
48 50 
 -	Initial build.	First version
SPECS/intltool/intltool.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Intltool
2 2 
 Name:		intltool
3 3 
 Version:	0.51.0
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		https://freedesktop.org/wiki/Software/intltool/
7 7 
 Source0:	https://launchpad.net/intltool/+download/%{name}-%{version}.tar.gz
... ... 
@@ -11,6 +11,8 @@ Vendor:		VMware, Inc.
11 11 
 Distribution:	Photon
12 12 
 Requires: 	XML-Parser
13 13 
 BuildRequires:	XML-Parser
14 
+BuildArch:      noarch
15 
+
14 16 
 %description
15 17 
 The Intltool is an internationalization tool used for extracting translatable strings from source files.
16 18 
 %prep
... ... 
@@ -33,6 +35,8 @@ make %{?_smp_mflags} check
33 33 
 %{_datadir}/intltool/*
34 34 
 %{_mandir}/man8/*
35 35 
 %changelog
36 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.51.0-3
37 
+-	Fix arch
36 38 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.51.0-2
37 39 
 -	GA - Bump release of all rpms
38 40 
 * 	Thu Feb 25 2016 Anish Swaminathan <anishs@vmware.com>  0.51.0-1
SPECS/iotop/iotop.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Iotop is a Python program with a top like UI used to show the processes and their corresponding IO activity.
2 2 
 Name:		iotop
3 3 
 Version:	0.6
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv2
6 6 
 URL:		http://guichaz.free.fr/iotop/
7 7 
 Group:		System/Monitoring
... ... 
@@ -10,6 +10,7 @@ Distribution:	Photon
10 10 
 Source0:	http://guichaz.free.fr/iotop/files/%{name}-%{version}.tar.gz
11 11 
 %define sha1 iotop=71a0e7043d83673a40d7ddc57f5b50adab7fff2a
12 12 
 BuildRequires: python2 python2-libs
13 
+BuildArch:      noarch
13 14
14 15 
 %description
15 16 
  Iotop is a Python program with a top like UI used to show the processes and their corresponding IO activity.
... ... 
@@ -40,6 +41,8 @@ rm -rf %{buildroot}/*
40 40
41 41
42 42 
 %changelog
43 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6-3
44 
+-	Fix arch
43 45 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6-2
44 46 
 -	GA - Bump release of all rpms
45 47 
 *	Mon Nov 30 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.6-1
SPECS/ipxe/ipxe.spec
History View file @ 421d1f6
... ... 
@@ -1,10 +1,11 @@
1 1 
 %global security_hardening none
2 2 
 %global commit          553f4857346faa8c5f6ddf9eced4180924890bfc.tar.bz2
3 
+%define debug_package %{nil}
3 4
4 5 
 Summary:        iPXE open source boot firmware
5 6 
 Name:           ipxe
6 7 
 Version:        553f485
7 
-Release:        1%{?dist}
8 
+Release:        2%{?dist}
8 9 
 License:        GPLv2
9 10 
 URL:            http://ipxe.org
10 11 
 Group:          System Environment/Daemons
... ... 
@@ -61,6 +62,8 @@ install -vDm 644 src/bin/*.{rom,mrom} %{buildroot}/usr/share/ipxe/
61 61 
 /usr/share/ipxe/rtl8139.rom
62 62
63 63 
 %changelog
64 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com>  553f485-2
65 
+-   disable debuginfo gen
64 66 
 *   Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 553f485-1
65 67 
 -   Version update to build with gcc-6.3
66 68 
 -   Removed linux/linux-devel build-time dependency
SPECS/itstool/itstool.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Itstool-2.0.2
2 2 
 Name:		itstool
3 3 
 Version:	2.0.2
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv3+
6 6 
 URL:		http://itstool.org
7 7 
 Source0:	http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2
... ... 
@@ -13,6 +13,8 @@ BuildRequires:	docbook-xml >= 4.5
13 13 
 BuildRequires:	python2 >= 2.7.8
14 14 
 BuildRequires:	python2-libs >= 2.7.8
15 15 
 Requires:	python2
16 
+BuildArch:      noarch
17 
+
16 18 
 %description
17 19 
 Itstool extracts messages from XML files and outputs PO template files, then merges
18 20 
 translations from MO files to create translated XML files. It determines what
... ... 
@@ -31,6 +33,8 @@ make DESTDIR=%{buildroot} install
31 31 
 /usr/share/%{name}/*
32 32 
 %{_mandir}/man1/*
33 33 
 %changelog
34 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.2-4
35 
+-	Fix arch
34 36 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.2-3
35 37 
 -	GA - Bump release of all rpms
36 38 
 *   Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 2.0.2-2
SPECS/jna/jna.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,10 @@
1 
+#need to disable debuginfo till we bring in x11 deps
2 
+%define debug_package %{nil}
3 
+
1 4 
 Summary:        Java Native Access
2 5 
 Name:           jna
3 6 
 Version:        4.4.0
4 
-Release:        2%{?dist}
7 
+Release:        3%{?dist}
5 8 
 License:        Apache
6 9 
 URL:            http://github.com/twall/jna
7 10 
 Group:          Applications/System
... ... 
@@ -70,6 +73,8 @@ $ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true
70 70 
 %{_prefix}/*.aar
71 71
72 72 
 %changelog
73 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.4.0-3
74 
+-   disable debuginfo temporarily - wait for x11 deps
73 75 
 *   Tue Apr 04 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.4.0-2
74 76 
 -   use java rpm macros to determine versions
75 77 
 *   Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> 4.4.0-1
SPECS/libnss-ato/destdir.patch
History View file @ 421d1f6
... ... 
@@ -9,7 +9,8 @@ index 6d9a628..23977f2 100644
9 9 
 -INSTALL = /usr/bin/install
10 10 
 +INSTALL = /usr/bin/install -D
11 11 
  INSTALL_PROGRAM = ${INSTALL}
12 
- INSTALL_DATA = ${INSTALL} -m 644
12 
+-INSTALL_DATA = ${INSTALL} -m 644
13 
++INSTALL_DATA = ${INSTALL} -m 755
13 14
14 15 
 -prefix = ""
15 16 
 +DESTDIR ?= ""
... ... 
@@ -17,3 +18,12 @@ index 6d9a628..23977f2 100644
17 17 
  exec_prefix = ${prefix}
18 18
19 19 
  # Where the installed binary goes.
20 
+@@ -25,7 +26,7 @@
21 
+ all:	libnss_ato libnss_ato_test
22 
+
23 
+ libnss_ato:	libnss_ato.c
24 
+-	${CC} -fPIC -Wall -shared -o libnss_ato.so.2 -Wl,-soname,libnss_ato.so.2 libnss_ato.c
25 
++	${CC} ${CFLAGS} -fPIC -Wall -shared -o libnss_ato.so.2 -Wl,-soname,libnss_ato.so.2 libnss_ato.c
26 
+
27 
+ test:	libnss_ato_test.c
28 
+ 	${CC} -fPIC -Wall -o libnss_ato_test libnss_ato_test.c
SPECS/libnss-ato/libnss-ato.spec
History View file @ 421d1f6
... ... 
@@ -1,11 +1,11 @@
1 1 
 Summary:	libnss-ato
2 2 
 Name:		libnss-ato
3 3 
 Version:	2.3.6
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GNU General Public License
6 6 
 URL:		https://github.com/donapieppo/libnss-ato
7 7 
 Source0:	%{name}-%{version}.tar.gz
8 
-Patch0:     destdir.patch
8 
+Patch0:         destdir.patch
9 9 
 %define sha1 libnss-ato=7a3ec992cc443ac0e34ff2de43dee91b0bdf3f06
10 10 
 Group:		Development/Tools
11 11 
 Vendor:		VMware, Inc.
... ... 
@@ -20,8 +20,10 @@ The libnss_ato module is a set of C library extensions which allows to map every
20 20 
 %prep
21 21 
 %setup -q -n %{name}-%{version}
22 22 
 %patch0 -p1
23 
+
23 24 
 %build
24 
-make
25 
+make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS=""
26 
+
25 27 
 %install
26 28 
 make DESTDIR=%{buildroot} install
27 29
... ... 
@@ -34,6 +36,8 @@ make DESTDIR=%{buildroot} install
34 34 
 %exclude %{_mandir}/*
35 35
36 36 
 %changelog
37 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.3.6-3
38 
+-	Ensure non empty debuginfo
37 39 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.3.6-2
38 40 
 -	GA - Bump release of all rpms
39 41 
 *	Wed Oct 28 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>
SPECS/libtar/libtar-gen-debuginfo.patch
History View file @ 421d1f6
40 42 
new file mode 100644
... ... 
@@ -0,0 +1,22 @@
0 
+--- lib/Makefile.in	2013-10-09 16:59:44.000000000 +0000
1 
+@@ -20,7 +20,7 @@
2 
+
3 
+ ### Installation programs and flags
4 
+ INSTALL		= @INSTALL@
5 
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@ -s
6 
++INSTALL_PROGRAM	= @INSTALL_PROGRAM@
7 
+ INSTALL_DATA	= @INSTALL_DATA@
8 
+ LN_S		= @LN_S@
9 
+ MKDIR		= @MKDIR@
10 
+--- libtar/Makefile.in	2013-10-09 16:59:44.000000000 +0000
11 
+@@ -20,7 +20,7 @@
12 
+
13 
+ ### Installation programs and flags
14 
+ INSTALL		= @INSTALL@
15 
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@ -s
16 
++INSTALL_PROGRAM	= @INSTALL_PROGRAM@
17 
+ INSTALL_DATA	= @INSTALL_DATA@
18 
+ LN_S		= @LN_S@
19 
+ MKDIR		= @MKDIR@
SPECS/libtar/libtar.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        C library for manipulating tar files
2 2 
 Name:           libtar
3 3 
 Version:        1.2.20
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 URL:            https://github.com/tklauser/libtar/archive/v1.2.20.tar.gz
6 6 
 License:        MIT
7 7 
 Group:          System Environment/Libraries
... ... 
@@ -9,6 +9,7 @@ Vendor:         VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:        libtar-%{version}.tar.gz
11 11 
 %define         sha1 libtar=b3ec4058fa83448d6040ce9f9acf85eeec4530b1
12 
+Patch0:         libtar-gen-debuginfo.patch
12 13 
 Provides:       libtar.so.0()(64bit)
13 14
14 15 
 %description
... ... 
@@ -25,14 +26,16 @@ developing applications that use libtar.
25 25
26 26 
 %prep
27 27 
 %setup
28 
+%patch0
28 29 
 autoreconf -iv
29 30
30 31 
 %build
31 
-%configure --disable-static
32 
+%configure CFLAGS="%{optflags}" STRIP=/bin/true --disable-static
32 33 
 make %{?_smp_mflags}
33 34
34 35 
 %install
35 36 
 make DESTDIR=%{buildroot} install
37 
+chmod +x %{buildroot}/%{_libdir}/libtar.so.*
36 38
37 39 
 %check
38 40 
 make %{?_smp_mflags} check
... ... 
@@ -53,6 +56,8 @@ make %{?_smp_mflags} check
53 53 
 %{_libdir}/libtar.la
54 54
55 55 
 %changelog
56 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.20-3
57 
+-   Ensure non empty debuginfo
56 58 
 *   Fri Mar 10 2017 Xiaolin Li <xiaolinl@vmware.com> 1.2.20-2
57 59 
 -   Provides libtar.so.0()(64bit).
58 60 
 *   Fri Mar 03 2017 Xiaolin Li <xiaolinl@vmware.com> 1.2.20-1
SPECS/mkinitcpio/mkinitcpio.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:    Modular initramfs image creation utility
2 2 
 Name:       mkinitcpio
3 3 
 Version:    23
4 
-Release:    1%{?dist}
4 
+Release:    2%{?dist}
5 5 
 License:    GPLv2
6 6 
 URL:        https://projects.archlinux.org/mkinitcpio.git/
7 7 
 Group:      System Environment/Development
... ... 
@@ -15,6 +15,7 @@ BuildRequires: python-xml
15 15 
 BuildRequires: docbook-xsl
16 16 
 BuildRequires: libxml2-devel
17 17 
 BuildRequires: libxslt
18 
+BuildArch:     noarch
18 19
19 20 
 %description
20 21 
 Multi-format archive and compression library
... ... 
@@ -46,6 +47,8 @@ make DESTDIR=%{buildroot} install
46 46 
 /usr/share/*
47 47
48 48 
 %changelog
49 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 23-2
50 
+-   Fix arch
49 51 
 *   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 23-1
50 52 
 -   Update package version
51 53 
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 19-2
SPECS/netkit-telnet/netkit-telnet.spec
History View file @ 421d1f6
... ... 
@@ -1,8 +1,9 @@
1 1 
 %global security_hardening none
2 
+
2 3 
 Summary:        Programs to parse command-line options
3 4 
 Name:           netkit-telnet
4 5 
 Version:        0.17
5 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
6 7 
 License:        BSD
7 8 
 URL:            http://rpm5.org/files/popt
8 9 
 Group:          Applications/Internet
... ... 
@@ -26,11 +27,14 @@ This provides the telnet server daemons.
26 26 
 %build
27 27 
 sed -i 's/MANDIR="$PREFIX\/man"/MANDIR="$PREFIX\/share\/man"/g' configure
28 28 
 sed -i 's/LIBS += $(LIBTERMCAP)/LIBS += $(LIBTERMCAP) -lstdc++/g' telnet/Makefile
29 
+sed -i 's/install -s/install/' telnet/Makefile
30 
+sed -i 's/install -s/install/' telnetd/Makefile
29 31 
 sed -i '/#include <termios.h>/{s/.*/&\n#include <stdlib.h>\n#include <string.h>/;:a;n;ba}' telnet/externs.h
30 32 
 sed -i '/#include <stdlib.h>/{s/.*/&\n#include <string.h>/;:a;n;ba}' telnet/netlink.cc
31 33 
 ./configure --installroot=%{buildroot}
32 34
33 35 
 make
36 
+
34 37 
 %install
35 38 
 export MANDIR=%{_mandir}
36 39 
 mkdir -p %{buildroot}/%{_bindir}
... ... 
@@ -61,5 +65,7 @@ rm -rf %{buildroot}/*
61 61
62 62
63 63 
 %changelog
64 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.17-2
65 
+-   Ensure non empty debuginfo
64 66 
 *   Mon Jan 09 2017 Xiaolin Li <xiaolinl@vmware.com> 0.17-1
65 67 
 -   Initial build. First version
SPECS/perl-Crypt-SSLeay/perl-Crypt-SSLeay.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Crypt::SSLeay - OpenSSL support for LWP
2 2 
 Name:           perl-Crypt-SSLeay
3 3 
 Version:        0.72
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 URL:            http://search.cpan.org/dist/Crypt-SSLeay/
6 6 
 License:        Perl Artistic License 2.0
7 7 
 Group:          Development/Libraries
... ... 
@@ -35,6 +35,7 @@ Work on Crypt::SSLeay has been continued only to provide https support for the L
35 35
36 36 
 %build
37 37 
 env PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
38 
+sed -i 's/CCCDLFLAGS = /CCCDLFLAGS = -g /' Makefile
38 39 
 make %{?_smp_mflags}
39 40
40 41 
 %install
... ... 
@@ -50,6 +51,8 @@ make test
50 50 
 %{_mandir}/man?/*
51 51
52 52 
 %changelog
53 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.72-2
54 
+-   Fix arch
53 55 
 *   Wed Apr 19 2017 Xiaolin Li <xiaolinl@vmware.com> 0.72-1
54 56 
 -   Initial version.
55 57
SPECS/perl-IO-Socket-SSL/perl-IO-Socket-SSL.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        SSL sockets with IO::Socket interface
2 2 
 Name:           perl-IO-Socket-SSL
3 3 
 Version:        2.024
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        Perl Artistic License 2.0
6 6 
 Group:          Development/Libraries
7 7 
 URL:            http://search.cpan.org/~sullr/IO-Socket-SSL-2.024/lib/IO/Socket/SSL.pod
... ... 
@@ -9,7 +9,7 @@ Source:         http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-
9 9 
 %define sha1 IO-Socket-SSL=2c624f52d1c53c36f8cc0b21c15575e64114f53c
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
12 
-BuildArch:      x86_64
12 
+BuildArch:      noarch
13 13 
 Requires:       perl-Net-SSLeay
14 14 
 BuildRequires:  perl-Net-SSLeay
15 15
... ... 
@@ -37,6 +37,8 @@ make test
37 37 
 %{_mandir}/man?/*
38 38
39 39 
 %changelog
40 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.024-3
41 
+-   Ensure non empty debuginfo
40 42 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.024-2
41 43 
 -	GA - Bump release of all rpms
42 44 
 *    Mon Mar 28 2016 Mahmoud Bassiouny <mbassiounu@vmware.com> 2.024-1
SPECS/perl-Path-Class/perl-Path-Class.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Cross-platform path specification manipulation for Perl
2 2 
 Name:           perl-Path-Class
3 3 
 Version:        0.37
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 URL:            http://search.cpan.org/~kwilliams/Path-Class-0.37/
6 6 
 License:        The Perl 5 License (Artistic 1 & GPL 1)
7 7 
 Group:          Development/Libraries
... ... 
@@ -10,7 +10,7 @@ Distribution:   Photon
10 10 
 Source:         http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Path-Class-%{version}.tar.gz
11 11 
 %define sha1    Path-Class=448cc1089add95d6a616a8e22adbde83dcb8f562
12 12
13 
-BuildArch:      x86_64
13 
+BuildArch:      noarch
14 14 
 Requires:       perl
15 15 
 BuildRequires:  perl
16 16
... ... 
@@ -38,5 +38,7 @@ make test
38 38 
 %{_mandir}/man?/*
39 39
40 40 
 %changelog
41 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.37-2
42 
+-   Fix arch
41 43 
 *   Wed Apr 19 2017 Xiaolin Li <xiaolinl@vmware.com> 0.37-1
42 44 
 -   Initial version.
SPECS/perl-Try-Tiny/perl-Try-Tiny.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Minimal try/catch with proper preservation of $@
2 2 
 Name:           perl-Try-Tiny
3 3 
 Version:        0.28
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 URL:            http://search.cpan.org/~ether/Try-Tiny-0.28/
6 6 
 License:        The MIT (X11) License
7 7 
 Group:          Development/Libraries
... ... 
@@ -10,7 +10,7 @@ Distribution:   Photon
10 10 
 Source:         http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Try-Tiny-%{version}.tar.gz
11 11 
 %define sha1    Try-Tiny=70dc6bfc6b6cdba3bc7262fe7b2ee488934b3095
12 12
13 
-BuildArch:      x86_64
13 
+BuildArch:      noarch
14 14 
 Requires:       perl
15 15 
 BuildRequires:  perl
16 16
... ... 
@@ -38,5 +38,8 @@ make test
38 38 
 %{_mandir}/man?/*
39 39
40 40 
 %changelog
41 
+
42 
+*   Wed Apr 26 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.28-2
43 
+-   Fix arch
41 44 
 *   Wed Apr 19 2017 Xiaolin Li <xiaolinl@vmware.com> 0.28-1
42 45 
 -   Initial version.
SPECS/procmail/procmail-3.22-config.patch
History View file @ 421d1f6
... ... 
@@ -27,6 +27,26 @@
27 27 
  #			it better than the autoconf lockingtests.
28 28 
  #			This will cause the lockingtests to be hotwired.
29 29 
  #			100	to enable fcntl()
30 
+@@ -86,8 +86,8 @@
31 
+  #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
32 
+
33 
+ # The place to put your favourite extra cc flag
34 
+-CFLAGS0 = -O #$(GCC_WARNINGS)
35 
+-LDFLAGS0= -s
36 
++CFLAGS0 = -O2 -g
37 
++LDFLAGS0=
38 
+ # Read my libs :-)
39 
+ LIBS=
40 
+
41 
+@@ -103,7 +103,7 @@
42 
+ BSHELL	= /bin/sh
43 
+ INSTALL = cp
44 
+ DEVNULL = /dev/null
45 
+-STRIP	= strip
46 
++STRIP	= /bin/true
47 
+ MKDIRS	= new/mkinstalldirs
48 
+
49 
+ SUBDIRS = src man
30 50 
 --- procmail-3.22/config.h.rhconfig	2001-09-10 22:53:50.000000000 -0600
31 51 
 +++ procmail-3.22/config.h	2003-09-12 07:41:40.000000000 -0600
32 52 
 @@ -46,13 +47,13 @@
SPECS/procmail/procmail.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Autonomous Mail Processor
2 2 
 Name:		procmail
3 3 
 Version:	3.22
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://www.procmail.org
7 7 
 Group:		Applications/Internet
... ... 
@@ -33,6 +33,8 @@ make BASENAME=%{buildroot}%{_prefix} install-suid
33 33 
 %{_mandir}/man1/*
34 34 
 %{_mandir}/man5/*
35 35 
 %changelog
36 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.22-4
37 
+-	Ensure non empty debuginfo
36 38 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.22-3
37 39 
 -	GA - Bump release of all rpms
38 40 
 * 	Wed Mar 30 2016 Anish Swaminathan <anishs@vmware.com>  3.22-2
SPECS/python-antlrpythonruntime/python-antlrpythonruntime.spec
History View file @ 421d1f6
... ... 
@@ -3,7 +3,7 @@
3 3 
 Summary:        ANother Tool for Language Recognition
4 4 
 Name:           python-antlrpythonruntime
5 5 
 Version:        3.1.3
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 License:        BSD
8 8 
 Group:          Development/Languages/Python
9 9 
 Vendor:         VMware, Inc.
... ... 
@@ -20,6 +20,7 @@ BuildRequires:  lapack-devel
20 20
21 21 
 Requires:       python2
22 22 
 Requires:       python2-libs
23 
+BuildArch:      noarch
23 24
24 25 
 %description
25 26 
 ANother Tool for Language Recognition, is a language tool that provides a framework for constructing recognizers, interpreters, compilers, and translators from grammatical descriptions containing actions in a variety of target languages.
... ... 
@@ -42,6 +43,8 @@ python2 setup.py test
42 42 
 %{python2_sitelib}/*
43 43
44 44 
 %changelog
45 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.1.3-2
46 
+-   Fix arch
45 47 
 *   Wed Mar 29 2017 Rongrong Qiu <rqiu@vmware.com> 3.1.3-1
46 48 
 -   upgrade to 3.1.3
47 49 
 *   Thu Mar 02 2017 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-1
SPECS/python-jinja2/python-jinja2.spec
History View file @ 421d1f6
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           python-jinja2
2 2 
 Version:        2.9.5
3 
-Release:        1%{?dist}
3 
+Release:        2%{?dist}
4 4 
 Url:            http://jinja.pocoo.org/
5 5 
 Summary:        A fast and easy to use template engine written in pure Python
6 6 
 License:        BSD
... ... 
@@ -15,6 +15,7 @@ BuildRequires:  python-setuptools
15 15
16 16 
 Requires:       python2
17 17 
 Requires:       python2-libs
18 
+BuildArch:      noarch
18 19
19 20 
 %description
20 21 
 Jinja2 is a template engine written in pure Python.  It provides a Django
... ... 
@@ -43,6 +44,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
43 43 
 %{python_sitelib}/Jinja2-%{version}-py%{python_version}.egg-info
44 44
45 45 
 %changelog
46 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9.5-2
47 
+-   Fix arch
46 48 
 *   Mon Mar 27 2017 Sarah Choi <sarahc@vmware.com> 2.9.5-1
47 49 
 -   Upgrade version to 2.9.5
48 50 
 *   Tue Dec 13 2016 Dheeraj Shetty <dheerajs@vmware.com> 2.8-1
SPECS/python-lockfile/python-lockfile.spec
History View file @ 421d1f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        file locking module
5 5 
 Name:           python-lockfile
6 6 
 Version:        0.12.2
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -16,6 +16,7 @@ Source0:        https://pypi.python.org/packages/source/l/lockfile/lockfile-%{ve
16 16 
 BuildRequires:  python2-devel
17 17 
 BuildRequires:  python-setuptools
18 18 
 BuildRequires:  python-pbr
19 
+BuildArch:      noarch
19 20
20 21 
 %description
21 22 
 The lockfile package exports a LockFile class which provides a simple API for locking files.
... ... 
@@ -69,5 +70,7 @@ popd
69 69 
 %{python3_sitelib}/lockfile
70 70
71 71 
 %changelog
72 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.12.2-2
73 
+-   Fix arch
72 74 
 *   Fri Apr 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.12.2-1
73 75 
 -   Initial packaging for Photon
SPECS/python-packaging/python-packaging.spec
History View file @ 421d1f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Core utilities for Python packages
5 5 
 Name:           python-packaging
6 6 
 Version:        16.8
7 
-Release:        2%{?dist}
7 
+Release:        3%{?dist}
8 8 
 Url:            https://pypi.python.org/pypi/packaging
9 9 
 License:        BSD or ASL 2.0
10 10 
 Group:          Development/Languages/Python
... ... 
@@ -19,6 +19,8 @@ BuildRequires:  python2-devel
19 19 
 Requires:       python2
20 20 
 Requires:       python2-libs
21 21
22 
+BuildArch:      noarch
23 
+
22 24 
 %description
23 25 
 Cryptography is a Python library which exposes cryptographic recipes and primitives.
24 26
... ... 
@@ -65,6 +67,8 @@ python3 setup.py test
65 65 
 %{python3_sitelib}/*
66 66
67 67 
 %changelog
68 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 16.8-3
69 
+-   Fix arch
68 70 
 *   Wed Apr 05 2017 Sarah Choi <sarahc@vmware.com> 16.8-2
69 71 
 -   Remove python-setuptools from BuildRequires
70 72 
 *   Tue Apr 04 2017 Xiaolin Li <xiaolinl@vmware.com> 16.8-1
SPECS/python-pbr/python-pbr.spec
History View file @ 421d1f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Python Build Reasonableness
5 5 
 Name:           python-pbr
6 6 
 Version:        2.1.0
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        ASL 2.0
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -17,6 +17,7 @@ BuildRequires:  python-docutils
17 17 
 BuildRequires:  python-setuptools
18 18 
 BuildRequires:  python2-devel
19 19 
 Requires:       python2
20 
+BuildArch:      noarch
20 21 
 %description
21 22 
 A library for managing setuptools packaging needs in a consistent manner.
22 23
... ... 
@@ -67,5 +68,7 @@ popd
67 67 
 %{python3_sitelib}/pbr
68 68
69 69 
 %changelog
70 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.0-2
71 
+-   Fix arch
70 72 
 *   Fri Apr 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.1.0-1
71 73 
 -   Initial packaging for Photon
SPECS/python-pip/python-pip.spec
History View file @ 421d1f6
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           python-pip
2 2 
 Version:        9.0.1
3 
-Release:        2%{?dist}
3 
+Release:        3%{?dist}
4 4 
 Url:            https://pypi.python.org/pypi/pip
5 5 
 Summary:        The PyPA recommended tool for installing Python packages.
6 6 
 License:        MIT
... ... 
@@ -17,6 +17,8 @@ Requires:       python2
17 17 
 Requires:       python2-libs
18 18 
 Requires:       python-setuptools
19 19
20 
+BuildArch:      noarch
21 
+
20 22 
 %description
21 23 
 The PyPA recommended tool for installing Python packages.
22 24
... ... 
@@ -40,6 +42,8 @@ easy_install freezegun
40 40 
 %{_bindir}/*
41 41
42 42 
 %changelog
43 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.0.1-3
44 
+-   Fix arch
43 45 
 *   Tue Apr 11 2017 Xiaolin Li <xiaolinl@vmware.com> 9.0.1-2
44 46 
 -   Added python-setuptools to requires.
45 47 
 *   Thu Mar 30 2017 Sarah Choi <sarahc@vmware.com> 9.0.1-1
SPECS/python-pycparser/python-pycparser.spec
History View file @ 421d1f6
... ... 
@@ -3,7 +3,7 @@
3 3 
 Summary:        Python C parser
4 4 
 Name:           python-pycparser
5 5 
 Version:        2.17
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Url:            https://pypi.python.org/pypi/pycparser
8 8 
 License:        BSD
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -19,6 +19,7 @@ BuildRequires:  python-setuptools
19 19
20 20 
 Requires:       python2
21 21 
 Requires:       python2-libs
22 
+BuildArch:      noarch
22 23
23 24
24 25 
 %description
... ... 
@@ -59,6 +60,8 @@ python all_tests.py
59 59 
 %{python3_sitelib}/*
60 60
61 61 
 %changelog
62 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.17-2
63 
+-   Fix arch
62 64 
 *   Thu Mar 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.17-1
63 65 
 -   Updated to version 2.17.
64 66 
 *   Thu Feb 02 2017 Xiaolin Li <xiaolinl@vmware.com> 2.14-4
SPECS/python-sphinx/python-sphinx.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:       Python documentation generator
2 2 
 Name:          python-sphinx
3 3 
 Version:       1.5.3
4 
-Release:       1%{?dist}
4 
+Release:       2%{?dist}
5 5 
 Group:         Development/Tools
6 6 
 Vendor:        VMware, Inc.
7 7 
 License:       BSD-2-Clause
... ... 
@@ -16,6 +16,8 @@ BuildRequires: python-setuptools
16 16
17 17 
 Requires:       python2
18 18
19 
+BuildArch:      noarch
20 
+
19 21 
 %description
20 22 
 Sphinx is a tool that makes it easy to create intelligent and
21 23 
 beautiful documentation for Python projects (or other documents
... ... 
@@ -39,6 +41,8 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
39 39 
 %{python_sitelib}/*
40 40
41 41 
 %changelog
42 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.3-2
43 
+-   Fix arch
42 44 
 *   Thu Mar 30 2017 Sarah Choi <sarahc@vmware.com> 1.5.3-1
43 45 
 -   Upgrade version to 1.5.3
44 46 
 *   Fri Dec 16 2016 Dheeraj Shetty <dheerajs@vmware.com> 1.5.1-1
SPECS/rabbitmq/rabbitmq.spec
History View file @ 421d1f6
... ... 
@@ -1,13 +1,12 @@
1 1 
 Name:          rabbitmq-server
2 2 
 Summary:       RabbitMQ messaging server
3 3 
 Version:       3.6.9
4 
-Release:       1%{?dist}
4 
+Release:       2%{?dist}
5 5 
 Group:         Applications
6 6 
 Vendor:        VMware, Inc.
7 7 
 Distribution:  Photon
8 8 
 License:       MPLv1.1
9 9 
 URL:           http://www.rabbitmq.com
10 
-BuildArch:     x86_64
11 10 
 Source0:       %{name}-%{version}.tar.xz
12 11 
 %define sha1 rabbitmq=559372baa7df9ebf853f3cbf2a15a1fc14cd38ee
13 12 
 Source1:       rabbitmq.config
... ... 
@@ -20,6 +19,7 @@ BuildRequires: rsync
20 20 
 BuildRequires: zip
21 21 
 BuildRequires: libxslt
22 22 
 BuildRequires: python-xml
23 
+BuildArch:     noarch
23 24
24 25 
 %description
25 26 
 rabbitmq messaging server
... ... 
@@ -74,6 +74,8 @@ rm -rf $RPM_BUILD_ROOT
74 74 
 /var/lib/*
75 75
76 76 
 %changelog
77 
+* Wed Apr 26 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.9-2
78 
+- Fix arch
77 79 
 * Wed Apr 5 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.6.9-1
78 80 
 - Updating package to the latest
79 81 
 * Mon Dec 12 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.6-1
SPECS/rpm/db-6.0.20.tar.gz
History View file @ 421d1f6
80 82 
deleted file mode 100644
81 83 
Binary files a/SPECS/rpm/db-6.0.20.tar.gz and /dev/null differ
SPECS/rpm/find-debuginfo-script-fix.patch
History View file @ 421d1f6
82 84 
new file mode 100644
... ... 
@@ -0,0 +1,11 @@
0 
+--- a/scripts/find-debuginfo.sh	2017-04-23 19:30:21.289059468 +0000
1 
+@@ -314,7 +314,7 @@
2 
+     $strict && exit 2
3 
+   fi
4 
+
5 
+-  [ type gdb-add-index >/dev/null 2>&1 && gdb-add-index "$f" > /dev/null 2>&1
6 
++  type gdb-add-index >/dev/null 2>&1 && gdb-add-index "$f" > /dev/null 2>&1
7 
+
8 
+   # A binary already copied into /usr/lib/debug doesn't get stripped,
9 
+   # just has its file names collected and adjusted.
SPECS/rpm/rpm-4.11.2-cve-2014-8118.patch
History View file @ 421d1f6
0 10 
deleted file mode 100644
... ... 
@@ -1,12 +0,0 @@
1 
-+++ b/lib/cpio.c	2016-10-18 22:37:07.136000000 +0000
2 
-@@ -296,6 +296,9 @@
3 
-     st->st_rdev = makedev(major, minor);
4 
-
5 
-     GET_NUM_FIELD(hdr.namesize, nameSize);
6 
-+    if (nameSize <= 0 || nameSize > 4096) {
7 
-+        return CPIOERR_BAD_HEADER;
8 
-+    }
9 
-
10 
-     *path = xmalloc(nameSize + 1);
11 
-     read = Fread(*path, nameSize, 1, cpio->fd);
SPECS/rpm/rpm.spec
History View file @ 421d1f6
... ... 
@@ -3,25 +3,26 @@
3 3
4 4 
 Summary:        Package manager
5 5 
 Name:           rpm
6 
-Version:        4.11.2
7 
-Release:        22%{?dist}
6 
+Version:        4.13.0
7 
+Release:        1%{?dist}
8 8 
 License:        GPLv2+
9 9 
 URL:            http://rpm.org
10 10 
 Group:          Applications/System
11 11 
 Vendor:         VMware, Inc.
12 12 
 Distribution:   Photon
13 
-Source0:        http://rpm.org/releases/rpm-4.11.x/%{name}-%{version}.tar.bz2
14 
-%define sha1    rpm-4.11.2=ceef44bd180d48d4004c437bc31a3ea038f54e3e
13 
+Source0:        https://github.com/rpm-software-management/rpm/archive/%{name}-%{version}-release.tar.gz
14 
+%define sha1    rpm=67f4c9607460d5f71fc8f6206b40d812090f652f
15 15 
 Source1:        http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
16 16 
 %define sha1    db=fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9
17 17 
 Source2:        macros
18 18 
 Source3:        brp-strip-debug-symbols
19 19 
 Source4:        brp-strip-unneeded
20 20 
 Patch0:         find-debuginfo-do-not-generate-non-existing-build-id.patch
21 
-Patch1:         rpm-4.11.2-cve-2014-8118.patch
22 
-Patch2:         find-debuginfo-do-not-generate-dir-entries.patch
21 
+Patch1:         find-debuginfo-do-not-generate-dir-entries.patch
22 
+Patch2:         find-debuginfo-script-fix.patch
23 23 
 Requires:       bash
24 24 
 Requires:       rpm-libs = %{version}-%{release}
25 
+BuildRequires:  libarchive-devel
25 26 
 BuildRequires:  python2
26 27 
 BuildRequires:  python2-libs
27 28 
 BuildRequires:  python2-devel
... ... 
@@ -87,13 +88,14 @@ Requires:       python3
87 87 
 Python3 rpm.
88 88
89 89 
 %prep
90 
-%setup -q
90 
+%setup -n rpm-%{name}-%{version}-release
91 91 
 %patch0 -p1
92 92 
 %patch1 -p1
93 93 
 %patch2 -p1
94 
-%setup -q -T -D -a 1
94 
+%setup -n rpm-%{name}-%{version}-release  -T -D -a 1
95 95 
 mv db-5.3.28 db
96 96 
 %build
97 
+sed -i '/define _GNU_SOURCE/a #include "../config.h"' tools/sepdebugcrcfix.c
97 98 
 ./autogen.sh --noconfigure
98 99 
 ./configure \
99 100 
     CPPFLAGS='-I/usr/include/nspr -I/usr/include/nss -DLUA_COMPAT_APIINTCASTS' \
... ... 
@@ -149,12 +151,15 @@ popd
149 149
150 150 
 %post libs -p /sbin/ldconfig
151 151 
 %postun libs -p /sbin/ldconfig
152 
+
152 153 
 %clean
153 154 
 rm -rf %{buildroot}
155 
+
154 156 
 %files
155 157 
 %defattr(-,root,root)
156 158 
 /bin/rpm
157 159 
 %{_bindir}/gendiff
160 
+%{_bindir}/rpm2archive
158 161 
 %{_bindir}/rpm2cpio
159 162 
 %{_bindir}/rpmdb
160 163 
 %{_bindir}/rpmgraph
... ... 
@@ -199,12 +204,8 @@ rm -rf %{buildroot}
199 199 
 %{_bindir}/rpmspec
200 200 
 %{_libdir}/librpmbuild.so
201 201 
 %{_libdir}/librpmbuild.so.*
202 
-%{_libdir}/rpm/osgideps.pl
203 
-%{_libdir}/rpm/perldeps.pl
204 
-%{_libdir}/rpm/macros.perl
205 
-%{_libdir}/rpm/perl.prov
202 
+%{_libdir}/rpm/macros.*
206 203 
 %{_libdir}/rpm/perl.req
207 
-%{_libdir}/rpm/perldeps.pl
208 204 
 %{_libdir}/rpm/find-debuginfo.sh
209 205 
 %{_libdir}/rpm/find-lang.sh
210 206 
 %{_libdir}/rpm/find-provides
... ... 
@@ -214,12 +215,8 @@ rm -rf %{buildroot}
214 214 
 %{_libdir}/rpm/mono-find-requires
215 215 
 %{_libdir}/rpm/ocaml-find-provides.sh
216 216 
 %{_libdir}/rpm/ocaml-find-requires.sh
217 
-%{_libdir}/rpm/macros.perl
218 
-%{_libdir}/rpm/macros.php
219 
-%{_libdir}/rpm/macros.python
220 217 
 %{_libdir}/rpm/fileattrs/*
221 218 
 %{_libdir}/rpm/script.req
222 
-%{_libdir}/rpm/tcl.req
223 219 
 %{_libdir}/rpm/check-buildroot
224 220 
 %{_libdir}/rpm/check-files
225 221 
 %{_libdir}/rpm/check-prereqs
... ... 
@@ -228,12 +225,13 @@ rm -rf %{buildroot}
228 228 
 %{_libdir}/rpm/config.guess
229 229 
 %{_libdir}/rpm/config.sub
230 230 
 %{_libdir}/rpm/debugedit
231 
-%{_libdir}/rpm/desktop-file.prov
232 231 
 %{_libdir}/rpm/elfdeps
233 
-%{_libdir}/rpm/fontconfig.prov
234 232 
 %{_libdir}/rpm/libtooldeps.sh
235 233 
 %{_libdir}/rpm/mkinstalldirs
236 234 
 %{_libdir}/rpm/pkgconfigdeps.sh
235 
+%{_libdir}/rpm/*.prov
236 
+%{_libdir}/rpm/sepdebugcrcfix
237 
+
237 238
238 239 
 %{_libdir}/rpm/pythondeps.sh
239 240 
 %{_libdir}/rpm/rpmdeps
... ... 
@@ -265,6 +263,8 @@ rm -rf %{buildroot}
265 265 
 %{python3_sitelib}/*
266 266
267 267 
 %changelog
268 
+*   Fri Apr 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.13.0-1
269 
+-   Update to 4.13.0
268 270 
 *   Wed Apr 19 2017 Alexey Makhalov <amakhalov@vmware.com> 4.11.2-22
269 271 
 -   Do not allow -debuginfo to own directories to avoid conflicts with
270 272 
     filesystem package and between each other. Patch applied
SPECS/runit/runit-gen-debug.patch
History View file @ 421d1f6
271 273 
new file mode 100644
... ... 
@@ -0,0 +1,17 @@
0 
+--- src/conf-cc	2014-08-10 18:22:35.000000000 +0000
1 
+@@ -1,5 +1,5 @@
2 
+-gcc -O2 -Wall
3 
++gcc -O2 -g -Wall
4 
+
5 
+-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
6 
++gcc -O2 -g -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
7 
+
8 
+ This will be used to compile .c files.
9 
+--- src/conf-ld	2014-08-10 18:22:34.000000000 +0000
10 
+@@ -1,3 +1,3 @@
11 
+-gcc -s
12 
++gcc
13 
+
14 
+ This will be used to link .o files into an executable.
SPECS/runit/runit.spec
History View file @ 421d1f6
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        A UNIX init scheme with service supervision
3 3 
 Name:           runit
4 4 
 Version:        2.1.2
5 
-Release:        3%{?dist}
5 
+Release:        4%{?dist}
6 6 
 License:        BSD
7 7 
 Group:		System Environment/Base
8 8 
 Vendor:		VMware, Inc.
... ... 
@@ -13,6 +13,7 @@ Source0:        http://smarden.org/runit/runit-%{version}.tar.gz
13 13 
 Source1:	runit.service
14 14 
 #Patch source: https://github.com/imeyer/runit-rpm
15 15 
 Patch0:		runit-default-service.patch
16 
+Patch1:		runit-gen-debug.patch
16 17
17 18 
 %description
18 19 
 runit is a cross-platform Unix init scheme with service supervision; a
... ... 
@@ -23,6 +24,7 @@ systems.
23 23 
 %prep
24 24 
 %setup -q -n admin/%{name}-%{version}
25 25 
 %patch0
26 
+%patch1
26 27
27 28 
 %build
28 29 
 sh package/compile
... ... 
@@ -52,6 +54,8 @@ rm -rf %{buildroot}
52 52 
 %dir /etc/service
53 53
54 54 
 %changelog
55 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.2-4
56 
+-	Ensure non empty debuginfo
55 57 
 *       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 2.1.2-3
56 58 
 -       Modified %check
57 59 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.2-2
SPECS/sysstat/sysstat.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        The Sysstat package contains utilities to monitor system performance and usage activity
2 2 
 Name:           sysstat
3 3 
 Version:        11.4.3
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        GPLv2
6 6 
 URL:            http://sebastien.godard.pagesperso-orange.fr/
7 7 
 Group:          Development/Debuggers
... ... 
@@ -23,7 +23,8 @@ Requires:       cronie
23 23 
             --enable-copy-only \
24 24 
             --disable-file-attr \
25 25 
             sa_lib_dir=%{_libdir}/sa \
26 
-            --mandir=%{_mandir}
26 
+            --mandir=%{_mandir} \
27 
+            --disable-stripping
27 28 
 make %{?_smp_mflags}
28 29 
 %install
29 30 
 make install
... ... 
@@ -51,6 +52,8 @@ rm -rf %{buildroot}/*
51 51
52 52
53 53 
 %changelog
54 
+*   Thu Apr 27 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 11.4.3-2
55 
+-   Ensure debuginfo
54 56 
 *   Tue Apr 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 11.4.3-1
55 57 
 -   Update to version 11.4.3
56 58 
 *   Thu Jan 05 2017 Xiaolin Li <xiaolinl@vmware.com> 11.4.2-1
SPECS/tboot/tboot.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:    Trusted pre-kernel module and tools.
2 2 
 Name:       tboot
3 3 
 Version:    1.9.5
4 
-Release:    1%{?dist}
4 
+Release:    2%{?dist}
5 5 
 License:    BSD
6 6 
 URL:        https://sourceforge.net/projects/tboot/
7 7 
 Group:      System Environment/Security
... ... 
@@ -19,10 +19,12 @@ and verified launch of an OS kernel/VMM.
19 19 
 %prep
20 20 
 %setup -q
21 21 
 %build
22 
-make %{?_smp_mflags}
22 
+CFLAGS="%{optflags}"
23 
+export CFLAGS
24 
+make debug=y %{?_smp_mflags}
23 25
24 26 
 %install
25 
-make DESTDIR=%{buildroot} install
27 
+make debug=y DESTDIR=%{buildroot} install
26 28
27 29 
 %files
28 30 
 %defattr(-,root,root)
... ... 
@@ -31,5 +33,7 @@ make DESTDIR=%{buildroot} install
31 31 
 %exclude %{_sysconfdir}
32 32
33 33 
 %changelog
34 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.5-2
35 
+-   Ensure non empty debuginfo
34 36 
 *   Thu Mar 2 2017 Alexey Makhalov <amakhalov@vmware.com> 1.9.5-1
35 37 
 -   Initial build. First version
SPECS/tcsh/tcsh.spec
History View file @ 421d1f6
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        An enhanced version of csh, the C shell
3 3 
 Name:           tcsh
4 4 
 Version:        6.20.00
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 License:        BSD
7 7 
 Group:          System Environment/Shells
8 8 
 Source:         http://www.sfr-fresh.com/unix/misc/%{name}-%{version}.tar.xz
... ... 
@@ -35,7 +35,6 @@ sed -i -e 's|\$\*|#&|' -e 's|fR/g|&m|' tcsh.man2html &&
35 35
36 36 
 %configure --prefix=%{_prefix}
37 37 
 make %{?_smp_mflags} all
38 
-make %{?_smp_mflags} -C nls catalogs
39 38
40 39 
 %install
41 40 
 mkdir -p %{buildroot}%{_mandir}/man1 %{buildroot}%{_bindir}
... ... 
@@ -46,9 +45,9 @@ ln -sf tcsh.1 %{buildroot}%{_mandir}/man1/csh.1
46 46
47 47 
 while read lang language ; do
48 48 
   dest=%{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
49 
-  if test -f tcsh.$language.cat ; then
49 
+  if test -f nls/$language.cat ; then
50 50 
     mkdir -p $dest
51 
-    install -p -m 644 tcsh.$language.cat $dest/tcsh
51 
+    install -p -m 644 nls/$language.cat $dest/tcsh
52 52 
     echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh"
53 53 
   fi
54 54 
 done > tcsh.lang << _EOF
... ... 
@@ -112,6 +111,8 @@ fi
112 112 
 %{_mandir}/man1/*.1*
113 113
114 114 
 %changelog
115 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.20.00-2
116 
+-   Ensure non empty debuginfo
115 117 
 *   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 6.20.00-1
116 118 
 -   Updated to version 6.20.00
117 119 
 *   Tue Feb 07 2017 Divya Thaluru <dthaluru@vmware.com> 6.19.00-6
SPECS/thin-provisioning-tools/thin-provisioning-tools.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Thin provisioning tools
2 2 
 Name:           thin-provisioning-tools
3 3 
 Version:        0.6.3
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        GPLv3+
6 6 
 Group:          System Environment/Base
7 7 
 URL:            https://github.com/jthornber/thin-provisioning-tools
... ... 
@@ -26,15 +26,21 @@ snapshot eras
26 26
27 27 
 %build
28 28 
 autoconf
29 
-%configure
29 
+export CFLAGS="%{optflags}"
30 
+export LDFLAGS=""
31 
+./configure STRIP=/bin/true --prefix=%{_prefix}
32 
+
30 33 
 make %{?_smp_mflags}
31 34
32 35 
 %install
36 
+rm -rf %{buildroot}
33 37 
 make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
34 38
35 39 
 %clean
40 
+rm -rf %{buildroot}
36 41
37 42 
 %files
43 
+%defattr(-,root,root,-)
38 44 
 %doc COPYING README.md
39 45 
 %{_mandir}/man8/*
40 46 
 %{_sbindir}/pdata_tools
... ... 
@@ -58,6 +64,8 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
58 58 
 %{_sbindir}/thin_trim
59 59
60 60 
 %changelog
61 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.3-2
62 
+-   Ensure non empty debuginfo
61 63 
 *   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 0.6.3-1
62 64 
 -   Updated to version 0.6.3.
63 65 
 *   Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.1-3
SPECS/toybox/toybox.spec
History View file @ 421d1f6
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           toybox
2 2 
 Version:        0.7.3
3 
-Release:        1%{?dist}
3 
+Release:        2%{?dist}
4 4 
 License:        BSD
5 5 
 Summary:        Common Linux command line utilities in a single executable
6 6 
 Url:            http://landley.net/toybox/
... ... 
@@ -21,7 +21,7 @@ environment.
21 21
22 22 
 %build
23 23 
 cp %{SOURCE1} .config
24 
-make
24 
+NOSTRIP=1 make CFLAGS="-Wall -Wundef -Wno-char-subscripts -Werror=implicit-function-declaration -g"
25 25
26 26 
 %install
27 27 
 PREFIX=%{buildroot} make install
... ... 
@@ -45,5 +45,7 @@ popd
45 45 
 %{_sbindir}/*
46 46
47 47 
 %changelog
48 
+*   Thu Apr 27 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.3-2
49 
+-   Ensure debuginfo
48 50 
 *   Thu Apr 20 2017 Fabio Rapposelli <fabio@vmware.com> 0.7.3-1
49 51 
 -   Initial build.  First version
SPECS/traceroute/traceroute.spec
History View file @ 421d1f6
... ... 
@@ -1,8 +1,8 @@
1 1 
 Name:           traceroute
2 2 
 Summary:        Traces the route taken by packets over an IPv4/IPv6 network
3 3 
 Version:        2.1.0
4 
-Release:        1%{?dist}
5 
-License:        GPLv2
4 
+Release:        2%{?dist}
5 
+License:        GPLv2+
6 6 
 Group:          Applications/Internet
7 7 
 Url:            http://traceroute.sourceforge.net
8 8 
 Source0:        http://downloads.sourceforge.net/project/traceroute/traceroute/traceroute-%{version}/traceroute-%{version}.tar.gz
... ... 
@@ -20,9 +20,10 @@ way to a specified network (or Internet) host.
20 20
21 21
22 22 
 %build
23 
-make %{?_smp_mflags}
23 
+make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS=""
24 24
25 25 
 %install
26 
+rm -rf %{buildroot}
26 27
27 28 
 install -d %{buildroot}/bin
28 29 
 install -m755 traceroute/traceroute %{buildroot}/bin
... ... 
@@ -34,14 +35,17 @@ install -d %{buildroot}%{_bindir}
34 34 
 install -m755 wrappers/tcptraceroute %{buildroot}%{_bindir}
35 35
36 36 
 install -d %{buildroot}%{_mandir}/man8
37 
-install -p -m644 traceroute/traceroute.8 %{buildroot}%{_mandir}/man8
37 
+install -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
38 38 
 pushd %{buildroot}%{_mandir}/man8
39 39 
 ln -s traceroute.8 traceroute6.8
40 40 
 ln -s traceroute.8 tcptraceroute.8
41 41 
 popd
42 42
43 
+%clean
44 
+rm -rf $RPM_BUILD_ROOT
43 45
44 46 
 %files
47 
+%defattr(-,root,root,-)
45 48 
 %doc COPYING README TODO CREDITS
46 49 
 /bin/*
47 50 
 %{_bindir}/*
... ... 
@@ -49,6 +53,8 @@ popd
49 49
50 50
51 51 
 %changelog
52 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.0-2
53 
+-   Ensure non empty debuginfo
52 54 
 *   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 2.1.0-1
53 55 
 -   Updated to version 2.1.0.
54 56 
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.22-2
SPECS/unzip/unzip.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Unzip-6.0
2 2 
 Name:		unzip
3 3 
 Version:	6.0
4 
-Release:	8%{?dist}
4 
+Release:	9%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		http://www.gnu.org/software/%{name}
7 7 
 Source0:	http://downloads.sourceforge.net/infozip/unzip60.tar.gz
... ... 
@@ -34,6 +34,9 @@ case `uname -m` in
34 34 
     ;;
35 35 
   *)
36 36 
     sed -i -e 's/CFLAGS="-O -Wall/& -DNO_LCHMOD/' unix/Makefile
37 
+    sed -i 's/CFLAGS="-O -Wall/CFLAGS="-O -g -Wall/' unix/Makefile
38 
+    sed -i 's/LF2 = -s/LF2 =/' unix/Makefile
39 
+    sed -i 's|STRIP = strip|STRIP = /bin/true|' unix/Makefile
37 40 
     make -f unix/Makefile linux_noasm %{?_smp_mflags}
38 41 
     ;;
39 42 
 esac
... ... 
@@ -55,6 +58,8 @@ make %{?_smp_mflags}  check
55 55 
 %{_bindir}/*
56 56
57 57 
 %changelog
58 
+*	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.0-9
59 
+-	Ensure non empty debuginfo
58 60 
 *       Wed Nov 30 2016 Dheeraj Shetty <dheerajs@vmware.com> 6.0-8
59 61 
 -       Added patch for CVE-2015-7696 and CVE-2015-7697
60 62 
 *       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 6.0-7
SPECS/vmware-event/vmware-event.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,9 @@
1 
+%define debug_package %{nil}
2 
+
1 3 
 Name:          vmware-event
2 4 
 Summary:       VMware Event SDK
3 5 
 Version:       1.2.0
4 
-Release:       1%{?dist}
6 
+Release:       2%{?dist}
5 7 
 License:       Apache 2.0
6 8 
 Group:         Applications/System
7 9 
 Vendor:        VMware, Inc.
... ... 
@@ -46,5 +48,7 @@ cd vmevent/build && make install DESTDIR=$RPM_BUILD_ROOT
46 46 
 %{_includedir}/*
47 47
48 48 
 %changelog
49 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-2
50 
+-   disable debuginfo - dont change arch. package might have binaries in future
49 51 
 *   Thu Mar 30 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.0-1
50 52 
 -   Initial - spec modified for Photon from lightwave git repo.
SPECS/vsftpd/vsftpd-gen-debuginfo.patch
History View file @ 421d1f6
51 53 
new file mode 100644
... ... 
@@ -0,0 +1,18 @@
0 
+--- Makefile	2012-09-16 07:27:35.000000000 +0000
1 
+@@ -3,13 +3,13 @@
2 
+ INSTALL	=	install
3 
+ IFLAGS  = -idirafter dummyinc
4 
+ #CFLAGS = -g
5 
+-CFLAGS	=	-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
6 
++CFLAGS	=	-O2 -g -fPIE -fstack-protector --param=ssp-buffer-size=4 \
7 
+ 	-Wall -W -Wshadow -Werror -Wformat-security \
8 
+ 	-D_FORTIFY_SOURCE=2 \
9 
+ 	#-pedantic -Wconversion
10 
+
11 
+ LIBS	=	`./vsf_findlibs.sh`
12 
+-LINK	=	-Wl,-s
13 
++LINK	=
14 
+ LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
15 
+
16 
+ OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
SPECS/vsftpd/vsftpd.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Very secure and very small FTP daemon.
2 2 
 Name:           vsftpd
3 3 
 Version:        3.0.3
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        GPLv2 with exceptions
6 6 
 URL:            https://security.appspot.com/vsftpd.html
7 7 
 Group:          System Environment/Daemons
... ... 
@@ -9,15 +9,19 @@ Vendor:         VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:        https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
11 11 
 %define sha1    vsftpd=d5f5a180dbecd0fbcdc92bf0ba2fc001c962b55a
12 
+Patch0:         vsftpd-gen-debuginfo.patch
12 13 
 BuildRequires:  libcap-devel Linux-PAM-devel openssl-devel
13 14 
 Requires:       libcap Linux-PAM openssl
14 15 
 %description
15 16 
 Very secure and very small FTP daemon.
16 17 
 %prep
17 18 
 %setup -q
19 
+%patch0
20 
+
18 21 
 %build
19 22 
 sed -i -e 's|#define VSF_SYSDEP_HAVE_LIBCAP|//&|' sysdeputil.c
20 
-make %{?_smp_mflags}
23 
+make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS=""
24 
+
21 25 
 %install
22 26 
 install -vdm 755 %{buildroot}%{_sbindir}
23 27 
 install -vdm 755 %{buildroot}%{_mandir}/{man5,man8}
... ... 
@@ -76,8 +80,10 @@ fi
76 76 
 %{_sysconfdir}/*
77 77 
 %{_sbindir}/*
78 78 
 %{_datadir}/*
79 
-%exclude %{_libdir}/debug
79 
+
80 80 
 %changelog
81 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0.3-3
82 
+-   Ensure non empty debuginfo
81 83 
 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 3.0.3-2
82 84 
 -   BuildRequires Linux-PAM-devel
83 85 
 *   Wed Nov 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.0.3-1
SPECS/xfsprogs/xfsprogs.spec
History View file @ 421d1f6
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Utilities for managing the XFS filesystem
2 2 
 Name:           xfsprogs
3 3 
 Version:        4.10.0
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        GPL+ and LGPLv2+
6 6 
 URL:            http://oss.sgi.com/projects/xfs/
7 7 
 Group:          System Environment/Base
... ... 
@@ -68,6 +68,7 @@ rm -rf %{buildroot}/*
68 68 
 %{_mandir}/man8/*
69 69 
 %{_mandir}/man5/*
70 70 
 %{_sbindir}/*
71 
+%exclude %{_docdir}/%{name}-%{version}/CHANGES.gz
71 72
72 73 
 %files devel
73 74 
 %defattr(-,root,root)
... ... 
@@ -81,6 +82,8 @@ rm -rf %{buildroot}/*
81 81 
 %defattr(-,root,root)
82 82
83 83 
 %changelog
84 
+*   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.10.0-2
85 
+-   Ensure non empty debuginfo
84 86 
 *   Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 4.10.0-1
85 87 
 -   Updated to version 4.10.0.
86 88 
 *   Fri Jan 6 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.9.0-1