The package rpms/avogadro2-libs.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/avogadro2-libs.git/commit/?id=b75....
Change:
+%ifarch %{power64}
Thanks.
Full change:
============
commit b752697461daa0a6f66a7f6f279ebf47d360af31
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Tue Aug 31 18:49:11 2021 +0200
Release 1.95.1 | Upgrade avogenerators
diff --git a/.gitignore b/.gitignore
index aee42c4..c02999c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
/avogadro2-libs-molecules-master.zip
/avogadrolibs-1.94.0.tar.gz
/avogenerators-46725196ca0a93cae82e538d323b05f351dd9c6b.tar.gz
+/avogadrolibs-1.95.1.tar.gz
+/avogenerators-023c5555022906334cb5045d9acfc62bd99505b9.tar.gz
diff --git a/avogadro2-libs-1.94.0-do_not_download_external_files.patch
b/avogadro2-libs-1.94.0-do_not_download_external_files.patch
index cd45e61..4fde7e3 100644
--- a/avogadro2-libs-1.94.0-do_not_download_external_files.patch
+++ b/avogadro2-libs-1.94.0-do_not_download_external_files.patch
@@ -1,10 +1,14 @@
--- avogadro/qtplugins/insertfragment/CMakeLists.orig.txt 2021-06-02 23:02:35.000000000
+0200
+++ avogadro/qtplugins/insertfragment/CMakeLists.txt 2021-06-04 15:01:50.784121876 +0200
-@@ -15,38 +15,3 @@
+@@ -13,41 +13,10 @@
+
+ # Install the fragments & crystals
# TODO - make this a for loop
- set(_molecules "${AvogadroLibs_SOURCE_DIR}/../molecules")
- set(_crystals "${AvogadroLibs_SOURCE_DIR}/../crystals")
--
+-set(_molecules "${AvogadroLibs_SOURCE_DIR}/../molecules")
+-set(_crystals "${AvogadroLibs_SOURCE_DIR}/../crystals")
++set(_molecules "${AvogadroLibs_SOURCE_DIR}/molecules")
++set(_crystals "${AvogadroLibs_SOURCE_DIR}/crystals")
+
-# Look in parallel directory for the molecule fragment repository
-if(NOT EXISTS "${_molecules}")
-# download molecules...
@@ -34,9 +38,10 @@
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
-)
--install(DIRECTORY "${AvogadroLibs_SOURCE_DIR}/../crystals"
--DESTINATION "${INSTALL_DATA_DIR}/avogadro2"
--PATTERN ".git" EXCLUDE
--)
-endif()
-\ No newline at end of file
+-
+-install(DIRECTORY "${AvogadroLibs_SOURCE_DIR}/../crystals"
++install(DIRECTORY "${AvogadroLibs_SOURCE_DIR}/crystals"
+ DESTINATION "${INSTALL_DATA_DIR}/avogadro2"
+ PATTERN ".git" EXCLUDE
+ )
diff --git a/avogadro2-libs.spec b/avogadro2-libs.spec
index 690b98c..42be70f 100644
--- a/avogadro2-libs.spec
+++ b/avogadro2-libs.spec
@@ -8,8 +8,8 @@
%endif
Name: avogadro2-libs
-Version: 1.94.0
-Release: 4%{?dist}
+Version: 1.95.1
+Release: 1%{?dist}
Summary: Avogadro2 libraries
# BSD is main license
@@ -20,7 +20,7 @@ Source0:
https://github.com/OpenChemistry/avogadrolibs/archive/%{version}/avogad
# External source code for avogadrolibs >= 1.91.0
# See
https://github.com/OpenChemistry/avogadrolibs/issues/362
-%global commit 46725196ca0a93cae82e538d323b05f351dd9c6b
+%global commit 023c5555022906334cb5045d9acfc62bd99505b9
Source1:
https://github.com/OpenChemistry/avogenerators/archive/%{commit}/avogener...
# External sources for data files
@@ -29,7 +29,7 @@ Source3:
https://github.com/OpenChemistry/crystals/archive/1.0.1/crystals-1.0.1.
# Set installation path of Python files
Patch0: %{name}-set_pythonpath.patch
-Patch1: %{name}-%{version}-do_not_download_external_files.patch
+Patch1: %{name}-1.94.0-do_not_download_external_files.patch
BuildRequires: boost-devel
BuildRequires: python%{python3_pkgversion}-devel
@@ -86,12 +86,12 @@ HTML documentation of %{name}.
%prep
%autosetup -a 1 -N -n avogadrolibs-%{version}
-pushd avogadro/qtplugins
+
unzip -qq %{SOURCE2} && mv molecules-master molecules
tar -xf %{SOURCE3} && mv crystals-1.0.1 crystals
# Rename LICENSE file
mv molecules/LICENSE molecules/LICENSE-molecules
-popd
+
%patch0 -p0 -b .backup
%patch1 -p0 -b .backup
@@ -109,6 +109,10 @@ mv thirdparty/libgwavi/README.md
thirdparty/libgwavi/README-libgwavi.md
%endif
mkdir -p build
export CXXFLAGS="%{optflags} -DH5_USE_110_API"
+# RHBZ #1996330
+%ifarch %{power64}
+export CXXFLAGS="%{optflags} -DEIGEN_ALTIVEC_DISABLE_MMA"
+%endif
%cmake3 -B build -DCMAKE_BUILD_TYPE:STRING=Release \
-DINSTALL_INCLUDE_DIR:PATH=include/avogadro2 -DINSTALL_LIBRARY_DIR:PATH=%{_lib} \
-Wno-dev \
@@ -152,12 +156,9 @@ ln -sf %{python3_sitearch}/avogadro2/scripts
%{buildroot}%{_libdir}/avogadro2/sc
chrpath -d %{buildroot}%{_libdir}/lib*.so
rm -rf %{buildroot}%{_datadir}/doc
-cp -a avogadro/qtplugins/molecules %{buildroot}%{_datadir}/avogadro2/
-cp -a avogadro/qtplugins/crystals %{buildroot}%{_datadir}/avogadro2/
-
%files
%doc README.md thirdparty/libgwavi/README-libgwavi.md
avogadrogenerators/README-avogenerators.md
-%license LICENSE avogadro/qtplugins/molecules/LICENSE-molecules
+%license LICENSE molecules/LICENSE-molecules
%{_libdir}/libAvogadro*.so.1
%{_libdir}/libAvogadro*.so.%{version}
%dir %{_libdir}/avogadro2
@@ -177,6 +178,10 @@ cp -a avogadro/qtplugins/crystals %{buildroot}%{_datadir}/avogadro2/
%license LICENSE
%changelog
+* Tue Aug 31 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.95.1-1
+- Release 1.95.1
+- Upgrade avogenerators
+
* Tue Aug 10 2021 Orion Poplawski <orion(a)nwra.com> - 1.94.0-4
- Rebuild for hdf5 1.10.7
@@ -184,7 +189,7 @@ cp -a avogadro/qtplugins/crystals %{buildroot}%{_datadir}/avogadro2/
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jun 08 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.94.0-2
-- Rebuild release 1.94.0
+- Release 1.94.0
* Fri Jun 04 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.94.0-1
- Release 1.94.0
diff --git a/sources b/sources
index 3a982c4..e8aea0a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (avogadro2-libs-crystals-1.0.1.tar.gz) =
c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650
SHA512 (avogadro2-libs-molecules-master.zip) =
e1a9ac86b1805291c0e6b37a2ab6353eb54cb55058fe018f9c9de00ae840ad4c88f3e877c938a8bf402e548853ccd9503540eef31d6bb00592d8694fed4753ba
-SHA512 (avogadrolibs-1.94.0.tar.gz) =
d144e01081c6f1c4cde7a3a03c5af24a8f15d6e09538277167c5e5721dd379e5b7d2de341a80cd0d8449a1af1971f3dc2f2d434e87a58f12088a211ddcf6a5a1
-SHA512 (avogenerators-46725196ca0a93cae82e538d323b05f351dd9c6b.tar.gz) =
3d46dc7cbf020134142507881adff4074e22b8914e3bdc2ec19548d9305aa6ec55dcd456994177d23c3554cc6b4a1948dec00ccd59c0ece2a7e0deaee1758b74
+SHA512 (avogadrolibs-1.95.1.tar.gz) =
b4734c732b1686eba74055c4834fef2f9fb66d4a67cd1199c84e81965c3f6e783911e7c7c8d09386c4ff9f1322bab91fe490d3606784ae49acf5531a65a58beb
+SHA512 (avogenerators-023c5555022906334cb5045d9acfc62bd99505b9.tar.gz) =
f840652df3ddd4e5a720d611ad31b0f0784896f5e75fdaf7cd24fdc5bf3a8956692c75cf7a35f50b093e47549871b715eed4608408bd15ce617b0582de7f0056