1. photon
  2. Commit cee736b5ea30cc9f229efb53daf23ca588d6dd1e
Browse code

Do not stick BuildArch to x86_64

It will allow us to build these packages for other architectures as well

Change-Id: Idc4ac099f1f5f9841e116e51c10b63590daf6d33
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4048
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>

Alexey Makhalov authored on 2017/10/14 15:04:58
Showing 13 changed files
SPECS/apache-maven/apache-maven.spec
History View file @ cee736b
... ... 
@@ -1,13 +1,12 @@
1 1 
 Summary:	Apache Maven
2 2 
 Name:		apache-maven
3 3 
 Version:	3.5.0
4 
-Release:	4%{?dist}
4 
+Release:	5%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://maven.apache.org
7 7 
 Group:		Applications/System
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution: 	Photon
10 
-BuildArch:      x86_64
11 10 
 Source0:	http://apache.mirrors.lucidnetworks.net//maven/source/%{name}-%{version}-src.tar.gz
12 11 
 %define sha1 apache-maven=1730812af1cdd77493e269b371ef8ac536230c15
13 12 
 BuildRequires: openjre8
... ... 
@@ -77,6 +76,8 @@ done
77 77 
 %exclude %{_libdir}/jansi-native
78 78
79 79 
 %changelog
80 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 3.5.0-5
81 
+-   Remove BuildArch
80 82 
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.5.0-4
81 83 
 -   Requires /usr/bin/which
82 84 
 *   Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 3.5.0-3
SPECS/cdrkit/cdrkit.spec
History View file @ cee736b
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary: 	Utilities for writing cds.
2 2 
 Name: 		cdrkit
3 3 
 Version: 	1.1.11
4 
-Release: 	3%{?dist}
4 
+Release: 	4%{?dist}
5 5 
 License: 	GPLv2+
6 6 
 Group: 		System Environment/Base
7 7 
 Vendor:		VMware, Inc.
... ... 
@@ -10,7 +10,6 @@ Source0: 	%{name}-%{version}.tar.gz
10 10 
 %define sha1 cdrkit=3f7ddc06db0272942e1a4cd98c3c96462df77387
11 11 
 URL:  		http://gd.tuwien.ac.at/utils/schilling/cdrtools/
12 12 
 Patch0:		cdrkit-1.1.9-efi-boot.patch
13 
-BuildArchitectures: x86_64
14 13 
 Requires: 	bash
15 14 
 Requires: 	libcap
16 15 
 BuildRequires: 	cmake
