Hello community, here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2018-06-29 22:30:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Rivet (Old) and /work/SRC/openSUSE:Factory/.Rivet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Rivet" Fri Jun 29 22:30:01 2018 rev:14 rq:618021 version:2.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2018-03-28 10:29:29.157135617 +0200 +++ /work/SRC/openSUSE:Factory/.Rivet.new/Rivet.changes 2018-06-29 22:30:04.902316045 +0200 @@ -1,0 +2,16 @@ +Sat Jun 9 16:03:53 UTC 2018 - [email protected] + +- Update to version 2.6.0: + * Long long list of changes: see + %{_docdir}/%{name}-devel/ChangeLog. +- Rebase sover.diff for updated version. +- Fix package groups. +- Add a plugins package containing all the different analysis + packages: + * Plugins are unversioned; the need to depend on the version of + the devel package. + * Move plugins to %{_libdir}/Rivet-plugins directory + * Install an ld.so.conf file so that the plugins are found when + compiling against them. + +------------------------------------------------------------------- Old: ---- Rivet-2.5.4.tar.bz2 New: ---- Rivet-2.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Rivet.spec ++++++ --- /var/tmp/diff_new_pack.agdQrl/_old 2018-06-29 22:30:05.554315548 +0200 +++ /var/tmp/diff_new_pack.agdQrl/_new 2018-06-29 22:30:05.558315545 +0200 @@ -16,38 +16,35 @@ # -%define so_name lib%{name}-2_5_4 - +%define so_name lib%{name}-2_6_0 Name: Rivet -Version: 2.5.4 +Version: 2.6.0 Release: 0 Summary: A toolkit for validation of Monte Carlo event generators License: GPL-2.0-only -Group: Development/Libraries/C and C++ -Url: http://rivet.hepforge.org/ +Group: Productivity/Scientific/Physics +URL: http://rivet.hepforge.org/ Source: http://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.bz2 -Patch1: sover.diff +Patch0: sover.diff BuildRequires: HepMC2-devel BuildRequires: YODA-devel >= 1.0.6 -BuildRequires: autoconf -BuildRequires: automake -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: doxygen BuildRequires: fastjet-devel BuildRequires: fastjet-plugin-siscone-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: texlive-latex-bin BuildRequires: yaml-cpp-devel BuildRequires: pkgconfig(gsl) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif %description The Rivet project (Robust Independent Validation of Experiment and @@ -94,8 +91,7 @@ %package -n python-%{name} Summary: A toolkit for validation of Monte Carlo event generators -Group: Development/Languages/Python -Requires: %{so_name} = %{version} +Group: Productivity/Scientific/Physics %description -n python-%{name} The Rivet project (Robust Independent Validation of Experiment and @@ -109,58 +105,86 @@ This package provides the python bindings for %{name}. +%package plugins +Summary: A collection of analyses plugins for %{name} +Group: Productivity/Scientific/Physics +Requires: %{name}-devel = %{version} + +%description plugins +The Rivet project (Robust Independent Validation of Experiment and +Theory) is a toolkit for validation of Monte Carlo event generators. +It provides a large (and ever growing) set of experimental analyses +useful for MC generator development, validation, and tuning, as well +as a convenient infrastructure for adding your own analyses. Rivet is +the most widespread way by which analysis code from the LHC and other +high-energy collider experiments is preserved for comparison to and +development of future theory models. + +This package provides all the analysis plugins for %{name}. + %prep %setup -q -%patch -P 1 -p1 +%patch0 -p1 # REMOVE EXISTING rivet.pc FILE, ALLOW make TO GENERATE rivet.pc FROM rivet.pc.in rm -f rivet.pc # REMOVE INCORRECT LIBDIRS FROM .pc.in FILE (the right libdirs are already present) sed -i "s| -L@GSLLIBPATH@||g" rivet.pc.in +sed -i "s| -L@GSLINCPATH@||g" rivet.pc.in %build -autoreconf -fi +autoreconf -fvi %configure --docdir=%{_docdir}/%{name}/ -make %{?_smp_mflags} pkglibdir="%{_libdir}/rivet-%{version}" +make %{?_smp_mflags} %install -%make_install pkglibdir="%{_libdir}/rivet-%{version}" +%make_install -# Remove traces of BUILDROOT from files -sed -i "s|%{buildroot}||g" %{buildroot}%{python_sitearch}/rivet/*.pyc +# SECTION Fix env based hashbangs in binaries +sed -Ei "1s:^#!\s*%{_bindir}/env python:#!%{_bindir}/python:" %{buildroot}%{_bindir}/* +sed -Ei "1s:^#!\s*%{_bindir}/env bash:#!/bin/bash:" %{buildroot}%{_bindir}/* +# /SECTION -# MANUALLY REMOVE rpath FROM PKGCONFIG FILE AND rivet-config SCRIPT +# SECTION Remove rpaths from config binaries and pkgconfig file sed -i "s|-Wl,-rpath,||g" %{buildroot}%{_libdir}/pkgconfig/rivet.pc sed -i "s|-Wl,-rpath,||g" %{buildroot}%{_bindir}/rivet-config +# /SECTION -find %{buildroot}%{_libdir}/ -name "*.la" -delete +find %{buildroot} -type f -name "*.la" -delete -print -%post -n %{so_name} -p /sbin/ldconfig +# SECTION Move .so plugins to %%{_libdir}/%%{name} +mkdir -p %{buildroot}%{_libdir}/%{name}-plugins +mv %{buildroot}%{_libdir}/Rivet*Analyses.so %{buildroot}%{_libdir}/%{name}-plugins/ +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/%{name}-plugins" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-plugins.conf +# /SECTION +%post -n %{so_name} -p /sbin/ldconfig %postun -n %{so_name} -p /sbin/ldconfig %files -n %{so_name} -%defattr(-,root,root) %{_libdir}/libRivet-*.so -%{_libdir}/rivet-%{version}/ %files devel -%defattr(-,root,root) -%doc AUTHORS ChangeLog README COPYING +%license COPYING +%doc ChangeLog README %{_bindir}/rivet-config %{_bindir}/rivet-buildplugin %{_includedir}/%{name}/ %{_datadir}/%{name}/ -%{_libdir}/libRivet.so +%{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/rivet.pc %files -n python-%{name} -%defattr(-,root,root) %{_bindir}/* %exclude %{_bindir}/rivet-config %exclude %{_bindir}/rivet-buildplugin %{python_sitearch}/rivet/ %{python_sitearch}/rivet-*egg-info +%files plugins +%config %{_sysconfdir}/ld.so.conf.d/%{name}-plugins.conf +%{_libdir}/%{name}-plugins/ + %changelog ++++++ Rivet-2.5.4.tar.bz2 -> Rivet-2.6.0.tar.bz2 ++++++ ++++ 742759 lines of diff (skipped) ++++++ sover.diff ++++++ --- /var/tmp/diff_new_pack.agdQrl/_old 2018-06-29 22:30:08.526313283 +0200 +++ /var/tmp/diff_new_pack.agdQrl/_new 2018-06-29 22:30:08.530313280 +0200 @@ -1,166 +1,13 @@ -Index: Rivet-2.5.4/src/Analyses/Makefile.am +Index: Rivet-2.6.0/src/Makefile.am =================================================================== ---- Rivet-2.5.4.orig/src/Analyses/Makefile.am -+++ Rivet-2.5.4/src/Analyses/Makefile.am -@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = -Wno-portability - ## Flags for building all plugins - AM_LDFLAGS = $(LDFLAGS) -module -avoid-version -L$(FASTJETLIBPATH) - LIBS = $(FASTJETCONFIGLIBADD) --lib_LTLIBRARIES = -+pkglib_LTLIBRARIES = +--- Rivet-2.6.0.orig/src/Makefile.am ++++ Rivet-2.6.0/src/Makefile.am +@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libRivet.la - BUILT_SOURCES = - DISTCLEANFILES = -@@ -21,7 +21,7 @@ libRivetAnalysisTools_la_SOURCES = \ - - if ENABLE_ANALYSES - --lib_LTLIBRARIES += RivetALICEAnalyses.la -+pkglib_LTLIBRARIES += RivetALICEAnalyses.la - - nodist_RivetALICEAnalyses_la_SOURCES = ALICE__all.cc - BUILT_SOURCES += ALICE__all.cc -@@ -43,7 +43,7 @@ ALICE_ALL = \ - ALICE_2015_I1357424.cc - - --lib_LTLIBRARIES += RivetATLASAnalyses.la -+pkglib_LTLIBRARIES += RivetATLASAnalyses.la - - nodist_RivetATLASAnalyses_la_SOURCES = ATLAS_1__all.cc ATLAS_2__all.cc - BUILT_SOURCES += ATLAS_1__all.cc ATLAS_2__all.cc -@@ -207,7 +207,7 @@ ATLAS_ALL_2 += \ - ATLAS_2012_I1190891.cc - - --lib_LTLIBRARIES += RivetCMSAnalyses.la -+pkglib_LTLIBRARIES += RivetCMSAnalyses.la - - nodist_RivetCMSAnalyses_la_SOURCES = CMS__all.cc - BUILT_SOURCES += CMS__all.cc -@@ -289,7 +289,7 @@ CMS_ALL += \ - CMS_2016_PAS_SUS_16_14.cc - - --lib_LTLIBRARIES += RivetLHCbAnalyses.la -+pkglib_LTLIBRARIES += RivetLHCbAnalyses.la - - nodist_RivetLHCbAnalyses_la_SOURCES = LHCb__all.cc - BUILT_SOURCES += LHCb__all.cc -@@ -313,18 +313,18 @@ LHCb_ALL = \ - LHCB_2015_I1333223.cc - - --lib_LTLIBRARIES += RivetLHCfAnalyses.la -+pkglib_LTLIBRARIES += RivetLHCfAnalyses.la - RivetLHCfAnalyses_la_SOURCES = \ - LHCF_2012_I1115479.cc - - --lib_LTLIBRARIES += RivetTOTEMAnalyses.la -+pkglib_LTLIBRARIES += RivetTOTEMAnalyses.la - RivetTOTEMAnalyses_la_SOURCES = \ - TOTEM_2012_I1115294.cc \ - TOTEM_2012_I1220862.cc - - --lib_LTLIBRARIES += RivetCDFAnalyses.la -+pkglib_LTLIBRARIES += RivetCDFAnalyses.la - - nodist_RivetCDFAnalyses_la_SOURCES = CDF__all.cc - BUILT_SOURCES += CDF__all.cc -@@ -379,7 +379,7 @@ CDF_ALL += \ - CDF_2001_S4563131.cc - - --lib_LTLIBRARIES += RivetD0Analyses.la -+pkglib_LTLIBRARIES += RivetD0Analyses.la - - nodist_RivetD0Analyses_la_SOURCES = D0__all.cc - BUILT_SOURCES += D0__all.cc -@@ -421,7 +421,7 @@ D0_ALL += \ - D0_1996_S3324664.cc - - --lib_LTLIBRARIES += RivetHERAAnalyses.la -+pkglib_LTLIBRARIES += RivetHERAAnalyses.la - - nodist_RivetHERAAnalyses_la_SOURCES = HERA__all.cc - BUILT_SOURCES += HERA__all.cc -@@ -443,7 +443,7 @@ HERA_ALL += \ - - - --lib_LTLIBRARIES += RivetPetraAnalyses.la -+pkglib_LTLIBRARIES += RivetPetraAnalyses.la - - nodist_RivetPetraAnalyses_la_SOURCES = Petra__all.cc - BUILT_SOURCES += Petra__all.cc -@@ -460,7 +460,7 @@ Petra_ALL = \ - TASSO_1989_I277658.cc \ - TASSO_1990_S2148048.cc - --lib_LTLIBRARIES += RivetLEPAnalyses.la -+pkglib_LTLIBRARIES += RivetLEPAnalyses.la - - nodist_RivetLEPAnalyses_la_SOURCES = LEP__all.cc - BUILT_SOURCES += LEP__all.cc -@@ -521,7 +521,7 @@ LEP_ALL += \ - DELPHI_2002_069_CONF_603.cc - - --lib_LTLIBRARIES += RivetRHICAnalyses.la -+pkglib_LTLIBRARIES += RivetRHICAnalyses.la - - nodist_RivetRHICAnalyses_la_SOURCES = RHIC__all.cc - BUILT_SOURCES += RHIC__all.cc -@@ -546,7 +546,7 @@ RHIC_ALL += \ - STAR_2008_S7993412.cc - - --lib_LTLIBRARIES += RivetSPSAnalyses.la -+pkglib_LTLIBRARIES += RivetSPSAnalyses.la - - nodist_RivetSPSAnalyses_la_SOURCES = SPS__all.cc - BUILT_SOURCES += SPS__all.cc -@@ -567,7 +567,7 @@ SPS_ALL = \ - UA5_1989_S1926373.cc - - --lib_LTLIBRARIES += RivetMiscAnalyses.la -+pkglib_LTLIBRARIES += RivetMiscAnalyses.la - - nodist_RivetMiscAnalyses_la_SOURCES = Misc__all.cc - BUILT_SOURCES += Misc__all.cc -@@ -612,7 +612,7 @@ Misc_ALL += \ - SFM_1984_S1178091.cc - - --lib_LTLIBRARIES += RivetMCAnalyses.la -+pkglib_LTLIBRARIES += RivetMCAnalyses.la - - nodist_RivetMCAnalyses_la_SOURCES = MC__all.cc - BUILT_SOURCES += MC__all.cc -Index: Rivet-2.5.2/src/Makefile.am -=================================================================== ---- Rivet-2.5.2.orig/src/Makefile.am -+++ Rivet-2.5.2/src/Makefile.am -@@ -4,6 +4,6 @@ ANA_LIBADD = Analyses/libRivetAnalysisTo - - lib_LTLIBRARIES = libRivet.la libRivet_la_SOURCES = + -libRivet_la_LDFLAGS = -export-dynamic -avoid-version -L$(YODALIBPATH) -L$(HEPMCLIBPATH) +libRivet_la_LDFLAGS = -export-dynamic -release ${PACKAGE_VERSION} -L$(YODALIBPATH) -L$(HEPMCLIBPATH) - libRivet_la_LIBADD = Core/libRivetCore.la Projections/libRivetProjections.la Tools/libRivetTools.la $(ANA_LIBADD) \ - -lYODA -lHepMC -ldl -lm $(FASTJETCONFIGLIBADD) $(GSL_LDFLAGS) -Index: Rivet-2.5.2/src/Tools/Makefile.am -=================================================================== ---- Rivet-2.5.2.orig/src/Tools/Makefile.am -+++ Rivet-2.5.2/src/Tools/Makefile.am -@@ -16,4 +16,4 @@ libRivetTools_la_SOURCES = \ - - dist_noinst_HEADERS = binreloc.h mt2_bisect.hh --libRivetTools_la_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_BINRELOC -DDEFAULTDATADIR=\"$(datadir)\" -DDEFAULTLIBDIR=\"$(libdir)\" -+libRivetTools_la_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_BINRELOC -DDEFAULTDATADIR=\"$(datadir)\" -DDEFAULTLIBDIR=\"$(pkglibdir)\" - + libRivet_la_LIBADD = \ + Core/libRivetCore.la \
