Skip to content

Commit

Permalink
Do not stick BuildArch to x86_64
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Vinay Kulkarni <[email protected]>
Reviewed-by: Priyesh Padmavilasom <[email protected]>
  • Loading branch information
YustasSwamp authored and Priyesh Padmavilasom committed Oct 17, 2017
1 parent 1206453 commit cee736b
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 36 deletions.
5 changes: 3 additions & 2 deletions SPECS/apache-maven/apache-maven.spec
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Summary: Apache Maven
Name: apache-maven
Version: 3.5.0
Release: 4%{?dist}
Release: 5%{?dist}
License: Apache
URL: http://maven.apache.org
Group: Applications/System
Vendor: VMware, Inc.
Distribution: Photon
BuildArch: x86_64
Source0: http://apache.mirrors.lucidnetworks.net//maven/source/%{name}-%{version}-src.tar.gz
%define sha1 apache-maven=1730812af1cdd77493e269b371ef8ac536230c15
BuildRequires: openjre8
Expand Down Expand Up @@ -77,6 +76,8 @@ done
%exclude %{_libdir}/jansi-native

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 3.5.0-5
- Remove BuildArch
* Mon Sep 18 2017 Alexey Makhalov <[email protected]> 3.5.0-4
- Requires /usr/bin/which
* Mon Jun 19 2017 Divya Thaluru <[email protected]> 3.5.0-3
Expand Down
5 changes: 3 additions & 2 deletions SPECS/cdrkit/cdrkit.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Utilities for writing cds.
Name: cdrkit
Version: 1.1.11
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+
Group: System Environment/Base
Vendor: VMware, Inc.
Expand All @@ -10,7 +10,6 @@ Source0: %{name}-%{version}.tar.gz
%define sha1 cdrkit=3f7ddc06db0272942e1a4cd98c3c96462df77387
URL: http://gd.tuwien.ac.at/utils/schilling/cdrtools/
Patch0: cdrkit-1.1.9-efi-boot.patch
BuildArchitectures: x86_64
Requires: bash
Requires: libcap
BuildRequires: cmake
Expand Down Expand Up @@ -38,6 +37,8 @@ ln -s genisoimage %{buildroot}%{_prefix}/bin/mkisofs
%{_sbindir}/*
%{_datadir}/man/*
%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 1.1.11-4
- Remove BuildArch
* Mon Mar 6 2017 Alexey Makhalov <[email protected]> 1.1.11-3
- Support for efi boot (.patch)
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.1.11-2
Expand Down
5 changes: 3 additions & 2 deletions SPECS/commons-daemon/commons-daemon.spec
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Summary: Apache Commons Daemon
Name: commons-daemon
Version: 1.0.15
Release: 11%{?dist}
Release: 12%{?dist}
License: Apache
URL: http://commons.apache.org/proper/commons-daemon
Group: Applications/System
Vendor: VMware, Inc.
Distribution: Photon
BuildArch: x86_64
Source0: http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
%define sha1 commons-daemon=ca6a448d1d214f714e214b35809a2117568970e3
BuildRequires: openjre8
Expand Down Expand Up @@ -57,6 +56,8 @@ chmod -R 755 $DIST_DIR
%{_datadir}/java/*.jar

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 1.0.15-12
- Remove BuildArch
* Tue Jun 20 2017 Divya Thaluru <[email protected]> 1.0.15-11
- Packaged jar files to /usr/share/java
- Removed version information from jar files
Expand Down
5 changes: 3 additions & 2 deletions SPECS/copenapi/copenapi.spec
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Name: copenapi
Summary: c open api spec parser
Version: 0.0.2
Release: 2%{?dist}
Release: 3%{?dist}
Group: Development/Libraries
Vendor: VMware, Inc.
Distribution: Photon
License: Apache 2.0
URL: https://www.github.com/vmware/copenapi
BuildArch: x86_64
Requires: jansson
Requires: curl
BuildRequires: jansson-devel
Expand Down Expand Up @@ -60,6 +59,8 @@ rm -rf %{buildroot}/*
%{_libdir}/*.so

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 0.0.2-3
- Remove BuildArch
* Sat Sep 30 2017 Priyesh Padmavilasom <[email protected]> 0.0.2-2
- Apply patch to correct response code status size.
* Thu Sep 28 2017 Priyesh Padmavilasom <[email protected]> 0.0.2-1
Expand Down
10 changes: 5 additions & 5 deletions SPECS/ddclient/ddclient.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: ddclient
Version: 3.8.3
Release: 2%{?dist}
Release: 3%{?dist}
Url: https://sourceforge.net/p/ddclient/wiki/Home/
Summary: Perl client used to update dynamic DNS entries for accounts on Dynamic DNS Network Service Provider
License: GPLv2
Expand All @@ -12,8 +12,6 @@ Requires: perl
Requires: perl-IO-Socket-SSL
Requires: perl-JSON-Any

BuildArch: x86_64

%description
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.

Expand Down Expand Up @@ -54,7 +52,9 @@ EOF
%dir /var/cache/ddclient

%changelog
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 3.8.3-2
- GA - Bump release of all rpms
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 3.8.3-3
- Remove BuildArch
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 3.8.3-2
- GA - Bump release of all rpms
* Tue Mar 22 2016 Mahmoud Bassiouny <[email protected]> 3.8.3-1
- Initial packaging for Photon
5 changes: 3 additions & 2 deletions SPECS/erlang/erlang.spec
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Name: erlang
Summary: erlang
Version: 19.3
Release: 1%{?dist}
Release: 2%{?dist}
Group: Development/Languages
Vendor: VMware, Inc.
Distribution: Photon
License: ASL2.0
URL: http://erlang.com
BuildArch: x86_64
Source0: otp_src_%{version}.tar.gz
%define sha1 otp_src=a3be29bff2d258399b1e2fddfc76cf2f6f1efba8
%description
Expand Down Expand Up @@ -37,6 +36,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
%exclude %{_libdir}/debug

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 19.3-2
- Remove BuildArch
* Thu Apr 06 2017 Chang Lee <[email protected]> 19.3-1
- Updated Version
* Mon Dec 12 2016 Priyesh Padmavilasom <[email protected]> 19.1-1
Expand Down
5 changes: 3 additions & 2 deletions SPECS/jna/jna.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
Summary: Java Native Access
Name: jna
Version: 4.4.0
Release: 8%{?dist}
Release: 9%{?dist}
License: Apache
URL: http://github.com/twall/jna
Group: Applications/System
Vendor: VMware, Inc.
Distribution: Photon
BuildArch: x86_64
Source0: https://github.com/java-native-access/jna/archive/%{version}/%{name}-%{version}.tar.gz
%define sha1 jna=d9b54e98393a696f458468bc8f3167f701a9ea9f
Patch0: jna_remove_clover_jar.patch
Expand Down Expand Up @@ -84,6 +83,8 @@ ant
%{_prefix}/*.aar

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 4.4.0-9
- Remove BuildArch
* Thu Sep 14 2017 Dheeraj Shetty <[email protected]> 4.4.0-8
- Makecheck for jna
* Tue Sep 05 2017 Alexey Makhalov <[email protected]> 4.4.0-7
Expand Down
5 changes: 3 additions & 2 deletions SPECS/nodejs/nodejs.spec
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
Summary: A JavaScript runtime built on Chrome's V8 JavaScript engine.
Name: nodejs
Version: 7.7.4
Release: 3%{?dist}
Release: 4%{?dist}
License: MIT
Group: Applications/System
Vendor: VMware, Inc.
Distribution: Photon
URL: https://github.com/nodejs/node
Source0: node-%{version}.tar.gz
%define sha1 node=31f7b14476b90037516449aec233c68d9b21edd3
BuildArch: x86_64

BuildRequires: coreutils >= 8.22, openssl-devel >= 1.0.1
Requires: (coreutils >= 8.22 or toybox)
Expand Down Expand Up @@ -70,6 +69,8 @@ make cctest
%{_datadir}/systemtap/tapset/node.stp

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 7.7.4-4
- Remove BuildArch
* Mon Sep 18 2017 Alexey Makhalov <[email protected]> 7.7.4-3
- Requires coreutils or toybox
* Fri Jul 14 2017 Chang Lee <[email protected]> 7.7.4-2
Expand Down
5 changes: 3 additions & 2 deletions SPECS/perl-Crypt-SSLeay/perl-Crypt-SSLeay.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Crypt::SSLeay - OpenSSL support for LWP
Name: perl-Crypt-SSLeay
Version: 0.72
Release: 2%{?dist}
Release: 3%{?dist}
URL: http://search.cpan.org/dist/Crypt-SSLeay/
License: Perl Artistic License 2.0
Group: Development/Libraries
Expand All @@ -10,7 +10,6 @@ Distribution: Photon
Source: http://search.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-%{version}.tar.gz
%define sha1 Crypt-SSLeay=1b39920947c33a88b19a9c8e61ccb135b56091f8

BuildArch: x86_64
Requires: perl
Requires: openssl
BuildRequires: perl
Expand Down Expand Up @@ -51,6 +50,8 @@ make test
%{_mandir}/man?/*

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 0.72-3
- Remove BuildArch
* Tue Apr 25 2017 Priyesh Padmavilasom <[email protected]> 0.72-2
- Fix arch
* Wed Apr 19 2017 Xiaolin Li <[email protected]> 0.72-1
Expand Down
13 changes: 7 additions & 6 deletions SPECS/perl-Net-SSLeay/perl-Net-SSLeay.spec
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
Summary: Perl extension for using OpenSSL
Name: perl-Net-SSLeay
Version: 1.81
Release: 1%{?dist}
Release: 2%{?dist}
License: Perl Artistic License 2.0
Group: Development/Libraries
URL: http://search.cpan.org/~mikem/Net-SSLeay-%{version}/
Source: http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-%{version}.tar.gz
%define sha1 Net-SSLeay=7dc2a5e6f037af95a2c2b424404781b55f03c254
Vendor: VMware, Inc.
Distribution: Photon
BuildArch: x86_64
Requires: perl
Requires: openssl
BuildRequires: perl
Expand Down Expand Up @@ -45,10 +44,12 @@ make test
%{_mandir}/man?/*

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 1.81-2
- Remove BuildArch
* Wed Apr 05 2017 Robert Qi <[email protected]> 1.81-1
- Update version to 1.81
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.72-2
- GA - Bump release of all rpms
* Mon Mar 28 2016 Mahmoud Bassiouny <[email protected]> 1.72-1
- Initial version.
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.72-2
- GA - Bump release of all rpms
* Mon Mar 28 2016 Mahmoud Bassiouny <[email protected]> 1.72-1
- Initial version.

9 changes: 5 additions & 4 deletions SPECS/python-M2Crypto/python-M2Crypto.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@

Name: python-M2Crypto
Version: 0.26.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Crypto and SSL toolkit for Python
Group: Development/Languages/Python
License: MIT
URL: https://pypi.python.org/pypi/M2Crypto/0.26.0
Source0: https://pypi.python.org/packages/11/29/0b075f51c38df4649a24ecff9ead1ffc57b164710821048e3d997f1363b9/M2Crypto-%{version}.tar.gz
Vendor: VMware, Inc.
Distribution: Photon
BuildArch: x86_64
%define sha1 M2Crypto=1583782298a635c0634377e4037b1708c12ce426
BuildRequires: python2-devel
BuildRequires: openssl
Expand Down Expand Up @@ -75,5 +74,7 @@ rm -rf %{buildroot}
%{python3_sitelib}/*

%changelog
* Fri Jul 14 2017 Kumar Kaushik <[email protected]> 0.26.0-1
- Initial packaging
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 0.26.0-2
- Remove BuildArch
* Fri Jul 14 2017 Kumar Kaushik <[email protected]> 0.26.0-1
- Initial packaging
6 changes: 3 additions & 3 deletions SPECS/python-Twisted/python-Twisted.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Summary: An asynchronous networking framework written in Python
Name: python-Twisted
Version: 17.5.0
Release: 2%{?dist}
Release: 3%{?dist}
License: MIT
Group: Development/Languages/Python
Vendor: VMware, Inc.
Expand Down Expand Up @@ -33,8 +33,6 @@ Requires: python-incremental
Requires: python-constantly
Requires: python-hyperlink

BuildArch: x86_64

%description
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.

Expand Down Expand Up @@ -129,6 +127,8 @@ popd
%{_bindir}/cftp3

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 17.5.0-3
- Remove BuildArch
* Mon Sep 11 2017 Dheeraj Shetty <[email protected]> 17.5.0-2
- Added python-automat, python-hyperlink and its python3 version to the
- requires.
Expand Down
5 changes: 3 additions & 2 deletions SPECS/python-cassandra-driver/python-cassandra-driver.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
Summary: A modern, feature-rich and highly-tunable Python client library for Apache Cassandra (2.1+)
Name: python-cassandra-driver
Version: 3.10.0
Release: 4%{?dist}
Release: 5%{?dist}
Url: https://github.com/datastax/python-driver#datastax-python-driver-for-apache-cassandra
License: Apache 2.0
Group: Development/Languages/Python
Vendor: VMware, Inc.
Distribution: Photon
Source0: https://github.com/datastax/python-driver/archive/%{name}-%{version}.tar.gz
%define sha1 python-cassandra-driver=1eb85a0979b6b480b53c7a725018cc0991599a60
BuildArch: x86_64
BuildRequires: python2
BuildRequires: cython
BuildRequires: python2-libs
Expand Down Expand Up @@ -107,6 +106,8 @@ popd
%{python3_sitelib}/*

%changelog
* Fri Oct 13 2017 Alexey Makhalov <[email protected]> 3.10.0-5
- Remove BuildArch
* Tue Sep 12 2017 Dheeraj Shetty <[email protected]> 3.10.0-4
- Do make check for python3 subpackage
* Wed Aug 16 2017 Harish Udaiya Kumar <[email protected]> 3.10.0-3
Expand Down

0 comments on commit cee736b

Please sign in to comment.