openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
July 2019
- 2 participants
- 2045 discussions
Hello community,
here is the log from the commit of package perl-File-Unpack for openSUSE:Factory checked in at 2019-07-05 13:48:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-File-Unpack (Old)
and /work/SRC/openSUSE:Factory/.perl-File-Unpack.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-File-Unpack"
Fri Jul 5 13:48:56 2019 rev:4 rq:713432 version:0.70
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-File-Unpack/perl-File-Unpack.changes 2018-07-28 12:39:44.864350286 +0200
+++ /work/SRC/openSUSE:Factory/.perl-File-Unpack.new.4615/perl-File-Unpack.changes 2019-07-05 13:48:56.625474183 +0200
@@ -1,0 +2,6 @@
+Sun Jun 9 18:13:14 UTC 2019 - Bernhard Wiedemann <bwiedemann(a)suse.com>
+
+- Add perl-File-Unpack-fix-race.patch to make build reproducible
+ (boo#1102408)
+
+-------------------------------------------------------------------
New:
----
perl-File-Unpack-fix-race.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-File-Unpack.spec ++++++
--- /var/tmp/diff_new_pack.oGsLw7/_old 2019-07-05 13:48:58.469477027 +0200
+++ /var/tmp/diff_new_pack.oGsLw7/_new 2019-07-05 13:48:58.473477033 +0200
@@ -26,7 +26,8 @@
Patch0: fix-xml-test.diff
Patch1: https://patch-diff.githubusercontent.com/raw/jnweiger/perl-File-Unpack/pull…
Patch2: https://patch-diff.githubusercontent.com/raw/jnweiger/perl-File-Unpack/pull…
-Url: http://github.com/jnweiger/perl-File-Unpack
+Patch3: perl-File-Unpack-fix-race.patch
+Url: https://github.com/jnweiger/perl-File-Unpack
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl(Test::CheckManifest)
@@ -183,6 +184,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
++++++ perl-File-Unpack-fix-race.patch ++++++
https://github.com/jnweiger/perl-File-Unpack/pull/9
https://rt.cpan.org/Public/Bug/Display.html?id=124916
Date: 2018-03-26
Author: Bernhard M. Wiedemann <bwiedemann suse de>
Without this patch, it was
randomly missing a man-page part
Index: File-Unpack-0.70/Makefile.PL
===================================================================
--- File-Unpack-0.70.orig/Makefile.PL
+++ File-Unpack-0.70/Makefile.PL
@@ -55,6 +55,7 @@ sub MY::postamble
return q{
file_unpack: file_unpack.pl Makefile
$(CP) file_unpack.pl $@
+ mkdir -p $(INST_MAN1DIR)
## wait, so that -M < -M succeeds in ExtUtils/Command/MM.pm
(sleep 1; echo .nf; $(PERL) $@ --help) > $(INST_MAN1DIR)/$@.1 || true
};
1
0
Hello community,
here is the log from the commit of package monitoring-plugins-traffic_limit for openSUSE:Factory checked in at 2019-07-05 13:48:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-traffic_limit (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-traffic_limit.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-traffic_limit"
Fri Jul 5 13:48:47 2019 rev:3 rq:708767 version:0.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/monitoring-plugins-traffic_limit/monitoring-plugins-traffic_limit.changes 2016-11-10 13:23:43.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.monitoring-plugins-traffic_limit.new.4615/monitoring-plugins-traffic_limit.changes 2019-07-05 13:48:48.569461759 +0200
@@ -1,0 +2,13 @@
+Mon Jun 3 09:38:00 UTC 2019 - Dirk Stoecker <opensuse(a)dstoecker.de>
+
+- update to version 0.5
+ * use b337c024130437d217d6be53ba58cd0238311200.patch for update
+ as upstream didn't react on proposal to do a "real" release
+
+-------------------------------------------------------------------
+Wed Oct 18 15:46:25 UTC 2017 - opensuse(a)dstoecker.de
+
+- Switch from Nagios::Plugin to Monitoring::Plugin
+- Update to version 0.4
+
+-------------------------------------------------------------------
Old:
----
check_traffic_limit_0.3_20110209.tar.gz
New:
----
0.4.tar.gz
b337c024130437d217d6be53ba58cd0238311200.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monitoring-plugins-traffic_limit.spec ++++++
--- /var/tmp/diff_new_pack.V3QCiC/_old 2019-07-05 13:48:49.061462518 +0200
+++ /var/tmp/diff_new_pack.V3QCiC/_new 2019-07-05 13:48:49.065462524 +0200
@@ -1,7 +1,7 @@
#
# spec file for package monitoring-plugins-traffic_limit
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,25 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: monitoring-plugins-traffic_limit
-Version: 0.3
+Version: 0.5
Release: 0
Summary: Checks the traffic on any interface
License: BSD-4-Clause
Group: System/Monitoring
Url: http://exchange.nagios.org/directory/Plugins/Network-Connections%2C-Stats-a…
-Source0: check_traffic_limit_%{version}_20110209.tar.gz
+Source0: https://github.com/localguru/check_traffic_limit/archive/0.4.tar.gz
+# PATCH-FIX-UPSTREAM https://github.com/localguru/check_traffic_limit/pull/1
+Patch1: b337c024130437d217d6be53ba58cd0238311200.patch
BuildRequires: nagios-rpm-macros
Provides: nagios-plugins-traffic_limit = %{version}-%{release}
Obsoletes: nagios-plugins-traffic_limit < %{version}-%{release}
Requires: gawk
Requires: grep
Requires: vnstat
-Requires: perl(Nagios::Plugin)
+Requires: perl(Monitoring::Plugin)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -43,25 +45,23 @@
./check_traffic_limit -i eth0 -w 10000 -c 12000 -p d
%prep
-%setup -q -n check_traffic_limit_%{version}
+%setup -q -n check_traffic_limit-0.4
+%patch1 -p1
%build
+sed -i s/Nagios::/Monitoring::/ check_traffic_limit
%install
install -Dm755 check_traffic_limit %{buildroot}/%{nagios_plugindir}/check_traffic_limit
-install -Dm644 check_traffic_limit.ncfg %{buildroot}/%{nagiosgrapher_sysconfdir}/check_traffic_limit.ncfg
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
-%doc CHANGES README
+%doc docs README.md
%dir %{nagios_libdir}
%dir %{nagios_plugindir}
-%attr(0755,root,%{nagios_command_group}) %dir %{nagios_sysconfdir}
-%dir %{nagiosgrapher_sysconfdir}
%{nagios_plugindir}/check_traffic_limit
-%config(noreplace) %{nagiosgrapher_sysconfdir}/check_traffic_limit.ncfg
%changelog
++++++ check_traffic_limit_0.3_20110209.tar.gz -> 0.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_traffic_limit_0.3/CHANGES new/check_traffic_limit-0.4/CHANGES
--- old/check_traffic_limit_0.3/CHANGES 2011-02-09 15:12:24.000000000 +0100
+++ new/check_traffic_limit-0.4/CHANGES 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-V0.3/2011-02-09 minor fixes, add nagios grapher template
-
-V0.2/2011-02-06 add daily and monthly limit,
- some fixes for different vnstat versions
-
-V0.1/2011-02-05 initial version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_traffic_limit_0.3/INSTALL new/check_traffic_limit-0.4/INSTALL
--- old/check_traffic_limit_0.3/INSTALL 2011-02-06 23:51:42.000000000 +0100
+++ new/check_traffic_limit-0.4/INSTALL 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-installation
-============
-
-Just install and set up vnstat[1] and copy check_traffic_limit to
-your nagios plugin directory, e.g. /usr/lib/nagios/plugins/contrib/
-
-Please report any installation problem to <marcus.schopen(a)uni-bielefeld.de>
-
-[1] http://humdi.net/vnstat/
-
-
-nagiosgrapher
-=============
-
-Copy check_traffic_limit.ncfg template to e.g.
-/etc/nagiosgrapher/ngraph.d/standard/ and restart ngrapher.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_traffic_limit_0.3/README new/check_traffic_limit-0.4/README
--- old/check_traffic_limit_0.3/README 2011-02-06 21:05:57.000000000 +0100
+++ new/check_traffic_limit-0.4/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-check_traffic_limit is a Nagios plugin based on vnstat to check if daily or monthly traffic
-limit of an interface has reached.
-
-Example:
-check_traffic_limit_0.2 -i eth0 -w 10000 -c 12000 -p d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_traffic_limit_0.3/README.md new/check_traffic_limit-0.4/README.md
--- old/check_traffic_limit_0.3/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/check_traffic_limit-0.4/README.md 2017-10-03 00:28:49.000000000 +0200
@@ -0,0 +1,108 @@
+# check_traffic_limit
+
+check_traffic_limit is a Nagios/Icinga2 plugin based on vnstat traffic accounting. It checks traffic on any interface and sends a warning when defined daily or monthly limits are reached.
+The plugin comes with a pnp4Nagios grapher templates.
+
+# Installation
+
+* `apt install vnstat`
+* `vnstat -u -i eth0`
+* `apt install libnagios-plugin-perl`
+* `cp check_traffic_limit /usr/local/lib/nagios/plugins/`
+
+# Usage
+
+see `check_traffic_limit --h` for help
+
+```
+check_traffic_limit -i interface
+ [-w warning_threshold] [-c critical_threshold]
+ [-p period d|m]
+```
+
+* Example:
+
+ `check_traffic_limit -i eth0 -w 10000 -c 12000 -p d`
+
+# Icinga2 configuration
+
+### /etc/nagios/nrpe_local.cfg
+```
+command[check_traffic_limit]=/usr/local/lib/nagios/plugins/check_traffic_limit -i $ARG1$ -w $ARG2$ -c $ARG3$ -p $ARG4$
+```
+
+### /etc/icinga2/conf.d/hosts/servername/nrpe-check-traffic-limit.conf
+
+```
+object Service "NRPE trafficlimit: servername - day" {
+ import "generic-nrpe-service"
+ host_name = "servername"
+ check_command = "check_nrpe_1arg"
+ vars.nrpe_command = "check_traffic_limit"
+
+ vars.nrpe_args = [ "$interface$", "$warning$", "$critical$", "$period$" ]
+
+ vars.interface = "eth0"
+ vars.warning = "20971520"
+ vars.critical = "23068672"
+ vars.period = "d"
+}
+
+object Service "NRPE trafficlimit: servername - month" {
+ import "generic-nrpe-service"
+ host_name = "servername"
+ check_command = "check_nrpe_1arg"
+ vars.nrpe_command = "check_traffic_limit"
+
+ vars.nrpe_args = [ "$interface$", "$warning$", "$critical$", "$period$" ]
+
+ vars.interface = "eth0"
+ vars.warning = "576716800"
+ vars.critical = "597688320"
+ vars.period = "m"
+
+ check_interval = 10m
+}
+```
+
+/etc/icinga2/conf.d/templates.conf
+```
+template Service "generic-nrpe-service" {
+ import "generic-service"
+ check_command = "check_nrpe_1arg"
+ vars.pnp_check_arg1 = "!$nrpe_command$"
+}
+```
+
+/etc/icinga2/conf.d/your_commands.conf
+```
+object CheckCommand "check_nrpe_1arg" {
+ import "plugin-check-command"
+ command = [PluginDir + "/check_nrpe" ]
+ arguments = {
+ "-H" = "$nrpe_host$"
+ "-p" = "$nrpe_port$"
+ "-c" = "$nrpe_command$"
+ "-a" = {
+ value = "$nrpe_args$"
+ repeat_key = false
+ order = 1
+ }
+ "-t" = "$nrpe_timeout$"
+ }
+
+ vars.nrpe_host = "$address$"
+ vars.nrpe_port = 5666
+
+```
+# Output examples
+
+#### 24h
+![24h overview](docs/img/check_traffic_limit_day_24h.png)
+
+#### one year
+![24h overview](docs/img/check_traffic_limit_month_year.png)
+
+# Feedback
+
+Feel free to contact me on any questions: marcus.schopen(a)uni-bielefeld.de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_traffic_limit_0.3/check_traffic_limit new/check_traffic_limit-0.4/check_traffic_limit
--- old/check_traffic_limit_0.3/check_traffic_limit 2011-02-09 15:11:59.000000000 +0100
+++ new/check_traffic_limit-0.4/check_traffic_limit 2017-10-03 00:28:49.000000000 +0200
@@ -3,7 +3,7 @@
# ---
=head1 NAME
-check_traffic_limit - Nagios plugin for checking daily traffic limit
+check_traffic_limit - Icinga2 / Nagios plugin for checking daily traffic limit
=head1 SYNOPSIS
@@ -15,14 +15,14 @@
=head1 OPTIONS
=over 4
-
+
=item -i|--iface=
Select one specific interface. Default is eth0.
=item -w|--warning=threshold
-threshold in ḱilobyte. All values must be integer and > 0. Default is unlimitted.
+threshold in kilobyte. All values must be integer and > 0. Default is unlimitted.
=item -c|--critical=threshold
@@ -45,6 +45,8 @@
use Getopt::Long qw(:config no_ignore_case bundling);
use Pod::Usage;
+$ENV{'LC_ALL'}='C';
+
my $vnstatbin = '/usr/bin/vnstat';
my $vnstat_output_kb = 'KB|KiB';
my $vnstat_output_mb = 'MB|MiB';
@@ -58,7 +60,7 @@
my $warn_threshold = '0:';
my $crit_threshold = '0:';
my $period = "d";
-my $version = 'v0.2/2011-02-06/schoppa';
+my $version = 'v0.4/2017-10-02/schoppa';
my $printversion = 0;
my $result = UNKNOWN;
my $help = 0;
@@ -145,7 +147,7 @@
=head1 AUTHOR
-marcus.schopen(a)uni-bielefeld.de
+<marcus.schopen(a)uni-bielefeld.de>
University of Bielefeld
=head1 KNOWN ISSUES
@@ -174,9 +176,10 @@
=head1 HISTORY
+v0.4/2017-10-02 encoding bug fix in help output, LC_ALL fix
+
V0.3/2011-02-09 minor fixes, add nagios grapher template
-V0.2/2011-02-06 add daily and monthly limit,
- some fixes for different vnstat versions
+V0.2/2011-02-06 add daily and monthly limit, some fixes for different vnstat versions
V0.1/2011-02-05 initial version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/check_traffic_limit_0.3/check_traffic_limit.ncfg new/check_traffic_limit-0.4/check_traffic_limit.ncfg
--- old/check_traffic_limit_0.3/check_traffic_limit.ncfg 2011-02-09 15:21:53.000000000 +0100
+++ new/check_traffic_limit-0.4/check_traffic_limit.ncfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,152 +0,0 @@
-# ---
-# NagiosGrapher Template for check_traffic_limit
-# Author: Marcus Schopen
-# ---
-
-define ngraph{
- service_name TRAFFICLIMIT
- graph_perf_regex TOTAL=(\d+)
- graph_value TOTAL
- graph_units MegaByte
- graph_legend TOTAL:
- rrd_plottype LINE2
- rrd_color FEF102
- page TOTAL
-}
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source TOTAL
- print_description Latest:
- print_function LAST
- print_format %2.2lf
-}
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source TOTAL
- print_description Minimum:
- print_function MIN
- print_format %2.2lf
- }
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source TOTAL
- print_description Maximum:
- print_function MAX
- print_format %2.2lf
- }
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source TOTAL
- print_description Average:
- print_function AVERAGE
- print_format %2.2lf
- print_eol left
- }
-
-# -- TRAFFICLIMIT2 CPU
-
-define ngraph{
- service_name TRAFFICLIMIT
- graph_perf_regex IN=(\d+)
- graph_value IN
- graph_units MegaByte
- graph_legend IN:
- rrd_plottype LINE2
- rrd_color F34AC9
- page IN
-}
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source IN
- print_description Latest:
- print_function LAST
- print_format %2.2lf
-}
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source IN
- print_description Minimum:
- print_function MIN
- print_format %2.2lf
- }
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source IN
- print_description Maximum:
- print_function MAX
- print_format %2.2lf
- }
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source IN
- print_description Average:
- print_function AVERAGE
- print_format %2.2lf
- print_eol left
- }
-
-# -- TRAFFICLIMIT3 CPU
-
-define ngraph{
- service_name TRAFFICLIMIT
- graph_perf_regex OUT=(\d+)
- graph_value OUT
- graph_units MegaByte
- graph_legend OUT:
- rrd_plottype LINE2
- rrd_color C5FE3F
- page OUT
-}
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source OUT
- print_description Latest:
- print_function LAST
- print_format %2.2lf
-}
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source OUT
- print_description Minimum:
- print_function MIN
- print_format %2.2lf
- }
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source OUT
- print_description Maximum:
- print_function MAX
- print_format %2.2lf
- }
-
-define ngraph{
- service_name TRAFFICLIMIT
- type GPRINT
- print_source OUT
- print_description Average:
- print_function AVERAGE
- print_format %2.2lf
- print_eol left
- }
Binary files old/check_traffic_limit_0.3/docs/img/check_traffic_limit_day_24h.png and new/check_traffic_limit-0.4/docs/img/check_traffic_limit_day_24h.png differ
Binary files old/check_traffic_limit_0.3/docs/img/check_traffic_limit_month_year.png and new/check_traffic_limit-0.4/docs/img/check_traffic_limit_month_year.png differ
++++++ b337c024130437d217d6be53ba58cd0238311200.patch ++++++
>From b337c024130437d217d6be53ba58cd0238311200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20St=C3=B6cker?= <github(a)dstoecker.de>
Date: Tue, 28 May 2019 10:07:02 +0200
Subject: [PATCH] support ISO date, increase version to 0.5
---
check_traffic_limit | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/check_traffic_limit b/check_traffic_limit
index 129f7c1..61513b2 100755
--- a/check_traffic_limit
+++ b/check_traffic_limit
@@ -60,20 +60,20 @@ my $iface = 'eth0';
my $warn_threshold = '0:';
my $crit_threshold = '0:';
my $period = "d";
-my $version = 'v0.4/2017-10-02/schoppa';
+my $version = 'v0.5/2019-05-28/schoppa';
my $printversion = 0;
my $result = UNKNOWN;
my $help = 0;
my $vnstatquery = '';
use Time::localtime;
-my ($mday, $mon) = (localtime->mday,localtime->mon);
+my ($mday, $mon, $year) = (localtime->mday,localtime->mon,1900+localtime->year);
my $local_day = sprintf("%02d", $mday);
my $local_month = sprintf("%02d", $mon +1);
my @months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
my $local_month_abbreviated = $months[$local_month -1];
-my $day = "($local_month\/$local_day\/|$local_day\.$local_month\.)";
+my $day = "($local_month\/$local_day\/|$local_day\.$local_month\.|$year-$local_month-$local_day)";
my $month = "$local_month_abbreviated";
# -- GetOpt
@@ -176,6 +176,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
=head1 HISTORY
+v0.5/2019-05-28 support ISO data format yyyy-mm-dd
+
v0.4/2017-10-02 encoding bug fix in help output, LC_ALL fix
V0.3/2011-02-09 minor fixes, add nagios grapher template
1
0
Hello community,
here is the log from the commit of package perl-Pod-Readme for openSUSE:Factory checked in at 2019-07-05 13:48:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Pod-Readme (Old)
and /work/SRC/openSUSE:Factory/.perl-Pod-Readme.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Pod-Readme"
Fri Jul 5 13:48:45 2019 rev:12 rq:691007 version:1.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Pod-Readme/perl-Pod-Readme.changes 2017-10-03 23:18:56.556421915 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Pod-Readme.new.4615/perl-Pod-Readme.changes 2019-07-05 13:48:46.369458367 +0200
@@ -1,0 +2,54 @@
+Wed Apr 3 07:25:15 UTC 2019 - Stephan Kulow <coolo(a)suse.com>
+
+- updated to 1.2.3
+ see /usr/share/doc/packages/perl-Pod-Readme/Changes
+
+ v1.2.3 2018-10-31 22:56:42+00:00 Europe/London
+ [Bug Fixes]
+ - Increased minimum version of Type::Tiny to 1.000000.
+
+ v1.2.2 2018-10-31 22:41:45+00:00 Europe/London
+ [Documentation]
+ - Updated POD with regard to format types (Mohammad S Anwar).
+
+ - Fixed typos in Changes.
+
+ [Bug Fixes]
+ - Added explicit requirements for Pod::Simple as well as recommended
+ modules.
+
+ [Toolchain]
+ - Remove explicit core dependencies from prereqs list.
+
+ - Updated list of contributors in distribution metadata. (Apologies
+ if anyone was omitted.)
+
+ v1.2.1 2018-10-30 18:23:48+00:00 Europe/London
+ [Documentation]
+ - Added note about Github Flavoured Markdown (GFM) support
+ to Changes for v1.2.0.
+
+ [Other]
+ - Restore license to "Perl_5" that was inadvertently changed
+ in the conversion to use Dist::Zilla, GH#25.
+
+ v1.2.0 2018-10-29 19:24:01+00:00 Europe/London
+ [Bug Fixes]
+ - Specify minimum version of List::Util, GH#22.
+
+ [Enhancements]
+ - Added "md" as an alias for "markdown" in pod2readme.
+
+ - Added "github" or "gfm" for Github Flavored Markdown in
+ pod2readme, GH#15.
+
+ [Incompatabilities]
+ - Removed DistZilla type from Pod::Readme::Types, as it was not
+ necessary.
+
+ [Toolchain]
+ - Remove use of Module::Install, fixes GH#21.
+
+ - Use Dist::Zilla to build the distribution.
+
+-------------------------------------------------------------------
Old:
----
Pod-Readme-v1.1.2.tar.gz
New:
----
Pod-Readme-v1.2.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Pod-Readme.spec ++++++
--- /var/tmp/diff_new_pack.DWGL0h/_old 2019-07-05 13:48:46.981459310 +0200
+++ /var/tmp/diff_new_pack.DWGL0h/_new 2019-07-05 13:48:46.985459316 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Pod-Readme
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: perl-Pod-Readme
-Version: 1.1.2
+Version: 1.2.3
Release: 0
%define cpan_name Pod-Readme
Summary: Intelligently generate a README file from POD
-License: Artistic-1.0 or GPL-1.0+
+License: Artistic-1.0 OR GPL-1.0-or-later
Group: Development/Libraries/Perl
-Url: http://search.cpan.org/dist/Pod-Readme/
+Url: https://metacpan.org/release/%{cpan_name}
Source0: https://cpan.metacpan.org/authors/id/R/RR/RRWO/%{cpan_name}-v%{version}.tar…
Source1: cpanspec.yml
BuildArch: noarch
@@ -32,49 +32,51 @@
BuildRequires: perl-macros
BuildRequires: perl(CPAN::Changes) >= 0.30
BuildRequires: perl(CPAN::Meta)
-BuildRequires: perl(Class::Method::Modifiers) >= 2.00
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.56
+BuildRequires: perl(Class::Method::Modifiers)
BuildRequires: perl(File::Slurp)
BuildRequires: perl(Getopt::Long::Descriptive)
BuildRequires: perl(IO::String)
BuildRequires: perl(List::Util) >= 1.33
BuildRequires: perl(Module::CoreList)
-BuildRequires: perl(Module::Load)
-BuildRequires: perl(Moo) >= 1.004005
+BuildRequires: perl(Module::Metadata)
+BuildRequires: perl(Moo)
BuildRequires: perl(Moo::Role)
BuildRequires: perl(MooX::HandlesVia)
-BuildRequires: perl(Path::Tiny) >= 0.018
+BuildRequires: perl(Path::Tiny)
BuildRequires: perl(Pod::Simple)
+BuildRequires: perl(Pod::Simple::Text)
BuildRequires: perl(Role::Tiny)
BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::Exception)
+BuildRequires: perl(Test::Kit)
BuildRequires: perl(Try::Tiny)
-BuildRequires: perl(Type::Tiny)
+BuildRequires: perl(Type::Tiny) >= 1.000000
BuildRequires: perl(Types::Standard)
BuildRequires: perl(namespace::autoclean)
-BuildRequires: perl(version) >= 0.77
Requires: perl(CPAN::Changes) >= 0.30
Requires: perl(CPAN::Meta)
-Requires: perl(Class::Method::Modifiers) >= 2.00
-Requires: perl(ExtUtils::MakeMaker) >= 6.56
+Requires: perl(Class::Method::Modifiers)
Requires: perl(File::Slurp)
Requires: perl(Getopt::Long::Descriptive)
Requires: perl(List::Util) >= 1.33
Requires: perl(Module::CoreList)
-Requires: perl(Module::Load)
-Requires: perl(Moo) >= 1.004005
+Requires: perl(Moo)
Requires: perl(Moo::Role)
Requires: perl(MooX::HandlesVia)
-Requires: perl(Path::Tiny) >= 0.018
+Requires: perl(Path::Tiny)
Requires: perl(Pod::Simple)
Requires: perl(Role::Tiny)
Requires: perl(Try::Tiny)
-Requires: perl(Type::Tiny)
+Requires: perl(Type::Tiny) >= 1.000000
Requires: perl(Types::Standard)
Requires: perl(namespace::autoclean)
-Requires: perl(version) >= 0.77
Recommends: perl(Pod::Markdown)
+Recommends: perl(Pod::Markdown::Github)
+Recommends: perl(Pod::Simple::HTML)
Recommends: perl(Pod::Simple::LaTeX)
+Recommends: perl(Pod::Simple::RTF)
+Recommends: perl(Pod::Simple::Text)
+Recommends: perl(Pod::Simple::XHTML)
Recommends: perl(Type::Tiny::XS)
%{perl_requires}
@@ -89,11 +91,11 @@
# MANUAL END
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
%check
-%{__make} test
+make test
%install
%perl_make_install
@@ -103,5 +105,6 @@
%files -f %{name}.files
%defattr(-,root,root,755)
%doc Changes
+%license LICENSE
%changelog
++++++ Pod-Readme-v1.1.2.tar.gz -> Pod-Readme-v1.2.3.tar.gz ++++++
++++ 5749 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package petsc for openSUSE:Factory checked in at 2019-07-05 13:48:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/petsc (Old)
and /work/SRC/openSUSE:Factory/.petsc.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "petsc"
Fri Jul 5 13:48:42 2019 rev:14 rq:688860 version:3.8.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/petsc/petsc.changes 2018-05-16 18:44:48.540321966 +0200
+++ /work/SRC/openSUSE:Factory/.petsc.new.4615/petsc.changes 2019-07-05 13:48:43.437453845 +0200
@@ -1,0 +2,26 @@
+Tue Mar 26 15:29:56 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de>
+
+- Disable pastix also in openmpi flavor, same as for serial and HPC flavors.
+ Pastix is only built with openmpi, and not available in Factory.
+
+-------------------------------------------------------------------
+Wed Mar 20 18:15:58 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de>
+
+- Fix building non-MPI flavors of packages depending on petsc
+ Add petsc-fix-nonmpi.patch
+- Do not move headers to /usr/include and symlink, causes problems with
+ -isystem
+
+-------------------------------------------------------------------
+Wed Mar 13 23:34:19 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de>
+
+- Fix spec for non-HPC, reenable serial and non-HPC openmpi build.
+- Disable HYPRE for non-HPC, same as for HPC.
+
+-------------------------------------------------------------------
+Wed Feb 13 11:40:48 UTC 2019 - Egbert Eich <eich(a)suse.com>
+
+- Consolidate use of openmpi1, openmpi2, openmpi3.
+- Do not build non-HPC on SLE.
+
+-------------------------------------------------------------------
New:
----
petsc-fix-nonmpi.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ petsc.spec ++++++
--- /var/tmp/diff_new_pack.PX4j5W/_old 2019-07-05 13:48:44.473455443 +0200
+++ /var/tmp/diff_new_pack.PX4j5W/_new 2019-07-05 13:48:44.477455449 +0200
@@ -1,7 +1,7 @@
#
# spec file for package petsc
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -25,6 +25,11 @@
ExcludeArch: s390 s390x
+# Fails to link during configure, as it omits SuperLU from the link libraries
+%bcond_with hypre
+# Only available as openmpi flavor, and not in Factory
+%bcond_with pastix
+
%if 0%{?is_opensuse} || 0%{?is_backports}
%undefine DisOMPI3
%else
@@ -48,6 +53,13 @@
%if "%flavor" == "openmpi"
%define mpi_family openmpi
+%define mpi_vers 1
+%{bcond_with hpc}
+%endif
+
+%if "%flavor" == "openmpi2"
+%define mpi_family openmpi
+%define mpi_vers 2
%{bcond_with hpc}
%endif
@@ -129,13 +141,22 @@
%{bcond_without hpc}
%endif
+%if !0%{?is_opensuse} && !0%{?with_hpc:1}
+ExclusiveArch: do_not_build
+%endif
+
%if %{without hpc}
%if 0%{!?package_name:1}
-%define package_name() %{pname}%{?with_mpi:-%{mpi_family}}
+%define package_name() %{pname}%{?with_mpi:-%{mpi_family}%{?mpi_ext}}
%endif
-%define libname() lib%{pname}%{so_ver}%{?with_mpi:-%{mpi_family}}
+%define libname() lib%{pname}%{so_ver}%{?with_mpi:-%{mpi_family}%{?mpi_ext}}
%else
-%{hpc_init -c %compiler_family -m %mpi_family %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
+%{hpc_init -c %compiler_family -m %mpi_family %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
+
+# For compatibility package names
+%if "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1"
+%define mpi_ext %{?mpi_ver}
+%endif
%define package_name() %{hpc_package_name %_vers}
%define libname() lib%{pname}%{expand:%%{hpc_package_name_tail %{**}}}
@@ -152,9 +173,9 @@
%if %{without mpi}
%define p_base %{_prefix}/
%else
-%{!?mpi_family:%global mpi_family openmpi}
-%define p_base %{_libdir}/mpi/gcc/%{mpi_family}/
-%define n_pref %{?with_mpi:%{mpi_family}-}
+ %{?with_mpi:%{!?mpi_family:error "No MPI family specified!"}}
+
+%define p_base %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext}/
%endif # mpi
%define p_prefix %{p_libdir}/petsc/%{version}/%petsc_arch
%else # hpc
@@ -163,7 +184,7 @@
%endif
%define p_libdir %{p_base}%_lib
-%define p_include %{p_base}include
+%define p_include %{p_prefix}/include
%define petsc_arch linux-gnu-c-opt
@@ -181,6 +202,8 @@
Patch3: petsc-3.3-fix-error-detection-in-makefile.patch
Patch4: petsc-3.7-fix-pastix-detection.patch
Patch5: Python-Fix-a-number-of-scripts-to-by-Python-3-compliant.patch
+# PATCH-FIX-UPSTREAM [rebased] -- Fix building non-MPI flavors of packages depending on petsc
+Patch6: petsc-fix-nonmpi.patch
Url: http://www.mcs.anl.gov/petsc/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{!?makedoc:1}
@@ -198,18 +221,25 @@
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: lapack-devel
-BuildRequires: metis-devel
BuildRequires: suitesparse-devel
%if %{with mpi}
-BuildRequires: %{mpi_family}-devel
-BuildRequires: blacs-%{mpi_family}-devel
-BuildRequires: hdf5-%{mpi_family}-devel
-BuildRequires: hypre-%{mpi_family}-devel
-BuildRequires: libptscotch-%{mpi_family}-devel
-BuildRequires: libptscotch-parmetis-%{mpi_family}-devel
-BuildRequires: pastix-%{mpi_family}-devel
-BuildRequires: scalapack-%{mpi_family}-devel
+BuildRequires: %{mpi_family}%{?mpi_ext}-devel
+BuildRequires: blacs-%{mpi_family}%{?mpi_ext}-devel
+BuildRequires: hdf5-%{mpi_family}%{?mpi_ext}-devel
+%if %{with hypre}
+BuildRequires: hypre-%{mpi_family}%{?mpi_ext}-devel
+BuildRequires: superlu-devel
+%endif
+BuildRequires: ptscotch-%{mpi_family}%{?mpi_ext}-devel
+BuildRequires: ptscotch-parmetis-%{mpi_family}%{?mpi_ext}-devel
+#!BuildIgnore: metis-devel
+%if %{with pastix}
+BuildRequires: pastix-%{mpi_family}%{?mpi_ext}-devel
+%endif
+BuildRequires: scalapack-%{mpi_family}%{?mpi_ext}-devel
+ %else
+BuildRequires: metis-devel
%endif
%else
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
@@ -258,12 +288,12 @@
Requires: metis-devel
%else
Requires: %{libname %_vers} = %{version}
-Requires: blacs-%{mpi_family}-devel
-Requires: hdf5-%{mpi_family}-devel
-Requires: hypre-%{mpi_family}-devel
-Requires: libptscotch-%{mpi_family}-devel
-Requires: libptscotch-parmetis-%{mpi_family}-devel
-Requires: scalapack-%{mpi_family}-devel
+Requires: blacs-%{mpi_family}%{?mpi_ext}-devel
+Requires: hdf5-%{mpi_family}%{?mpi_ext}-devel
+Requires: hypre-%{mpi_family}%{?mpi_ext}-devel
+Requires: ptscotch-%{mpi_family}%{?mpi_ext}-devel
+Requires: ptscotch-parmetis-%{mpi_family}%{?mpi_ext}-devel
+Requires: scalapack-%{mpi_family}%{?mpi_ext}-devel
%endif
%else # with hpc
Requires: %{libname %_vers} = %{version}
@@ -310,6 +340,7 @@
%patch3 -p1 -b .error-detect
%patch4 -p1 -b .pastix-detect
%patch5 -p1
+%patch6 -p1
%if 0%{?makedoc:1}
%files doc
@@ -363,22 +394,27 @@
--with-mpi=1 \
--with-mpi-dir=%{p_base}\
--with-blacs=1 \
- --with-blacs-include=%{p_include} \
+ --with-blacs-include=%{p_base}/include \
--with-blacs-lib=[%{p_libdir}/libblacs.so] \
+ %if %{with pastix}
--with-pastix=1 \
--with-pastix-pkg-config=%{p_libdir}/pkgconfig \
+ %endif
--with-ptscotch=1 \
- --with-ptscotch-include=%{p_include} \
+ --with-ptscotch-include=%{p_base}/include \
--with-ptscotch-lib=[%{p_libdir}/libptscotch.so,%{p_libdir}/libptscotcherr.so,%{p_libdir}/libptscotcherrexit.so,%{p_libdir}/libptscotchparmetis.so] \
--with-scalapack=1 \
- --with-scalapack-include=%{p_include} \
+ --with-scalapack-include=%{p_base}/include \
--with-scalapack-lib=[%{p_libdir}/libscalapack.so] \
+ %if %{with hypre}
+ --with-superlu=1 \
--with-hypre=1 \
- --with-hypre-include=%{p_include}/hypre \
+ --with-hypre-include=%{p_base}/include/hypre \
--with-hypre-lib=%{p_libdir}/libHYPRE.so \
+ %endif
--with-hdf5=1 \
--with-hdf5-lib=%{p_libdir}/libhdf5.so \
- --with-hdf5-include=%{p_include}
+ --with-hdf5-include=%{p_base}/include
%endif
%else # with hpc
--with-blas-lapack-lib=$OPENBLAS_LIB/libopenblas.so \
@@ -415,10 +451,6 @@
rm -rf %{buildroot}%{p_prefix}/lib/petsc/conf/*.py
rm -rf %{buildroot}%{p_prefix}/lib/petsc/conf/modules
-# move include dirs outside ptesc dir
-mv %{buildroot}%{p_prefix}/include %{buildroot}%{p_base}/
-ln -s %{p_include} %{buildroot}%{p_prefix}/include
-
# create symlink for libs between %%libdir and petscdir
pushd %{buildroot}%{p_libdir}
for f in petsc/%{version}/%petsc_arch/lib/*.so*; do
@@ -428,7 +460,7 @@
# Module files
mkdir -p %{buildroot}/usr/share/modules/%{name}-%{petsc_arch}
-cat << EOF > %{buildroot}/usr/share/modules/%{name}-%{petsc_arch}/%version%{?with_mpi:-%{mpi_family}}
+cat << EOF > %{buildroot}/usr/share/modules/%{name}-%{petsc_arch}/%version%{?with_mpi:-%{mpi_family}%{?mpi_ext}}
#%%Module
proc ModulesHelp { } {
global dotversion
@@ -494,13 +526,13 @@
puts stderr " "
puts stderr "This module loads the PETSc library built with the %{compiler_family} compiler"
-puts stderr "toolchain and the %{mpi_family} MPI stack."
+puts stderr "toolchain and the %{mpi_family}%{?mpi_vers} MPI stack."
puts stderr " "
puts stderr "\nVersion %{version}\n"
}
-module-whatis "Name: %{pname} built with %{compiler_family} compiler and %{mpi_family} MPI"
+module-whatis "Name: %{pname} built with %{compiler_family} compiler and %{mpi_family}%{?mpi_vers} MPI"
module-whatis "Version: %{version}"
module-whatis "Category: runtime library"
module-whatis "Description: %{SUMMARY:0}"
@@ -578,7 +610,6 @@
%{?with_hpc:%{hpc_module_delete_if_default}}
%files -n %{libname %_vers}
-%defattr(-,root,root,-)
%doc docs/manual.pdf
%if %{without hpc}
%dir %{p_libdir}/petsc
@@ -586,18 +617,17 @@
%else
%hpc_dirs
%hpc_modules_files
+%{dirname:%{hpc_python_sitearch_no_singlespec}}
%endif # with hpc
%dir %{p_prefix}
%dir %{p_prefix}/lib
%{p_libdir}/*.so.*
%{!?with_hpc:%{p_prefix}/lib/*.so.*}
%{p_prefix}/share
-%{dirname:%{hpc_python_sitearch_no_singlespec}}
%exclude %{p_prefix}/share/petsc/examples
%exclude %{p_prefix}/share/petsc/saws
%files %{?n_pre}devel
-%defattr(-,root,root,-)
%{p_prefix}/bin
%exclude %{p_prefix}/bin/saws
%{p_prefix}/include
@@ -608,13 +638,12 @@
%if %{without hpc}
%{p_prefix}/lib/*.so
%dir %{_datadir}/modules/%{name}-%{petsc_arch}
-%{_datadir}/modules/%{name}-%{petsc_arch}/%version%{?with_mpi:-%{mpi_family}}
+%{_datadir}/modules/%{name}-%{petsc_arch}/%version%{?with_mpi:-%{mpi_family}%{?mpi_ext}}
%endif
%{p_prefix}/share/petsc/examples
%if %{with hpc}
%files saws
-%defattr(-,root,root,-)
%{p_prefix}/bin/saws
%{p_prefix}/share/petsc/saws
%endif
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.PX4j5W/_old 2019-07-05 13:48:44.529455529 +0200
+++ /var/tmp/diff_new_pack.PX4j5W/_new 2019-07-05 13:48:44.529455529 +0200
@@ -1,7 +1,7 @@
<multibuild>
<package>doc</package>
- <!-- <package>serial</package> -->
- <!-- <package>openmpi</package> -->
+ <package>serial</package>
+ <package>openmpi</package>
<package>gnu-openmpi-hpc</package>
<package>gnu-openmpi2-hpc</package>
<package>gnu-openmpi3-hpc</package>
++++++ petsc-fix-nonmpi.patch ++++++
>From e771154c37bc6fe9f87d08fde802125c02a241e3 Mon Sep 17 00:00:00 2001
From: Jed Brown <jed(a)jedbrown.org>
Date: Wed, 25 Apr 2018 14:16:55 -0600
Subject: [PATCH] Include <petsc/mpiuni/mpi.h> instead of requiring extra -I on
command-line
This makes a PETSc --with-mpi=0 behave more predictably for people who
do not want to know about MPI.
---
include/petscsys.h | 6 +++++-
src/benchmarks/streams/MPIVersion.c | 2 --
src/dm/examples/tests/ex42.c | 3 +--
src/tao/leastsquares/examples/tutorials/chwirut2.c | 1 -
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/petscsys.h b/include/petscsys.h
index 6d893c0a8e..43e07d644a 100644
--- a/include/petscsys.h
+++ b/include/petscsys.h
@@ -127,7 +127,11 @@ void assert_never_put_petsc_headers_inside_an_extern_c(int); void assert_never_p
#if !defined(OMPI_WANT_MPI_INTERFACE_WARNING)
# define OMPI_WANT_MPI_INTERFACE_WARNING 0
#endif
-#include <mpi.h>
+#if defined(PETSC_HAVE_MPIUNI)
+# include <petsc/mpiuni/mpi.h>
+#else
+# include <mpi.h>
+#endif
/*
Perform various sanity checks that the correct mpi.h is being included at compile time.
diff --git a/src/benchmarks/streams/MPIVersion.c b/src/benchmarks/streams/MPIVersion.c
index 569e107b21..6fe8a7aeec 100644
--- a/src/benchmarks/streams/MPIVersion.c
+++ b/src/benchmarks/streams/MPIVersion.c
@@ -73,8 +73,6 @@ static double bytes[4] = {
3 * sizeof(double) * N
};
-#include <mpi.h>
-
int main(int argc,char **args)
{
int quantum, checktick(void);
diff --git a/src/dm/examples/tests/ex42.c b/src/dm/examples/tests/ex42.c
index 5e9d7a0200..216980c5b9 100644
--- a/src/dm/examples/tests/ex42.c
+++ b/src/dm/examples/tests/ex42.c
@@ -2,9 +2,8 @@
static char help[] = "Test VTK Rectilinear grid (.vtr) viewer support\n\n";
-#include <mpi.h>
#include <petscdm.h>
-#include "petscdmda.h"
+#include <petscdmda.h>
/*
Write 3D DMDA vector with coordinates in VTK VTR format
diff --git a/src/tao/leastsquares/examples/tutorials/chwirut2.c b/src/tao/leastsquares/examples/tutorials/chwirut2.c
index 2868aee2cf..7c94e4f1d0 100644
--- a/src/tao/leastsquares/examples/tutorials/chwirut2.c
+++ b/src/tao/leastsquares/examples/tutorials/chwirut2.c
@@ -9,7 +9,6 @@
*/
#include <petsctao.h>
-#include <mpi.h>
/*
1
0
Hello community,
here is the log from the commit of package hypre for openSUSE:Factory checked in at 2019-07-05 13:48:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hypre (Old)
and /work/SRC/openSUSE:Factory/.hypre.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hypre"
Fri Jul 5 13:48:40 2019 rev:2 rq:680428 version:2.15.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/hypre/hypre.changes 2019-01-28 20:49:04.301865489 +0100
+++ /work/SRC/openSUSE:Factory/.hypre.new.4615/hypre.changes 2019-07-05 13:48:41.445450773 +0200
@@ -1,0 +2,39 @@
+Wed Feb 27 09:16:16 UTC 2019 - Egbert Eich <eich(a)suse.com>
+
+- Build the examples and docs as a separate HPC package.
+- Made example and doc packages 'noarch'.
+- Remove duplicates from examples.
+- Fix rpmlint warnings about macros in comments.
+- Fix library path to work both on 32 and 64 bit.
+
+-------------------------------------------------------------------
+Tue Feb 26 09:41:05 UTC 2019 - cgoll(a)suse.com
+
+- Switched to cmake build system to fix boo#1126367
+ * added hypre_CMakeLists.patch for proper version numbering
+ * added dependency for lapack and superlu devel for non hpc builds
+- Due to boo#1127070 does not compile for mvapich2/mpich
+
+-------------------------------------------------------------------
+Wed Feb 13 11:35:06 UTC 2019 - Antoine Ginies <aginies(a)suse.com>
+
+- Add a sub examples package to test in prod env
+ Add: hypre_Makefile_examples.patch
+
+-------------------------------------------------------------------
+Sun Feb 10 22:11:16 UTC 2019 - Egbert Eich <eich(a)suse.com>
+
+- Properly create and tear down default version links when the
+ HPC master packages are installed/uninstalled.
+- Fix dependencies for HPC.
+- Add dependency to HPC modulefile.
+- Fix package groups.
+- Add pkgconfig file.
+- Consolidate use of openmpi1, openmpi2, openmpi3 for non-HPC builds.
+
+-------------------------------------------------------------------
+Fri Jan 25 13:29:16 UTC 2019 - eich(a)suse.com
+
+- Disable openmpi1 builds on SLE.
+
+-------------------------------------------------------------------
New:
----
hypre_CMakeLists.patch
hypre_Makefile_examples.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hypre.spec ++++++
--- /var/tmp/diff_new_pack.sXIJWT/_old 2019-07-05 13:48:42.053451710 +0200
+++ /var/tmp/diff_new_pack.sXIJWT/_new 2019-07-05 13:48:42.057451717 +0200
@@ -16,7 +16,7 @@
#
-%global flavor @BUILD_FLAVOR@
+%global flavor @BUILD_FLAVOR@%{?nil}
%define ver 2.15.1
%define _ver 2_15_1
%define somver 0
@@ -27,8 +27,12 @@
%define PNAME %(echo %{pname} | tr [a-z] [A-Z])
%if 0%{?is_opensuse} || 0%{?is_backports}
+%undefine DisOMPI1
+%undefine DisOMPI2
%undefine DisOMPI3
%else
+%define DisOMPI1 ExclusiveArch: do_not_build
+%undefine DisOMPI2
%define DisOMPI3 ExclusiveArch: do_not_build
%endif
@@ -41,19 +45,21 @@
%undefine suffix
%undefine mpi_family
%bcond_with hpc
-%define install_doc 1
+%bcond_without install_doc
%endif
%if "%{flavor}" == "openmpi"
%global mpi_family openmpi
%define mpi_vers 1
%bcond_with hpc
+%{?DisOMPI1}
%endif
%if "%{flavor}" == "openmpi2"
%global mpi_family openmpi
%define mpi_vers 2
%bcond_with hpc
+%{?DisOMPI2}
%endif
%if "%{flavor}" == "mvapich2"
@@ -66,6 +72,14 @@
%bcond_with hpc
%endif
+%if "%{flavor}" == "doc-hpc"
+%bcond_without hpc
+%bcond_without install_doc
+%bcond_with build_all
+%else
+%bcond_without build_all
+%endif
+
%if "%{flavor}" == "gnu-mvapich2-hpc"
%undefine c_f_ver
%define mpi_family mvapich2
@@ -86,6 +100,7 @@
%define mpi_family openmpi
%define mpi_vers 1
%bcond_without hpc
+%{?DisOMPI1}
%endif
%if "%{flavor}" == "gnu-openmpi2-hpc"
@@ -94,6 +109,7 @@
%define mpi_family openmpi
%define mpi_vers 2
%bcond_without hpc
+%{?DisOMPI2}
%endif
%if "%{flavor}" == "gnu-openmpi3-hpc"
@@ -111,9 +127,11 @@
%endif
%{?mpi_family:%{bcond_without mpi}}%{!?mpi_family:%{bcond_with mpi}}
-%{?with_hpc:%{!?compiler_family:%global compiler_family gnu}}
-%{?with_mpi:%global my_suffix -%{mpi_family}}
+# For compatibility package names
+%if "%{mpi_family}" != "openmpi" || "%{mpi_vers}" != "1"
+%define mpi_ext %{?mpi_vers}
+%endif
%if %{without hpc}
%if %{without mpi}
@@ -122,7 +140,8 @@
%define my_libdir %_libdir
%define my_incdir %_includedir
%else
- %global my_prefix %{_libdir}/mpi/gcc/%{mpi_family}
+ %global my_suffix -%{?mpi_family}%{?mpi_ext}
+ %global my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext}
%global my_bindir %{my_prefix}/bin
%global my_libdir %{my_prefix}/%{_lib}/
%global my_incdir %{my_prefix}/include/
@@ -133,7 +152,7 @@
%endif
%define libname lib%{PNAME}%{somver}%{?my_suffix}
%else # with hpc
-%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m {%mpi_family}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
+%{hpc_init %{?compiler_family:-c %compiler_family %{?c_f_ver:-v %{c_f_ver}}} %{?with_mpi:-m {%mpi_family}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
%define my_prefix %hpc_prefix
%define my_bindir %hpc_bindir
%define my_libdir %hpc_libdir
@@ -146,30 +165,34 @@
Version: %{ver}
Release: 0
Summary: Scalable algorithms for solving linear systems of equations
-License: LGPL-2.1
-Group: Development/Tools/Other
+License: LGPL-2.1-only
+Group: Productivity/Scientific/Math
Url: https://www.llnl.gov/casc/hypre/
Source: https://github.com/LLNL/hypre/archive/v%{version}.tar.gz#/hypre-%{version}.…
+Patch0: hypre_Makefile_examples.patch
+Patch1: hypre_CMakeLists.patch
+
# TODO : add babel
#BuildRequires: babel-devel
-%if %{without hpc}
+%if %{with build_all}
+ %if %{without hpc}
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: lapack-devel
BuildRequires: superlu-devel
-%if 0%{?with mpi}
-BuildRequires: %{mpi_family}-devel
-%endif
-%else
-Requires: %{compiler_family}%{?c_f_ver}-compilers-hpc
-Requires: superlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
+ %if 0%{?with mpi}
+BuildRequires: %{mpi_family}%{?mpi_ext}-devel
+ %endif
+ %else
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
BuildRequires: %{mpi_family}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
BuildRequires: superlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
+ %endif
+BuildRequires: cmake
+%endif # build_all
+%if %{with hpc}
BuildRequires: suse-hpc
-%hpc_requires
-%hpc_requires_devel
%endif
BuildRequires: fdupes
# Default library install path
@@ -184,6 +207,12 @@
%package -n %{libname}
Summary: Scalable algorithms for solving linear systems of equations
Group: System/Libraries
+%if %{with hpc}
+%hpc_requires
+Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc
+Requires: libsuperlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc
+Requires: lua-lmod >= 7.6.1
+%endif
%description -n %{libname}
Hypre is a library of preconditioners that feature parallel multigrid
@@ -192,29 +221,54 @@
phenomena in the defense, environmental, energy, and biological
sciences.
-This package contains %{?mpi_family}%{!?mpi_family:serial} shared libraries of Hypre.
+This package contains %{?mpi_family}%{?mpi_vers}%{!?mpi_family:serial} shared libraries of Hypre.
%package devel
Summary: Headers and library links for %{libname}
Group: Development/Libraries/C and C++
Requires: %{libname} = %version
+Requires: lapack-devel
+Requires: superlu-devel
+%if %{with hpc}
+Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
+Requires: superlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
+%hpc_requires_devel
+%endif
%description devel
%{PNAME} headers and libraries files needed for development
-This package contains development files of the %{?mpi_family}%{!?mpi_family:serial} version of Hypre.
+This package contains development files of the %{?mpi_family}%{?mpi_vers}%{!?mpi_family:serial} version of Hypre.
+%package examples
+Summary: Examples for Hypre
+Group: Documentation/Other
+BuildArch: noarch
+
+%description examples
+This package contains examples for Hypre.
+
+%if %{with install_doc}
%package doc
Summary: Development documentation for Hypre
Group: Documentation/Other
+BuildArch: noarch
+BuildRequires: texlive-bibtex
+BuildRequires: texlive-latex-bin-bin
+BuildRequires: texlive-xypic
%description doc
This package contains development documentation for Hypre.
+%endif
-%{?with_hpc:%{hpc_master_package -l -N %PNAME -n lib%{PNAME}%{hpc_package_name_tail}}}
-%{?with_hpc:%{hpc_master_package devel}}
+%if %{with build_all}
+%{?with_hpc:%{hpc_master_package -L -l -N %PNAME -n lib%{PNAME}%{hpc_package_name_tail}}}
+%{?with_hpc:%{hpc_master_package -L devel}}
+%endif
%prep
%setup -q -n %{pname}-%{version}
+%patch0 -p0
+%patch1 -p1
%if %{without hpc}
cat > %{_sourcedir}/baselibs.conf <<EOF
%{libname}
@@ -225,137 +279,67 @@
%endif
%build
-
-cd src
-%define FLAGS %optflags -fPIC %{?with_hpc:-Dhypre_dgesvd=dgesvd_ -Dhypre_dlamch=dlamch_ -Dhypre_blas_lsame=hypre_lapack_lsame -Dhypre_blas_xerbla=hypre_lapack_xerbla }
-
-export CFLAGS="%{FLAGS}"
-export CXXFLAGS="%{FLAGS}"
-export LDFLAGS="-pie"
-
-%if %{without hpc}
-
+%if %{with build_all}
+ %if %{without hpc}
%{?with_mpi: . %{my_bindir}/mpivars.sh}
-
-%configure \
- --prefix=%{my_prefix} \
- --with-timing \
- --without-openmp \
-%if %{with mpi}
- --with-MPI \
- --with-MPI-include=%{my_incdir} \
- --with-MPI-lib-dirs=%{my_libdir} \
-%else
- --without-MPI \
-%endif
- --with-blas-lib=-lblas \
- --with-lapack \
- --with-lapack-lib="-llapack" \
- --with-mli \
- --with-fei \
- --with-superlu \
- %{?with_mpi: MPI_PREFIX=%%{mpiprefix} }
-
-%else
+ %else
%hpc_setup
module load openblas
module load superlu
-%if %{with mpi}
-# set this here for now as 'module purge' sets CC
-export CC=mpicc
-export CXX=mpicxx
-export F77=mpif77
-%endif
-
-%hpc_configure \
- --with-timing \
- --with-MPI \
- --with-MPI-include=%{my_incdir} \
- --with-MPI-lib-dirs=%{my_libdir} \
- --without-openmp \
- --with-blas-lib="-L$OPENBLAS_LIB -lopenblas" \
- --with-lapack-lib="-L$OPENBLAS_LIB -lopenblas" \
- --with-mli \
- --with-fei \
- --with-superlu \
- --with-superlu-include=$SUPERLU_INC \
- --with-superlu-lib=$SUPERLU_LIB
+ %endif
-%endif
+export LDFLAGS="-lm"
+
+cd src/
+ %if %{without hpc}
+%cmake \
+ %else
+%hpc_cmake \
+ %endif
+ -DHYPRE_SHARED=ON \
+ %if %{without mpi}
+ -DHYPRE_SEQUENTIAL=ON \
+ %else
+ -DHYPRE_SEQUENTIAL=OFF \
+ %endif
+ -DHYPRE_USING_HYPRE_BLAS=OFF \
+ -DHYPRE_USING_HYPRE_LAPACK=OFF \
+ -DCMAKE_SHARED_LINKER_FLAGS="-lm" \
-mkdir -p hypre/lib
-pushd FEI_mv/femli
-make %{?_smp_mflags} all
-popd
-make %{?_smp_mflags} all
-cd ..
+%make_jobs
+%endif # build_all
%install
-%if %{without hpc}
-%{?with_mpi: . %{my_bindir}/mpivars.sh}
-%else
-%{hpc_setup}
-%if %{with mpi}
-export CXX=mpicxx
-%endif
-%endif
-
+%if %{with install_doc}
+install -m 644 -D docs/*pdf -t %{buildroot}%{_docdir}/%{package_name}/
+%fdupes -s src/examples
+%endif
+%if %{with build_all}
+pushd .
+cd src/
+%cmake_install
+
+# move libaries arround for mpi builds
+ %if %{without hpc}
+ %if %{with mpi}
+mkdir -pv %{buildroot}%{my_libdir}
+mv -v %{buildroot}/usr/%{_lib}/*.so* %{buildroot}%{my_libdir}
+mv -v %{buildroot}/usr/include %{buildroot}%{my_incdir}
+ %endif
+ %endif
-# %%makeinstall macro does not work with hypre
-cd src
-make install HYPRE_INSTALL_DIR=%{buildroot}%{my_prefix} \
- HYPRE_LIB_INSTALL=%{buildroot}%{my_libdir} \
- HYPRE_INC_INSTALL=%{buildroot}%{my_incdir}%{!?with_hpc:/%{pname}}
-install -m644 hypre/lib/* %{buildroot}%{my_libdir}
-
-# install LLNL FEI headers
-mkdir -p %{buildroot}%{my_incdir}/%{!?with_hpc:%{pname}/}FEI_mv
-cp -r FEI_mv/fei-base %{buildroot}%{my_incdir}/%{!?with_hpc:%{pname}/}FEI_mv/.
-cd ..
-
-# Fix wrong permissions
-chmod 644 %{buildroot}%{my_incdir}/%{!?with_hpc:%{pname}/}*.h
-
-# This files are provided with babel - TODO
-rm -f %{buildroot}%%{my_libdir}/libsidl*
-
-# shared libraries
-
-pushd %{buildroot}%{my_libdir}
-LIBS="$(ls *.a|sed 's|\.a||'|sort)"
-mkdir tmp; pushd tmp
-for i in $LIBS; do
- if [ "$i" != "libbHYPREClient-F" -a "$i" != "libbHYPREClient-CX" ]
- then
- ar x ../$i.a
- ${CXX:-c++} -shared * -L.. $ADDLIB \
- -Wl,-soname,$i.so.%{somver} -o ../$i.so.%{sover}
- ln -s $i.so.%sover ../$i.so.%{somver}
- ln -s $i.so.%{somver} ../$i.so
- rm -f *
- ADDLIB="-lHYPRE"
- fi
-done
-popd
-rm -rf tmp
-rm libHYPRE.a
-popd
-
-%if 0%{?install_doc}
-install -d %{buildroot}%{_docdir}/%{package_name}
-cp -fR docs/* %{buildroot}%{_docdir}/%{package_name}/
-%endif
+ %if %{with hpc}
+%{hpc_write_pkgconfig -n %{pname} -l %{PNAME}}
-%if %{with hpc}
%hpc_write_modules_files
-#%Module1.0#####################################################################
+#%%Module1.0#####################################################################
proc ModulesHelp { } {
puts stderr " "
puts stderr "This module loads the hypre library built with the %{compiler_family} compiler"
-puts stderr "toolchain and the %{mpi_family} MPI stack."
+puts stderr "toolchain and the %{mpi_family}%{?mpi_vers} MPI stack."
puts stderr " "
puts stderr "Note that this build of hypre leverages the superlu and MKL libraries."
puts stderr "Consequently, these packages are loaded automatically with this module."
@@ -363,44 +347,76 @@
puts stderr "\nVersion %{version}\n"
}
-module-whatis "Name: %{pname} built with %{compiler_family} compiler and %{mpi_family} MPI"
+module-whatis "Name: %{pname} built with %{compiler_family} compiler and %{mpi_family}%{?mpi_vers} MPI"
+module-whatis "Description: %{SUMMARY}"
module-whatis "Version: %{version}"
module-whatis "Category: runtime library"
module-whatis "%{url}"
set version %{version}
+depends-on openblas
+depends-on superlu
+
prepend-path PATH %{hpc_bindir}
+if {[file isdirectory %{hpc_includedir}]} {
prepend-path INCLUDE %{hpc_includedir}
+
+%hpc_modulefile_add_pkgconfig_path
+}
prepend-path LD_LIBRARY_PATH %{hpc_libdir}
setenv %{PNAME}_DIR %{hpc_prefix}
setenv %{PNAME}_BIN %{hpc_bindir}
+if {[file isdirectory %{hpc_includedir}]} {
setenv %{PNAME}_INC %{hpc_includedir}
+prepend-path CPATH %{hpc_includedir}
+prepend-path C_INCLUDE_PATH %{hpc_includedir}
+prepend-path CPLUS_INCLUDE_PATH %{hpc_includedir}
+
+}
setenv %{PNAME}_LIB %{hpc_libdir}
EOF
-%endif
+ %endif
%fdupes -s %{buildroot}%{my_prefix}
+%endif # build_all
+%if %{without hpc} && %{without mpi}
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
+%else
+%post -n %{libname}
+/sbin/ldconfig -N %{my_libdir}
+
+%postun -n %{libname}
+/sbin/ldconfig -N %{my_libdir}
+%{?with_hpc:%hpc_module_delete_if_default}
+%endif
+%if %{with build_all}
%files -n %{libname}
%{?hpc_dirs}
%{?hpc_modules_files}
%{my_libdir}/*.so.*
%files devel
+%if %{with hpc}
%{?hpc_dirs}
+%{hpc_pkgconfig_file}
+%endif
%license COPYING.LESSER COPYRIGHT
%doc CHANGELOG README
%{my_incdir}%{?!with_hpc:/%{pname}}
%{my_libdir}/*.so
+%endif # build_all
-%if 0%{?install_doc}
+%if %{with install_doc}
%files doc
%{_docdir}/%{package_name}
+
+%files examples
+%doc src/examples
%endif
%changelog
++++++ hypre_CMakeLists.patch ++++++
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f766f7..1b339e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,8 @@ project (hypre)
# The version number.
set (HYPRE_VERSION 2.15.1)
+set (HYPRE_MAJOR 0)
+set (HYPRE_MINOR 0.2.6)
set (HYPRE_DATE 2018/10/19)
set (HYPRE_TIME 00:00:00)
set (HYPRE_BUGS hypre-support(a)llnl.gov)
@@ -775,19 +777,6 @@ else ()
set (BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
endif ()
-# Set MPI compile flags
-if (NOT HYPRE_SEQUENTIAL)
- find_package (MPI)
- if ((MPI_C_FOUND) AND (NOT CMAKE_C_COMPILER STREQUAL MPI_C_COMPILER))
- include_directories (${MPI_C_INCLUDE_PATH})
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}")
- endif ()
- if ((MPI_CXX_FOUND) AND (NOT CMAKE_CXX_COMPILER STREQUAL MPI_CXX_COMPILER))
- include_directories (${MPI_CXX_INCLUDE_PATH})
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MPI_CXX_COMPILE_FLAGS}")
- endif ()
-endif (NOT HYPRE_SEQUENTIAL)
-
# Set OpenMP compile flags
if (HYPRE_USING_OPENMP)
find_package (OpenMP)
@@ -832,9 +821,25 @@ if (HYPRE_USING_FEI)
endif ()
add_library (HYPRE ${HYPRE_SOURCES} ${FEI_LIBS})
+set_target_properties(HYPRE PROPERTIES VERSION ${HYPRE_MINOR} SOVERSION ${HYPRE_MAJOR})
+
+# Set MPI compile flags
+if (NOT HYPRE_SEQUENTIAL)
+ find_package (MPI)
+ include_directories(${MPI_INCLUDE_PATH})
+ if (MPI_COMPILE_FLAGS)
+ set_target_properties(HYPRE PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
+ endif()
+ if (MPI_LINK_FLAGS)
+ set_target_properties(HYPRE PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
+ endif()
+ target_link_libraries(HYPRE ${MPI_C_LIBRARIES})
+endif (NOT HYPRE_SEQUENTIAL)
+
+
-install (TARGETS HYPRE DESTINATION lib)
-install (FILES ${HYPRE_HEADERS} DESTINATION include)
+install (TARGETS HYPRE DESTINATION lib${LIB_SUFFIX})
+install (FILES ${HYPRE_HEADERS} DESTINATION include/hypre)
# add_subdirectory (test EXCLUDE_FROM_ALL)
++++++ hypre_Makefile_examples.patch ++++++
--- src/examples/Makefile.orig 2019-02-13 14:10:08.298666931 +0100
+++ src/examples/Makefile 2019-02-13 14:10:26.674630317 +0100
@@ -27,7 +28,7 @@
LINKOPTS = $(COPTS)
-LIBS = -L$(HYPRE_DIR)/lib -lHYPRE -lm
+LIBS = -L$(HYPRE_LIB) -L$(SUPERLU_LIB) -lHYPRE -lm -lblas -llapack -lsuperlu
LFLAGS = $(LINKOPTS) $(LIBS) -lstdc++
LFLAGS_B =\
-L${HYPRE_DIR}/lib\
1
0
Hello community,
here is the log from the commit of package scalapack for openSUSE:Factory checked in at 2019-07-05 13:48:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scalapack (Old)
and /work/SRC/openSUSE:Factory/.scalapack.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scalapack"
Fri Jul 5 13:48:37 2019 rev:12 rq:678390 version:2.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/scalapack/scalapack.changes 2018-12-13 19:49:17.548635160 +0100
+++ /work/SRC/openSUSE:Factory/.scalapack.new.4615/scalapack.changes 2019-07-05 13:48:38.681446510 +0200
@@ -1,0 +2,14 @@
+Fri Feb 22 19:17:17 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de>
+
+- spec file cleanup:
+ * Use %license, remove %defattr
+ * Shorten descriptions and fix some typos
+ * Remove redundant (and wrong) pointer to test data install dir
+
+-------------------------------------------------------------------
+Wed Feb 13 10:52:29 UTC 2019 - Egbert Eich <eich(a)suse.com>
+
+- Consolidate use of openmpi1, openmpi2, openmpi3 for non-HPC builds.
+- Disable openmpi1/3 and non-HPC builds on SLE.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scalapack.spec ++++++
--- /var/tmp/diff_new_pack.Jo3qZZ/_old 2019-07-05 13:48:39.521447806 +0200
+++ /var/tmp/diff_new_pack.Jo3qZZ/_new 2019-07-05 13:48:39.525447812 +0200
@@ -1,7 +1,7 @@
#
# spec file for package scalapack
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -23,8 +23,12 @@
%define _vers 2_0_2
%if 0%{?is_opensuse} || 0%{?is_backports}
+%undefine DisOMPI1
+%undefine DisOMPI2
%undefine DisOMPI3
%else
+%define DisOMPI1 ExclusiveArch: do_not_build
+%undefine DisOMPI2
%define DisOMPI3 ExclusiveArch: do_not_build
%endif
@@ -34,23 +38,29 @@
%endif
%if "%flavor" == "openmpi"
+%{?DisOMPI1}
%define mpi_flavor openmpi
+%define mpi_vers 1
%{bcond_with hpc}
-%{bcond_without blacs_devel_headers}
-%else
-# Only build header back on one multibuild for non-HPC.
-# Note: For HPC the headers need to be built always.
-%{bcond_with blacs_devel_headers}
%endif
%if "%flavor" == "openmpi2"
-%define mpi_flavor openmpi2
+%{?DisOMPI2}
+%define mpi_flavor openmpi
+%define mpi_vers 2
%{bcond_with hpc}
%endif
%if "%flavor" == "openmpi3"
-%define mpi_flavor openmpi3
+%{?DisOMPI3}
+%define mpi_flavor openmpi
+%define mpi_vers 3
%{bcond_with hpc}
+%{bcond_without blacs_devel_headers}
+%else
+# Only build header back on one multibuild for non-HPC.
+# Note: For HPC the headers need to be built always.
+%{bcond_with blacs_devel_headers}
%endif
%if "%flavor" == "mvapich2"
@@ -131,17 +141,26 @@
%{bcond_without hpc}
%endif
+%if !0%{?is_opensuse} && !0%{?with_hpc:1}
+ExclusiveArch: do_not_build
+%endif
+
+# For compatibility package names
+%if "%{mpi_flavor}" != "openmpi" || "%{mpi_vers}" != "1"
+%define mpi_ext %{?mpi_vers}
+%endif
+
%define so_ver 2
%if %{without hpc}
%if 0%{!?package_name:1}
-%define package_name %{pname}-%{mpi_flavor}
+%define package_name %{pname}-%{mpi_flavor}%{?mpi_ext}
%endif
-%define libname() lib%{pname}%{so_ver}-%{mpi_flavor}
-%define libblacsname() libblacs%{so_ver}-%{mpi_flavor}
-%define installdir %{_libdir}/mpi/gcc/%{mpi_flavor}
+%define libname() lib%{pname}%{so_ver}-%{mpi_flavor}%{?mpi_ext}
+%define libblacsname() libblacs%{so_ver}-%{mpi_flavor}%{?mpi_ext}
+%define installdir %{_libdir}/mpi/gcc/%{mpi_flavor}%{?mpi_ext}
%define p_includedir %{_includedir}
%else
-%{hpc_init -c %compiler_family -m %mpi_flavor %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
+%{hpc_init -c %compiler_family -m %mpi_flavor %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
%define package_name %{hpc_package_name %{?_vers}}
%define libname() lib%{pname}%{so_ver}%{expand:%%{hpc_package_name_tail %{**}}}
@@ -166,7 +185,7 @@
# PATCH-FIX-OPENSUSE scalapack-2.0.2-shared-blacs.patch -- build shared blacs library
Patch1: scalapack-2.0.2-shared-blacs.patch
%if %{without hpc}
-BuildRequires: %{mpi_flavor}-devel
+BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel
BuildRequires: blas-devel
BuildRequires: gcc-fortran
BuildRequires: lapack-devel
@@ -214,7 +233,7 @@
This package contains headers for BLACS.
%package -n %{libname %_vers}
-Summary: ScaLAPACK libraries compiled against %{mpi_flavor}
+Summary: ScaLAPACK libraries compiled against %{mpi_flavor}%{?mpi_vers}
Group: Development/Libraries/Parallel
Obsoletes: %{name} < %{version}
Provides: %{name} = %{version}
@@ -250,16 +269,16 @@
BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK
routines resemble their LAPACK equivalents as much as possible.
-This package contains ScaLAPACK libraries compiled with %{mpi_flavor}.
+This package contains ScaLAPACK libraries compiled with %{mpi_flavor}%{?mpi_vers}.
%{?with_hpc:%{hpc_master_package -s %so_ver -n %{libname_plain} -L}}
%package -n %{libname %_vers}-devel
-Summary: Development libraries for ScaLAPACK (%{mpi_flavor})
+Summary: Development libraries for ScaLAPACK (%{mpi_flavor}%{?mpi_vers})
Group: Development/Libraries/Parallel
Requires: %{libname %_vers} = %{version}
%if %{without hpc}
-Requires: %{mpi_flavor}-devel
+Requires: %{mpi_flavor}%{?mpi_ext}-devel
%else
%hpc_requires_devel
Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
@@ -268,28 +287,27 @@
Provides: %{name}-devel = %{version}
%description -n %{libname %_vers}-devel
-This package contains development libraries for ScaLAPACK, compiled against %{mpi_flavor}.
+This package contains development libraries for ScaLAPACK, compiled against %{mpi_flavor}%{?mpi_vers}.
%{?with_hpc:%{hpc_master_package -n %{libname_plain}-devel -s %so_ver devel}}
%package -n %{libname %_vers}-devel-static
-Summary: Static libraries for ScaLAPACK (%{mpi_flavor})
+Summary: Static libraries for ScaLAPACK (%{mpi_flavor}%{?mpi_vers})
Group: Development/Libraries/Parallel
Requires: %{libname %_vers}-devel = %{version}
Obsoletes: %{name}-devel-static < %{version}
Provides: %{name}-devel-static = %{version}
%description -n %{libname %_vers}-devel-static
-This package contains static libraries for ScaLAPACK, compiled against %{mpi_flavor}.
+This package contains static libraries for ScaLAPACK, compiled against %{mpi_flavor}%{?mpi_vers}.
%package test
-Summary: Test programs for ScaLAPACK (%{mpi_flavor})
+Summary: Test programs for ScaLAPACK (%{mpi_flavor}%{?mpi_vers})
Group: Development/Libraries/Parallel
%description test
-This packages contains the few tests programs for ScaLAPACK compiled against
-%{mpi_flavor}. These programs needs data files which are provided with this package
-in the directory /usr/share/doc/packages/scalapack-test-%{mpi_flavor}.
+This packages contains some test programs for ScaLAPACK compiled against
+%{mpi_flavor}%{?mpi_vers}.
%package -n %{libblacsname %_vers}
Summary: Basic Linear Algebra Communication Subprograms
@@ -300,43 +318,42 @@
%endif
%description -n %{libblacsname %_vers}
-The BLACS (Basic Linear Algebra Communication Subprograms) project is
-an ongoing investigation whose purpose is to create a linear algebra
-oriented message passing interface that may be implemented efficiently
-and uniformly across a large range of distributed memory platforms.
+The BLACS (Basic Linear Algebra Communication Subprograms) project
+provides a linear algebra oriented message passing interface for
+a large range of distributed memory platforms.
The length of time required to implement efficient distributed memory
-algorithms makes it impractical to rew/mpi/gccrite programs for every new
+algorithms makes it impractical to rewrite programs for every new
parallel machine. The BLACS exist in order to make linear algebra
applications both easier to program and more portable.
%{?with_hpc:%{hpc_master_package -l -n %{libblacs_plain} -N blacs -s %so_ver}}
%package -n %{libblacsname %_vers}-devel
-Summary: Development libraries for BLACS (%{mpi_flavor})
+Summary: Development libraries for BLACS (%{mpi_flavor}%{?mpi_vers})
Group: Development/Libraries/Parallel
Requires: %{libblacsname %_vers} = %{version}
%if %{without hpc}
-Requires: %{mpi_flavor}-devel
+Requires: %{mpi_flavor}%{?mpi_ext}-devel
Requires: blacs-devel-headers
-Obsoletes: blacs-%{mpi_flavor}-devel < %{version}
-Provides: blacs-%{mpi_flavor}-devel = %{version}
+Obsoletes: blacs-%{mpi_flavor}%{?mpi_ext}-devel < %{version}
+Provides: blacs-%{mpi_flavor}%{?mpi_ext}-devel = %{version}
%else
%hpc_requires_devel
%endif
%description -n %{libblacsname %_vers}-devel
-This package contains development libraries for BLACS, compiled against %{mpi_flavor}.
+This package contains development libraries for BLACS, compiled against %{mpi_flavor}%{?mpi_vers}.
%package -n %{libblacsname %_vers}-devel-static
-Summary: Development libraries for BLACS (%{mpi_flavor})
+Summary: Development libraries for BLACS (%{mpi_flavor}%{?mpi_vers})
Group: Development/Libraries/Parallel
Requires: %{libblacsname %_vers}-devel = %{version}
%{?with_hpc:%{hpc_master_package -n %{libblacs_plain}-devel -N blacs -s %so_ver -a devel}}
%description -n %{libblacsname %_vers}-devel-static
-This package contains static libraries for BLACS, compiled against %{mpi_flavor}.
+This package contains static libraries for BLACS, compiled against %{mpi_flavor}%{?mpi_vers}.
%if %{with hpc}
%package module
@@ -344,7 +361,7 @@
Group: Development/Libraries/Parallel
%description module
-This package contains module files required buy SCALAPACK and BLACS, compiled against %{mpi_flavor}.
+This package contains module files required by SCALAPACK and BLACS, compiled against %{mpi_flavor}%{?mpi_vers}.
%endif
%prep
@@ -358,7 +375,7 @@
cat > %{_sourcedir}/baselibs.conf <<EOF
%{libname %{?_vers}}
%{libname %{?_vers}}-devel
- requires -%{mpi_flavor}-<targettype>
+ requires -%{mpi_flavor}%{?mpi_ext}-<targettype>
requires "%{libname %{?_vers}}-<targettype> = <version>"
EOF
%endif
@@ -373,8 +390,8 @@
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
cd %{pname}-%{version};
%if %{without hpc}
-echo $PATH | grep -q %{mpi_flavor} || PATH=/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin:$PATH
-%define makeargs CC=/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpicc FC=/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpif90 %{?_smp_flags}
+echo $PATH | grep -q %{mpi_flavor}%{?mpi_ext} || PATH=/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin:$PATH
+%define makeargs CC=/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/mpicc FC=/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/mpif90 %{?_smp_flags}
%else
%define makeargs FCFLAGS+="$(pkg-config --cflags openblas)" LIBS="$(pkg-config --libs openblas)" %{?_smp_flags}
%endif
@@ -475,38 +492,32 @@
%endif
%files -n %{libname %_vers}
-%defattr(-,root,root,-)
-%doc README LICENSE
+%license LICENSE
+%doc README
%{installdir}/%_lib/libscalapack.so.*
%{?with_hpc:%hpc_dirs}
%files test
-%defattr(-,root,root,-)
%{installdir}/%_lib/TESTING
%files -n %{libname %_vers}-devel
-%defattr(-,root,root,-)
%{installdir}/%_lib/libscalapack.so
%{?with_hpc:%hpc_pkgconfig_file}
%files -n %{libname %_vers}-devel-static
-%defattr(-,root,root,-)
%{installdir}/%_lib/libscalapack.a
%if %{without hpc}
%if %{with blacs_devel_headers}
%files -n blacs-devel-headers
-%defattr(-,root,root,-)
%{p_includedir}/blacs/
%endif
%endif
%files -n %{libblacsname %_vers}
-%defattr(-,root,root,-)
%{installdir}/%_lib/libblacs.so.*
%files -n %{libblacsname %_vers}-devel
-%defattr(-,root,root,-)
%{installdir}/%_lib/libblacs.so
%if %{with hpc}
%{hpc_pkgconfig_file -n blacs}
@@ -515,7 +526,6 @@
%endif
%files -n %{libblacsname %_vers}-devel-static
-%defattr(-,root,root,-)
%{installdir}/%_lib/libblacs.a
%if %{with hpc}
1
0
Hello community,
here is the log from the commit of package scotch for openSUSE:Factory checked in at 2019-07-05 13:48:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scotch (Old)
and /work/SRC/openSUSE:Factory/.scotch.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scotch"
Fri Jul 5 13:48:35 2019 rev:2 rq:674944 version:6.0.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/scotch/scotch.changes 2019-01-26 22:22:48.030836994 +0100
+++ /work/SRC/openSUSE:Factory/.scotch.new.4615/scotch.changes 2019-07-05 13:48:36.241442747 +0200
@@ -1,0 +2,18 @@
+Thu Feb 14 09:17:41 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Fix the package group fix.
+
+-------------------------------------------------------------------
+Mon Feb 11 06:35:16 UTC 2019 - Egbert Eich <eich(a)suse.com>
+
+- Set default module version correctly when installing
+ master package, unset when deinstalling the default library
+ package.
+- Fix dependencies for HPC packages.
+- Fix HPC modulefile: library dir is always there when module file
+ is installed.
+- Fix package groups.
+- Cosmetic fixes to module file.
+- Consolidate use of openmpi1, openmpi2, openmpi3 for non-HPC builds.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scotch.spec ++++++
--- /var/tmp/diff_new_pack.3skVBt/_old 2019-07-05 13:48:36.757443543 +0200
+++ /var/tmp/diff_new_pack.3skVBt/_new 2019-07-05 13:48:36.761443549 +0200
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%global flavor @BUILD_FLAVOR@%{nil}
%define base_pname scotch
@@ -45,20 +46,21 @@
%if "%{flavor}" == "openmpi"
%{?DisOMPI1}
-%global mpi_family %{flavor}
+%global mpi_family openmpi
%bcond_with hpc
+%define mpi_vers 1
%endif
%if "%{flavor}" == "openmpi2"
%{?DisOMPI2}
-%global mpi_family %{flavor}
+%global mpi_family openmpi
%bcond_with hpc
%define mpi_vers 2
%endif
%if "%{flavor}" == "openmpi3"
%{?DisOMPI3}
-%global mpi_family %{flavor}
+%global mpi_family openmpi
%bcond_with hpc
%define mpi_vers 3
%endif
@@ -132,7 +134,12 @@
%{?mpi_family:%{bcond_without mpi}}%{!?mpi_family:%{bcond_with mpi}}
%{?with_hpc:%{!?compiler_family:%global compiler_family gnu}}
-%{?with_mpi:%{!?mpi_family:%global mpi_family openmpi}}
+%{?with_mpi:%{!?mpi_family:error "No MPI family specified!"}}
+
+# For compatibility package names
+%if "%{mpi_family}" != "openmpi" || "%{mpi_vers}" != "1"
+%define mpi_ext %{?mpi_vers}
+%endif
%if %{without mpi}
%define pname %{base_pname}
@@ -144,7 +151,7 @@
%endif
%if %{with hpc}
-%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_family} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
+%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_family} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
%define my_prefix %hpc_prefix
%define my_bindir %hpc_bindir
%define my_libdir %hpc_libdir
@@ -160,8 +167,8 @@
%define my_incdir %_includedir
%define my_mandir %_mandir
%else
- %global my_suffix -%{mpi_family}%{?mpi_ver}
- %define my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ver}
+ %define my_suffix -%{mpi_family}%{?mpi_ext}
+ %define my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext}
%define my_bindir %{my_prefix}/bin
%define my_libdir %{my_prefix}/%{_lib}/
%define my_incdir %{my_prefix}/include/
@@ -173,10 +180,9 @@
%define f_name(ln:s:) %{-l:lib}%{pname}%{-n*}%{-s*}%{?my_suffix}
%endif
-
Summary: Graph, mesh and hypergraph partitioning library
License: CECILL-C
-Group: Development/Libraries/C and C++
+Group: Productivity/Scientific/Math
Name: %{package_name}
Version: %{vers}
Release: 0
@@ -188,19 +194,19 @@
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
+BuildRequires: libbz2-devel
BuildRequires: make
BuildRequires: zlib-devel
-BuildRequires: libbz2-devel
%if %{without hpc}
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
%if %{with mpi}
-BuildRequires: %{mpi_family}%{?mpi_ver}-devel
+BuildRequires: %{mpi_family}%{?mpi_ext}-devel
%endif
%else # hpc
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
-BuildRequires: lua-lmod
+BuildRequires: lua-lmod >= 7.6.1
BuildRequires: suse-hpc >= 0.2
Requires: %{f_name -l -s %{so_ver}} = %version
%if %{with mpi}
@@ -212,22 +218,26 @@
Scotch is a software package for graph and mesh/hypergraph partitioning and
sparse matrix ordering.
-%{?with_hpc:%{hpc_master_package}}
+%{?with_hpc:%{hpc_master_package -L}}
%package -n %{f_name -l -s %{so_ver}}
Summary: Graph, mesh and hypergraph partitioning library
Group: System/Libraries
-%if %{without hpc} && %{with mpi}
+%if %{without hpc}
+ %if %{with mpi}
BuildRequires: libscotch%{so_ver}
Requires: libscotch%{so_ver}
+ %endif
+%else
+%hpc_requires
+Requires: lua-lmod >= 7.6.1
%endif
-%{?with_hpc:%hpc_requires}
%description -n %{f_name -l -s %{so_ver}}
Scotch is a software package for graph and mesh/hypergraph partitioning and
sparse matrix ordering.
-%{?with_hpc:%{hpc_master_package -l -n lib%{pname}%{hpc_package_name_tail}}}
+%{?with_hpc:%{hpc_master_package -L -l -n lib%{pname}%{hpc_package_name_tail}}}
%package devel
Summary: Development libraries for scotch
@@ -237,8 +247,8 @@
Requires: gcc-fortran
%if %{with mpi}
BuildRequires: scotch-devel
+Requires: %{mpi_family}%{?mpi_ext}-devel
Requires: scotch-devel
-Requires: %{mpi_family}-devel
%else
Provides: scotch-devel = %{version}
%endif
@@ -250,7 +260,7 @@
%description devel
This package contains development libraries for libscotch.
-%{?with_hpc:%{hpc_master_package devel}}
+%{?with_hpc:%{hpc_master_package -L devel}}
%package devel-static
Summary: Development libraries for scotch
@@ -261,8 +271,6 @@
%description devel-static
This package contains libscotch static libraries.
-%{?with_hpc:%{hpc_master_package devel-static}}
-
%package -n %{f_name -n -%{metis}}-devel
Summary: Development libraries for scotch
Group: Development/Libraries/C and C++
@@ -367,13 +375,13 @@
puts stderr " "
puts stderr "This module loads the Scotch library built with the %{compiler_family} compiler"
-puts stderr "toolchain and the %{mpi_family} MPI stack."
+puts stderr "toolchain and the %{mpi_family}%{?mpi_vers} MPI stack."
puts stderr " "
puts stderr "\nVersion %{version}\n"
}
-module-whatis "Name: %{pname} built with %{compiler_family} compiler and %{mpi_family} MPI"
+module-whatis "Name: %{pname} built with %{compiler_family} compiler and %{mpi_family}%{?mpi_vers} MPI"
module-whatis "Version: %{version}"
module-whatis "Category: runtime library"
module-whatis "Description: %{SUMMARY:0}"
@@ -394,8 +402,8 @@
setenv %{hpc_upcase %pname}_BIN %{hpc_bindir}
if {[file isdirectory %{hpc_includedir}]} {
setenv %{hpc_upcase %pname}_LIB %{hpc_libdir}
-setenv %{hpc_upcase %pname}_INC %{hpc_includedir}
}
+setenv %{hpc_upcase %pname}_INC %{hpc_includedir}
EOF
%endif # without hpc
@@ -421,8 +429,10 @@
# HPC and MPI package install to non-standard locations: don't update cache
%post -n %{f_name -l -s %so_ver}
/sbin/ldconfig -N %{my_libdir}
+
%postun -n %{f_name -l -s %so_ver}
/sbin/ldconfig -N %{my_libdir}
+%{?with_hpc:%hpc_module_delete_if_default}
%endif
%files
1
0
Hello community,
here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2019-07-05 13:48:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf (Old)
and /work/SRC/openSUSE:Factory/.netcdf.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf"
Fri Jul 5 13:48:32 2019 rev:45 rq:674847 version:4.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2019-01-10 15:22:51.986359925 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf.new.4615/netcdf.changes 2019-07-05 13:48:33.545438590 +0200
@@ -1,0 +2,5 @@
+Wed Feb 13 11:49:57 UTC 2019 - Egbert Eich <eich(a)suse.com>
+
+- Consolidate use of openmpi1, openmpi2, openmpi3.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf.spec ++++++
--- /var/tmp/diff_new_pack.qH2yFC/_old 2019-07-05 13:48:34.193439589 +0200
+++ /var/tmp/diff_new_pack.qH2yFC/_new 2019-07-05 13:48:34.193439589 +0200
@@ -1,7 +1,7 @@
#
# spec file for package netcdf
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -134,12 +134,23 @@
%endif
%if "%{flavor}" == "openmpi"
+%{?DisOMPI1}
%define mpi_flavor openmpi
+%define mpi_ver 1
%bcond_with hpc
%endif
%if "%{flavor}" == "openmpi2"
-%define mpi_flavor openmpi2
+%{?DisOMPI2}
+%define mpi_flavor openmpi
+%define mpi_ver 2
+%bcond_with hpc
+%endif
+
+%if "%{flavor}" == "openmpi3"
+%{?DisOMPI3}
+%define mpi_flavor openmpi
+%define mpi_ver 3
%bcond_with hpc
%endif
@@ -149,7 +160,12 @@
%{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
%{?with_hpc:%{!?compiler_family:%global compiler_family gnu}}
-%{?with_mpi:%{!?mpi_flavor:%global mpi_flavor openmpi}}
+%{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
+
+# For compatibility package names
+%if "%{mpi_flavor}" != "openmpi" || "%{mpi_ver}" != "1"
+%define mpi_ext %{?mpi_ver}
+%endif
%if %{with hpc}
%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m {%mpi_flavor}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
@@ -171,14 +187,14 @@
%define p_mandir %_mandir
%define p_includedir %_includedir
%else
-%define p_prefix /usr/%{_lib}/mpi/gcc/%{mpi_flavor}
+%define p_prefix /usr/%{_lib}/mpi/gcc/%{mpi_flavor}%{?mpi_ext}
%define p_bindir %{p_prefix}/bin
%define p_libdir %{p_prefix}/%{_lib}
%define p_mandir %{p_prefix}/share/man
%define p_includedir %{p_prefix}/include
%endif
%endif
-%define p_suffix %{?with_mpi:-%{mpi_flavor}}
+%define p_suffix %{?with_mpi:-%{mpi_flavor}%{?mpi_ext}}
%define hdf5_module_file %{?with_mpi:p}hdf5
Name: %{package_name}
@@ -209,7 +225,7 @@
BuildRequires: hdf5%{p_suffix}-devel
BuildRequires: libhdf5_hl%{p_suffix}
%if %{with mpi}
-BuildRequires: %{mpi_flavor}-devel
+BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel
%if "%{flavor}" == "openmpi"
BuildRequires: libpnetcdf%{p_suffix}
BuildRequires: parallel-netcdf%{p_suffix}-devel
@@ -234,7 +250,7 @@
%if %{without mpi}
This package contains utility functions for working with NetCDF files.
%else
-This package contains the %{mpi_flavor} version of utility functions for
+This package contains the %{mpi_flavor}%{?mpi_ver} version of utility functions for
working with NetCDF files.
%endif
@@ -294,7 +310,7 @@
%if %{without mpi}
This package contains the NetCDF runtime libraries.
%else
-This package contains the %{mpi_flavor} versuib if the NetCDF runtime
+This package contains the %{mpi_flavor}%{?mpi_ver} versuib if the NetCDF runtime
libraries.
%endif
@@ -324,9 +340,9 @@
Requires: zlib-devel >= 1.2.5
%if %{without hpc}
Requires: hdf5%{p_suffix}-devel >= 1.8.8
-%{?with_mpi:Requires: %{mpi_flavor}-devel}
+%{?with_mpi:Requires: %{mpi_flavor}%{?mpi_ext}-devel}
%if "%{flavor}" == "openmpi"
-Requires: parallel-netcdf-%{mpi_flavor}-devel
+Requires: parallel-netcdf-%{mpi_flavor}%{?mpi_ext}-devel
%endif
%else
%{hpc_requires_devel}
@@ -342,7 +358,7 @@
This package contains all files needed to create projects that use NetCDF.
%else
This package contains all files needed to create projects that use
-the %{mpi_flavor} version of NetCDF.
+the %{mpi_flavor}%{?mpi_ver} version of NetCDF.
%endif
%{?with_hpc:%{hpc_master_package devel}}
@@ -366,7 +382,7 @@
%if %{without mpi}
This package contains the static libraries for NetCDF.
%else
-This package contains the %{mpi_flavor} versions of the static libraries
+This package contains the %{mpi_flavor}%{?mpi_ver} versions of the static libraries
for NetCDF.
%endif
@@ -392,9 +408,9 @@
%if %{without mpi}
export CC=gcc CXX=g++ FC=gfortran
%else
-export CC=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/}mpicc
-export FC=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/}mpif90
-export CXX=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/}mpic++
+export CC=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/}mpicc
+export FC=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/}mpif90
+export CXX=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/}mpic++
%endif
autoreconf -fv
export CFLAGS="-fno-strict-aliasing %{?with_hpc:-L$HDF5_LIB -I$HDF5_INC}"
@@ -452,8 +468,8 @@
%if %{without hpc}
%if %{with mpi}
# Module files
-mkdir -p %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}
-cat << EOF > %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}/%version
+mkdir -p %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}%{?mpi_ext}
+cat << EOF > %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}%{?mpi_ext}/%version
#%%Module
proc ModulesHelp { } {
global dotversion
@@ -479,7 +495,7 @@
puts stderr " "
puts stderr "This module loads the NetCDF C API built with the %{compiler_family} compiler"
-puts stderr "toolchain and the %{mpi_flavor} MPI stack."
+puts stderr "toolchain and the %{mpi_flavor}%{?mpi_ver} MPI stack."
puts stderr " "
puts stderr "Note that this build of NetCDF leverages the HDF I/O library and requires linkage"
puts stderr "against hdf5. Consequently, the phdf5 package is loaded automatically with this module."
@@ -535,7 +551,7 @@
module load %{hdf5_module_file}
%else
%if %{with mpi}
- . /usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpivars.sh
+ . /usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/mpivars.sh
%endif
%endif
make check
@@ -566,7 +582,7 @@
%else
%if %{with mpi}
%dir %{_datadir}/modules
-%{_datadir}/modules/%{pname}-%{mpi_flavor}
+%{_datadir}/modules/%{pname}-%{mpi_flavor}%{?mpi_ext}
%endif
%endif
%{p_libdir}/libnetcdf.so.*
1
0
Hello community,
here is the log from the commit of package python-PyHamcrest for openSUSE:Factory checked in at 2019-07-05 13:48:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyHamcrest (Old)
and /work/SRC/openSUSE:Factory/.python-PyHamcrest.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyHamcrest"
Fri Jul 5 13:48:21 2019 rev:2 rq:713181 version:1.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyHamcrest/python-PyHamcrest.changes 2018-10-18 15:32:13.118583490 +0200
+++ /work/SRC/openSUSE:Factory/.python-PyHamcrest.new.4615/python-PyHamcrest.changes 2019-07-05 13:48:22.537421614 +0200
@@ -1,0 +2,6 @@
+Wed Jul 3 08:35:33 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Add patch to fix build with new pytest:
+ * pytest4.patch
+
+-------------------------------------------------------------------
New:
----
pytest4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyHamcrest.spec ++++++
--- /var/tmp/diff_new_pack.XrhkDL/_old 2019-07-05 13:48:23.921423748 +0200
+++ /var/tmp/diff_new_pack.XrhkDL/_new 2019-07-05 13:48:23.921423748 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-PyHamcrest
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,9 +28,10 @@
#Source: https://files.pythonhosted.org/packages/source/P/PyHamcrest/PyHamcrest-%%{v…
Source: https://github.com/hamcrest/PyHamcrest/archive/V%{version}.tar.gz
Patch0: 0001-Add-boolean-matchers.patch
+Patch1: pytest4.patch
BuildRequires: %{python_module hypothesis >= 1.11}
BuildRequires: %{python_module mock}
-BuildRequires: %{python_module pytest-cov}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six >= 1.4}
BuildRequires: fdupes
@@ -48,7 +49,8 @@
%prep
%setup -q -n PyHamcrest-%{version}
-%patch0 -p1
+%autopatch -p1
+rm pytest.ini
%build
%python_build
@@ -58,7 +60,7 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}/hamcrest
%check
-%python_exec setup.py test
+%pytest
%files %{python_files}
%license LICENSE.txt
++++++ pytest4.patch ++++++
>From f71c3c6f8af716435b6d44c007d502b6fb362e20 Mon Sep 17 00:00:00 2001
From: Simon Brunning <simon(a)brunningonline.net>
Date: Fri, 2 Nov 2018 09:50:20 +0000
Subject: [PATCH] Silence warnings from tests due to use of old
pytest.parameterize() signature.
---
tests/hamcrest_unit_test/base_description_test.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/hamcrest_unit_test/base_description_test.py b/tests/hamcrest_unit_test/base_description_test.py
index 82cd238..60f1862 100644
--- a/tests/hamcrest_unit_test/base_description_test.py
+++ b/tests/hamcrest_unit_test/base_description_test.py
@@ -35,10 +35,10 @@ def test_append_text_delegates(desc):
@pytest.mark.parametrize('described, appended', (
(Described(), 'described'),
- pytest.mark.skipif(six.PY3, reason="py2 only")((six.u('unicode-py2'), "'unicode-py2'")),
- pytest.mark.skipif(six.PY3, reason="py2 only")((six.b('bytes-py2'), "'bytes-py2'")),
- pytest.mark.skipif(six.PY2, reason="py3 only")((six.u('unicode-py3'), "'unicode-py3'")),
- pytest.mark.skipif(six.PY2, reason="py3 only")((six.b('bytes-py3'), "<b'bytes-py3'>")),
+ pytest.param(six.u('unicode-py2'), "'unicode-py2'", marks=pytest.mark.skipif(six.PY3, reason="py2 only")),
+ pytest.param(six.b('bytes-py2'), "'bytes-py2'", marks=pytest.mark.skipif(six.PY3, reason="py2 only")),
+ pytest.param(six.u('unicode-py3'), "'unicode-py3'", marks=pytest.mark.skipif(six.PY2, reason="py3 only")),
+ pytest.param(six.b('bytes-py3'), "<b'bytes-py3'>", marks=pytest.mark.skipif(six.PY2, reason="py3 only")),
(six.u("\U0001F4A9"), six.u("'{0}'").format(six.u("\U0001F4A9"))),
))
def test_append_description_types(desc, described, appended):
1
0
Hello community,
here is the log from the commit of package python-chardet for openSUSE:Factory checked in at 2019-07-05 13:48:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-chardet (Old)
and /work/SRC/openSUSE:Factory/.python-chardet.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-chardet"
Fri Jul 5 13:48:16 2019 rev:26 rq:713178 version:3.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-chardet/python-chardet.changes 2019-02-26 22:16:08.674196156 +0100
+++ /work/SRC/openSUSE:Factory/.python-chardet.new.4615/python-chardet.changes 2019-07-05 13:48:17.329413582 +0200
@@ -1,0 +2,6 @@
+Wed Jul 3 08:32:17 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Add patch to fix build with pytest4:
+ * pytest4.patch
+
+-------------------------------------------------------------------
New:
----
pytest4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-chardet.spec ++++++
--- /var/tmp/diff_new_pack.RV8rtD/_old 2019-07-05 13:48:17.945414532 +0200
+++ /var/tmp/diff_new_pack.RV8rtD/_new 2019-07-05 13:48:17.949414538 +0200
@@ -34,6 +34,7 @@
URL: https://github.com/chardet/chardet
Source0: https://files.pythonhosted.org/packages/source/c/chardet/chardet-%{version}…
Source1: python-chardet-rpmlintrc
+Patch0: pytest4.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -77,6 +78,7 @@
%prep
%setup -q -n chardet-%{version}
+%patch0 -p1
%build
%python_build
@@ -92,7 +94,7 @@
%check
%if %{with test}
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} test.py
+%pytest test.py
%endif
%if !%{with test}
++++++ pytest4.patch ++++++
>From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
Date: Tue, 12 Mar 2019 18:44:36 +0100
Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters
Fixes https://github.com/chardet/chardet/issues/173
---
test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test.py b/test.py
index 9833307..ad2b753 100644
--- a/test.py
+++ b/test.py
@@ -59,7 +59,7 @@ def gen_test_params():
full_path = join(path, file_name)
test_case = full_path, encoding
if full_path in EXPECTED_FAILURES:
- test_case = pytest.mark.xfail(test_case)
+ test_case = pytest.param(*test_case, marks=pytest.mark.xfail)
yield test_case
1
0