From ce52ccae498e39597ad5000cce6760403655fdb3c13621f4a64f85bdc7ab00a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 6 Feb 2016 13:45:14 +0000 Subject: [PATCH] Accepting request 357987 from home:badshah400:branches:science Update to version 2.7.0 OBS-URL: https://build.opensuse.org/request/show/357987 OBS-URL: https://build.opensuse.org/package/show/science/apfel?expand=0&rev=7 --- 2.5.2.tar.gz | 3 -- 2.7.0.tar.gz | 3 ++ README | 15 ------ apfel.changes | 30 +++++++++++ apfel.spec | 8 ++- apfelgui.changes | 54 ------------------- apfelgui.spec | 131 ----------------------------------------------- apfelgui.spec.in | 131 ----------------------------------------------- pre_checkin.sh | 4 -- 9 files changed, 39 insertions(+), 340 deletions(-) delete mode 100644 2.5.2.tar.gz create mode 100644 2.7.0.tar.gz delete mode 100644 README delete mode 100644 apfelgui.changes delete mode 100644 apfelgui.spec delete mode 100644 apfelgui.spec.in delete mode 100644 pre_checkin.sh diff --git a/2.5.2.tar.gz b/2.5.2.tar.gz deleted file mode 100644 index ffc3981..0000000 --- a/2.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbdf42f24f66ed028392710a985d774a55ffeb2a7a0fb53177f45af2b47c4b6b -size 5797583 diff --git a/2.7.0.tar.gz b/2.7.0.tar.gz new file mode 100644 index 0000000..fff175e --- /dev/null +++ b/2.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfd270f434b147ad2b4f86189dfe1e773cca14ee63124328c32956f28db43a99 +size 9027350 diff --git a/README b/README deleted file mode 100644 index 8e72e7d..0000000 --- a/README +++ /dev/null @@ -1,15 +0,0 @@ -NEVER MODIFY apfelgui.spec DIRECTLY. - -To ensure that apfel and apfelgui packages are always tied at the same version, -the same package build provides both the apfel and apfelgui spec files. The -apfelgui package in science is simply a linked version of the apfel package. - -For packaging a version change please follow the steps: -1. Edit the Version in the apfel.spec file as applicable, -2. Document changes in the apfel.changes file, and -3. Then run the pre_checkin.sh script to update the apfelgui.spec file - appropriately - -If any other changes to the apfelgui.spec file might be necessary (patches, -build issues, etc.), please make these changes in the *apfelgui.spec.in* file -and run the pre_checkin.sh script to generate the updated apfelgui.spec file. diff --git a/apfel.changes b/apfel.changes index ce6dfb8..27522a9 100644 --- a/apfel.changes +++ b/apfel.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Feb 2 12:59:43 UTC 2016 - badshah400@gmail.com + +- Update to version 2.7.0: + + Implementation of the polarized evolution up to NNLO. + + Implementation of the LO contribution to intrinsic charm in + FONLL. + + Possibility to perform dynamical factorization/renormalization + scale variations. + + New functions to feed higher order EW corrections. + + Reduction of the memory footprint. + + Speed up of the initialization phase. + + Minor improvements and bug fixings. +- Changes from version 2.6.0: + + Implementation of the factorization and renormalization scale + variation for the DIS structure functions. + + Implementation of a faster solution for the QCD+QED unified + solution of the DGLAP equation. + + Improving the production of the LHAPDF grids. + + Improving the accuracy of the truncated solution of the DGLAP + equation (from 3- to 5-point derivative). + + Colorful banner. + + Minor improvements. +- Apfelgui is deprecated, drop all supporting files: + + apfelgui.changes. + + pre_checkin.sh. + + apfelgui.spec. + + apfelgui.spec.in. + + README. + ------------------------------------------------------------------- Thu Jul 9 10:20:17 UTC 2015 - badshah400@gmail.com diff --git a/apfel.spec b/apfel.spec index 0568cca..6b8e15c 100644 --- a/apfel.spec +++ b/apfel.spec @@ -20,7 +20,7 @@ %define pypackage python-%{name} Name: apfel -Version: 2.5.2 +Version: 2.7.0 Release: 0 Summary: A PDF Evolution Library License: GPL-3.0+ @@ -109,6 +109,7 @@ rm -fr %{buildroot}%{_datadir}/doc/apfel %defattr(-,root,root) %{_includedir}/APFEL/ %doc AUTHORS ChangeLog NEWS README COPYING +%{_bindir}/CheckAPFEL %{_bindir}/%{name}-config %{_libdir}/*.so @@ -120,6 +121,9 @@ rm -fr %{buildroot}%{_datadir}/doc/apfel # COMPILED OBJECT FILE CONTAINS BUILDROOT %exclude %{python_sitearch}/%{name}.pyc %{python_sitearch}/_%{name}.so -%{python_sitearch}/APFEL-%{version}-py%{py_ver}.egg-info +%{python_sitearch}/APFEL-*py%{py_ver}.egg-info +%dir %{_datadir}/apfel +%{_datadir}/%{name}/gen_info.py +%{_datadir}/%{name}/*.info %changelog diff --git a/apfelgui.changes b/apfelgui.changes deleted file mode 100644 index ce6dfb8..0000000 --- a/apfelgui.changes +++ /dev/null @@ -1,54 +0,0 @@ -------------------------------------------------------------------- -Thu Jul 9 10:20:17 UTC 2015 - badshah400@gmail.com - -- Update to version 2.5.2: - + Implementation of truncated PDF evolution. - + libAPFELevol: a light version of APFEL with just evolution. - + general code improvements. - + Fixed bugs: - - Fixed bug in the computation of the SIA cross-sections. - - Fixed xmax and xmin tolerance. -- Changes from previous versions 2.3.4 through 2.4.0: - + See https://github.com/scarrazza/apfel/releases. - -------------------------------------------------------------------- -Fri Mar 20 22:07:36 UTC 2015 - badshah400@gmail.com - -- Update to version 2.3.3: - + Functions for the production of FK tables. - + Updated format of the output LHAPDF grids. - + Implementation of semi-inclusive e^+e^- annihilation structure - functions, - + Added flag to the apfel-config script to list the APFEL - functions. -- Changes from previous versions: - + Long list of changes since previous packaged version, see NEWS - file. -- Packaging changes: Use LHAPDF 6.x (instead of 5.x) for building, - since apfel is now LHAPDFv6 compatible. -- Since version 2.3.0, building on 32-bit architectures is - unsupported by upstream. - -------------------------------------------------------------------- -Thu May 1 02:15:58 UTC 2014 - badshah400@gmail.com - -- apfelgui: Requires(post) and Requires(postun) should be on - desktop-file-utils (for %desktop_database_post(un) scriptlets) - rather than on update-desktop-files. - -------------------------------------------------------------------- -Tue Apr 29 23:47:26 UTC 2014 - badshah400@gmail.com - -- apfel-devel should have a "Requires:" on lhapdf-devel <= 5.9.1. - -------------------------------------------------------------------- -Sat Apr 19 23:21:37 UTC 2014 - badshah400@gmail.com - -- Build and install hicolor icons (introduces a BuildRequires on - hicolor-icon-theme) and desktop menu entry. - -------------------------------------------------------------------- -Sun Apr 13 21:16:25 UTC 2014 - badshah400@gmail.com - -- Initial package (version 2.0.1). - diff --git a/apfelgui.spec b/apfelgui.spec deleted file mode 100644 index 88852b0..0000000 --- a/apfelgui.spec +++ /dev/null @@ -1,131 +0,0 @@ -# -# spec file for package apfel-gui -# -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# 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/ -# - - -%define bname apfel - -Name: apfelgui -Version: 2.5.2 -Release: 0 -Summary: A PDF Evolution Library -License: GPL-3.0+ -Group: Development/Libraries/C and C++ -Url: http://apfel.hepforge.org/ -Source: https://github.com/scarrazza/%{bname}/archive/%{version}.tar.gz -BuildRequires: apfel-devel = %{version} -BuildRequires: gcc-c++ -BuildRequires: gcc-fortran -BuildRequires: hicolor-icon-theme -BuildRequires: ImageMagick -BuildRequires: LHAPDF-devel -BuildRequires: libqt4-devel -BuildRequires: libroot-core-devel -BuildRequires: libroot-graf2d-gpad-devel -BuildRequires: libroot-graf2d-graf-devel -BuildRequires: libroot-graf2d-postscript-devel -BuildRequires: libroot-graf3d-g3d-devel -BuildRequires: libroot-gui-devel -BuildRequires: libroot-hist-devel -BuildRequires: libroot-io-devel -BuildRequires: libroot-math-mathcore-devel -BuildRequires: libroot-math-matrix-devel -BuildRequires: libroot-math-physics-devel -BuildRequires: libroot-net-devel -BuildRequires: libroot-tree-devel -BuildRequires: python-apfel = %{version} -BuildRequires: python-devel -Requires: apfel-devel = %{version} -Requires: libroot-core-devel -Requires: libroot-graf2d-gpad-devel -Requires: libroot-graf2d-graf-devel -Requires: libroot-graf2d-postscript-devel -Requires: libroot-graf3d-g3d-devel -Requires: libroot-gui-devel -Requires: libroot-hist-devel -Requires: libroot-io-devel -Requires: libroot-math-mathcore-devel -Requires: libroot-math-matrix-devel -Requires: libroot-math-physics-devel -Requires: libroot-net-devel -Requires: libroot-tree-devel -Requires: python-apfel = %{version} -Requires: root-plugin-graf2d-asimage-devel -Requires: root-plugin-hist-histpainter-devel -Requires: root-ttf -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -APFEL is a library to perform the combined QCD+QED DGLAP -evolution of parton distributions. It is written and maintained -by Valerio Bertone (CERN), Stefano Carrazza (Milano) and -Juan Rojo (CERN). - -This package provides the gui for apfel. - -%prep -%setup -q -n %{bname}-%{version}/apfelGUI - -%build -qmake -make %{?_smp_mflags} - -%install -# make_install script is broken -install -D apfelgui %{buildroot}%{_bindir}/apfelgui - -# Build and install hicolor icons -for i in 24 32 48 64 128 256; -do - convert -geometry ${i}x resources/logo.png %{name}-${i}.png - install -Dm0644 \ - %{name}-${i}.png \ - %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png -done - -# Create and install desktop menu file -cat << EOF > %{name}.desktop -[Desktop Entry] -Encoding=UTF-8 -Name=ApfelGUI -GenericName=Parton Distribution Function Evolution Utility -Comment=Plotting Parton Distributions, luminosity and DIS observables -Exec=apfelgui -Icon=apfelgui -Terminal=false -Type=Application -Categories=Graphics;2DGraphics; -EOF - -install -Dm0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop - -%post -%icon_theme_cache_post -%desktop_database_post - -%postun -%icon_theme_cache_postun -%desktop_database_postun - -%files -%defattr(-,root,root) -%{_bindir}/apfelgui -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop - -%changelog diff --git a/apfelgui.spec.in b/apfelgui.spec.in deleted file mode 100644 index 4135f13..0000000 --- a/apfelgui.spec.in +++ /dev/null @@ -1,131 +0,0 @@ -# -# spec file for package apfel-gui -# -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# 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/ -# - - -%define bname apfel - -Name: apfelgui -Version: @version@ -Release: 0 -Summary: A PDF Evolution Library -License: GPL-3.0+ -Group: Development/Libraries/C and C++ -Url: http://apfel.hepforge.org/ -Source: https://github.com/scarrazza/%{bname}/archive/%{version}.tar.gz -BuildRequires: apfel-devel = %{version} -BuildRequires: gcc-c++ -BuildRequires: gcc-fortran -BuildRequires: hicolor-icon-theme -BuildRequires: ImageMagick -BuildRequires: LHAPDF-devel -BuildRequires: libqt4-devel -BuildRequires: libroot-core-devel -BuildRequires: libroot-graf2d-gpad-devel -BuildRequires: libroot-graf2d-graf-devel -BuildRequires: libroot-graf2d-postscript-devel -BuildRequires: libroot-graf3d-g3d-devel -BuildRequires: libroot-gui-devel -BuildRequires: libroot-hist-devel -BuildRequires: libroot-io-devel -BuildRequires: libroot-math-mathcore-devel -BuildRequires: libroot-math-matrix-devel -BuildRequires: libroot-math-physics-devel -BuildRequires: libroot-net-devel -BuildRequires: libroot-tree-devel -BuildRequires: python-apfel = %{version} -BuildRequires: python-devel -Requires: apfel-devel = %{version} -Requires: libroot-core-devel -Requires: libroot-graf2d-gpad-devel -Requires: libroot-graf2d-graf-devel -Requires: libroot-graf2d-postscript-devel -Requires: libroot-graf3d-g3d-devel -Requires: libroot-gui-devel -Requires: libroot-hist-devel -Requires: libroot-io-devel -Requires: libroot-math-mathcore-devel -Requires: libroot-math-matrix-devel -Requires: libroot-math-physics-devel -Requires: libroot-net-devel -Requires: libroot-tree-devel -Requires: python-apfel = %{version} -Requires: root-plugin-graf2d-asimage-devel -Requires: root-plugin-hist-histpainter-devel -Requires: root-ttf -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -APFEL is a library to perform the combined QCD+QED DGLAP -evolution of parton distributions. It is written and maintained -by Valerio Bertone (CERN), Stefano Carrazza (Milano) and -Juan Rojo (CERN). - -This package provides the gui for apfel. - -%prep -%setup -q -n %{bname}-%{version}/apfelGUI - -%build -qmake -make %{?_smp_mflags} - -%install -# make_install script is broken -install -D apfelgui %{buildroot}%{_bindir}/apfelgui - -# Build and install hicolor icons -for i in 24 32 48 64 128 256; -do - convert -geometry ${i}x resources/logo.png %{name}-${i}.png - install -Dm0644 \ - %{name}-${i}.png \ - %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png -done - -# Create and install desktop menu file -cat << EOF > %{name}.desktop -[Desktop Entry] -Encoding=UTF-8 -Name=ApfelGUI -GenericName=Parton Distribution Function Evolution Utility -Comment=Plotting Parton Distributions, luminosity and DIS observables -Exec=apfelgui -Icon=apfelgui -Terminal=false -Type=Application -Categories=Graphics;2DGraphics; -EOF - -install -Dm0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop - -%post -%icon_theme_cache_post -%desktop_database_post - -%postun -%icon_theme_cache_postun -%desktop_database_postun - -%files -%defattr(-,root,root) -%{_bindir}/apfelgui -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop - -%changelog diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index 760eb3c..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -vtagline=$(grep "^Version:.*$" apfel.spec) -sed "s/^Version:.*@version@$/${vtagline}/" apfelgui.spec.in > apfelgui.spec -cp apfel.changes apfelgui.changes