xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spec file updates for el7 needs explicit filter_from_requires to prevent eclipse feature dependencies from being picked up as rpm deps

Browse source 
Conflicts:
	rpms/awips2.core/Installer.database/component.spec
	rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
	rpms/awips2.core/Installer.notification/component.spec
	rpms/awips2.edex/Installer.edex-datadelivery/component.spec
	rpms/build/x86_64/build.sh
	rpms/python.site-packages/Installer.python-awips/component.spec
	rpms/unidata/buildEnvironment.sh
This commit is contained in:
mjames-upc 2016-06-20 20:17:29 +00:00 • committed by Michael James
parent 6fbc6fd9ad
commit 58dc79da1a
46 changed files with 83 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pythonPackages/metpy Symbolic link
View file

@ -0,0 +1 @@
/home/awips/MetPy

2
pythonPackages/pint

@ -1 +1 @@
Subproject commit b2287c5e0f345bcc691d158324b2abeddbb51962
Subproject commit 81fb63f85ab1f013e71fd1ccf9e172d007db4a77

1
pythonPackages/python-awips Symbolic link
View file

@ -0,0 +1 @@
/home/awips/python-awips

2
rpms/awips2.cave/Installer.alertviz/component.spec
View file

@ -10,7 +10,7 @@
Name: awips2-alertviz
Summary: AWIPS II AlertViz
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
URL: N/A

2
rpms/awips2.cave/Installer.cave-feature/component.spec
View file

@ -10,7 +10,7 @@
Name: %{_component_name}
Summary: %{_component_name} Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
URL: N/A

4
rpms/awips2.cave/Installer.cave/component.spec
View file

