[rpms/avogadro2-libs] f44: Re-organize duplicated files

[rpms/avogadro2-libs] f44: Re-organize duplicated files

[Antonio Trande]

A new commit has been pushed.

Repo   : rpms/avogadro2-libs
Branch : f44
Commit : 3a5aca36e59964b5170f094988e1384390bfbb2b
Author : Antonio Trande <sagitter@fedoraproject.org>
Date   : 2026-06-28T22:56:28+02:00
Stats  : +21/-16 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/avogadro2-libs/c/3a5aca36e59964b5170f094988e1384390bfbb2b?branch=f44

Log:
Re-organize duplicated files

---
diff --git a/avogadro2-libs.spec b/avogadro2-libs.spec
index 888cc40..daa7916 100644
--- a/avogadro2-libs.spec
+++ b/avogadro2-libs.spec
@@ -27,6 +27,7 @@ BuildRequires:  cmake
 BuildRequires:  cups-devel
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
+BuildRequires:  fdupes
 BuildRequires:  pkgconfig(eigen3)
 BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(openbabel-3)
@@ -50,7 +51,6 @@ BuildRequires:  JKQtPlotter-devel
 BuildRequires:  libarchive-devel >= 3.4.0
 %endif
 Provides: %{name}-static = 0:%{version}-%{release}
-Obsoletes: %{name} < 0:2.0.0-1
 %py_provides python3-%{name}
 %py_provides python3-avogadro
 %description
@@ -150,25 +150,31 @@ export CXXFLAGS="%{optflags} -DEIGEN_ALTIVEC_DISABLE_MMA"
 %install
 %cmake_install
 
-# Move Python scripts under a system Python directory
-mv %{buildroot}%{_datadir}/avogadro2/fragments/scripts %{buildroot}%{python3_sitearch}/avogadro/fragments/
-
-# Link Python scripts directory under private datadir to the related system Python directory
-ln -sf %{python3_sitearch}/avogadro/fragments/scripts %{buildroot}%{_datadir}/avogadro2/fragments/scripts
-
 # Use pkgdocdir macro
 rm -rf %{buildroot}%{_datadir}/doc
 mkdir -p %{buildroot}%{_pkgdocdir}
 cp -r %_vpath_builddir/docs/html %{buildroot}%{_pkgdocdir}/html/
 
-# Link data files under private libdir to the related data directory
-mkdir -p %{buildroot}%{_datadir}/avogadro2/avogenerators
-cp -r avogenerators %{buildroot}%{_datadir}/avogadro2
-ln -sf %{_datadir}/avogadro2/avogenerators %{buildroot}%{_libdir}/avogadro2/plugins/avogenerators
-
 # Fix missing exec perrmissions
-%py3_shebang_fix %{buildroot}%{python3_sitearch}/avogadro/fragments/*.py
-chmod a+x %{buildroot}%{python3_sitearch}/avogadro/fragments/*.py
+%py3_shebang_fix %{buildroot}%{_datadir}/avogadro2/fragments/scripts/*.py
+
+%fdupes %{buildroot}
+
+# Remove hard links across partitions
+unlink %{buildroot}%{_datadir}/avogadro2/fragments/scripts/requirements.txt
+unlink %{buildroot}%{_datadir}/avogadro2/fragments/scripts/requirements-dev.txt
+unlink %{buildroot}%{_libdir}/avogadro2/plugins/avogenerators
+
+# Fix exec permissions
+chmod a+x %{buildroot}%{_datadir}/avogadro2/fragments/scripts/*.py
+
+# Remove hidden file
+rm -f %{buildroot}%{_datadir}/avogadro2/fragments/.pre-commit-config.yaml
+
+# Remove duplicated files
+rm -f %{buildroot}%{_datadir}/avogadro2/fragments/LICENSE-fragments
+rm -f %{buildroot}%{_datadir}/avogadro2/fragments/README-fragments.md
+rm -f %{buildroot}%{_datadir}/avogadro2/fragments/LICENSE-molecules
 
 %check
 %ctest
@@ -178,6 +184,7 @@ chmod a+x %{buildroot}%{python3_sitearch}/avogadro/fragments/*.py
 %doc fragments/README-fragments.md
 %license LICENSE molecules/LICENSE-molecules fragments/LICENSE-fragments
 %{_libdir}/libAvogadro*.so.%{version}
+%{_libdir}/libAvogadro*.so.2
 %dir %{_libdir}/avogadro2
 %{_libdir}/avogadro2/libgwavi.a
 %{_libdir}/avogadro2/staticplugins/
@@ -185,10 +192,8 @@ chmod a+x %{buildroot}%{python3_sitearch}/avogadro/fragments/*.py
 %{_datadir}/avogadro2/
 %{python3_sitearch}/avogadro/
 
-
 %files devel
 %{_includedir}/avogadro2/
-%{_libdir}/libAvogadro*.so.2
 %{_libdir}/libAvogadro*.so
 %{_libdir}/cmake/avogadrolibs/