Hello community, here is the log from the commit of package LHAPDF for openSUSE:Leap:15.2 checked in at 2020-05-06 20:39:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/LHAPDF (Old) and /work/SRC/openSUSE:Leap:15.2/.LHAPDF.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "LHAPDF" Wed May 6 20:39:54 2020 rev:12 rq:799997 version:6.2.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/LHAPDF/LHAPDF.changes 2020-02-21 23:51:23.868810442 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.LHAPDF.new.2738/LHAPDF.changes 2020-05-06 20:40:09.136615577 +0200 @@ -1,0 +2,10 @@ +Tue Apr 28 01:35:14 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Use python-rpm-macros to allow building python mod for all + supported versions of python; copy source into a different + directory for each python version and configure, build, and + install them correctly. +- Move python dependent binary to python subpackage (python3 + only). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ LHAPDF.spec ++++++ --- /var/tmp/diff_new_pack.v5JDGI/_old 2020-05-06 20:40:09.524616380 +0200 +++ /var/tmp/diff_new_pack.v5JDGI/_new 2020-05-06 20:40:09.528616388 +0200 @@ -1,7 +1,7 @@ # # spec file for package LHAPDF # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Summary: A library for unified interface to PDF sets License: GPL-3.0-only Group: Development/Libraries/C and C++ -Url: https://lhapdf.hepforge.org/ +URL: https://lhapdf.hepforge.org/ Source: http://www.hepforge.org/archive/lhapdf/%{name}-%{version}.tar.gz Patch1: sover.diff %if 0%{?suse_version} > 1325 @@ -33,14 +33,17 @@ %else BuildRequires: boost-devel >= 1.53.0 %endif +BuildRequires: %{python_module devel} BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: python-devel +BuildRequires: python-rpm-macros BuildRequires: texlive-latex-bin BuildRoot: %{_tmppath}/%{name}-%{version}-build +%python_subpackages + %description LHAPDF provides a unified and interface to PDF (probability distribution function) sets. It also works with the more recent @@ -65,7 +68,7 @@ This package provides the shared library for %{name}. -%package devel +%package -n %{name}-devel Summary: Development files for LHAPDF, a library for PDF sets Group: Development/Libraries/C and C++ Requires: %{so_name} = %{version} @@ -75,38 +78,38 @@ BuildRequires: boost-devel >= 1.53.0 %endif -%description devel +%description -n %{name}-devel LHAPDF provides a unified and interface to PDF (probability distribution function) sets. This package provides the header and source files for development with %{name}. -%package -n python-%{name} -Summary: Python bindings for LHAPDF, a library for PDF sets -Group: Development/Libraries/C and C++ -Requires: %{so_name} = %{version} -Requires: python - -%description -n python-%{name} -LHAPDF provides a unified and interface to PDF (probability -distribution function) sets. - -This package provides the python wrapper for %{name}. - %prep %setup -q %patch -P 1 -p1 %build autoreconf -fi +%{python_expand # Necessary to run %%configure with both py2 and py3 +export PYTHON=%{_bindir}/$python +mkdir ../$python +cp -pr ./ ../$python +pushd ../$python %configure --disable-static --docdir=%{_docdir}/%{name}/ make %{?_smp_mflags} +popd +} %install +%{python_expand # py2 and py3 make_install +export PYTHON=%{_bindir}/$python +pushd ../$python %make_install +popd +} -sed -E -i "s|#! /usr/bin/env python|#! /usr/bin/python%{py_ver}|" %{buildroot}%{_bindir}/lhapdf +sed -E -i "s|#! /usr/bin/env python|#! /usr/bin/python3|" %{buildroot}%{_bindir}/lhapdf sed -E -i "s|#! /usr/bin/env bash|#! /bin/bash|" %{buildroot}%{_bindir}/lhapdf-config find %{buildroot}%{_libdir}/ -name "*.la" -delete @@ -118,20 +121,18 @@ %defattr(-, root, root) %{_libdir}/libLHAPDF-%version.so -%files devel -%defattr(-, root, root) +%files -n %{name}-devel %doc AUTHORS ChangeLog %license COPYING -%{_bindir}/%{execname} %{_bindir}/%{execname}-* %{_datadir}/%{name}/ %{_includedir}/%{name} %{_libdir}/libLHAPDF.so %{_libdir}/pkgconfig/%{execname}.pc -%files -n python-%{name} -%defattr(-, root, root) -%{python_sitearch}/%{name}-*.egg-info -%{python_sitearch}/%{execname}.so +%files %{python_files} +%python3_only %{_bindir}/%{execname} +%{python_sitearch}/*.egg-info +%{python_sitearch}/*.so %changelog