@ -334,4 +334,8 @@ rm -rf ${RPM_BUILD_ROOT}
/awips2/cave/*.so
%dir /awips2/cave/lib%{_build_bits}
/awips2/cave/lib%{_build_bits}/*
/awips2/cave/epl-v10.html
/awips2/cave/notice.html
/awips2/cave/readme/readme_eclipse.html

2
rpms/awips2.core/Installer.adapt-native/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-adapt-native
Summary: AWIPS II Adapt Native Distribution
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

2
rpms/awips2.core/Installer.ant/component.spec
View file

@ -5,7 +5,7 @@
Name: awips2-ant
Summary: AWIPS II Ant Distribution
Version: 1.7.1
Release: %{_component_version}.%{_component_release}
Release: %{_component_version}.%{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: noarch

2
rpms/awips2.core/Installer.aviation/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-aviation-shared
Summary: AWIPS II Aviation Distribution
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

2
rpms/awips2.core/Installer.cli/component.spec
View file

@ -7,7 +7,7 @@
Name: %{_component_name}
Summary: AWIPS II CLI Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

2
rpms/awips2.core/Installer.collab-dataserver/component.spec
View file

@ -3,7 +3,7 @@
Name: awips2-collab-dataserver
Summary: AWIPSII Collaboration HTTP Dataserver
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: %{_build_arch}

2
rpms/awips2.core/Installer.common-base/component.spec
View file

@ -10,7 +10,7 @@
Name: awips2-common-base
Summary: AWIPS II Edex
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: %{_build_arch}

2
rpms/awips2.core/Installer.database-server-configuration/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-database-server-configuration
Summary: AWIPS II Database Server Configuration
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

3
rpms/awips2.core/Installer.database-standalone-configuration/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-database-standalone-configuration
Summary: AWIPS II Database Standalone Configuration
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch
@ -61,5 +61,4 @@ rm -rf ${RPM_BUILD_ROOT}
/awips2/data/postgresql.conf
%defattr(644,awips,fxalpha,700)
%dir /awips2
%dir /awips2/data

20
rpms/awips2.core/Installer.database/component.spec
View file

@ -8,7 +8,7 @@
Name: %{_component_name}
Summary: AWIPS II Database Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch
@ -17,18 +17,16 @@ URL: N/A
License: N/A
Distribution: N/A
Vendor: Raytheon
Packager: %{_build_site}
Packager: Bryan Kowal
AutoReq: no
Provides: awips2-database
Provides: awips2-static-user
Requires: libpng
Requires: awips2-postgresql
Requires: awips2-psql
Requires: awips2-database-configuration
Requires: netcdf = 4.1.2
Requires: netcdf-devel = 4.1.2
provides: awips2-database
provides: awips2-static-user
requires: libpng
requires: awips2-postgresql
requires: awips2-psql
requires: awips2-database-configuration
#BuildRequires: netcdf
%description
AWIPS II Database Installation - Sets Up The Basic AWIPS II Database, Creating The

2
rpms/awips2.core/Installer.edex-environment/edex/component.spec
View file

@ -5,7 +5,7 @@
Name: awips2-edex-environment
Summary: awips2-edex-environment
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: noarch

5
rpms/awips2.core/Installer.gfe/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-data.gfe
Summary: AWIPS II gfe Distribution
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
# We default the buildroot to determine whether or not the user has
# specified the buildroot.
@ -62,9 +62,6 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,awips,fxalpha,755)
%dir /awips2
%dir /awips2/edex
%defattr(775,awips,fxalpha,775)
%dir /awips2/edex/data
%dir /awips2/edex/data/gfe
/awips2/edex/data/gfe/*

2
rpms/awips2.core/Installer.gfesuite-client/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-gfesuite-client
Summary: AWIPS II gfesuite client Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

2
rpms/awips2.core/Installer.gfesuite-server/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-gfesuite-server
Summary: AWIPS II gfesuite server Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

2
rpms/awips2.core/Installer.groovy/component.spec
View file

@ -5,7 +5,7 @@
Name: awips2-groovy
Summary: AWIPS II Groovy Distribution
Version: %{_groovy_version}
Release: %{_component_version}.%{_component_release}
Release: %{_component_version}.%{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: noarch

4
rpms/awips2.core/Installer.httpd-pypies/component.spec
View file

@ -15,7 +15,7 @@
Summary: Pypies Apache HTTP Server
Name: awips2-httpd-pypies
Version: 2.4.6
Release: 17.1
Release: 17.1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: centos-noindex.tar.gz
@ -77,7 +77,7 @@ License: ASL 2.0
Group: AWIPSII
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto, httpd-devel
BuildRequires: zlib-devel, libselinux-devel, lua-devel
BuildRequires: zlib-devel, libselinux-devel, lua-devel, cpp, gcc
BuildRequires: apr-devel >= 1.4.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
BuildRequires: systemd-devel
Requires: /etc/mime.types, system-logos >= 7.92.1-1

7
rpms/awips2.core/Installer.hydroapps/component.spec
View file

@ -6,7 +6,7 @@
Name: %{_component_name}
Summary: AWIPS II Hydroapps Distribution
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
URL: N/A
@ -71,11 +71,6 @@ fi
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,awips,fxalpha,775)
%dir /awips2
%dir /awips2/edex
%dir /awips2/edex/data
%dir /awips2/edex/data/share
%defattr(777,awips,fxalpha,777)
%dir /awips2/edex/data/share/hydroapps
/awips2/edex/data/share/hydroapps/*

2
rpms/awips2.core/Installer.irt/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-irt
Summary: AWIPS II IRT Installation
Version: 1.0.0
Release: 1
Release: 1%{?dist}
Group: AWIPSII
BuildRoot: /tmp
Prefix: /irt

2
rpms/awips2.core/Installer.ldm/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-ldm
Summary: AWIPS II LDM Distribution
Version: %{_ldm_version}
Release: %{_component_version}.%{_component_release}
Release: %{_component_version}.%{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

2
rpms/awips2.core/Installer.localapps-environment/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-localapps-environment
Summary: AWIPS II localapps Environment Spec File
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

5
rpms/awips2.core/Installer.localization/component.spec
View file

@ -4,7 +4,7 @@
Name: %{_component_name}
Summary: AWIPS II Localization Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch
@ -395,8 +395,5 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(755,awips,fxalpha,755)
%dir /awips2
%dir /awips2/edex
%dir /awips2/edex/data
%dir /awips2/edex/data/utility
/awips2/edex/data/utility/*

7
rpms/awips2.core/Installer.maps-database/component.spec
View file

@ -6,7 +6,7 @@
Name: %{_component_name}
Summary: AWIPS II Maps Database
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch
@ -297,11 +297,6 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(666,awips,fxalpha,775)
%dir /awips2
%dir /awips2/database
%dir /awips2/database/sqlScripts
%dir /awips2/database/sqlScripts/share
%dir /awips2/database/sqlScripts/share/sql
%dir /awips2/database/sqlScripts/share/sql/maps
/awips2/database/sqlScripts/share/sql/maps/maps.log

7
rpms/awips2.core/Installer.ncep-database/component.spec
View file

@ -6,7 +6,7 @@
Name: awips2-ncep-database
Summary: AWIPS II NCEP Database Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch
@ -284,11 +284,6 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,awips,fxalpha,-)
%dir /awips2
%dir /awips2/database
%dir /awips2/database/sqlScripts
%dir /awips2/database/sqlScripts/share
%dir /awips2/database/sqlScripts/share/sql
%dir /awips2/database/sqlScripts/share/sql/ncep
%attr(777,root,root) /awips2/database/sqlScripts/share/sql/ncep/ncep_sql_install.log
%attr(755,awips,fxalpha) /awips2/database/sqlScripts/share/sql/ncep/addNcepNwxAdminMessageGpTable.sql

5
rpms/awips2.core/Installer.notification/component.spec
View file

@ -16,7 +16,7 @@
Name: %{_component_name}
Summary: AWIPS II Notification
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: %{_build_arch}
@ -33,8 +33,7 @@ Requires: awips2-qpid-lib
Provides: awips2-notification
BuildRequires: awips2-java
BuildRequires: awips2-qpid-lib
BuildRequires: libuuid-devel
BuildRequires: awips2-qpid-lib, libcurl-devel, libuuid-devel
%description
AWIPS II Notification Distribution - the AWIPS II Notification application.

2
rpms/awips2.core/Installer.postgres/component.spec
View file

@ -21,6 +21,7 @@ Packager: Bryan Kowal
AutoReq: no
Requires: jasper-libs
BuildRequires: bison, readline-devel, gcc-c++
provides: awips2-postgresql
provides: awips2-base-component
@ -348,7 +349,6 @@ and populate the AWIPS II databases.
%files -n awips2-psql
%defattr(755,awips,fxalpha,755)
%dir /awips2
%dir /awips2/psql
%dir /awips2/psql/bin
/awips2/psql/bin/*

2
rpms/awips2.core/Installer.pypies/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-pypies
Summary: AWIPS II PyPIES
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
URL: N/A

5
rpms/awips2.core/Installer.topo/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-data.hdf5-topo
Summary: AWIPS II Topo Distribution
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch
@ -71,9 +71,6 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(664,awips,fxalpha,775)
%dir /awips2
%dir /awips2/edex
%dir /awips2/edex/data
%dir /awips2/edex/data/hdf5
%dir /awips2/edex/data/hdf5/topo
/awips2/edex/data/hdf5/topo/*

2
rpms/awips2.core/Installer.version/component.spec
View file

@ -16,7 +16,7 @@
Name: %{_component_name}
Summary: awips2 Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch

4
rpms/awips2.core/Installer.yajsw/component.spec
View file

@ -7,10 +7,11 @@
Name: awips2-yajsw
Summary: AWIPS II yajsw Distribution
Version: %{_yajsw_version}
Release: 3
Release: %{_component_version}.%{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: noarch
URL: N/A
License: N/A
Distribution: N/A
@ -68,7 +69,6 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,awips,fxalpha,755)
%dir /awips2
%dir /awips2/yajsw
/awips2/yajsw/*.jar
/awips2/yajsw/*.txt

8
rpms/awips2.edex/Installer.edex-component/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-%{_component_name}
Summary: awips2-%{_component_name} Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
URL: N/A
@ -25,6 +25,11 @@ requires: awips2-python
requires: awips2-java
requires: awips2-psql
%{?filter_setup:
%filter_from_requires /guava/d; /raytheon/d; /javax/d; /net\.sf/d; /org\.apache/d; /org\.geotools/d; /org\.codehaus/d; /org\.hibernate/d; /org\.quartz/d; /org\.reflections/d; /org\.slf4j/d; /org\.springframework/d; /ucar\.nc2/d; /org\.opensaml/d; /gov\.nasa\.gsfc\.fits/d; /org\.eclipse\.jetty/d; /com\.sun\.xml\.bind/d; /org\.joda\.time/d; /org\.itadaki/d; /org/\.junit/d; /org\.eclipse\.core\.runtime/d
%filter_setup
}
%description
AWIPS II Edex - Installs AWIPS II Edex Plugins.
@ -85,6 +90,5 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(644,awips,fxalpha,755)
%dir /awips2
%dir /awips2/edex
/awips2/edex/*

4
rpms/awips2.edex/Installer.edex-configuration/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-edex-configuration
Summary: AWIPS II Edex
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
#BuildArch: noarch
@ -157,7 +157,7 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(644,awips,fxalpha,755)
%dir /awips2
%dir /awips2/edex
%dir /awips2/edex/bin/*
%dir /awips2/edex/bin
%dir /awips2/edex/conf
/awips2/edex/conf/*
%dir /awips2/edex/data

2
rpms/awips2.edex/Installer.edex-hazards/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-%{_component_name}
Summary: awips2-%{_component_name} Installation
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
URL: N/A

2
rpms/awips2.edex/Installer.edex-shapefiles/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-edex-shapefiles
Summary: AWIPS II Edex
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: noarch

7
rpms/awips2.edex/Installer.edex/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-edex
Summary: AWIPS II Edex
Version: %{_component_version}
Release: %{_component_release}
Release: %{_component_release}%{?dist}
Group: AWIPSII
BuildRoot: %{_build_root}
URL: N/A
@ -22,6 +22,11 @@ requires: awips2-psql
requires: awips2-yajsw
Obsoletes: awips2-edex-grib < 16.1.6
%{?filter_setup:
%filter_from_requires /guava/d; /raytheon/d
%filter_setup
}
%description
AWIPS II Edex Installation - Installs and configures AWIPS II Edex.

2
rpms/awips2.upc/Installer.edex-upc/component.spec
View file

@ -8,6 +8,8 @@ Version: %{_component_version}
Release: %{_component_release}
Group: AWIPSII
BuildRoot: /tmp
BuildRoot: %{_build_root}
BuildArch: %{_build_arch}
URL: N/A
License: N/A
Distribution: N/A

1
rpms/awips2.upc/Installer.ldm/component.spec
View file

@ -22,7 +22,6 @@ Packager: Michael James
AutoReq: no
Requires: awips2-qpid-lib
requires: awips2-python
requires: compat-gcc-34-g77
requires: pax, gcc, libxml2-devel
requires: libtool, libpng-devel
provides: awips2-ldm

2
rpms/python.site-packages/Installer.basemap/component.spec
View file

@ -71,6 +71,8 @@ if [ ${RC} -ne 0 ]; then
exit 1
fi
cd basemap-%{version}
export LD_LIBRARY_PATH=/awips2/python/lib:/awips2/postgresql/lib
export CPPFLAGS="-I/awips2/postgresql/include -L/awips2/postgresql/lib"
/awips2/python/bin/python setup.py clean
RC=$?
if [ ${RC} -ne 0 ]; then

2
rpms/python.site-packages/Installer.cartopy/component.spec
View file

@ -20,6 +20,7 @@ Vendor: Unidata
Packager: Michael James
AutoReq: no
BuildRequires: awips2-postgresql
requires: awips2-python
requires: awips2-python-numpy
provides: awips2-python-cartopy
@ -77,6 +78,7 @@ fi
pushd . > /dev/null
cd Cartopy-%{version}
export LD_LIBRARY_PATH=/awips2/python/lib
export CPPFLAGS="-I/awips2/postgresql/include -L/awips2/postgresql/lib"
/awips2/python/bin/python setup.py build
RC=$?
if [ ${RC} -ne 0 ]; then

1
rpms/python.site-packages/Installer.numpy/component.spec
View file

@ -20,6 +20,7 @@ Vendor: Unidata
Packager: Michael James
AutoReq: no
BuildRequires: subversion
requires: compat-libf2c-34(x86-64) >= 3.4.6-19.el6
requires: libgfortran(x86-64) >= 4.4.7-3.el6
requires: awips2-python

2
rpms/unidata/build.sh
View file

@ -33,6 +33,8 @@ logdir=${dir}/../logs
source ${dir}/buildEnvironment.sh
# prepare the rpm build directory structure
mkdir -p /awips2/jenkins/build/rpms/awips2_16.1.5/x86_64/
mkdir -p /awips2/jenkins/build/rpms/awips2_16.1.5/noarch/
mkdir -p ${AWIPSII_TOP_DIR}/BUILD
mkdir -p ${AWIPSII_TOP_DIR}/RPMS
mkdir -p ${AWIPSII_TOP_DIR}/SOURCES

10
rpms/unidata/manage.sh Executable file
View file

@ -0,0 +1,10 @@
#!/bin/bash
if [ -z "$1" ]
then
exit 1
fi
unset LD_LIBRARY_PATH
if [ -d "$1" ]; then
repomanage -k3 --old ${1} | xargs rm -f
createrepo -g ${1}/comps.xml ${1}
fi