Spec cleanup: relocate some top level packages

smuzaffar · smuzaffar · commit fcd8385198dc · 2022-09-22T07:56:29.000+02:00
diff --git a/OpenBLAS.spec b/OpenBLAS.spec
@@ -28,3 +28,5 @@ make %{build_opts} CFLAGS="%{arch_build_flags}"
 %install
 make install PREFIX=%i MAKE_NB_JOBS=%{compiling_processes}
 
+%post
+%relocateConfigAll lib/cmake *.cmake
diff --git a/dd4hep.spec b/dd4hep.spec
@@ -45,6 +45,4 @@ mv ../../%{n}-%{realversion}/DDG4/include/DDG4 %i/include
 %install
 
 %post
-%{relocateConfig}*.cmake
 %{relocateConfig}bin/*.sh
-%{relocateConfig}bin/*.csh
diff --git a/evtgen.spec b/evtgen.spec
@@ -60,3 +60,6 @@ find %i/lib64 -name "*.*" -exec mv {} %i/lib \;
 rm -rf %i/lib64
 ls %{i}/lib
 cd ..
+
+%post
+%relocateConfigAll share/EvtGen/cmake *.cmake
diff --git a/fastjet.spec b/fastjet.spec
@@ -48,5 +48,7 @@ make %{makeprocesses}
 %install
 make install
 rm -rf %{i}/lib/*.la
+
 %post
 %{relocateConfig}bin/fastjet-config
+%relocateConfigAll lib _fastjet.la
diff --git a/fftw3.spec b/fftw3.spec
@@ -25,3 +25,6 @@ make install
 
 # Remove documentation. 
 %define drop_files %{i}/share
+
+%post
+%relocateConfigAll lib/cmake *.cmake
diff --git a/freetype.spec b/freetype.spec
@@ -25,5 +25,3 @@ perl -p -i -e 's|-lfreetype|-lfreetype-cms|' %{i}/bin/freetype-config
 
 # Strip libraries, we are not going to debug them.
 %define strip_files %{i}/lib
-%post
-%{relocateConfig}bin/freetype-config
diff --git a/hdf5.spec b/hdf5.spec
@@ -17,3 +17,5 @@ make %{makeprocesses} VERBOSE=1
 make install
 
 %post
+%{relocateConfig}bin/h5pcc
+%{relocateConfig}lib/libhdf5.settings
diff --git a/heppdt.spec b/heppdt.spec
@@ -32,3 +32,6 @@ make
 
 %install
 make install
+
+%post
+%{relocateConfig}examples/*/GNUmakefile
diff --git a/herwig7.spec b/herwig7.spec
@@ -73,12 +73,12 @@ sed -i -e 's|^#!.*python|#!/usr/bin/env python3|' %{i}/lib/Herwig/python/ufo2her
 
 %post
 %{relocateConfig}bin/herwig-config
-%{relocateConfig}bin/Herwig7
 %{relocateConfig}bin/Herwig-cms
 %{relocateConfig}bin/ufo2herwig
 %{relocateConfig}lib/Herwig/*.la
 %{relocateConfig}lib/Herwig/python/Makefile-FR
 %{relocateConfig}share/Herwig/Makefile-UserModules
 %{relocateConfig}share/Herwig/defaults/PDF.in
 %{relocateConfig}share/Herwig/HerwigDefaults.rpo
-sed -i -e "s|^.*/BUILDROOT/[0-9a-f][0-9a-f]*%{installroot}/|$CMS_INSTALL_PREFIX/|g" $RPM_INSTALL_PREFIX/%{pkgrel}/share/Herwig/HerwigDefaults.rpo
+%{relocateConfig}share/Herwig/Doc/*.conf
+%{relocateConfig}share/Herwig/defaults/setup.gosam.in
diff --git a/highfive.spec b/highfive.spec
@@ -26,3 +26,5 @@ cmake ../%{n}-%{realversion} \
 cd %{_builddir}/build
 make install
 
+%post
+%{relocateConfig}share/HighFive/CMake/HighFiveTargets.cmake
diff --git a/llvm.spec b/llvm.spec
@@ -84,3 +84,5 @@ rm -f %{i}/bin/set-xcode-analyzer
 
 %post
 %{relocateConfig}include/llvm/Config/llvm-config.h
+%{relocateConfig}include/clang/Config/config.h
+%{relocateConfig}lib64/cmake/llvm/LLVMConfig.cmake
diff --git a/lwtnn.spec b/lwtnn.spec
@@ -30,3 +30,6 @@ ninja -v %{makeprocesses}
 cd ../build
 
 ninja -v %{makeprocesses} install
+
+%post
+%{relocateConfig}cmake/lwtnnConfig-targets.cmake
diff --git a/madgraph5amcatnlo.spec b/madgraph5amcatnlo.spec
@@ -45,6 +45,10 @@ EOF
 
 # Remove all downloaded tgz files before building the package
 find . -type f -name '*.tgz' -delete
+rm -rf HEPTools/ninja/Ninja HEPTools/ninja/ninja_install.log \
+       ME5_debug basiceventgeneration/run*debug.log \
+       basiceventgeneration/Source/StdHEP/log.mcfio.*
+find HEPTools/oneloop -type f -print | xargs chmod a+r
 
 %install
 rsync -avh %{_builddir}/MG5_aMC_v%{versiontag}_py3/ %{i}/
@@ -54,4 +58,8 @@ sed -ideleteme 's|#!.*/bin/python|#!/usr/bin/env python|' \
 find %{i} -name '*deleteme' -delete
 
 %post
