The package rpms/avogadro2.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.git/commit/?id=eb0714b5....
Change:
+%ifarch %{power64}
Thanks.
Full change:
============
commit 091fbb8207e5fe6b530b9a063f79963f3d5e6fd0
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Wed Sep 1 11:43:49 2021 +0200
Add translation files
diff --git a/.gitignore b/.gitignore
index 0d89623..8b168b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/avogadroapp-1.93.0.tar.gz
/avogadroapp-1.94.0.tar.gz
/avogadroapp-1.95.1.tar.gz
+/avogadro-i18n-master.zip
diff --git a/avogadro2-avoid_i18n_download.patch b/avogadro2-avoid_i18n_download.patch
new file mode 100644
index 0000000..273fdf9
--- /dev/null
+++ b/avogadro2-avoid_i18n_download.patch
@@ -0,0 +1,29 @@
+--- a/avogadro/CMakeLists.orig.txt 2021-08-27 00:28:19.000000000 +0200
++++ b/avogadro/CMakeLists.txt 2021-09-01 10:36:39.407384992 +0200
+@@ -39,26 +39,6 @@
+
+ qt5_add_resources(rcc_srcs avogadro.qrc)
+
+-# download and install QM translation files
+-# Look in parallel directory for the i18n repository
+-set(_i18n "${AvogadroApp_SOURCE_DIR}/../avogadro-i18n")
+-if(NOT EXISTS "${_i18n}")
+-# download molecules...
+-ExternalProject_Add(i18n
+- GIT_REPOSITORY
https://github.com/openchemistry/avogadro-i18n
+- SOURCE_DIR "${AvogadroApp_SOURCE_DIR}/../avogadro-i18n"
+- CONFIGURE_COMMAND ""
+- BUILD_COMMAND ""
+- INSTALL_COMMAND ""
+-)
+-endif()
+-
+-install(DIRECTORY "${AvogadroApp_SOURCE_DIR}/../avogadro-i18n/avogadroapp/"
+- "${AvogadroApp_SOURCE_DIR}/../avogadro-i18n/avogadrolibs/"
+- DESTINATION "${INSTALL_DATA_DIR}/avogadro2/i18n"
+- FILES_MATCHING PATTERN "*.qm"
+-)
+-
+ if(INSTALL_BUNDLE_FILES)
+ # copy the qt translation files
+ get_filename_component(_qttranslationdir "${Qt5_DIR}/../../../translations"
ABSOLUTE)
diff --git a/avogadro2.spec b/avogadro2.spec
index 145a278..3b62630 100644
--- a/avogadro2.spec
+++ b/avogadro2.spec
@@ -11,12 +11,14 @@ License: BSD
URL:
http://avogadro.openmolecules.net/
Source0:
https://github.com/OpenChemistry/avogadroapp/archive/%{version}/avogadroa...
Source1: %{name}.appdata.xml
+Source2:
https://github.com/OpenChemistry/avogadro-i18n/archive/refs/heads/master....
+
+Patch0: %{name}-avoid_i18n_download.patch
%if 0%{?rhel}
BuildRequires: epel-rpm-macros
%endif
BuildRequires: cmake3
-BuildRequires: git
BuildRequires: chrpath
BuildRequires: desktop-file-utils
BuildRequires: avogadro2-libs-devel >= 0:%{version}
@@ -55,7 +57,8 @@ features and goals of the Avogadro project:
* Flexible supporting a range of chemical data formats and packages
%prep
-%autosetup -n avogadroapp-%{version}
+%setup -n avogadroapp-%{version} -a 2 -q
+%autopatch -p1
%build
%if 0%{?el7}
@@ -89,11 +92,17 @@ desktop-file-edit --set-key=Exec --set-value='env
QT_QPA_PLATFORM=xcb LD_LIBRARY
cp -p %{buildroot}%{_datadir}/applications/%{name}.desktop
%{buildroot}%{_datadir}/applications/%{name}-x11.desktop
desktop-file-edit --set-key=Exec --set-value='env
LD_LIBRARY_PATH=%{_libdir}/avogadro2 %{name} %f' \
+ --set-name='Avogadro2 for X11' \
%{buildroot}%{_datadir}/applications/%{name}-x11.desktop
mkdir -p %{buildroot}%{_datadir}/icons/%{name}
cp -a avogadro/icons/* %{buildroot}%{_datadir}/icons/%{name}/
+mkdir -p %{buildroot}%{_datadir}/%{name}/i18n
+cp -a avogadro-i18n-master/avogadroapp %{buildroot}%{_datadir}/%{name}/i18n/
+cp -a avogadro-i18n-master/avogadrolibs %{buildroot}%{_datadir}/%{name}/i18n/
+install -pm 644 i18n/* %{buildroot}%{_datadir}/%{name}/i18n/
+
%if 0%{?fedora}
## Install appdata file
mkdir -p %{buildroot}%{_metainfodir}
diff --git a/sources b/sources
index 91ea78e..d7123c6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+SHA512 (avogadro-i18n-master.zip) =
269998e1d7d3e62fc938ab457f52c29dbe08af405c8a6bda8371229a9f769b41b33ebb4df8b0523d8579d409e04a695110a5203ce86dda0989f34d48eaac2b3e
SHA512 (avogadroapp-1.95.1.tar.gz) =
15300da0ecc85be0e369758aafa50ca5c236132988da68611f198637ea49f4a88da93d58ecd177aeb3c2ac363c0da79b91064156e61c828a059277aa09245604
commit eb0714b529e2a1248c2e084206d2e0b1520f1461
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Tue Aug 31 19:20:00 2021 +0200
Release 1.95.1
diff --git a/.gitignore b/.gitignore
index d896939..0d89623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/avogadroapp-1.91.0.tar.gz
/avogadroapp-1.93.0.tar.gz
/avogadroapp-1.94.0.tar.gz
+/avogadroapp-1.95.1.tar.gz
diff --git a/avogadro2.spec b/avogadro2.spec
index 5085564..145a278 100644
--- a/avogadro2.spec
+++ b/avogadro2.spec
@@ -4,8 +4,8 @@
%endif
Name: avogadro2
-Version: 1.94.0
-Release: 2%{?dist}
+Version: 1.95.1
+Release: 1%{?dist}
Summary: Advanced molecular editor
License: BSD
URL:
http://avogadro.openmolecules.net/
@@ -16,12 +16,20 @@ Source1: %{name}.appdata.xml
BuildRequires: epel-rpm-macros
%endif
BuildRequires: cmake3
-BuildRequires: chrpath, desktop-file-utils
+BuildRequires: git
+BuildRequires: chrpath
+BuildRequires: desktop-file-utils
BuildRequires: avogadro2-libs-devel >= 0:%{version}
-BuildRequires: molequeue-devel, spglib-devel
-BuildRequires: %{?dts}gcc, %{?dts}gcc-c++, doxygen
-BuildRequires: eigen3-devel, hdf5-devel, glew-devel
-BuildRequires: qt5-qtbase-devel, qt5-qttools-devel
+BuildRequires: molequeue-devel
+BuildRequires: spglib-devel
+BuildRequires: %{?dts}gcc
+BuildRequires: %{?dts}gcc-c++
+BuildRequires: doxygen
+BuildRequires: eigen3-devel
+BuildRequires: hdf5-devel
+BuildRequires: glew-devel
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qttools-devel
BuildRequires: make
%if 0%{?fedora}
BuildRequires: libappstream-glib
@@ -56,6 +64,10 @@ features and goals of the Avogadro project:
export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
export CFLAGS="%{optflags} -I%{_includedir}/%{name}"
export CXXFLAGS="%{optflags} -I%{_includedir}/%{name}"
+# RHBZ #1996330
+%ifarch %{power64}
+export CXXFLAGS="%{optflags} -DEIGEN_ALTIVEC_DISABLE_MMA"
+%endif
%cmake3 -DCMAKE_BUILD_TYPE:STRING=Release \
-Wno-dev \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
@@ -115,9 +127,13 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/*.appdata.xml
%{_datadir}/applications/%{name}-x11.desktop
%{_metainfodir}/*.appdata.xml
%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/icons/%{name}/
+%{_datadir}/icons/%{name}
+%{_datadir}/%{name}/
%changelog
+* Tue Aug 31 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.95.1-1
+- Release 1.95.1
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.94.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 5ddb413..91ea78e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (avogadroapp-1.94.0.tar.gz) =
ab9b7527cd446803b48eb673ad15115a24b2b22fbee72c405955d86626c140d1870270648b112f530f51fc6d71a69942a3648867e5002f4b5bf8639c1f53d895
+SHA512 (avogadroapp-1.95.1.tar.gz) =
15300da0ecc85be0e369758aafa50ca5c236132988da68611f198637ea49f4a88da93d58ecd177aeb3c2ac363c0da79b91064156e61c828a059277aa09245604
commit 9bc72fd7a8d3b571e723321c31690953db777f8b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 18:16:40 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/avogadro2.spec b/avogadro2.spec
index 088c970..5085564 100644
--- a/avogadro2.spec
+++ b/avogadro2.spec
@@ -5,7 +5,7 @@
Name: avogadro2
Version: 1.94.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Advanced molecular editor
License: BSD
URL:
http://avogadro.openmolecules.net/
@@ -118,6 +118,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/*.appdata.xml
%{_datadir}/icons/%{name}/
%changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.94.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Mon Jun 07 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.94.0-1
- Release 1.94.0
commit 471bbe2f93fe89ffc88af723d4f5ed586dca77d3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 13:20:30 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 8fb8110455da19910a90cb7146b361cbd8892bd6
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Mon Jun 7 18:53:14 2021 +0200
Release 1.94.0
diff --git a/.gitignore b/.gitignore
index 06aeb5c..d896939 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/avogadroapp-74e1edebd83ebb4a37b8e8712c788903abe3f341.zip
/avogadroapp-1.91.0.tar.gz
/avogadroapp-1.93.0.tar.gz
+/avogadroapp-1.94.0.tar.gz
diff --git a/avogadro2.spec b/avogadro2.spec
index e47abb8..088c970 100644
--- a/avogadro2.spec
+++ b/avogadro2.spec
@@ -1,13 +1,11 @@
-%global __cmake_in_source_build 1
-
# Use devtoolset 8
%if 0%{?rhel} && 0%{?rhel} == 7
%global dts devtoolset-8-
%endif
Name: avogadro2
-Version: 1.93.0
-Release: 7%{?dist}
+Version: 1.94.0
+Release: 1%{?dist}
Summary: Advanced molecular editor
License: BSD
URL:
http://avogadro.openmolecules.net/
@@ -19,7 +17,7 @@ BuildRequires: epel-rpm-macros
%endif
BuildRequires: cmake3
BuildRequires: chrpath, desktop-file-utils
-BuildRequires: avogadro2-libs-devel >= %{version}
+BuildRequires: avogadro2-libs-devel >= 0:%{version}
BuildRequires: molequeue-devel, spglib-devel
BuildRequires: %{?dts}gcc, %{?dts}gcc-c++, doxygen
BuildRequires: eigen3-devel, hdf5-devel, glew-devel
@@ -31,7 +29,7 @@ BuildRequires: libappstream-glib
Requires: python%{python3_pkgversion}
Requires: openbabel%{?_isa}
-Requires: avogadro2-libs%{?_isa} >= %{version}
+Requires: avogadro2-libs%{?_isa} >= 0:%{version}
%description
Avogadro is an advanced molecular editor designed for cross-platform use in
@@ -52,7 +50,6 @@ features and goals of the Avogadro project:
%autosetup -n avogadroapp-%{version}
%build
-mkdir build && pushd build
%if 0%{?el7}
%{?dts:source /opt/rh/devtoolset-8/enable}
%endif
@@ -65,19 +62,23 @@ export CXXFLAGS="%{optflags} -I%{_includedir}/%{name}"
-DENABLE_RPATH:BOOL=ON \
-DENABLE_TESTING:BOOL=OFF \
-DAvogadroLibs_DIR:PATH=%{_libdir} \
- -DBUILD_DOCUMENTATION:BOOL=ON ..
-%make_build
+ -DBUILD_DOCUMENTATION:BOOL=ON
+%cmake_build
%install
-%make_install -C build
+%cmake_install
rm -rf %{buildroot}%{_datadir}/doc
chrpath -d %{buildroot}%{_bindir}/%{name}
-desktop-file-edit --set-key=Exec --set-value='env LD_LIBRARY_PATH=%{_libdir}/%{name}
%{name} %f' \
+desktop-file-edit --set-key=Exec --set-value='env QT_QPA_PLATFORM=xcb
LD_LIBRARY_PATH=%{_libdir}/avogadro2 %{name} %f' \
--set-key=Icon --set-value=%{_datadir}/icons/%{name}/avogadro2_128.png \
%{buildroot}%{_datadir}/applications/%{name}.desktop
+cp -p %{buildroot}%{_datadir}/applications/%{name}.desktop
%{buildroot}%{_datadir}/applications/%{name}-x11.desktop
+ desktop-file-edit --set-key=Exec --set-value='env
LD_LIBRARY_PATH=%{_libdir}/avogadro2 %{name} %f' \
+ %{buildroot}%{_datadir}/applications/%{name}-x11.desktop
+
mkdir -p %{buildroot}%{_datadir}/icons/%{name}
cp -a avogadro/icons/* %{buildroot}%{_datadir}/icons/%{name}/
@@ -111,11 +112,15 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/*.appdata.xml
%license LICENSE
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}-x11.desktop
%{_metainfodir}/*.appdata.xml
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/icons/%{name}/
%changelog
+* Mon Jun 07 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.94.0-1
+- Release 1.94.0
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.93.0-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 1e25a84..5ddb413 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (avogadroapp-1.93.0.tar.gz) =
8e4e15b6c2d1935f8c585c83761b28a6397bc1dc22cd5f66464d59dd25327b1cffec809af492586be4b56793448f94f9375c16e8a4c4969f7b8f2591049cc5fc
+SHA512 (avogadroapp-1.94.0.tar.gz) =
ab9b7527cd446803b48eb673ad15115a24b2b22fbee72c405955d86626c140d1870270648b112f530f51fc6d71a69942a3648867e5002f4b5bf8639c1f53d895