From f253542cded903ced3825971dfa0ad00c2f7c8bf09ebfabff9bcd4e3b233f955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 13 Jan 2019 16:17:36 +0000 Subject: [PATCH 1/2] Accepting request 664992 from home:badshah400:branches:science - Install pre-generated PDF manual as part of a new -doc package. - Move ListFunctions binary into -devel package: apfel-config, already being installed as part of the devel package, is partly broken without this. - Change `env` based script interpreter in apfel-config to directly call /bin/bash instead. - Use %%license macro to install the license file. - Run spec-cleaner for minor specfile cleanups OBS-URL: https://build.opensuse.org/request/show/664992 OBS-URL: https://build.opensuse.org/package/show/science/apfel?expand=0&rev=26 --- apfel.changes | 12 ++++++++++++ apfel.spec | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/apfel.changes b/apfel.changes index bbb73be..0ee5aba 100644 --- a/apfel.changes +++ b/apfel.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Jan 12 15:15:56 UTC 2019 - badshah400@gmail.com + +- Install pre-generated PDF manual as part of a new -doc package. +- Move ListFunctions binary into -devel package: apfel-config, + already being installed as part of the devel package, is partly + broken without this. +- Change `env` based script interpreter in apfel-config to + directly call /bin/bash instead. +- Use %%license macro to install the license file. +- Run spec-cleaner for minor specfile cleanups + ------------------------------------------------------------------- Sat Jul 14 16:58:46 UTC 2018 - badshah400@gmail.com diff --git a/apfel.spec b/apfel.spec index ec54631..98f15ca 100644 --- a/apfel.spec +++ b/apfel.spec @@ -1,7 +1,7 @@ # # spec file for package apfel # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,28 +18,26 @@ %define soname libAPFEL0 %define pypackage python-%{name} - Name: apfel Version: 3.0.3 Release: 0 Summary: A Probability Distribution Function Evolution Library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ -Url: http://apfel.hepforge.org/ +URL: http://apfel.hepforge.org/ Source: https://github.com/scarrazza/%{name}/archive/%{version}.tar.gz BuildRequires: LHAPDF-devel BuildRequires: gcc-c++ BuildRequires: gcc-fortran +BuildRequires: python-devel %if 0%{?suse_version} > 1320 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif -BuildRequires: python-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -APFEL is a library to perform the combined QCD+QED DGLAP +APFEL is a library to perform the combined QCD+QED DGLAP evolution of parton distributions. %package -n %{soname} @@ -47,7 +45,7 @@ Summary: A Probability Distribution Function Evolution Library Group: System/Libraries %description -n %{soname} -APFEL is a library to perform the combined QCD+QED DGLAP +APFEL is a library to perform the combined QCD+QED DGLAP evolution of parton distributions. This package provides the shared libraries for %{name}. @@ -57,9 +55,10 @@ Summary: Development files for Apfel, a PDF Evolution Library Group: Development/Libraries/C and C++ Requires: %{soname} = %{version} Requires: LHAPDF-devel +Recommends: %{name}-doc = %{version} %description devel -APFEL is a library to perform the combined QCD+QED DGLAP +APFEL is a library to perform the combined QCD+QED DGLAP evolution of parton distributions. This package provides the source files required to develop @@ -70,11 +69,19 @@ Summary: A PDF Evolution Library Group: Development/Languages/Python %description -n %{pypackage} -APFEL is a library to perform the combined QCD+QED DGLAP +APFEL is a library to perform the combined QCD+QED DGLAP evolution of parton distributions. This package provides the shared libraries for %{name}. +%package doc +Summary: Documentation for APFEL - A PDF evolution library +Group: Documentation/Other + +%description doc +This package provides pdf documentation for APFEL - a PDF evolution +library. + %prep %setup -q @@ -86,7 +93,10 @@ make %{?_smp_mflags} %make_install # REMOVE libtool ARCHIVES -rm %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print + +# FIX env BASED SCRIPT INTERPRETER +sed -Ei "1{s|#\!\s*/usr/bin/env bash|#\!/bin/bash|}" %{buildroot}%{_bindir}/apfel-config # REMOVE README FROM NON-STD LOCATIONS, INSTALL IT USING %%doc INSTEAD rm -fr %{buildroot}%{_datadir}/apfel/README @@ -96,25 +106,26 @@ rm -fr %{buildroot}%{_datadir}/doc/apfel %postun -n %{soname} -p /sbin/ldconfig %files -n %{soname} -%defattr(-,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root) %{_includedir}/APFEL/ -%doc AUTHORS ChangeLog NEWS README COPYING +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_bindir}/CheckAPFEL %{_bindir}/%{name}-config +%{_bindir}/ListFunctions %{_libdir}/*.so %files -n %{pypackage} -%defattr(-,root,root) %{_bindir}/%{name} -%{_bindir}/ListFunctions %{python_sitearch}/%{name}.py # COMPILED OBJECT FILE CONTAINS BUILDROOT %exclude %{python_sitearch}/%{name}.pyc %{python_sitearch}/_%{name}.so %{python_sitearch}/APFEL-*py%{py_ver}.egg-info +%files doc +%doc doc/pdfs/manual.pdf + %changelog From 6cc25085b07a6289085c9508a192608fda5b347971408766721c8a0fdd3b0ee6 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Mon, 14 Jan 2019 10:41:55 +0000 Subject: [PATCH 2/2] Accepting request 665322 from home:jengelh:branches:science - Update descriptions. OBS-URL: https://build.opensuse.org/request/show/665322 OBS-URL: https://build.opensuse.org/package/show/science/apfel?expand=0&rev=27 --- apfel.changes | 5 +++++ apfel.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apfel.changes b/apfel.changes index 0ee5aba..7eb38ed 100644 --- a/apfel.changes +++ b/apfel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 13 16:42:39 UTC 2019 - Jan Engelhardt + +- Update descriptions. + ------------------------------------------------------------------- Sat Jan 12 15:15:56 UTC 2019 - badshah400@gmail.com diff --git a/apfel.spec b/apfel.spec index 98f15ca..71c1e5b 100644 --- a/apfel.spec +++ b/apfel.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -75,11 +75,12 @@ evolution of parton distributions. This package provides the shared libraries for %{name}. %package doc -Summary: Documentation for APFEL - A PDF evolution library +Summary: Documentation for APFEL, a PDF evolution library Group: Documentation/Other %description doc -This package provides pdf documentation for APFEL - a PDF evolution +This package provides documentation for APFEL in PDF (Portable +Document Format), a PDF (Probability Distribution Function) evolution library. %prep