+%relocateConfigAll . py.py
 %{relocateConfig}input/mg5_configuration.txt
+%{relocateConfig}basiceventgeneration/Cards/amcatnlo_configuration.txt
+%{relocateConfig}basiceventgeneration/Source/make_opts
+%{relocateConfig}HEPTools/ninja/lib/lib*.la
diff --git a/mxnet-predict.spec b/mxnet-predict.spec
@@ -48,3 +48,7 @@ cd ../build
 ninja -v %{makeprocesses} install
 rm %{i}/*.so
 mv %{i}/python* %{i}/lib
+
+%post
+%{%relocateConfig}include/mxnet-cpp/op.h
+%relocateConfigAll lib/cmake *.cmake
diff --git a/openldap.spec b/openldap.spec
@@ -30,4 +30,4 @@ make install
 find %{i}/lib -type f | xargs chmod 0755
 
 # Remove man pages.
-rm -rf %{i}/man
+rm -rf %{i}/man %{i}/share/man
diff --git a/pip/scipy.file b/pip/scipy.file
@@ -9,3 +9,5 @@ Provides: python%{cms_python3_major_minor_version}dist(scipy) = %{realversion}
 Provides: python3dist(scipy) = %{realversion}
 %define __find_provides true
 %endif
+
+%define PipPostPost %{relocateConfig}lib/python*/site-packages/scipy/__config__.py
diff --git a/pythia6.spec b/pythia6.spec
@@ -48,3 +48,6 @@ make install
 %install
 tar -c lib include | tar -x -C %i
 
+%post
+%{relocateConfig}include/Makefile
+%{relocateConfig}lib/lib*.la
diff --git a/pythia8.spec b/pythia8.spec
@@ -15,3 +15,7 @@ make %makeprocesses
 %install
 make install
 test -f %i/lib/libpythia8lhapdf6.so || exit 1
+rm -rf %{i}/share/Pythia8/examples
+
+%post
+%{relocateConfig}bin/pythia8-config
diff --git a/qd.spec b/qd.spec
@@ -17,3 +17,6 @@ make %{makeprocesses}
 
 %install
 make install
+
+%post
+%{relocateConfig}bin/qd-config
diff --git a/rivet.spec b/rivet.spec
@@ -58,3 +58,5 @@ sed -i -e 's|^#!.*python.*|#!/usr/bin/env python3|' %{i}/bin/*
 %post
 %{relocateConfig}bin/rivet-config
 %{relocateConfig}bin/rivet-buildplugin
+%{relocateConfig}bin/rivet-build
+%{relocateConfig}lib/python*/site-packages/rivet-*egg-info/SOURCES.txt
diff --git a/root.spec b/root.spec
@@ -184,4 +184,9 @@ cd ..
 rm -rf build
 
 %post
-%{relocateConfig}etc/cling/llvm/Config/llvm-config.h
+%{relocateConfig}bin/root-config
+%{relocateConfig}cmake/ROOTConfig-targets.cmake
+%{relocateConfig}config/Makefile.config
+%{relocateConfig}etc/notebook/jupyter_notebook_config.py
+%{relocateConfig}include/RConfigOptions.h
+%{relocateConfig}include/compiledata.h
diff --git a/rpm-preamble.file b/rpm-preamble.file
@@ -192,6 +192,7 @@
 %define relocateRpmPkg		perl -p -i -e "s|\\Q%{instroot}\\E|%{cmsroot}|g;s|\\Q%{cmsroot}\\E|$RPM_INSTALL_PREFIX|g" $RPM_INSTALL_PREFIX/%{pkgrel}/
 %define relocateCmsPkg		perl -p -i -e "s|\\Q%{instroot}\\E|%{cmsroot}|g;s|\\Q%{cmsroot}\\E|$CMS_INSTALL_PREFIX|g" $RPM_INSTALL_PREFIX/%{pkgrel}/
 %define relocateConfig		%relocateCmsPkg
