Architecture specific change in rpms/aom.git
by githook-noreply@fedoraproject.org
The package rpms/aom.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/aom.git/commit/?id=9cc47c917de38d....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 9cc47c917de38df630537935a4c2f42677340505
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Jun 26 02:51:20 2018 +0200
Initial import (#1558224)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5794953
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/aom-1.0.0.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 85cab1a..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# aom
-
-The aom package
\ No newline at end of file
diff --git a/aom.spec b/aom.spec
new file mode 100644
index 0000000..8501374
--- /dev/null
+++ b/aom.spec
@@ -0,0 +1,105 @@
+%global sover 0
+
+Name: aom
+Version: 1.0.0
+Release: 1%{?dist}
+Summary: Royalty-free next-generation video format
+
+License: BSD
+URL: http://aomedia.org/
+Source0: https://aomedia.googlesource.com/aom/+archive/v%{version}.tar.gz#/%{name}...
+
+BuildRequires: gcc
+BuildRequires: cmake3
+BuildRequires: doxygen
+BuildRequires: git-core
+BuildRequires: graphviz
+BuildRequires: perl-interpreter
+BuildRequires: perl(Getopt::Long)
+BuildRequires: wxGTK3-devel
+BuildRequires: yasm
+
+Provides: av1 = %{version}-%{release}
+
+
+%description
+The Alliance for Open Media’s focus is to deliver a next-generation
+video format that is:
+
+ - Interoperable and open;
+ - Optimized for the Internet;
+ - Scalable to any modern device at any bandwidth;
+ - Designed with a low computational footprint and optimized for hardware;
+ - Capable of consistent, highest-quality, real-time video delivery; and
+ - Flexible for both commercial and non-commercial content, including
+ user-generated content.
+
+
+%package devel
+Summary: Development files for aom
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Development files for aom the royalty-free next-generation
+video format.
+
+
+%prep
+%autosetup -p1 -c %{name}-%{version}
+
+
+%build
+cd build
+%cmake3 ../ -DENABLE_CCACHE=1 \
+ -DCMAKE_SKIP_RPATH=1 \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%ifnarch aarch64 %{arm} %{ix86} x86_64
+ -DAOM_TARGET_CPU=generic \
+%endif
+%ifarch %{arm}
+ -DAOM_TARGET_CPU=arm \
+%endif
+%ifarch aarch64
+ -DAOM_TARGET_CPU=arm64 \
+%endif
+%ifarch %{ix86}
+ -DAOM_TARGET_CPU=x86 \
+%endif
+%ifarch x86_64
+ -DAOM_TARGET_CPU=x86_64 \
+%endif
+ -DCONFIG_WEBM_IO=1 \
+ -DENABLE_DOCS=1 \
+ -DCONFIG_ANALYZER=1
+%make_build
+
+
+%install
+cd build
+%make_install
+install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer
+
+
+%ldconfig_scriptlets
+
+
+%files
+%doc AUTHORS CHANGELOG README.md
+%license LICENSE PATENTS
+%{_bindir}/aomanalyzer
+%{_bindir}/aomdec
+%{_bindir}/aomenc
+%{_libdir}/libaom.so.%{sover}
+
+
+%files devel
+%doc build/docs/html/
+%{_includedir}/%{name}
+%{_libdir}/libaom.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+
+%changelog
+* Wed Mar 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.0.0-1
+- First RPM release
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..4a5a564
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (aom-1.0.0.tar.gz) = 85bca7eff7a247efd0772bcbbba2e8d1bc10390c64551b4a63ecf95b89bca3ad899e4aa04b8cb5d3ed3aaa42ab5e0b7f5612b085106375088062b38a2121d203
5 years, 9 months
Architecture specific change in rpms/golang-github-SAP-go-hdb.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-SAP-go-hdb.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-SAP-go-hdb.git/comm....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit c206a36b66abcbef5271471311e5638e934c0603
Author: Ed Marshall <esm(a)logic.net>
Date: Mon Jun 25 18:04:41 2018 -0700
Update to 0.12.1
diff --git a/.gitignore b/.gitignore
index 9ce601d..eff8e6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/go-hdb-0.9.5.tar.gz
/go-hdb-0.10.0.tar.gz
/go-hdb-0.11.0.tar.gz
+/go-hdb-0.12.1.tar.gz
diff --git a/golang-github-SAP-go-hdb.spec b/golang-github-SAP-go-hdb.spec
index eb3e47f..10b9599 100644
--- a/golang-github-SAP-go-hdb.spec
+++ b/golang-github-SAP-go-hdb.spec
@@ -1,188 +1,61 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-# Tests require a working SAP HANA database server
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 0
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project SAP
-%global repo go-hdb
# https://github.com/SAP/go-hdb
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0.11.0
-Release: 1%{?dist}
-Summary: SAP HANA Database Client for Go (Golang)
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz
+%global goipath github.com/SAP/go-hdb
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+%global common_description %{expand:
+A Go implementation of an SAP HANA Database Client.}
+Version: 0.12.1
+%gometa -i
-%description
-%{summary}
+Name: golang-github-SAP-go-hdb
+Release: 1%{?dist}
+Summary: SAP HANA Database Client for Go (Golang)
+License: ASL 2.0
+URL: %{gourl}
+Source0: %{gosource}
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
+BuildRequires: golang(golang.org/x/text/transform)
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(golang.org/x/text/transform)
-%endif
+%description
+%{common_description}
-Requires: golang(golang.org/x/text/transform)
-Provides: golang(%{import_path}/driver) = %{version}-%{release}
-Provides: golang(%{import_path}/driver/sqltrace) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
+%{common_description}
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
+This package contains source code needed for building packages that import
+the %{goipath} Go namespace.
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
%prep
-%setup -q -n %{repo}-%{version}
-
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
-
-%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
+%forgeautosetup
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
+%install
+%goinstall
-%gotest %{import_path}/driver
-%gotest %{import_path}/driver/sqltrace
-%gotest %{import_path}/internal/protocol
-%gotest %{import_path}/internal/unicode/cesu8
-%endif
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
+%check
+# The driver tests require a running SAP DB, sadly.
+%gochecks -d driver
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md NOTICE
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md NOTICE
-%endif
%changelog
+* Mon Jun 25 2018 Ed Marshall <esm(a)logic.net> - 0.12.1-1
+- Update to 0.12.1.
+- Update spec to latest go packaging macros.
+
* Tue Mar 27 2018 Ed Marshall <esm(a)logic.net> - 0.11.0-1
- Update to 0.11.0.
diff --git a/sources b/sources
index c13570e..48318c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-hdb-0.11.0.tar.gz) = afbf2d4b3e461767d58da6ba9f1717958c605bb3189ccf42f207991c12c73d109df92535d56bb6f6b2ab87e40b59a3ceed2067691f108c9bf22f7f89dfbe64f5
+SHA512 (go-hdb-0.12.1.tar.gz) = 03352bb9ca753290c796f23215e1f310dc91388f24b0d592b0326728c5c2305dd87fc1ba6ebef599e7849f0120b0aee1533b22035694d738995798c5c9af2790
5 years, 9 months
Architecture specific change in rpms/aom.git
by githook-noreply@fedoraproject.org
The package rpms/aom.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/aom.git/commit/?id=9cc47c917de38d....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 9cc47c917de38df630537935a4c2f42677340505
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Jun 26 02:51:20 2018 +0200
Initial import (#1558224)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5794953
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/aom-1.0.0.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 85cab1a..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# aom
-
-The aom package
\ No newline at end of file
diff --git a/aom.spec b/aom.spec
new file mode 100644
index 0000000..8501374
--- /dev/null
+++ b/aom.spec
@@ -0,0 +1,105 @@
+%global sover 0
+
+Name: aom
+Version: 1.0.0
+Release: 1%{?dist}
+Summary: Royalty-free next-generation video format
+
+License: BSD
+URL: http://aomedia.org/
+Source0: https://aomedia.googlesource.com/aom/+archive/v%{version}.tar.gz#/%{name}...
+
+BuildRequires: gcc
+BuildRequires: cmake3
+BuildRequires: doxygen
+BuildRequires: git-core
+BuildRequires: graphviz
+BuildRequires: perl-interpreter
+BuildRequires: perl(Getopt::Long)
+BuildRequires: wxGTK3-devel
+BuildRequires: yasm
+
+Provides: av1 = %{version}-%{release}
+
+
+%description
+The Alliance for Open Media’s focus is to deliver a next-generation
+video format that is:
+
+ - Interoperable and open;
+ - Optimized for the Internet;
+ - Scalable to any modern device at any bandwidth;
+ - Designed with a low computational footprint and optimized for hardware;
+ - Capable of consistent, highest-quality, real-time video delivery; and
+ - Flexible for both commercial and non-commercial content, including
+ user-generated content.
+
+
+%package devel
+Summary: Development files for aom
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Development files for aom the royalty-free next-generation
+video format.
+
+
+%prep
+%autosetup -p1 -c %{name}-%{version}
+
+
+%build
+cd build
+%cmake3 ../ -DENABLE_CCACHE=1 \
+ -DCMAKE_SKIP_RPATH=1 \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%ifnarch aarch64 %{arm} %{ix86} x86_64
+ -DAOM_TARGET_CPU=generic \
+%endif
+%ifarch %{arm}
+ -DAOM_TARGET_CPU=arm \
+%endif
+%ifarch aarch64
+ -DAOM_TARGET_CPU=arm64 \
+%endif
+%ifarch %{ix86}
+ -DAOM_TARGET_CPU=x86 \
+%endif
+%ifarch x86_64
+ -DAOM_TARGET_CPU=x86_64 \
+%endif
+ -DCONFIG_WEBM_IO=1 \
+ -DENABLE_DOCS=1 \
+ -DCONFIG_ANALYZER=1
+%make_build
+
+
+%install
+cd build
+%make_install
+install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer
+
+
+%ldconfig_scriptlets
+
+
+%files
+%doc AUTHORS CHANGELOG README.md
+%license LICENSE PATENTS
+%{_bindir}/aomanalyzer
+%{_bindir}/aomdec
+%{_bindir}/aomenc
+%{_libdir}/libaom.so.%{sover}
+
+
+%files devel
+%doc build/docs/html/
+%{_includedir}/%{name}
+%{_libdir}/libaom.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+
+%changelog
+* Wed Mar 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.0.0-1
+- First RPM release
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..4a5a564
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (aom-1.0.0.tar.gz) = 85bca7eff7a247efd0772bcbbba2e8d1bc10390c64551b4a63ecf95b89bca3ad899e4aa04b8cb5d3ed3aaa42ab5e0b7f5612b085106375088062b38a2121d203
5 years, 9 months
Architecture specific change in rpms/ergo.git
by githook-noreply@fedoraproject.org
The package rpms/ergo.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ergo.git/commit/?id=5267b7510ac65...
https://src.fedoraproject.org/cgit/rpms/ergo.git/commit/?id=d782fb7b407d9....
Change:
-%ifarch %ix86 x86_64
+%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
Thanks.
Full change:
============
commit d782fb7b407d9f4db075eea3df1ee6281ce52f62
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 21:06:59 2018 +0200
Don't use openblas on s390x as linear algebra tests fail.
diff --git a/ergo.spec b/ergo.spec
index 823498a..2d41d8e 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -7,8 +7,9 @@ License: GPLv3+
URL: http://www.ergoscf.org
Source0: http://ergoscf.org/source/tarfiles/ergo-%{version}.tar.gz
-# What architectures is OpenBLAS available on?
-%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+# What architectures is OpenBLAS available on? (s390x disabled since tests fail)
+#ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
%global openblas 1
%else
%global openblas 0
commit c70279c1f54c902c5a2198f87151ab44c6bbbdfc
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 20:55:25 2018 +0200
Missed the -Wp, part.
diff --git a/ergo.spec b/ergo.spec
index 163df04..823498a 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -73,7 +73,7 @@ export CC=gcc
export F77=gfortran
# Use OpenMP parallellization
-export CFLAGS=$(echo "%{optflags} -fopenmp" | sed "s|-D_GLIBCXX_ASSERTIONS||g")
+export CFLAGS=$(echo "%{optflags} -fopenmp" | sed "s|-Wp,-D_GLIBCXX_ASSERTIONS||g")
export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
commit 2af8d9fed51b02e959a49b19fbb2ad182c48c051
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 20:49:11 2018 +0200
Turn off GLIBC++ hardening which breaks the program.
diff --git a/ergo.spec b/ergo.spec
index e4a7650..163df04 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -73,7 +73,7 @@ export CC=gcc
export F77=gfortran
# Use OpenMP parallellization
-export CFLAGS="%{optflags} -fopenmp"
+export CFLAGS=$(echo "%{optflags} -fopenmp" | sed "s|-D_GLIBCXX_ASSERTIONS||g")
export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
commit b4b2fd66d1e97e8709c6eca0e340c15a282aff69
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat Jun 23 15:50:35 2018 +0200
Fix FTBFS.
diff --git a/ergo.spec b/ergo.spec
index 4d1f538..e4a7650 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -113,7 +113,8 @@ make check VERBOSE=1
%files
%defattr(-,root,root,-)
-%doc ChangeLog COPYING README ergo_license_long.txt ergo_release_notes*
+%license COPYING ergo_license_long.txt
+%doc README ergo_release_notes*
%{_bindir}/ergo
%{_datadir}/%{name}
@@ -122,7 +123,7 @@ make check VERBOSE=1
%doc COPYING documentation/html/*
%changelog
-* Sat May 05 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
+* Sat Jun 23 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
- Fix FTBFS.
* Wed Feb 28 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-1
commit 04801027e8cdac2899394f22d10e8acf35d3cbd3
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat May 5 21:10:59 2018 +0200
Minor clenaup
diff --git a/ergo.spec b/ergo.spec
index 8a8a3e2..4d1f538 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -78,10 +78,11 @@ export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
# Linker flags
-export LDFLAGS="-L%{_libdir}/atlas -fopenmp"
%if %{openblas}
export LIBS="-lopenblaso"
%else
+# OpenBLAS is not available; use ATLAS
+export LDFLAGS="-L%{_libdir}/atlas"
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
export LIBS="-lsatlas"
%else
commit 5267b7510ac652040741eb3826252e0500ac8c3a
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat May 5 12:53:50 2018 +0200
Fix FTBFS.
diff --git a/ergo.spec b/ergo.spec
index 3486a40..8a8a3e2 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -1,14 +1,20 @@
Name: ergo
Version: 3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A program for large-scale self-consistent field calculations
-
Group: Applications/Engineering
License: GPLv3+
URL: http://www.ergoscf.org
Source0: http://ergoscf.org/source/tarfiles/ergo-%{version}.tar.gz
+# What architectures is OpenBLAS available on?
%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+%global openblas 1
+%else
+%global openblas 0
+%endif
+
+%if %{openblas}
BuildRequires: openblas-devel
%else
BuildRequires: atlas-devel
@@ -73,7 +79,7 @@ export FFLAGS="${CFLAGS}"
# Linker flags
export LDFLAGS="-L%{_libdir}/atlas -fopenmp"
-%ifarch %ix86 x86_64
+%if %{openblas}
export LIBS="-lopenblaso"
%else
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
@@ -115,6 +121,9 @@ make check VERBOSE=1
%doc COPYING documentation/html/*
%changelog
+* Sat May 05 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
+- Fix FTBFS.
+
* Wed Feb 28 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-1
- Added gcc-c++ buildrequires.
- Update to 3.6.
commit a90e9a8d834053e8e63aee9dc643886d1486d052
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Wed Feb 28 16:37:17 2018 +0100
gcc is also required.
diff --git a/ergo.spec b/ergo.spec
index a3d8758..3486a40 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -14,6 +14,7 @@ BuildRequires: openblas-devel
BuildRequires: atlas-devel
%endif
+BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
BuildRequires: doxygen
5 years, 9 months
Architecture specific change in rpms/ergo.git
by githook-noreply@fedoraproject.org
The package rpms/ergo.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ergo.git/commit/?id=5267b7510ac65...
https://src.fedoraproject.org/cgit/rpms/ergo.git/commit/?id=d782fb7b407d9....
Change:
-%ifarch %ix86 x86_64
+%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
Thanks.
Full change:
============
commit d782fb7b407d9f4db075eea3df1ee6281ce52f62
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 21:06:59 2018 +0200
Don't use openblas on s390x as linear algebra tests fail.
diff --git a/ergo.spec b/ergo.spec
index 823498a..2d41d8e 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -7,8 +7,9 @@ License: GPLv3+
URL: http://www.ergoscf.org
Source0: http://ergoscf.org/source/tarfiles/ergo-%{version}.tar.gz
-# What architectures is OpenBLAS available on?
-%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+# What architectures is OpenBLAS available on? (s390x disabled since tests fail)
+#ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
%global openblas 1
%else
%global openblas 0
commit c70279c1f54c902c5a2198f87151ab44c6bbbdfc
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 20:55:25 2018 +0200
Missed the -Wp, part.
diff --git a/ergo.spec b/ergo.spec
index 163df04..823498a 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -73,7 +73,7 @@ export CC=gcc
export F77=gfortran
# Use OpenMP parallellization
-export CFLAGS=$(echo "%{optflags} -fopenmp" | sed "s|-D_GLIBCXX_ASSERTIONS||g")
+export CFLAGS=$(echo "%{optflags} -fopenmp" | sed "s|-Wp,-D_GLIBCXX_ASSERTIONS||g")
export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
commit 2af8d9fed51b02e959a49b19fbb2ad182c48c051
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 20:49:11 2018 +0200
Turn off GLIBC++ hardening which breaks the program.
diff --git a/ergo.spec b/ergo.spec
index e4a7650..163df04 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -73,7 +73,7 @@ export CC=gcc
export F77=gfortran
# Use OpenMP parallellization
-export CFLAGS="%{optflags} -fopenmp"
+export CFLAGS=$(echo "%{optflags} -fopenmp" | sed "s|-D_GLIBCXX_ASSERTIONS||g")
export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
commit b4b2fd66d1e97e8709c6eca0e340c15a282aff69
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat Jun 23 15:50:35 2018 +0200
Fix FTBFS.
diff --git a/ergo.spec b/ergo.spec
index 4d1f538..e4a7650 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -113,7 +113,8 @@ make check VERBOSE=1
%files
%defattr(-,root,root,-)
-%doc ChangeLog COPYING README ergo_license_long.txt ergo_release_notes*
+%license COPYING ergo_license_long.txt
+%doc README ergo_release_notes*
%{_bindir}/ergo
%{_datadir}/%{name}
@@ -122,7 +123,7 @@ make check VERBOSE=1
%doc COPYING documentation/html/*
%changelog
-* Sat May 05 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
+* Sat Jun 23 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
- Fix FTBFS.
* Wed Feb 28 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-1
commit 04801027e8cdac2899394f22d10e8acf35d3cbd3
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat May 5 21:10:59 2018 +0200
Minor clenaup
diff --git a/ergo.spec b/ergo.spec
index 8a8a3e2..4d1f538 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -78,10 +78,11 @@ export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
# Linker flags
-export LDFLAGS="-L%{_libdir}/atlas -fopenmp"
%if %{openblas}
export LIBS="-lopenblaso"
%else
+# OpenBLAS is not available; use ATLAS
+export LDFLAGS="-L%{_libdir}/atlas"
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
export LIBS="-lsatlas"
%else
commit 5267b7510ac652040741eb3826252e0500ac8c3a
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat May 5 12:53:50 2018 +0200
Fix FTBFS.
diff --git a/ergo.spec b/ergo.spec
index 3486a40..8a8a3e2 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -1,14 +1,20 @@
Name: ergo
Version: 3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A program for large-scale self-consistent field calculations
-
Group: Applications/Engineering
License: GPLv3+
URL: http://www.ergoscf.org
Source0: http://ergoscf.org/source/tarfiles/ergo-%{version}.tar.gz
+# What architectures is OpenBLAS available on?
%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+%global openblas 1
+%else
+%global openblas 0
+%endif
+
+%if %{openblas}
BuildRequires: openblas-devel
%else
BuildRequires: atlas-devel
@@ -73,7 +79,7 @@ export FFLAGS="${CFLAGS}"
# Linker flags
export LDFLAGS="-L%{_libdir}/atlas -fopenmp"
-%ifarch %ix86 x86_64
+%if %{openblas}
export LIBS="-lopenblaso"
%else
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
@@ -115,6 +121,9 @@ make check VERBOSE=1
%doc COPYING documentation/html/*
%changelog
+* Sat May 05 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
+- Fix FTBFS.
+
* Wed Feb 28 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-1
- Added gcc-c++ buildrequires.
- Update to 3.6.
commit a90e9a8d834053e8e63aee9dc643886d1486d052
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Wed Feb 28 16:37:17 2018 +0100
gcc is also required.
diff --git a/ergo.spec b/ergo.spec
index a3d8758..3486a40 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -14,6 +14,7 @@ BuildRequires: openblas-devel
BuildRequires: atlas-devel
%endif
+BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
BuildRequires: doxygen
5 years, 9 months
Architecture specific change in rpms/ergo.git
by githook-noreply@fedoraproject.org
The package rpms/ergo.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ergo.git/commit/?id=d782fb7b407d9....
Change:
+%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
Thanks.
Full change:
============
commit d782fb7b407d9f4db075eea3df1ee6281ce52f62
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 21:06:59 2018 +0200
Don't use openblas on s390x as linear algebra tests fail.
diff --git a/ergo.spec b/ergo.spec
index 823498a..2d41d8e 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -7,8 +7,9 @@ License: GPLv3+
URL: http://www.ergoscf.org
Source0: http://ergoscf.org/source/tarfiles/ergo-%{version}.tar.gz
-# What architectures is OpenBLAS available on?
-%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+# What architectures is OpenBLAS available on? (s390x disabled since tests fail)
+#ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
%global openblas 1
%else
%global openblas 0
5 years, 9 months
Architecture specific change in rpms/custodia.git
by githook-noreply@fedoraproject.org
The package rpms/custodia.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/custodia.git/commit/?id=27ce825ab....
Change:
-%ifarch ppc64
Thanks.
Full change:
============
commit 27ce825ab45821b06b36d81b35f16488e6f9147f
Author: Christian Heimes <cheimes(a)redhat.com>
Date: Mon Jun 25 15:19:28 2018 +0200
New upstream release 0.6.0
diff --git a/.gitignore b/.gitignore
index bfd1135..d8b3c1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/custodia-0.3.1.tar.gz
/custodia-0.3.1.tar.gz.sha512sum.txt
/custodia-0.5.0.tar.gz
+/custodia-0.6.0.tar.gz
diff --git a/custodia.spec b/custodia.spec
index 8d2ef14..475b0ef 100644
--- a/custodia.spec
+++ b/custodia.spec
@@ -1,26 +1,22 @@
-%if 0%{?fedora}
-%global with_python3 1
-%endif
-
-# Workaround for python-etcd issue on PPC64. Although it's a noarch package
-# it depends on etcd for testing. Go does not support PPC64 yet.
-%ifarch ppc64
-%global with_etcd 0
+%if 0%{?fedora} || 0%{?rhel} > 7
+# Enable python3 build by default
+%bcond_without python3
%else
-%global with_etcd 1
+%bcond_with python3
%endif
-# FreeIPA up to 4.4.4 are not compatible with custodia because the custodia
-# script now runs under Python 3. FreeIPA 4.4.5 and 4.4.4-2 on F26 are fixed.
-%if 0%{?fedora} >= 26
-%global ipa_conflict 4.4.4-2
+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
%else
-%global ipa_conflict 4.4.5
+%bcond_without python2
%endif
+%{!?python3_pkgversion:%global python3_pkgversion 3}
+
Name: custodia
-Version: 0.5.0
-Release: 13%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
Summary: A service to manage, retrieve and store secrets for other processes
License: GPLv3+
@@ -34,19 +30,19 @@ Source5: custodia.tmpfiles.conf
BuildArch: noarch
BuildRequires: systemd
+
+%if %{?with_python2}
BuildRequires: python2-devel
BuildRequires: python2-jwcrypto >= 0.4.2
BuildRequires: python2-requests
BuildRequires: python2-setuptools >= 18
BuildRequires: python2-coverage
BuildRequires: python2-pytest
-%if %{?with_etcd}
-BuildRequires: python2-python-etcd
-%endif
BuildRequires: python2-docutils
BuildRequires: python2-configparser
BuildRequires: python2-systemd
BuildRequires: tox >= 2.3.1
+%endif
%if 0%{?with_python3}
BuildRequires: python%{python3_pkgversion}-devel
@@ -55,9 +51,6 @@ BuildRequires: python%{python3_pkgversion}-requests
BuildRequires: python%{python3_pkgversion}-setuptools > 18
BuildRequires: python%{python3_pkgversion}-coverage
BuildRequires: python%{python3_pkgversion}-pytest
-%if %{?with_etcd}
-BuildRequires: python%{python3_pkgversion}-python-etcd
-%endif
BuildRequires: python%{python3_pkgversion}-docutils
BuildRequires: python%{python3_pkgversion}-systemd
%endif
@@ -72,9 +65,6 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(post): systemd-units
-Conflicts: freeipa-server-common < %{ipa_conflict}
-Conflicts: ipa-server-common < %{ipa_conflict}
-
%global overview \
Custodia is a Secrets Service Provider, it stores or proxies access to \
@@ -93,6 +83,7 @@ A service to manage, retrieve and store secrets for other processes
%{overview}
+%if 0%{?with_python2}
%package -n python2-custodia
Summary: Sub-package with python2 custodia modules
%{?python_provide:%python_provide python2-%{name}}
@@ -101,25 +92,13 @@ Requires: python2-jwcrypto >= 0.4.2
Requires: python2-requests
Requires: python2-setuptools
Requires: python2-systemd
-Conflicts: python2-ipalib < %{ipa_conflict}
+Conflicts: python2-custodia-extra < %{version}
%description -n python2-custodia
Sub-package with python custodia modules
%{overview}
-
-%if %{?with_etcd}
-%package -n python2-custodia-extra
-Summary: Sub-package with python2 custodia extra modules
-Requires: python2-python-etcd
-Requires: python2-custodia = %{version}-%{release}
-
-%description -n python2-custodia-extra
-Sub-package with python2 custodia extra modules (etcdstore)
-
-%{overview}
-
-%endif # with_etcd
+%endif
%if 0%{?with_python3}
%package -n python%{python3_pkgversion}-custodia
@@ -129,25 +108,13 @@ Requires: python%{python3_pkgversion}-jwcrypto >= 0.4.2
Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-setuptools
Requires: python%{python3_pkgversion}-systemd
-Conflicts: python%{python3_pkgversion}-ipalib < %{ipa_conflict}
+Conflicts: python%{python3_pkgversion}-custodia-extra < %{version}
%description -n python%{python3_pkgversion}-custodia
Sub-package with python custodia modules
%{overview}
-%if %{?with_etcd}
-%package -n python%{python3_pkgversion}-custodia-extra
-Summary: Sub-package with python3 custodia extra modules
-Requires: python%{python3_pkgversion}-python-etcd
-Requires: python%{python3_pkgversion}-custodia = %{version}-%{release}
-
-%description -n python%{python3_pkgversion}-custodia-extra
-Sub-package with python3 custodia extra modules (etcdstore)
-
-%{overview}
-
-%endif # with_etcd
%endif # with_python3
@@ -156,7 +123,9 @@ Sub-package with python3 custodia extra modules (etcdstore)
%build
+%if 0%{?with_python2}
%py2_build
+%endif
%if 0%{?with_python3}
%py3_build
%endif
@@ -171,9 +140,15 @@ export PIP_NO_DEPS=yes
# may pick up this package from global site-packages instead of source dist.
export PIP_IGNORE_INSTALLED=yes
+%if 0%{?with_python2}
tox --sitepackages -e py%{python2_version_nodots} -- --skip-servertests
+%endif
+
%if 0%{?with_python3}
-tox --sitepackages -e py%{python3_version_nodots} -- --skip-servertests
+# Test custodia in a virtual environment
+%{__python3} -m venv --system-site-packages testenv
+testenv/bin/pip install .
+testenv/bin/python -m pytest --capture=no --strict --skip-servertests
%endif
@@ -189,17 +164,12 @@ mkdir -p %{buildroot}/%{_localstatedir}/lib/custodia
mkdir -p %{buildroot}/%{_localstatedir}/log/custodia
mkdir -p %{buildroot}/%{_localstatedir}/run/custodia
+%if 0%{?with_python2}
%py2_install
mv %{buildroot}/%{_bindir}/custodia %{buildroot}/%{_sbindir}/custodia
cp %{buildroot}/%{_sbindir}/custodia %{buildroot}/%{_sbindir}/custodia-2
cp %{buildroot}/%{_bindir}/custodia-cli %{buildroot}/%{_bindir}/custodia-cli-2
-install -m 644 -t "%{buildroot}/%{_mandir}/man7" man/custodia.7
-install -m 644 -t "%{buildroot}/%{_defaultdocdir}/custodia" README API.md
-install -m 644 -t "%{buildroot}/%{_defaultdocdir}/custodia/examples" custodia.conf
-install -m 600 %{SOURCE2} %{buildroot}%{_sysconfdir}/custodia
-install -m 644 %{SOURCE3} %{buildroot}%{_unitdir}
-install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}
-install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/custodia.conf
+%endif
%if 0%{?with_python3}
# overrides /usr/bin/custodia-cli and /usr/sbin/custodia with Python 3 shebang
@@ -209,6 +179,15 @@ cp %{buildroot}/%{_sbindir}/custodia %{buildroot}/%{_sbindir}/custodia-3
cp %{buildroot}/%{_bindir}/custodia-cli %{buildroot}/%{_bindir}/custodia-cli-3
%endif
+install -m 644 -t "%{buildroot}/%{_mandir}/man7" man/custodia.7
+install -m 644 -t "%{buildroot}/%{_defaultdocdir}/custodia" README API.md
+install -m 644 -t "%{buildroot}/%{_defaultdocdir}/custodia/examples" custodia.conf
+install -m 600 %{SOURCE2} %{buildroot}%{_sysconfdir}/custodia
+install -m 644 %{SOURCE3} %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/custodia.conf
+
+
%pre
getent group custodia >/dev/null || groupadd -r custodia
@@ -249,42 +228,35 @@ exit 0
%dir %attr(0755,custodia,custodia) %{_localstatedir}/run/custodia
%{_tmpfilesdir}/custodia.conf
+%if 0%{?with_python2}
%files -n python2-custodia
%license LICENSE
-%exclude %{python2_sitelib}/custodia/store/etcdstore.py*
%{python2_sitelib}/%{name}
%{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info
%{python2_sitelib}/%{name}-%{version}-py%{python2_version}-nspkg.pth
%{_sbindir}/custodia-2
%{_bindir}/custodia-cli-2
-
-%if %{?with_etcd}
-%files -n python2-custodia-extra
-%license LICENSE
-%{python2_sitelib}/custodia/store/etcdstore.py*
-%endif # with_etcd
+%endif
%if 0%{?with_python3}
%files -n python%{python3_pkgversion}-custodia
%license LICENSE
-%exclude %{python3_sitelib}/custodia/store/etcdstore.py
-%exclude %{python3_sitelib}/custodia/store/__pycache__/etcdstore.*
%{python3_sitelib}/%{name}
%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
%{python3_sitelib}/%{name}-%{version}-py%{python3_version}-nspkg.pth
%{_sbindir}/custodia-3
%{_bindir}/custodia-cli-3
-%if %{?with_etcd}
-%files -n python%{python3_pkgversion}-custodia-extra
-%license LICENSE
-%{python3_sitelib}/custodia/store/etcdstore.py
-%{python3_sitelib}/custodia/store/__pycache__/etcdstore.*
-%endif # with_etcd
%endif # with_python3
%changelog
+* Mon Jun 25 2018 Christian Heimes <cheimes(a)redhat.com> - 0.6.0-1
+- New upstream release 0.6.0
+- Remove etcd support
+- Remove unnecesary conflict with old FreeIPA
+- Make Python 2 optional
+
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 0.5.0-13
- Rebuilt for Python 3.7
diff --git a/sources b/sources
index 4ac683d..6ed26a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (custodia-0.5.0.tar.gz) = 7e92bf30d9e09fb45efb85c2133adb608b3b992d20c58488e8ae2679d34c1dc3225935471bd7e5c03a7afcad8329cfa840c6d5cc7448684c77cb80758c6681d0
+SHA512 (custodia-0.6.0.tar.gz) = 1938f4020240a759963b888bc45fa67969da712675e20360d9ad6e2e420da40a95d49e93a72e2278a21154a910eb702b5c45c184879c472e32fbf79a3f88ca21
5 years, 9 months
Architecture specific change in rpms/scipy.git
by githook-noreply@fedoraproject.org
The package rpms/scipy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/scipy.git/commit/?id=33f8ec88d1bd...
https://src.fedoraproject.org/cgit/rpms/scipy.git/commit/?id=2b99813d5486....
Change:
-%ifarch %{openblas_arches}
+%ifarch ppc64le
Thanks.
Full change:
============
commit 2b99813d5486e9cc04904c1857b1ac68e5c492e3
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Sat Jun 23 23:00:13 2018 +0200
Don't ignore the tests results but rather have a tolerance rate
Historically, we ignored the test results as we don't have the
manpower to investigate the failures on various architectures.
Since most of the test pass, I've added a 1% failure tolerance
on everything except x86_64, so we do no longer need to ignore the
results. This makes it easier to spat that it's no longer a couple
test that fails on some random architecture but rather a more
severe problem.
In the process I had to disable test_decomp on ppc64le, because it
segfaults.
diff --git a/acceptable_failure_rate.patch b/acceptable_failure_rate.patch
new file mode 100644
index 0000000..6ae4bca
--- /dev/null
+++ b/acceptable_failure_rate.patch
@@ -0,0 +1,28 @@
+diff --git a/scipy/conftest.py b/scipy/conftest.py
+index b0edcdd..f5c3c0b 100644
+--- a/scipy/conftest.py
++++ b/scipy/conftest.py
+@@ -3,6 +3,7 @@ from __future__ import division, absolute_import, print_function
+
+ import os
+ import pytest
++import _pytest
+ import warnings
+
+ from scipy._lib._fpumode import get_fpu_mode
+@@ -33,3 +34,15 @@ def check_fpu_mode(request):
+ warnings.warn("FPU mode changed from {0:#x} to {1:#x} during "
+ "the test".format(old_mode, new_mode),
+ category=FPUModeChangeWarning, stacklevel=0)
++
++
++ACCEPTABLE_FAILURE_RATE = int(os.environ.get('ACCEPTABLE_FAILURE_RATE', 0))
++
++
++(a)pytest.hookimpl()
++def pytest_sessionfinish(session, exitstatus):
++ if exitstatus != _pytest.main.EXIT_TESTSFAILED:
++ return
++ failure_rate = (100.0 * session.testsfailed) / session.testscollected
++ if failure_rate <= ACCEPTABLE_FAILURE_RATE:
++ session.exitstatus = 0
diff --git a/scipy.spec b/scipy.spec
index e8950a2..503a5a7 100644
--- a/scipy.spec
+++ b/scipy.spec
@@ -7,7 +7,7 @@
Summary: Scientific Tools for Python
Name: scipy
Version: 1.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Development/Libraries
# BSD -- whole package except:
@@ -17,6 +17,11 @@ License: BSD and Boost and Public Domain
Url: http://www.scipy.org/scipylib/index.html
Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{vers...
+# Previously we ignored the tests results, because they don't always pass
+# Instead of ignoring the results entirely, we allow certain failure rate
+# https://stackoverflow.com/a/47731333/1839451
+Patch0: acceptable_failure_rate.patch
+
BuildRequires: python2-numpy, python2-devel,python2-numpy-f2py
BuildRequires: python2-pytest
BuildRequires: python2-pytest-xdist
@@ -109,7 +114,7 @@ leading scientists and engineers.
%prep
-%setup -q -n %{name}-%{version}%{?rcver}
+%autosetup -p1 -n %{name}-%{version}%{?rcver}
cat > site.cfg << EOF
[amd]
@@ -164,18 +169,35 @@ done
%check
# Skip all tests on s390x because they hangs unexpectedly and randomly
# and pytest-timeout has no effect. Note that the outcome of the tests
-# is ignored anyway so by disabling the test for s390x we are not doing
-# anything more dangerous.
-%ifnarch s390x
+# was previously ignored anyway so by disabling the test for s390x we
+# are not doing anything more dangerous.
+%ifarch s390x
+exit 0
+%endif
+
+%ifarch x86_64
+export ACCEPTABLE_FAILURE_RATE=0
+%else
+# there are usually 10-21 test failing, so we allow 1% failure rate
+export ACCEPTABLE_FAILURE_RATE=1
+%endif
+
+%ifarch ppc64le
+# test_decomp segfaults on ppc64le
+export k="not test_denormals and not test_decomp"
+%else
+# test_denormals tends to stuck
+export k="not test_denormals"
+%endif
+
pushd %{buildroot}/%{python3_sitearch}
-py.test-%{python3_version} --timeout=300 -k "not test_denormals" scipy || :
+py.test-3 --timeout=300 -k "$k" scipy
popd
pushd %{buildroot}/%{python2_sitearch}
-py.test-%{python2_version} --timeout=300 -k "not test_denormals" scipy || :
+py.test-2 --timeout=300 -k "$k" scipy
popd
-%endif # ifnarch s390x
%files -n python2-scipy
%doc LICENSE.txt
@@ -200,6 +222,10 @@ popd
%endif # with doc
%changelog
+* Sat Jun 23 2018 Miro Hrončok <mhroncok(a)redhat.com> - 1.1.0-2
+- Don't ignore the tests results but rather have a tolerance rate
+- Skip test_decomp on ppc64le as it currently segfaults
+
* Fri Jun 22 2018 Miro Hrončok <mhroncok(a)redhat.com> - 1.1.0-1
- Update to 1.1.0 (#1560265, #1594355)
commit 33f8ec88d1bd38c4783496ea6ada9def089a1981
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Sat Jun 23 10:10:51 2018 +0200
Only build scipy once (per Python)
The build_sphinx setup.py command previously used to build the docs
calls build_ext --inplace internally. That's one build.
Later the install command was called and that calls build as well.
Inplace and non-inplace builds happen separately.
By first explicitly building with build and then invoking sphinx
trough the Makefile, we can use install --skip-build (%pyX_install).
Explicit call to sphinx also removes the need to remove conf.py
from bundled projects.
This also saves us setting the build flags in %install, which was
previously only needed because of the build happening there.
While doing this, I've also switched the build section to build for
for Python 3 and Python 2 in a loop to make the specfile DRY.
diff --git a/scipy.spec b/scipy.spec
index 5ddfdba..e8950a2 100644
--- a/scipy.spec
+++ b/scipy.spec
@@ -129,73 +129,37 @@ openblas_libs = openblasp
%endif
EOF
-# sphinx_build somehow randomly decides which docs to build here
-# there is: doc/source/conf.py - scipy docs - we want that one
-# doc/sphinxext/doc/conf.py - bundled numpydoc documentation
-# doc/scipy-sphinx-theme/conf.py - testing documentation for the theme
-rm doc/sphinxext -r # contains only bundled numpydoc
-rm doc/scipy-sphinx-theme/conf.py
+# remove bundled numpydoc
+rm doc/sphinxext -r
%build
-env CFLAGS="$RPM_OPT_FLAGS -lm" \
- FFLAGS="$RPM_OPT_FLAGS -fPIC" \
-%ifarch %{openblas_arches}
- OPENBLAS=%{_libdir} \
-%else
- ATLAS=%{_libdir}/atlas \
-%endif
- FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
- %__python3 setup.py config_fc \
- --fcompiler=gnu95 --noarch \
-%if %{with doc}
- build_sphinx
- rm -r build/sphinx/html/.buildinfo
- mv build/sphinx build/sphinx-%{python3_version}
-%else
- build
-%endif # with doc
-
-env CFLAGS="$RPM_OPT_FLAGS" \
- FFLAGS="$RPM_OPT_FLAGS -fPIC" \
-%ifarch %{openblas_arches}
+for PY in %{python3_version} %{python2_version}; do
+ env CFLAGS="$RPM_OPT_FLAGS -lm" \
+ FFLAGS="$RPM_OPT_FLAGS -fPIC" \
+ %ifarch %{openblas_arches}
OPENBLAS=%{_libdir} \
-%else
+ %else
ATLAS=%{_libdir}/atlas \
-%endif
+ %endif
FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
- %__python2 setup.py config_fc \
+ %{_bindir}/python$PY setup.py config_fc \
--fcompiler=gnu95 --noarch \
-%if %{with doc}
- build_sphinx
- rm -r build/sphinx/html/.buildinfo
- mv build/sphinx build/sphinx-%{python2_version}
-%else
build
-%endif # with doc
+ %if %{with doc}
+ pushd doc
+ export PYTHONPATH=$(echo ../build/lib.linux-*-$PY/)
+ make html SPHINXBUILD=sphinx-build-$PY
+ rm -rf build/html/.buildinfo
+ mv build build-$PY
+ popd
+ %endif
+done
%install
-env CFLAGS="$RPM_OPT_FLAGS -lm" \
- FFLAGS="$RPM_OPT_FLAGS -fPIC" \
-%ifarch %{openblas_arches}
- OPENBLAS=%{_libdir} \
-%else
- ATLAS=%{_libdir}/atlas \
-%endif
- FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
- %__python3 setup.py install --root=%{buildroot}
-
-env CFLAGS="$RPM_OPT_FLAGS" \
- FFLAGS="$RPM_OPT_FLAGS -fPIC" \
-%ifarch %{openblas_arches}
- OPENBLAS=%{_libdir} \
-%else
- ATLAS=%{_libdir}/atlas \
-%endif
- FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
- %__python2 setup.py install --root=%{buildroot}
-
+%py3_install
+%py2_install
%check
# Skip all tests on s390x because they hangs unexpectedly and randomly
@@ -221,7 +185,7 @@ popd
%if %{with doc}
%files -n python2-scipy-doc
%license LICENSE.txt
-%doc build/sphinx-%{python2_version}/html
+%doc doc/build-%{python2_version}/html
%endif # with doc
%files -n python3-scipy
@@ -232,7 +196,7 @@ popd
%if %{with doc}
%files -n python3-scipy-doc
%license LICENSE.txt
-%doc build/sphinx-%{python3_version}/html
+%doc doc/build-%{python3_version}/html
%endif # with doc
%changelog
5 years, 9 months
Architecture specific change in rpms/rust-unix_socket.git
by githook-noreply@fedoraproject.org
The package rpms/rust-unix_socket.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-unix_socket.git/commit/?id=8....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 828743510d7899069deef04a5a46114d8123c0e6
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jun 25 08:49:34 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0f46585
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/unix_socket-0.5.0.crate
diff --git a/rust-unix_socket.spec b/rust-unix_socket.spec
new file mode 100644
index 0000000..094dc85
--- /dev/null
+++ b/rust-unix_socket.spec
@@ -0,0 +1,62 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate unix_socket
+
+Name: rust-%{crate}
+Version: 0.5.0
+Release: 1%{?dist}
+Summary: Unix domain socket bindings
+
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/unix_socket
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(cfg-if) >= 0.1.0 with crate(cfg-if) < 0.2.0)
+BuildRequires: (crate(libc) >= 0.2.1 with crate(libc) < 0.3.0)
+%if %{with check}
+# [dev-dependencies]
+BuildRequires: (crate(tempdir) >= 0.3.0 with crate(tempdir) < 0.4.0)
+%endif
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+Unix domain socket bindings.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%changelog
+* Fri Jun 22 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.5.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..2b0db0a
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (unix_socket-0.5.0.crate) = dcd3589f042491540a69176dde6944710deea7317ed0de6912725686473ca15b34dda0a67490252bc8ef5c1ffdf7aecd7b76aa81a27a34b3c4870305c89412e5
5 years, 9 months
Architecture specific change in rpms/rust-peg.git
by githook-noreply@fedoraproject.org
The package rpms/rust-peg.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-peg.git/commit/?id=bdc417aa3....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit bdc417aa3a2fc9db78dd876084b9dcd00f295f0d
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jun 25 08:49:21 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..861c674
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/peg-0.5.4.crate
diff --git a/rust-peg.spec b/rust-peg.spec
new file mode 100644
index 0000000..1b90fba
--- /dev/null
+++ b/rust-peg.spec
@@ -0,0 +1,62 @@
+# Generated by rust2rpm
+%bcond_without check
+
+%global crate peg
+
+Name: rust-%{crate}
+Version: 0.5.4
+Release: 1%{?dist}
+Summary: Simple Parsing Expression Grammar (PEG) parser generator
+
+License: MIT
+URL: https://crates.io/crates/peg
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(quote) >= 0.3.0 with crate(quote) < 0.4.0)
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+A simple Parsing Expression Grammar (PEG) parser generator.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/rust-peg
+
+%files devel
+%license LICENSE
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+%exclude %{cargo_registry}/%{crate}-%{version}/bootstrap.sh
+
+%changelog
+* Fri Jun 22 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.5.4-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..ed72ad6
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (peg-0.5.4.crate) = e2b8bee56498e19c58953871630245e0bb014a0071ff80fb0bb59e0cb1844b5d0ac767595f8a0123f514dbfae33305c3ec9b458cb64d8c821df154497087ce4e
5 years, 9 months