Hello community, here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2017-03-12 20:00:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Rivet (Old) and /work/SRC/openSUSE:Factory/.Rivet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Rivet" Sun Mar 12 20:00:15 2017 rev:10 rq:476776 version:2.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2017-02-14 00:42:05.315706685 +0100 +++ /work/SRC/openSUSE:Factory/.Rivet.new/Rivet.changes 2017-03-12 20:00:21.972607841 +0100 @@ -1,0 +2,5 @@ +Mon Feb 13 16:10:55 UTC 2017 - [email protected] + +- Add sover.diff, enforce versioning as per guidelines + +------------------------------------------------------------------- New: ---- sover.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Rivet.spec ++++++ --- /var/tmp/diff_new_pack.QsqCHz/_old 2017-03-12 20:00:22.864481643 +0100 +++ /var/tmp/diff_new_pack.QsqCHz/_new 2017-03-12 20:00:22.864481643 +0100 @@ -16,7 +16,7 @@ # -%define so_name lib%{name} +%define so_name lib%{name}-2_5_2 Name: Rivet Version: 2.5.2 @@ -26,6 +26,7 @@ Group: Development/Libraries/C and C++ Url: http://rivet.hepforge.org/ Source: http://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.bz2 +Patch1: sover.diff BuildRequires: HepMC-devel BuildRequires: YODA-devel >= 1.0.6 BuildRequires: autoconf @@ -108,9 +109,9 @@ This package provides the python bindings for %{name}. -% %prep %setup -q +%patch -P 1 -p1 # REMOVE EXISTING rivet.pc FILE, ALLOW make TO GENERATE rivet.pc FROM rivet.pc.in rm -f rivet.pc @@ -119,11 +120,12 @@ sed -i "s| -L@GSLLIBPATH@||g" rivet.pc.in %build +autoreconf -fi %configure --docdir=%{_docdir}/%{name}/ -make %{?_smp_mflags} +make %{?_smp_mflags} pkglibdir="%{_libdir}/rivet-%{version}" %install -%make_install +%make_install pkglibdir="%{_libdir}/rivet-%{version}" # Remove traces of BUILDROOT from files sed -i "s|%{buildroot}||g" %{buildroot}%{python_sitearch}/rivet/*.pyc @@ -140,7 +142,8 @@ %files -n %{so_name} %defattr(-,root,root) -%{_libdir}/*.so +%{_libdir}/libRivet-*.so +%{_libdir}/rivet-%{version}/ %files devel %defattr(-,root,root) @@ -149,6 +152,7 @@ %{_bindir}/rivet-buildplugin %{_includedir}/%{name}/ %{_datadir}/%{name}/ +%{_libdir}/libRivet.so %{_libdir}/pkgconfig/rivet.pc %files -n python-%{name} ++++++ sover.diff ++++++ --- src/Analyses/Makefile.am | 32 ++++++++++++++++---------------- src/Makefile.am | 2 +- src/Tools/Makefile.am | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) Index: Rivet-2.5.2/src/Analyses/Makefile.am =================================================================== --- Rivet-2.5.2.orig/src/Analyses/Makefile.am +++ Rivet-2.5.2/src/Analyses/Makefile.am @@ -1,7 +1,7 @@ ## Flags for building all plugins AM_LDFLAGS = $(LDFLAGS) -module -avoid-version -L$(FASTJETLIBPATH) LIBS = $(FASTJETCONFIGLIBADD) -lib_LTLIBRARIES = +pkglib_LTLIBRARIES = noinst_LTLIBRARIES = libRivetAnalysisTools.la libRivetAnalysisTools_la_SOURCES = \ @@ -12,7 +12,7 @@ libRivetAnalysisTools_la_SOURCES = \ if ENABLE_ANALYSES -lib_LTLIBRARIES += RivetALICEAnalyses.la +pkglib_LTLIBRARIES += RivetALICEAnalyses.la RivetALICEAnalyses_la_SOURCES = \ ALICE_2010_S8624100.cc \ ALICE_2010_S8625980.cc \ @@ -24,7 +24,7 @@ RivetALICEAnalyses_la_SOURCES = \ ALICE_2015_I1357424.cc -lib_LTLIBRARIES += RivetATLASAnalyses.la +pkglib_LTLIBRARIES += RivetATLASAnalyses.la RivetATLASAnalyses_la_SOURCES = \ ATLAS_2010_S8591806.cc \ ATLAS_2010_S8817804.cc \ @@ -154,7 +154,7 @@ RivetATLASAnalyses_la_SOURCES += \ ATLAS_2012_I1190891.cc -lib_LTLIBRARIES += RivetCMSAnalyses.la +pkglib_LTLIBRARIES += RivetCMSAnalyses.la RivetCMSAnalyses_la_SOURCES = \ CMS_2010_S8547297.cc \ CMS_2010_S8656010.cc \ @@ -210,7 +210,7 @@ RivetCMSAnalyses_la_SOURCES += \ CMS_2012_PAS_QCD_11_010.cc -lib_LTLIBRARIES += RivetLHCbAnalyses.la +pkglib_LTLIBRARIES += RivetLHCbAnalyses.la RivetLHCbAnalyses_la_SOURCES = \ LHCB_2010_I867355.cc \ LHCB_2010_S8758301.cc \ @@ -224,18 +224,18 @@ RivetLHCbAnalyses_la_SOURCES = \ 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 RivetCDFAnalyses_la_SOURCES = \ CDF_1988_S1865951.cc \ CDF_1990_S2089246.cc \ @@ -278,7 +278,7 @@ RivetCDFAnalyses_la_SOURCES += \ CDF_2001_S4563131.cc -lib_LTLIBRARIES += RivetD0Analyses.la +pkglib_LTLIBRARIES += RivetD0Analyses.la RivetD0Analyses_la_SOURCES = \ D0_1995_I398175.cc \ D0_2000_I499943.cc \ @@ -309,7 +309,7 @@ RivetD0Analyses_la_SOURCES += \ D0_1996_S3324664.cc -lib_LTLIBRARIES += RivetHERAAnalyses.la +pkglib_LTLIBRARIES += RivetHERAAnalyses.la RivetHERAAnalyses_la_SOURCES = \ H1_1994_S2919893.cc \ H1_2000_S4129130.cc @@ -319,12 +319,12 @@ RivetHERAAnalyses_la_SOURCES += \ ZEUS_2001_S4815815.cc -lib_LTLIBRARIES += RivetPetraAnalyses.la +pkglib_LTLIBRARIES += RivetPetraAnalyses.la RivetPetraAnalyses_la_SOURCES = \ JADE_1998_S3612880.cc \ TASSO_1990_S2148048.cc -lib_LTLIBRARIES += RivetLEPAnalyses.la +pkglib_LTLIBRARIES += RivetLEPAnalyses.la RivetLEPAnalyses_la_SOURCES = \ ALEPH_1991_S2435284.cc \ ALEPH_1995_I382179.cc \ @@ -366,7 +366,7 @@ RivetLEPAnalyses_la_SOURCES += \ DELPHI_2002_069_CONF_603.cc -lib_LTLIBRARIES += RivetRHICAnalyses.la +pkglib_LTLIBRARIES += RivetRHICAnalyses.la RivetRHICAnalyses_la_SOURCES = \ STAR_2006_S6500200.cc \ STAR_2006_S6860818.cc \ @@ -380,7 +380,7 @@ RivetRHICAnalyses_la_SOURCES += \ STAR_2008_S7993412.cc -lib_LTLIBRARIES += RivetSPSAnalyses.la +pkglib_LTLIBRARIES += RivetSPSAnalyses.la RivetSPSAnalyses_la_SOURCES = \ UA1_1990_S2044935.cc \ UA5_1982_S875503.cc \ @@ -390,7 +390,7 @@ RivetSPSAnalyses_la_SOURCES = \ UA5_1989_S1926373.cc -lib_LTLIBRARIES += RivetMiscAnalyses.la +pkglib_LTLIBRARIES += RivetMiscAnalyses.la RivetMiscAnalyses_la_SOURCES = \ E735_1998_S3905616.cc \ PDG_HADRON_MULTIPLICITIES.cc \ @@ -419,7 +419,7 @@ RivetMiscAnalyses_la_SOURCES += \ SFM_1984_S1178091.cc -lib_LTLIBRARIES += RivetMCAnalyses.la +pkglib_LTLIBRARIES += RivetMCAnalyses.la RivetMCAnalyses_la_SOURCES = \ EXAMPLE.cc \ EXAMPLE_CUTS.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)\"