+%define relocateConfigAll()     find $RPM_INSTALL_PREFIX/%{pkgrel}/%{1} -name '%{2}' -print -type f | xargs %{relocateCmsFiles}
 %define relocatePy3SitePackages \
   for py in $(grep -RlI -m1 '^#\!.*python' %{i}/${PYTHON3_LIB_SITE_PACKAGES} | grep -v '\.pyc$') ; do \
     lnum=$(grep -n -m1 '^#\!.*python' $py | sed 's|:.*||') \
diff --git a/scram-project-build.file b/scram-project-build.file
@@ -340,6 +340,6 @@ done
 if [ -f compile_commands.json ] ; then
   %{relocateConfig}compile_commands.json
 fi
-
+%{relocateConfig}external/%cmsplatf/links.DB
 %postun
 rm -fR $RPM_INSTALL_PREFIX/%pkgrel
diff --git a/sigcpp.spec b/sigcpp.spec
@@ -27,3 +27,6 @@ rm -rf %{i}/lib/pkgconfig
 # Read documentation online.
 %define drop_files %{i}/share
 cp %{i}/lib/sigc++-3.0/include/sigc++config.h %{i}/include/sigc++-3.0/
+
+%post
+%{relocateConfig}lib/cmake/sigc++-3/*.cmake
diff --git a/tauolapp.spec b/tauolapp.spec
@@ -34,3 +34,6 @@ make install
 
 mkdir %{i}/share
 cp TauSpinner/examples/CP-tests/Z-pi/*.txt %{i}/share/
+
+%post
+%{relocateConfig}lib/lib*.la
diff --git a/tensorflow.spec b/tensorflow.spec
@@ -25,3 +25,6 @@ esac
 %install
 
 tar xfz ${%{tf_root}}/libtensorflow_cc.tar.gz -C %{i}
+
+%post
+%{relocateConfig}lib/lib*.params
diff --git a/thepeg.spec b/thepeg.spec
@@ -63,6 +63,7 @@ find %{i}/lib -name '*.la' -exec rm -f {} \;
 
 
 %post
+%{relocateConfig}bin/thepeg-config
 %{relocateConfig}lib/ThePEG/Makefile.common
 %{relocateConfig}lib/ThePEG/Makefile
 %{relocateConfig}lib/ThePEG/ThePEGDefaults.rpo
diff --git a/ucx.spec b/ucx.spec
@@ -80,3 +80,4 @@ rm -f %{i}/lib/ucx/lib*.la
 rm -rf %{i}/share/ucx/examples
 
 %post
+%{relocateConfig}lib/cmake/ucx/*.cmake
diff --git a/xgboost.spec b/xgboost.spec
@@ -21,3 +21,6 @@ cmake ../%{n}-%{realversion} \
 cd ../build
 make %{makeprocesses}
 make install
+
+%post
+%{relocateConfig}lib64/pkgconfig/xgboost.pc
diff --git a/xrootd.spec b/xrootd.spec
@@ -55,3 +55,6 @@ make %makeprocesses VERBOSE=1
 cd ../build
 make install
 %{relocatePy3SitePackages}
+
+%post
+%{relocateConfig}bin/xrootd-config
diff --git a/xtensor.spec b/xtensor.spec
@@ -16,3 +16,5 @@ make %{makeprocesses}
 cd ../build
 make install
 
+%post
+%{relocateConfig}lib64/pkgconfig/xtensor.pc
diff --git a/xtl.spec b/xtl.spec
@@ -6,11 +6,11 @@ BuildRequires: cmake
 %setup -n %{n}-%{realversion}
 
 %build
-
 cmake -DCMAKE_INSTALL_PREFIX=%{i}
 make %{makeprocesses}
 
 %install
-
 make install
 
+%post
+%{relocateConfig}share/pkgconfig/xtl.pc
diff --git a/yoda.spec b/yoda.spec
@@ -25,3 +25,4 @@ make install
 
 %post
 %{relocateConfig}bin/yoda-config
+%{relocateConfig}lib/python*/site-packages/yoda*egg-info/SOURCES.txt

Original file line number	Diff line number	Diff line change
`@@ -80,3 +80,4 @@ rm -f %{i}/lib/ucx/lib*.la`
`80`	`80`	`rm -rf %{i}/share/ucx/examples`
`81`	`81`
`82`	`82`	`%post`
	`83`	`+%{relocateConfig}lib/cmake/ucx/*.cmake`
Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,4 @@ make install`
`25`	`25`
`26`	`26`	`%post`
`27`	`27`	`%{relocateConfig}bin/yoda-config`
	`28`	`+%{relocateConfig}lib/python/site-packages/yodaegg-info/SOURCES.txt`