... ... 
@@ -38,6 +37,8 @@ ln -s  genisoimage  %{buildroot}%{_prefix}/bin/mkisofs
38 38 
 %{_sbindir}/*
39 39 
 %{_datadir}/man/*
40 40 
 %changelog
41 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.1.11-4
42 
+-   Remove BuildArch
41 43 
 *   Mon Mar 6 2017 Alexey Makhalov <amakhalov@vmware.com> 1.1.11-3
42 44 
 -   Support for efi boot (.patch)
43 45 
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1.11-2
SPECS/commons-daemon/commons-daemon.spec
History View file @ cee736b
... ... 
@@ -1,13 +1,12 @@
1 1 
 Summary:	Apache Commons Daemon
2 2 
 Name:		commons-daemon
3 3 
 Version:	1.0.15
4 
-Release:	11%{?dist}
4 
+Release:	12%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://commons.apache.org/proper/commons-daemon
7 7 
 Group:		Applications/System
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution: 	Photon
10 
-BuildArch:      x86_64
11 10 
 Source0:	http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
12 11 
 %define sha1 commons-daemon=ca6a448d1d214f714e214b35809a2117568970e3
13 12 
 BuildRequires: openjre8
... ... 
@@ -57,6 +56,8 @@ chmod -R 755 $DIST_DIR
57 57 
 %{_datadir}/java/*.jar
58 58
59 59 
 %changelog
60 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.15-12
61 
+-   Remove BuildArch
60 62 
 *   Tue Jun 20 2017 Divya Thaluru <dthaluru@vmware.com> 1.0.15-11
61 63 
 -   Packaged jar files to /usr/share/java
62 64 
 -   Removed version information from jar files
SPECS/copenapi/copenapi.spec
History View file @ cee736b
... ... 
@@ -1,13 +1,12 @@
1 1 
 Name:          copenapi
2 2 
 Summary:       c open api spec parser
3 3 
 Version:       0.0.2
4 
-Release:       2%{?dist}
4 
+Release:       3%{?dist}
5 5 
 Group:         Development/Libraries
6 6 
 Vendor:        VMware, Inc.
7 7 
 Distribution:  Photon
8 8 
 License:       Apache 2.0
9 9 
 URL:           https://www.github.com/vmware/copenapi
10 
-BuildArch:     x86_64
11 10 
 Requires:      jansson
12 11 
 Requires:      curl
13 12 
 BuildRequires: jansson-devel
... ... 
@@ -60,6 +59,8 @@ rm -rf %{buildroot}/*
60 60 
 %{_libdir}/*.so
61 61
62 62 
 %changelog
63 
+*  Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.0.2-3
64 
+-  Remove BuildArch
63 65 
 *  Sat Sep 30 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.2-2
64 66 
 -  Apply patch to correct response code status size.
65 67 
 *  Thu Sep 28 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.2-1
SPECS/ddclient/ddclient.spec
History View file @ cee736b
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           ddclient
2 2 
 Version:        3.8.3
3 
-Release:        2%{?dist}
3 
+Release:        3%{?dist}
4 4 
 Url:            https://sourceforge.net/p/ddclient/wiki/Home/
5 5 
 Summary:        Perl client used to update dynamic DNS entries for accounts on Dynamic DNS Network Service Provider
6 6 
 License:        GPLv2
... ... 
@@ -12,8 +12,6 @@ Requires:       perl
12 12 
 Requires:       perl-IO-Socket-SSL
13 13 
 Requires:       perl-JSON-Any
14 14
15 
-BuildArch:      x86_64
16 
-
17 15 
 %description
18 16 
 DDclient is a Perl client used to update dynamic DNS entries for accounts on Dynamic DNS Network Service Provider. It was originally written by Paul Burry and is now mostly by wimpunk. It has the capability to update more than just dyndns and it can fetch your WAN-ipaddress in a few different ways.
19 17
... ... 
@@ -54,7 +52,9 @@ EOF
54 54 
 %dir /var/cache/ddclient
55 55
56 56 
 %changelog
57 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.8.3-2
58 
--	GA - Bump release of all rpms
57 
+* Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 3.8.3-3
58 
+- Remove BuildArch
59 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.8.3-2
60 
+- GA - Bump release of all rpms
59 61 
 * Tue Mar 22 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.8.3-1
60 62 
 - Initial packaging for Photon
SPECS/erlang/erlang.spec
History View file @ cee736b
... ... 
@@ -1,13 +1,12 @@
1 1 
 Name:         erlang
2 2 
 Summary:      erlang
3 3 
 Version:      19.3
4 
-Release:      1%{?dist}
4 
+Release:      2%{?dist}
5 5 
 Group:        Development/Languages
6 6 
 Vendor:       VMware, Inc.
7 7 
 Distribution: Photon
8 8 
 License:      ASL2.0
9 9 
 URL:          http://erlang.com
10 
-BuildArch:    x86_64
11 10 
 Source0:      otp_src_%{version}.tar.gz
12 11 
 %define sha1 otp_src=a3be29bff2d258399b1e2fddfc76cf2f6f1efba8
13 12 
 %description
... ... 
@@ -37,6 +36,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
37 37 
 %exclude %{_libdir}/debug
38 38
39 39 
 %changelog
40 
+* Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 19.3-2
41 
+- Remove BuildArch
40 42 
 * Thu Apr 06 2017 Chang Lee <changlee@vmware.com> 19.3-1
41 43 
 - Updated Version
42 44 
 * Mon Dec 12 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 19.1-1
SPECS/jna/jna.spec
History View file @ cee736b
... ... 
@@ -4,13 +4,12 @@
4 4 
 Summary:        Java Native Access
5 5 
 Name:           jna
6 6 
 Version:        4.4.0
7 
-Release:        8%{?dist}
7 
+Release:        9%{?dist}
8 8 
 License:        Apache
9 9 
 URL:            http://github.com/twall/jna
10 10 
 Group:          Applications/System
11 11 
 Vendor:         VMware, Inc.
12 12 
 Distribution:   Photon
13 
-BuildArch:      x86_64
14 13 
 Source0:        https://github.com/java-native-access/jna/archive/%{version}/%{name}-%{version}.tar.gz
15 14 
 %define sha1 jna=d9b54e98393a696f458468bc8f3167f701a9ea9f
16 15 
 Patch0:         jna_remove_clover_jar.patch
... ... 
@@ -84,6 +83,8 @@ ant
84 84 
 %{_prefix}/*.aar
85 85
86 86 
 %changelog
87 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.0-9
88 
+-   Remove BuildArch
87 89 
 *   Thu Sep 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.4.0-8
88 90 
 -   Makecheck for jna
89 91 
 *   Tue Sep 05 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.0-7
SPECS/nodejs/nodejs.spec
History View file @ cee736b
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        A JavaScript runtime built on Chrome's V8 JavaScript engine.
2 2 
 Name:           nodejs
3 3 
 Version:        7.7.4
4 
-Release:        3%{?dist}
4 
+Release:        4%{?dist}
5 5 
 License:        MIT
6 6 
 Group:          Applications/System
7 7 
 Vendor:         VMware, Inc.
... ... 
@@ -9,7 +9,6 @@ Distribution:   Photon
9 9 
 URL:            https://github.com/nodejs/node
10 10 
 Source0:        node-%{version}.tar.gz
11 11 
 %define         sha1 node=31f7b14476b90037516449aec233c68d9b21edd3
12 
-BuildArch:      x86_64
13 12
14 13 
 BuildRequires:  coreutils >= 8.22, openssl-devel >= 1.0.1
15 14 
 Requires:       (coreutils >= 8.22 or toybox)
... ... 
@@ -70,6 +69,8 @@ make cctest
70 70 
 %{_datadir}/systemtap/tapset/node.stp
71 71
72 72 
 %changelog
73 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 7.7.4-4
74 
+-   Remove BuildArch
73 75 
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 7.7.4-3
74 76 
 -   Requires coreutils or toybox
75 77 
 *   Fri Jul 14 2017 Chang Lee <changlee@vmware.com> 7.7.4-2
SPECS/perl-Crypt-SSLeay/perl-Crypt-SSLeay.spec
History View file @ cee736b
... ... 
@@ -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:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 URL:            http://search.cpan.org/dist/Crypt-SSLeay/
6 6 
 License:        Perl Artistic License 2.0
7 7 
 Group:          Development/Libraries
... ... 
@@ -10,7 +10,6 @@ Distribution:   Photon
10 10 
 Source:         http://search.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-%{version}.tar.gz
11 11 
 %define sha1    Crypt-SSLeay=1b39920947c33a88b19a9c8e61ccb135b56091f8
12 12
13 
-BuildArch:      x86_64
14 13 
 Requires:       perl
15 14 
 Requires:       openssl
16 15 
 BuildRequires:  perl
... ... 
@@ -51,6 +50,8 @@ make test
51 51 
 %{_mandir}/man?/*
52 52
53 53 
 %changelog
54 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.72-3
55 
+-   Remove BuildArch
54 56 
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.72-2
55 57 
 -   Fix arch
56 58 
 *   Wed Apr 19 2017 Xiaolin Li <xiaolinl@vmware.com> 0.72-1
SPECS/perl-Net-SSLeay/perl-Net-SSLeay.spec
History View file @ cee736b
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Perl extension for using OpenSSL
2 2 
 Name:           perl-Net-SSLeay
3 3 
 Version:        1.81
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        Perl Artistic License 2.0
6 6 
 Group:          Development/Libraries
7 7 
 URL:            http://search.cpan.org/~mikem/Net-SSLeay-%{version}/
... ... 
@@ -9,7 +9,6 @@ Source:         http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-%{v
9 9 
 %define sha1 Net-SSLeay=7dc2a5e6f037af95a2c2b424404781b55f03c254
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
12 
-BuildArch:      x86_64
13 12 
 Requires:       perl
14 13 
 Requires:       openssl
15 14 
 BuildRequires:  perl
... ... 
@@ -45,10 +44,12 @@ make test
45 45 
 %{_mandir}/man?/*
46 46
47 47 
 %changelog
48 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.81-2
49 
+-   Remove BuildArch
48 50 
 *   Wed Apr 05 2017 Robert Qi <qij@vmware.com> 1.81-1
49 51 
 -   Update version to 1.81
50 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.72-2
51 
--	GA - Bump release of all rpms
52 
-*    Mon Mar 28 2016 Mahmoud Bassiouny <mbassiounu@vmware.com> 1.72-1
53 
--    Initial version.
52 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.72-2
53 
+-   GA - Bump release of all rpms
54 
+*   Mon Mar 28 2016 Mahmoud Bassiouny <mbassiounu@vmware.com> 1.72-1
55 
+-   Initial version.
54 56
SPECS/python-M2Crypto/python-M2Crypto.spec
History View file @ cee736b
... ... 
@@ -3,7 +3,7 @@
3 3
4 4 
 Name:           python-M2Crypto
5 5 
 Version:        0.26.0
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        Crypto and SSL toolkit for Python
8 8 
 Group:          Development/Languages/Python
9 9 
 License:        MIT
... ... 
@@ -11,7 +11,6 @@ URL:            https://pypi.python.org/pypi/M2Crypto/0.26.0
11 11 
 Source0:        https://pypi.python.org/packages/11/29/0b075f51c38df4649a24ecff9ead1ffc57b164710821048e3d997f1363b9/M2Crypto-%{version}.tar.gz
12 12 
 Vendor:         VMware, Inc.
13 13 
 Distribution:   Photon
14 
-BuildArch:      x86_64
15 14 
 %define sha1 M2Crypto=1583782298a635c0634377e4037b1708c12ce426
16 15 
 BuildRequires:  python2-devel
17 16 
 BuildRequires:  openssl
... ... 
@@ -75,5 +74,7 @@ rm -rf %{buildroot}
75 75 
 %{python3_sitelib}/*
76 76
77 77 
 %changelog
78 
-*    Fri Jul 14 2017 Kumar Kaushik <kaushikk@vmware.com> 0.26.0-1
79 
--    Initial packaging
78 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.26.0-2
79 
+-   Remove BuildArch
80 
+*   Fri Jul 14 2017 Kumar Kaushik <kaushikk@vmware.com> 0.26.0-1
81 
+-   Initial packaging
SPECS/python-Twisted/python-Twisted.spec
History View file @ cee736b
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        An asynchronous networking framework written in Python
5 5 
 Name:           python-Twisted
6 6 
 Version:        17.5.0
7 
-Release:        2%{?dist}
7 
+Release:        3%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -33,8 +33,6 @@ Requires:       python-incremental
33 33 
 Requires:       python-constantly
34 34 
 Requires:       python-hyperlink
35 35
36 
-BuildArch:      x86_64
37 
-
38 36 
 %description
39 37 
 Twisted is an event-driven networking engine written in Python and licensed under the open source ​MIT license. Twisted runs on Python 2 and an ever growing subset also works with Python 3.
40 38
... ... 
@@ -129,6 +127,8 @@ popd
129 129 
 %{_bindir}/cftp3
130 130
131 131 
 %changelog
132 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 17.5.0-3
133 
+-   Remove BuildArch
132 134 
 *   Mon Sep 11 2017 Dheeraj Shetty <dheerajs@vmware.com> 17.5.0-2
133 135 
 -   Added python-automat, python-hyperlink and its python3 version to the
134 136 
 -   requires.
SPECS/python-cassandra-driver/python-cassandra-driver.spec
History View file @ cee736b
... ... 
@@ -6,7 +6,7 @@
6 6 
 Summary:        A modern, feature-rich and highly-tunable Python client library for Apache Cassandra (2.1+)
7 7 
 Name:           python-cassandra-driver
8 8 
 Version:        3.10.0
9 
-Release:        4%{?dist}
9 
+Release:        5%{?dist}
10 10 
 Url:            https://github.com/datastax/python-driver#datastax-python-driver-for-apache-cassandra
11 11 
 License:        Apache 2.0
12 12 
 Group:          Development/Languages/Python
... ... 
@@ -14,7 +14,6 @@ Vendor:         VMware, Inc.
14 14 
 Distribution:   Photon
15 15 
 Source0:        https://github.com/datastax/python-driver/archive/%{name}-%{version}.tar.gz
16 16 
 %define sha1    python-cassandra-driver=1eb85a0979b6b480b53c7a725018cc0991599a60
17 
-BuildArch:      x86_64
18 17 
 BuildRequires:  python2
19 18 
 BuildRequires:  cython
20 19 
 BuildRequires:  python2-libs
... ... 
@@ -107,6 +106,8 @@ popd
107 107 
 %{python3_sitelib}/*
108 108
109 109 
 %changelog
110 
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 3.10.0-5
111 
+-   Remove BuildArch
110 112 
 *   Tue Sep 12 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.10.0-4
111 113 
 -   Do make check for python3 subpackage
112 114 
 *   Wed Aug 16 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10.0-3