The package rpms/IQmol.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/IQmol.git/commit/?id=41e80148f58750b....
Change: +ExcludeArch: %{ix86}
Thanks.
Full change: ============
commit 1a438d1d9309edc227806c51a5cf92d289593978 Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Fri Jul 26 15:27:57 2024 +0000
Update to 3.1.4.
diff --git a/IQmol-3.1.3-cmake.patch b/IQmol-3.1.4-cmake.patch similarity index 53% rename from IQmol-3.1.3-cmake.patch rename to IQmol-3.1.4-cmake.patch index 266194d..cdf742d 100644 --- a/IQmol-3.1.3-cmake.patch +++ b/IQmol-3.1.4-cmake.patch @@ -1,6 +1,6 @@ -diff -up IQmol3-3.1.3/CMakeLists.txt.cmakebuild IQmol3-3.1.3/CMakeLists.txt ---- IQmol3-3.1.3/CMakeLists.txt.cmakebuild 2024-05-08 14:44:38.875325241 +0000 -+++ IQmol3-3.1.3/CMakeLists.txt 2024-05-08 14:46:09.549719022 +0000 +diff -up IQmol3-3.1.4/CMakeLists.txt.cmakebuild IQmol3-3.1.4/CMakeLists.txt +--- IQmol3-3.1.4/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/CMakeLists.txt 2024-07-26 14:26:58.926666223 +0000 @@ -34,26 +34,9 @@ endif() find_package(Threads REQUIRED) find_package(OpenGL REQUIRED) @@ -51,7 +51,27 @@ diff -up IQmol3-3.1.3/CMakeLists.txt.cmakebuild IQmol3-3.1.3/CMakeLists.txt add_subdirectory(src)
enable_testing() -@@ -166,10 +153,10 @@ target_link_libraries (${targetName} +@@ -129,8 +116,6 @@ if (LINUX) + src/main.C + ${IQmol_RESOURCES_RCC} + ) +- +- target_link_libraries(${targetName} -static-libgcc -static-libstdc++) + endif (LINUX) + + +@@ -147,10 +132,6 @@ if (WIN32) + endif (WIN32) + + +-# This works on ubuntu, not sure about others +-unset(CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES) +-set(FORTRAN_LIBRARIES libgfortran.a libquadmath.a) +- + target_link_libraries (${targetName} + Main + Process +@@ -166,10 +147,10 @@ target_link_libraries (${targetName} Math Plot Fort @@ -64,9 +84,9 @@ diff -up IQmol3-3.1.3/CMakeLists.txt.cmakebuild IQmol3-3.1.3/CMakeLists.txt Qt5::Core Qt5::Gui Qt5::Xml -diff -up IQmol3-3.1.3/src/Grid/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Grid/CMakeLists.txt ---- IQmol3-3.1.3/src/Grid/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 -+++ IQmol3-3.1.3/src/Grid/CMakeLists.txt 2024-05-08 14:44:38.875325241 +0000 +diff -up IQmol3-3.1.4/src/Grid/CMakeLists.txt.cmakebuild IQmol3-3.1.4/src/Grid/CMakeLists.txt +--- IQmol3-3.1.4/src/Grid/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/src/Grid/CMakeLists.txt 2024-07-26 14:12:42.909681938 +0000 @@ -53,4 +53,6 @@ target_link_libraries(${LIB} PRIVATE Qt5::Widgets Qt5::Xml @@ -74,18 +94,18 @@ diff -up IQmol3-3.1.3/src/Grid/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Grid/C + OpenMeshCore + OpenMeshTools ) -diff -up IQmol3-3.1.3/src/Main/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Main/CMakeLists.txt ---- IQmol3-3.1.3/src/Main/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 -+++ IQmol3-3.1.3/src/Main/CMakeLists.txt 2024-05-08 14:44:38.875325241 +0000 +diff -up IQmol3-3.1.4/src/Main/CMakeLists.txt.cmakebuild IQmol3-3.1.4/src/Main/CMakeLists.txt +--- IQmol3-3.1.4/src/Main/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/src/Main/CMakeLists.txt 2024-07-26 14:12:42.909681938 +0000 @@ -55,4 +55,5 @@ target_link_libraries(${LIB} PRIVATE Qt5::Widgets Qt5::Xml Qt5::OpenGL + QMsgBox-qt5 ) -diff -up IQmol3-3.1.3/src/Math/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Math/CMakeLists.txt ---- IQmol3-3.1.3/src/Math/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 -+++ IQmol3-3.1.3/src/Math/CMakeLists.txt 2024-05-08 14:44:38.875325241 +0000 +diff -up IQmol3-3.1.4/src/Math/CMakeLists.txt.cmakebuild IQmol3-3.1.4/src/Math/CMakeLists.txt +--- IQmol3-3.1.4/src/Math/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/src/Math/CMakeLists.txt 2024-07-26 14:12:42.910681920 +0000 @@ -22,7 +22,7 @@ set( SOURCES add_library(${LIB} ${SOURCES}) target_include_directories(${LIB} PUBLIC "${${LIB}_SOURCE_DIR}") @@ -95,18 +115,18 @@ diff -up IQmol3-3.1.3/src/Math/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Math/C Qt5::Xml Qt5::OpenGL ) -diff -up IQmol3-3.1.3/src/Network/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Network/CMakeLists.txt ---- IQmol3-3.1.3/src/Network/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 -+++ IQmol3-3.1.3/src/Network/CMakeLists.txt 2024-05-08 14:44:38.876325224 +0000 +diff -up IQmol3-3.1.4/src/Network/CMakeLists.txt.cmakebuild IQmol3-3.1.4/src/Network/CMakeLists.txt +--- IQmol3-3.1.4/src/Network/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/src/Network/CMakeLists.txt 2024-07-26 14:12:42.910681920 +0000 @@ -35,4 +35,5 @@ target_link_libraries(${LIB} PRIVATE Qt5::Widgets Qt5::Network OpenSSL::SSL + ssh2 ) -diff -up IQmol3-3.1.3/src/Plot/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Plot/CMakeLists.txt ---- IQmol3-3.1.3/src/Plot/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 -+++ IQmol3-3.1.3/src/Plot/CMakeLists.txt 2024-05-08 14:44:38.876325224 +0000 +diff -up IQmol3-3.1.4/src/Plot/CMakeLists.txt.cmakebuild IQmol3-3.1.4/src/Plot/CMakeLists.txt +--- IQmol3-3.1.4/src/Plot/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/src/Plot/CMakeLists.txt 2024-07-26 14:12:42.910681920 +0000 @@ -19,4 +19,6 @@ target_link_libraries(${LIB} PRIVATE Qt5::Core Qt5::Gui @@ -114,9 +134,9 @@ diff -up IQmol3-3.1.3/src/Plot/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Plot/C + Qt5::PrintSupport + QMsgBox-qt5 ) -diff -up IQmol3-3.1.3/src/Qui/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Qui/CMakeLists.txt ---- IQmol3-3.1.3/src/Qui/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 -+++ IQmol3-3.1.3/src/Qui/CMakeLists.txt 2024-05-08 14:44:38.876325224 +0000 +diff -up IQmol3-3.1.4/src/Qui/CMakeLists.txt.cmakebuild IQmol3-3.1.4/src/Qui/CMakeLists.txt +--- IQmol3-3.1.4/src/Qui/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/src/Qui/CMakeLists.txt 2024-07-26 14:12:42.910681920 +0000 @@ -75,5 +75,6 @@ target_link_libraries(${LIB} PRIVATE Qt5::Sql Qt5::OpenGL @@ -124,9 +144,9 @@ diff -up IQmol3-3.1.3/src/Qui/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Qui/CMa + QMsgBox-qt5 )
-diff -up IQmol3-3.1.3/src/Util/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Util/CMakeLists.txt ---- IQmol3-3.1.3/src/Util/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 -+++ IQmol3-3.1.3/src/Util/CMakeLists.txt 2024-05-08 14:44:38.876325224 +0000 +diff -up IQmol3-3.1.4/src/Util/CMakeLists.txt.cmakebuild IQmol3-3.1.4/src/Util/CMakeLists.txt +--- IQmol3-3.1.4/src/Util/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/src/Util/CMakeLists.txt 2024-07-26 14:12:42.911681903 +0000 @@ -3,7 +3,6 @@ set(LIB Util)
set(HEADERS @@ -143,9 +163,9 @@ diff -up IQmol3-3.1.3/src/Util/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Util/C QsDebugOutput.C QsLog.C QsLogDest.C -diff -up IQmol3-3.1.3/src/Viewer/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Viewer/CMakeLists.txt ---- IQmol3-3.1.3/src/Viewer/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 -+++ IQmol3-3.1.3/src/Viewer/CMakeLists.txt 2024-05-08 14:44:38.877325206 +0000 +diff -up IQmol3-3.1.4/src/Viewer/CMakeLists.txt.cmakebuild IQmol3-3.1.4/src/Viewer/CMakeLists.txt +--- IQmol3-3.1.4/src/Viewer/CMakeLists.txt.cmakebuild 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/src/Viewer/CMakeLists.txt 2024-07-26 14:12:42.911681903 +0000 @@ -23,7 +23,6 @@ set( SOURCES CameraDialog.C Cursors.C diff --git a/IQmol-3.1.4-fixdesktop.patch b/IQmol-3.1.4-fixdesktop.patch new file mode 100644 index 0000000..b685185 --- /dev/null +++ b/IQmol-3.1.4-fixdesktop.patch @@ -0,0 +1,12 @@ +diff -up IQmol3-3.1.4/resources/iqmol.desktop.fixdesktop IQmol3-3.1.4/resources/iqmol.desktop +--- IQmol3-3.1.4/resources/iqmol.desktop.fixdesktop 2024-02-22 10:09:22.000000000 +0000 ++++ IQmol3-3.1.4/resources/iqmol.desktop 2024-07-26 15:10:13.035096516 +0000 +@@ -4,7 +4,7 @@ Type=Application + GenericName=Molecular Editor + Comment=Build, visualize and animate molecules + Terminal=false +-Exec=/usr/local/bin/iqmol ++Exec=/usr/bin/IQmol + Icon=/usr/share/icons/hicolor/512x512/apps/iqmol.png + StartupNotify=true + Categories=Education;Science;Chemistry;Physics;Biology; diff --git a/IQmol.spec b/IQmol.spec index 7b09467..6c9dc6b 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -10,13 +10,15 @@ Patch1: IQmol3-fragdir.patch # Don't mess with OpenBabel's directories Patch4: IQmol-2.13-openbabel.patch # Fix CMake build -Patch5: IQmol-3.1.3-cmake.patch +Patch5: IQmol-3.1.4-cmake.patch # Use external QMSGBox headers Patch6: IQmol3-qmsgbox.patch # Add missing interdependencies Patch7: IQmol-3.1.2-builddeps.patch # and missing links Patch8: IQmol3-3.1.2-missinglink.patch +# Fix the desktop icon +Patch9: IQmol-3.1.4-fixdesktop.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -63,6 +65,7 @@ This package contains samples for IQmol. %patch 6 -p1 -b .qmsgbox #patch 7 -p1 -b .builddeps %patch 8 -p1 -b .missinglink +%patch 9 -p1 -b .fixdesktop # Get rid of bundled gl2ps rm src/Viewer/gl2ps.{h,C} # and of QMsgBox @@ -73,6 +76,9 @@ rm -rf src/OpenMesh/ # The bundled FindOpenBabel file is wrong \rm cmake/FindOpenBabel3.cmake
+# Clean up MacOS file system junk +find . -name .DS_Store -delete + %build # The IQmol build is based on libraries but the objects should be linked to the binary %cmake -DBUILD_SHARED_LIBS:BOOL=OFF @@ -84,12 +90,12 @@ install -D -p -m 755 %{__cmake_builddir}/IQmol %{buildroot}%{_bindir}/IQmol mkdir -p %{buildroot}%{_datadir}/IQmol cp -pr share/* %{buildroot}%{_datadir}/IQmol/ install -D -p -m 644 resources/IQmol.png %{buildroot}%{_datadir}/pixmaps/IQmol.png -desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/IQmol.desktop +desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/iqmol.desktop
%files %license LICENSE %doc README.md -%{_datadir}/applications/IQmol.desktop +%{_datadir}/applications/iqmol.desktop %{_datadir}/pixmaps/IQmol.png %{_datadir}/IQmol/ %{_bindir}/IQmol
commit 87ea526a85ad43a4d2ce8ffd8bcf575f7fd8619c Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Fri Jul 26 14:14:40 2024 +0000
Update to 3.1.4.
diff --git a/.gitignore b/.gitignore index 82e4ec7..21ff4e8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /IQmol-2.15.0.tar.gz /IQmol-3.1.2.tar.gz /IQmol-3.1.3.tar.gz +/IQmol-3.1.4.tar.gz diff --git a/IQmol.spec b/IQmol.spec index 7b37cfd..7b09467 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -1,6 +1,6 @@ Name: IQmol -Version: 3.1.3 -Release: 2%{?dist} +Version: 3.1.4 +Release: 1%{?dist} Summary: A free open-source molecular editor and visualization package License: BSD and GPLv2+ and GPLv3+ URL: http://iqmol.org @@ -99,6 +99,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/IQmol %doc samples/*
%changelog +* Fri Jul 26 2024 Susi Lehtola jussilehtola@fedoraproject.org - 3.1.4-1 +- Update to 3.1.4. + * Wed Jul 17 2024 Fedora Release Engineering releng@fedoraproject.org - 3.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/sources b/sources index 6c0b51a..56b15ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (IQmol-3.1.3.tar.gz) = 8e8654885f94735deada8760678e5d2fdd18889bf00aeef1801e7f62181d5c99fe9ec7812631e4e11795d8a3d6bf43d72a2cde755f71265c2da1d65fd20f73bc +SHA512 (IQmol-3.1.4.tar.gz) = 3259dcb57e64ae9d5e9c5604d6a23cacc45b7b5767342cd59f8cd168aa1333b430ff01ca1104c18deda556c97c97ace5ec69b0de2d4a8ad2b76ad91eb2dd52fb
commit 3161c484aeee205f56a1a2399d1ffe97c680f1da Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Jul 17 14:56:41 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/IQmol.spec b/IQmol.spec index 9833f2d..7b37cfd 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -1,6 +1,6 @@ Name: IQmol Version: 3.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A free open-source molecular editor and visualization package License: BSD and GPLv2+ and GPLv3+ URL: http://iqmol.org @@ -99,6 +99,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/IQmol %doc samples/*
%changelog +* Wed Jul 17 2024 Fedora Release Engineering releng@fedoraproject.org - 3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed May 08 2024 Susi Lehtola jussilehtola@fedoraproject.org - 3.1.3-1 - Update to 3.1.3.
commit 175211df34dc0064e82aed129a13a0d879078779 Author: Susi Lehtola jussilehtola@fedoraproject.org Date: Wed May 8 14:58:49 2024 +0000
Update to 3.1.3
diff --git a/.gitignore b/.gitignore index e983572..82e4ec7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /IQmol-2.14.3.tar.gz /IQmol-2.15.0.tar.gz /IQmol-3.1.2.tar.gz +/IQmol-3.1.3.tar.gz diff --git a/IQmol-3.1.2-cmake.patch b/IQmol-3.1.2-cmake.patch deleted file mode 100644 index b83076f..0000000 --- a/IQmol-3.1.2-cmake.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff -up IQmol3-3.1.2/CMakeLists.txt.cmakebuild IQmol3-3.1.2/CMakeLists.txt ---- IQmol3-3.1.2/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/CMakeLists.txt 2023-02-23 10:55:04.345344956 +0000 -@@ -26,26 +26,11 @@ endif() - find_package(Threads REQUIRED) - find_package(OpenGL REQUIRED) - find_package(OpenSSL REQUIRED) -+find_package(OpenBabel3 REQUIRED) - -+include_directories(OpenBabel3_INCLUDE_DIRS) - - # No CMakeLists.txt for libQGLViewer --include_directories(modules/libQGLViewer) --add_subdirectory(modules EXCLUDE_FROM_ALL) -- --include_directories(modules/libssh2/include) --add_subdirectory(modules/libssh2 EXCLUDE_FROM_ALL) -- --include_directories(modules/openmesh/src) --add_subdirectory(modules/openmesh EXCLUDE_FROM_ALL) -- --include_directories(modules/yaml-cpp/include) --add_subdirectory(modules/yaml-cpp EXCLUDE_FROM_ALL) -- --include_directories(modules/openbabel/include) --include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) --include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) --include_directories(${CMAKE_CURRENT_BINARY_DIR}/modules/openbabel/include) --add_subdirectory(modules/openbabel EXCLUDE_FROM_ALL) - - #set(HDF5_USE_STATIC_LIBRARIES 1) - #include_directories(modules/hdf5/src) -@@ -73,13 +58,18 @@ endif(QARCHIVE) - - # The following must come after the modules as it picks up the include - # for the system libssh2.h. --set(Boost_USE_STATIC_LIBS TRUE) -+set(Boost_USE_STATIC_LIBS FALSE) - find_package(Boost COMPONENTS iostreams serialization REQUIRED) - include_directories(${Boost_INCLUDE_DIRS}) - - set(CMAKE_AUTOUIC ON) - set(CMAKE_AUTOMOC ON) - -+# We need this to be able to include e.g. "Data/Bank.h" in the sources -+include_directories(src) -+# and this to access autogenerated files -+include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) -+ - add_subdirectory(src) - if (${Qt5Core_VERSION_STRING} VERSION_GREATER_EQUAL 5.15 ) - qt_add_resources(IQmol_RESOURCES_RCC resources/IQmol.qrc) -@@ -162,9 +152,9 @@ target_link_libraries (${targetName} - Plot - Fort - openbabel -- libssh2 -+ ssh2 - yaml-cpp -- QGLViewer -+ QGLViewer-qt5 - Qt5::Core - Qt5::Gui - Qt5::Xml -diff -up IQmol3-3.1.2/src/Grid/CMakeLists.txt.cmakebuild IQmol3-3.1.2/src/Grid/CMakeLists.txt ---- IQmol3-3.1.2/src/Grid/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/src/Grid/CMakeLists.txt 2023-02-23 10:54:06.653389439 +0000 -@@ -53,4 +53,6 @@ target_link_libraries(${LIB} PRIVATE - Qt5::Widgets - Qt5::Xml - Qt5::OpenGL -+ OpenMeshCore -+ OpenMeshTools - ) -diff -up IQmol3-3.1.2/src/Main/CMakeLists.txt.cmakebuild IQmol3-3.1.2/src/Main/CMakeLists.txt ---- IQmol3-3.1.2/src/Main/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/src/Main/CMakeLists.txt 2023-02-23 10:54:06.653389439 +0000 -@@ -55,4 +55,5 @@ target_link_libraries(${LIB} PRIVATE - Qt5::Widgets - Qt5::Xml - Qt5::OpenGL -+ QMsgBox-qt5 - ) -diff -up IQmol3-3.1.2/src/Math/CMakeLists.txt.cmakebuild IQmol3-3.1.2/src/Math/CMakeLists.txt ---- IQmol3-3.1.2/src/Math/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/src/Math/CMakeLists.txt 2023-02-23 10:54:06.654389421 +0000 -@@ -22,7 +22,7 @@ set( SOURCES - add_library(${LIB} ${SOURCES}) - target_include_directories(${LIB} PUBLIC "${${LIB}_SOURCE_DIR}") - target_link_libraries(${LIB} PRIVATE -- QGLViewer -+ QGLViewer-qt5 - Qt5::Xml - Qt5::OpenGL - ) -diff -up IQmol3-3.1.2/src/Network/CMakeLists.txt.cmakebuild IQmol3-3.1.2/src/Network/CMakeLists.txt ---- IQmol3-3.1.2/src/Network/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/src/Network/CMakeLists.txt 2023-02-23 10:54:06.654389421 +0000 -@@ -35,4 +35,5 @@ target_link_libraries(${LIB} PRIVATE - Qt5::Widgets - Qt5::Network - OpenSSL::SSL -+ ssh2 - ) -diff -up IQmol3-3.1.2/src/Plot/CMakeLists.txt.cmakebuild IQmol3-3.1.2/src/Plot/CMakeLists.txt ---- IQmol3-3.1.2/src/Plot/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/src/Plot/CMakeLists.txt 2023-02-23 10:54:06.654389421 +0000 -@@ -19,4 +19,6 @@ target_link_libraries(${LIB} PRIVATE - Qt5::Core - Qt5::Gui - Qt5::Widgets -+ Qt5::PrintSupport -+ QMsgBox-qt5 - ) -diff -up IQmol3-3.1.2/src/Qui/CMakeLists.txt.cmakebuild IQmol3-3.1.2/src/Qui/CMakeLists.txt ---- IQmol3-3.1.2/src/Qui/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/src/Qui/CMakeLists.txt 2023-02-23 10:54:06.654389421 +0000 -@@ -87,5 +87,6 @@ target_link_libraries(${LIB} PRIVATE - Qt5::Sql - Qt5::OpenGL - ${OpenBabel3_LIBRARIES} -+ QMsgBox-qt5 - ) - -diff -up IQmol3-3.1.2/src/Util/CMakeLists.txt.cmakebuild IQmol3-3.1.2/src/Util/CMakeLists.txt ---- IQmol3-3.1.2/src/Util/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/src/Util/CMakeLists.txt 2023-02-23 10:54:06.655389403 +0000 -@@ -3,7 +3,6 @@ set(LIB Util) - - set(HEADERS - ColorGradientDialog.h -- QMsgBox.h - LogMessageDialog.h - ProgressDialog.h - Task.h -@@ -18,7 +17,6 @@ set( SOURCES - LogMessageDialog.C - Preferences.C - ProgressDialog.C -- QMsgBox.C - QsDebugOutput.C - QsLog.C - QsLogDest.C -diff -up IQmol3-3.1.2/src/Viewer/CMakeLists.txt.cmakebuild IQmol3-3.1.2/src/Viewer/CMakeLists.txt ---- IQmol3-3.1.2/src/Viewer/CMakeLists.txt.cmakebuild 2023-02-09 05:00:10.000000000 +0000 -+++ IQmol3-3.1.2/src/Viewer/CMakeLists.txt 2023-02-23 10:54:06.655389403 +0000 -@@ -23,7 +23,6 @@ set( SOURCES - CameraDialog.C - Cursors.C - GLSLmath.C -- gl2ps.C - ManipulateHandler.C - ManipulateSelectionHandler.C - ManipulatedFrameSetConstraint.C -@@ -64,4 +63,5 @@ target_link_libraries(${LIB} PRIVATE - Qt5::Widgets - Qt5::Xml - Qt5::OpenGL -+ gl2ps - ) diff --git a/IQmol-3.1.3-cmake.patch b/IQmol-3.1.3-cmake.patch new file mode 100644 index 0000000..266194d --- /dev/null +++ b/IQmol-3.1.3-cmake.patch @@ -0,0 +1,162 @@ +diff -up IQmol3-3.1.3/CMakeLists.txt.cmakebuild IQmol3-3.1.3/CMakeLists.txt +--- IQmol3-3.1.3/CMakeLists.txt.cmakebuild 2024-05-08 14:44:38.875325241 +0000 ++++ IQmol3-3.1.3/CMakeLists.txt 2024-05-08 14:46:09.549719022 +0000 +@@ -34,26 +34,9 @@ endif() + find_package(Threads REQUIRED) + find_package(OpenGL REQUIRED) + find_package(OpenSSL REQUIRED) +- +- +-# No CMakeLists.txt for libQGLViewer +-include_directories(modules/libQGLViewer) +-add_subdirectory(modules EXCLUDE_FROM_ALL) +- +-include_directories(modules/libssh2/include) +-add_subdirectory(modules/libssh2 EXCLUDE_FROM_ALL) +- +-include_directories(modules/openmesh/src) +-add_subdirectory(modules/openmesh EXCLUDE_FROM_ALL) +-set(OPENMESH_LIBRARIES OpenMeshCoreStatic OpenMeshToolsStatic) +- +-include_directories(modules/yaml-cpp/include) +-add_subdirectory(modules/yaml-cpp EXCLUDE_FROM_ALL) +- +-include_directories(modules/openbabel/include) +-include_directories(${CMAKE_CURRENT_BINARY_DIR}/modules/openbabel/include) +-add_subdirectory(modules/openbabel EXCLUDE_FROM_ALL) +- ++find_package(OpenBabel3 REQUIRED) ++ ++include_directories(OpenBabel3_INCLUDE_DIR) + + if(QARCHIVE) + #set(HDF5_USE_STATIC_LIBRARIES 1) +@@ -78,7 +61,7 @@ endif(QARCHIVE) + + # The following must come after the modules as it picks up the include + # for the system libssh2.h. +-set(Boost_USE_STATIC_LIBS TRUE) ++set(Boost_USE_STATIC_LIBS FALSE) + find_package(Boost COMPONENTS iostreams serialization REQUIRED) + include_directories(${Boost_INCLUDE_DIRS}) + +@@ -86,6 +69,10 @@ include_directories(${Boost_INCLUDE_DIRS + set(CMAKE_AUTOUIC ON) + set(CMAKE_AUTOMOC ON) + ++# We need this to be able to include e.g. "Data/Bank.h" in the sources ++include_directories(src) ++# and this to access autogenerated files ++include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) + add_subdirectory(src) + + enable_testing() +@@ -166,10 +153,10 @@ target_link_libraries (${targetName} + Math + Plot + Fort +- libssh2 ++ ssh2 + yaml-cpp + openbabel +- QGLViewer ++ QGLViewer-qt5 + Qt5::Core + Qt5::Gui + Qt5::Xml +diff -up IQmol3-3.1.3/src/Grid/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Grid/CMakeLists.txt +--- IQmol3-3.1.3/src/Grid/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 ++++ IQmol3-3.1.3/src/Grid/CMakeLists.txt 2024-05-08 14:44:38.875325241 +0000 +@@ -53,4 +53,6 @@ target_link_libraries(${LIB} PRIVATE + Qt5::Widgets + Qt5::Xml + Qt5::OpenGL ++ OpenMeshCore ++ OpenMeshTools + ) +diff -up IQmol3-3.1.3/src/Main/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Main/CMakeLists.txt +--- IQmol3-3.1.3/src/Main/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 ++++ IQmol3-3.1.3/src/Main/CMakeLists.txt 2024-05-08 14:44:38.875325241 +0000 +@@ -55,4 +55,5 @@ target_link_libraries(${LIB} PRIVATE + Qt5::Widgets + Qt5::Xml + Qt5::OpenGL ++ QMsgBox-qt5 + ) +diff -up IQmol3-3.1.3/src/Math/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Math/CMakeLists.txt +--- IQmol3-3.1.3/src/Math/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 ++++ IQmol3-3.1.3/src/Math/CMakeLists.txt 2024-05-08 14:44:38.875325241 +0000 +@@ -22,7 +22,7 @@ set( SOURCES + add_library(${LIB} ${SOURCES}) + target_include_directories(${LIB} PUBLIC "${${LIB}_SOURCE_DIR}") + target_link_libraries(${LIB} PRIVATE +- QGLViewer ++ QGLViewer-qt5 + Qt5::Xml + Qt5::OpenGL + ) +diff -up IQmol3-3.1.3/src/Network/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Network/CMakeLists.txt +--- IQmol3-3.1.3/src/Network/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 ++++ IQmol3-3.1.3/src/Network/CMakeLists.txt 2024-05-08 14:44:38.876325224 +0000 +@@ -35,4 +35,5 @@ target_link_libraries(${LIB} PRIVATE + Qt5::Widgets + Qt5::Network + OpenSSL::SSL ++ ssh2 + ) +diff -up IQmol3-3.1.3/src/Plot/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Plot/CMakeLists.txt +--- IQmol3-3.1.3/src/Plot/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 ++++ IQmol3-3.1.3/src/Plot/CMakeLists.txt 2024-05-08 14:44:38.876325224 +0000 +@@ -19,4 +19,6 @@ target_link_libraries(${LIB} PRIVATE + Qt5::Core + Qt5::Gui + Qt5::Widgets ++ Qt5::PrintSupport ++ QMsgBox-qt5 + ) +diff -up IQmol3-3.1.3/src/Qui/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Qui/CMakeLists.txt +--- IQmol3-3.1.3/src/Qui/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 ++++ IQmol3-3.1.3/src/Qui/CMakeLists.txt 2024-05-08 14:44:38.876325224 +0000 +@@ -75,5 +75,6 @@ target_link_libraries(${LIB} PRIVATE + Qt5::Sql + Qt5::OpenGL + ${OpenBabel3_LIBRARIES} ++ QMsgBox-qt5 + ) + +diff -up IQmol3-3.1.3/src/Util/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Util/CMakeLists.txt +--- IQmol3-3.1.3/src/Util/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 ++++ IQmol3-3.1.3/src/Util/CMakeLists.txt 2024-05-08 14:44:38.876325224 +0000 +@@ -3,7 +3,6 @@ set(LIB Util) + + set(HEADERS + ColorGradientDialog.h +- QMsgBox.h + LogMessageDialog.h + ProgressDialog.h + Task.h +@@ -18,7 +17,6 @@ set( SOURCES + LogMessageDialog.C + Preferences.C + ProgressDialog.C +- QMsgBox.C + QsDebugOutput.C + QsLog.C + QsLogDest.C +diff -up IQmol3-3.1.3/src/Viewer/CMakeLists.txt.cmakebuild IQmol3-3.1.3/src/Viewer/CMakeLists.txt +--- IQmol3-3.1.3/src/Viewer/CMakeLists.txt.cmakebuild 2024-02-21 10:54:33.000000000 +0000 ++++ IQmol3-3.1.3/src/Viewer/CMakeLists.txt 2024-05-08 14:44:38.877325206 +0000 +@@ -23,7 +23,6 @@ set( SOURCES + CameraDialog.C + Cursors.C + GLSLmath.C +- gl2ps.C + ManipulateHandler.C + ManipulateSelectionHandler.C + ManipulatedFrameSetConstraint.C +@@ -64,4 +63,5 @@ target_link_libraries(${LIB} PRIVATE + Qt5::Widgets + Qt5::Xml + Qt5::OpenGL ++ gl2ps + ) diff --git a/IQmol.spec b/IQmol.spec index d8666a0..9833f2d 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -1,6 +1,6 @@ Name: IQmol -Version: 3.1.2 -Release: 7%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Summary: A free open-source molecular editor and visualization package License: BSD and GPLv2+ and GPLv3+ URL: http://iqmol.org @@ -10,7 +10,7 @@ Patch1: IQmol3-fragdir.patch # Don't mess with OpenBabel's directories Patch4: IQmol-2.13-openbabel.patch # Fix CMake build -Patch5: IQmol-3.1.2-cmake.patch +Patch5: IQmol-3.1.3-cmake.patch # Use external QMSGBox headers Patch6: IQmol3-qmsgbox.patch # Add missing interdependencies @@ -57,12 +57,12 @@ This package contains samples for IQmol.
%prep %setup -q -n IQmol3-%{version} -%patch1 -p1 -b .fragdir -%patch4 -p1 -b .openbabel -%patch5 -p1 -b .cmakebuild -%patch6 -p1 -b .qmsgbox -%patch7 -p1 -b .builddeps -%patch8 -p1 -b .missinglink +%patch 1 -p1 -b .fragdir +%patch 4 -p1 -b .openbabel +%patch 5 -p1 -b .cmakebuild +%patch 6 -p1 -b .qmsgbox +#patch 7 -p1 -b .builddeps +%patch 8 -p1 -b .missinglink # Get rid of bundled gl2ps rm src/Viewer/gl2ps.{h,C} # and of QMsgBox @@ -70,6 +70,9 @@ rm src/Util/QMsgBox.{h,C} # and of OpenMesh rm -rf src/OpenMesh/
+# The bundled FindOpenBabel file is wrong +\rm cmake/FindOpenBabel3.cmake + %build # The IQmol build is based on libraries but the objects should be linked to the binary %cmake -DBUILD_SHARED_LIBS:BOOL=OFF @@ -96,6 +99,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/IQmol %doc samples/*
%changelog +* Wed May 08 2024 Susi Lehtola jussilehtola@fedoraproject.org - 3.1.3-1 +- Update to 3.1.3. + * Mon Jan 22 2024 Fedora Release Engineering releng@fedoraproject.org - 3.1.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources index 8bb2418..6c0b51a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (IQmol-3.1.2.tar.gz) = 54bf948161b23dcba3aef04c328597dd3431012e42d7f822b62af18488e3966b1b337e4f670600db083fae6d5da79760fe6b3fbbceca8dc52bc05abca2da97da +SHA512 (IQmol-3.1.3.tar.gz) = 8e8654885f94735deada8760678e5d2fdd18889bf00aeef1801e7f62181d5c99fe9ec7812631e4e11795d8a3d6bf43d72a2cde755f71265c2da1d65fd20f73bc
commit 0ba5764b8b2485129990c1ddec8a0dcbab949b19 Author: Fedora Release Engineering releng@fedoraproject.org Date: Mon Jan 22 21:01:21 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/IQmol.spec b/IQmol.spec index 8702bee..d8666a0 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -1,6 +1,6 @@ Name: IQmol Version: 3.1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A free open-source molecular editor and visualization package License: BSD and GPLv2+ and GPLv3+ URL: http://iqmol.org @@ -96,6 +96,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/IQmol %doc samples/*
%changelog +* Mon Jan 22 2024 Fedora Release Engineering releng@fedoraproject.org - 3.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering releng@fedoraproject.org - 3.1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit 6c061b657e4d3e42f30bfd48c9f7ea56f21af0cb Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Jan 19 09:54:19 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/IQmol.spec b/IQmol.spec index efdde13..8702bee 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -1,6 +1,6 @@ Name: IQmol Version: 3.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A free open-source molecular editor and visualization package License: BSD and GPLv2+ and GPLv3+ URL: http://iqmol.org @@ -96,6 +96,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/IQmol %doc samples/*
%changelog +* Fri Jan 19 2024 Fedora Release Engineering releng@fedoraproject.org - 3.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Fedora Release Engineering releng@fedoraproject.org - 3.1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit 74430768658feff5016440330bb38eff9a620c6d Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jan 18 12:25:19 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/IQmol.spec b/IQmol.spec index 9a811d3..efdde13 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -1,6 +1,6 @@ Name: IQmol Version: 3.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A free open-source molecular editor and visualization package License: BSD and GPLv2+ and GPLv3+ URL: http://iqmol.org @@ -96,6 +96,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/IQmol %doc samples/*
%changelog +* Thu Jan 18 2024 Fedora Release Engineering releng@fedoraproject.org - 3.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Jonathan Wakely jwakely@redhat.com - 3.1.2-4 - Rebuilt for Boost 1.83
commit dacd6c0bffb41c44d89b86a127b048a5345e9c47 Author: Jonathan Wakely jwakely@redhat.com Date: Thu Jan 18 05:27:32 2024 +0000
Rebuilt for Boost 1.83
diff --git a/IQmol.spec b/IQmol.spec index 1d0677d..9a811d3 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -1,6 +1,6 @@ Name: IQmol Version: 3.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A free open-source molecular editor and visualization package License: BSD and GPLv2+ and GPLv3+ URL: http://iqmol.org @@ -96,6 +96,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ resources/IQmol %doc samples/*
%changelog +* Thu Jan 18 2024 Jonathan Wakely jwakely@redhat.com - 3.1.2-4 +- Rebuilt for Boost 1.83 + * Wed Jul 19 2023 Fedora Release Engineering releng@fedoraproject.org - 3.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
commit 41e80148f58750b51859355fe80613afdc9ba14d Author: Sandro devel@penguinpee.nl Date: Tue Sep 19 13:43:06 2023 +0200
Stop building for i686
This is for `highfive`.
diff --git a/IQmol.spec b/IQmol.spec index 31649bc..1d0677d 100644 --- a/IQmol.spec +++ b/IQmol.spec @@ -18,6 +18,9 @@ Patch7: IQmol-3.1.2-builddeps.patch # and missing links Patch8: IQmol3-3.1.2-missinglink.patch
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: armadillo-devel BuildRequires: boost-devel BuildRequires: gcc-c++
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org