Skip to content

Commit

Permalink
Merge remote-tracking branch 'ogc-baallan/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@baallan
baallan committed Sep 1, 2017
2 parents 28e016e + 4be2d32 commit a475818
Show file tree
Hide file tree
Showing 10 changed files with 375 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cle6.unstable/firerpms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ packing=cle6.unstable
ovis_branch=master
sos_branch=master
NetworkRequires=gitlab.opengridcomputing.com
[email protected]:tom/SOS.git
#[email protected]:tom/SOS.git
[email protected]:ovis/ovis.git

. ../support/package-functions
Expand Down
5 changes: 5 additions & 0 deletions rhel7.unstable/ovis.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ License: GPLv2 or BSD
Group: %{ldms_all}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: %{name}-%{version}.tar.gz
Obsoletes: ldms-all
Requires: rpm >= 4.8.0
Requires: libevent >= 2.0.21
Requires: libyaml libyaml-devel
Expand Down Expand Up @@ -112,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
Summary: LDMS devel package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-devel
%description devel
This is a development package of Lightweight Distributed Metric System (LDMS).
Users who want to implement their own sampler or store must install this
Expand All @@ -129,6 +131,7 @@ package.
Summary: LDMS test package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-test
%description test
This is a collection of test scripts for (LDMS).
They also serve as examples, but are not usually of interest
Expand All @@ -144,6 +147,7 @@ on compute nodes in large clusters.
Summary: LDMS base initscripts for libgenders control of %{name}
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-initscripts
%description initscripts-base
This is the support file set for libgenders based booting of LDMS daemons.
Users normally provide information via /etc/genders (or alternate file)
Expand Down Expand Up @@ -279,6 +283,7 @@ control file, use of libgenders can be bypassed.
%package doc
Summary: Documentation files for %{name}
Group: %{ldms_all}
Obsoletes: ldms-all-doc
## Requires: %{name}-devel = %{version}-%{release}
%description doc
Doxygen files for ovis package.
Expand Down
5 changes: 5 additions & 0 deletions rhel7/ovis.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ License: GPLv2 or BSD
Group: %{ldms_all}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: %{name}-%{version}.tar.gz
Obsoletes: ldms-all
Requires: rpm >= 4.8.0
Requires: libevent >= 2.0.21
Requires: libyaml libyaml-devel
Expand Down Expand Up @@ -120,6 +121,7 @@ rm -rf $RPM_BUILD_ROOT
Summary: LDMS devel package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-devel
%description devel
This is a development package of Lightweight Distributed Metric System (LDMS).
Users who want to implement their own sampler or store must install this
Expand All @@ -137,6 +139,7 @@ package.
Summary: LDMS test package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-test
%description test
This is a collection of test scripts for (LDMS).
They also serve as examples, but are not usually of interest
Expand All @@ -152,6 +155,7 @@ on compute nodes in large clusters.
Summary: LDMS base initscripts for libgenders control of %{name}
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-initscripts
%description initscripts-base
This is the support file set for libgenders based booting of LDMS daemons.
Users normally provide information via /etc/genders (or alternate file)
Expand Down Expand Up @@ -287,6 +291,7 @@ control file, use of libgenders can be bypassed.
%package doc
Summary: Documentation files for %{name}
Group: %{ldms_all}
Obsoletes: ldms-all-doc
## Requires: %{name}-devel = %{version}-%{release}
%description doc
Doxygen files for ovis package.
Expand Down
5 changes: 5 additions & 0 deletions toss2.unstable/ovis.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ License: GPLv2 or BSD
Group: %{ldms_all}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: %{name}-%{version}.tar.gz
Obsoletes: ldms-all
Requires: rpm >= 4.8.0
Requires: ovis-libevent2
@ENABLE_LDMS_PYTHON_TRUE@Requires: python
Expand Down Expand Up @@ -183,6 +184,7 @@ rm -rf $RPM_BUILD_ROOT
Summary: LDMS devel package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-devel
%description devel
This is a development package of Lightweight Distributed Metric System (LDMS).
Users who want to implement their own sampler or store must install this
Expand All @@ -200,6 +202,7 @@ package.
Summary: LDMS test package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-test
%description test
This is a collection of test scripts for (LDMS).
They also serve as examples, but are not usually of interest
Expand All @@ -215,6 +218,7 @@ on compute nodes in large clusters.
Summary: LDMS base initscripts for libgenders control of %{name}
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-initscripts
%description initscripts-base
This is the support file set for libgenders based booting of LDMS daemons.
Users normally provide information via /etc/genders (or alternate file)
Expand Down Expand Up @@ -350,6 +354,7 @@ control file, use of libgenders can be bypassed.
%package doc
Summary: Documentation files for %{name}
Group: %{ldms_all}
Obsoletes: ldms-all-doc
## Requires: %{name}-devel = %{version}-%{release}
%description doc
Doxygen files for ovis package.
Expand Down
5 changes: 5 additions & 0 deletions toss2/ovis.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ License: GPLv2 or BSD
Group: %{ldms_all}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: %{name}-%{version}.tar.gz
Obsoletes: ldms-all
Requires: rpm >= 4.8.0
Requires: ovis-libevent2
@ENABLE_LDMS_PYTHON_TRUE@Requires: python
Expand Down Expand Up @@ -183,6 +184,7 @@ rm -rf $RPM_BUILD_ROOT
Summary: LDMS devel package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-devel
%description devel
This is a development package of Lightweight Distributed Metric System (LDMS).
Users who want to implement their own sampler or store must install this
Expand All @@ -200,6 +202,7 @@ package.
Summary: LDMS test package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-test
%description test
This is a collection of test scripts for (LDMS).
They also serve as examples, but are not usually of interest
Expand All @@ -215,6 +218,7 @@ on compute nodes in large clusters.
Summary: LDMS base initscripts for libgenders control of %{name}
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-initscripts
%description initscripts-base
This is the support file set for libgenders based booting of LDMS daemons.
Users normally provide information via /etc/genders (or alternate file)
Expand Down Expand Up @@ -350,6 +354,7 @@ control file, use of libgenders can be bypassed.
%package doc
Summary: Documentation files for %{name}
Group: %{ldms_all}
Obsoletes: ldms-all-doc
## Requires: %{name}-devel = %{version}-%{release}
%description doc
Doxygen files for ovis package.
Expand Down
7 changes: 6 additions & 1 deletion toss3.unstable/ovis.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ License: GPLv2 or BSD
Group: %{ldms_all}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: %{name}-%{version}.tar.gz
Obsoletes: ldms-all
Requires: rpm >= 4.8.0
Requires: libevent >= 2.0.21
@ENABLE_LDMS_PYTHON_TRUE@Requires: python
Expand Down Expand Up @@ -186,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT
Summary: LDMS devel package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-devel
%description devel
This is a development package of Lightweight Distributed Metric System (LDMS).
Users who want to implement their own sampler or store must install this
Expand All @@ -203,6 +205,7 @@ package.
Summary: LDMS test package
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-test
%description test
This is a collection of test scripts for (LDMS).
They also serve as examples, but are not usually of interest
Expand All @@ -218,6 +221,7 @@ on compute nodes in large clusters.
Summary: LDMS base initscripts for libgenders control of %{name}
Group: %{ldms_grp}
Requires: ovis = @VERSION@
Obsoletes: ldms-all-initscripts
%description initscripts-base
This is the support file set for libgenders based booting of LDMS daemons.
Users normally provide information via /etc/genders (or alternate file)
Expand Down Expand Up @@ -353,6 +357,7 @@ control file, use of libgenders can be bypassed.
%package doc
Summary: Documentation files for %{name}
Group: %{ldms_all}
Obsoletes: ldms-all-doc
## Requires: %{name}-devel = %{version}-%{release}
%description doc
Doxygen files for ovis package.
Expand Down Expand Up @@ -427,7 +432,7 @@ Requires: ovis >= 3.0.0 python

@ENABLE_SOS_TRUE@%package ldms-sos
@ENABLE_SOS_TRUE@Summary: LDMS sosdb plugins
@ENABLE_SOS_TRUE@Requires: sosdb
@ENABLE_SOS_TRUE@Requires: ovis-sosdb
@ENABLE_SOS_TRUE@%description ldms-sos
@ENABLE_SOS_TRUE@Libraries and utilities for SOS usage in LDMS
@ENABLE_SOS_TRUE@%files ldms-sos
Expand Down
Loading

0 comments on commit a475818

Please sign in to comment.