openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File sover.diff of Package Rivet (Revision ba2e99ce07ee2863afc57324418572f6)

Currently displaying revision ba2e99ce07ee2863afc57324418572f6 , Show latest

Index: Rivet-2.5.4/src/Analyses/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 =
 
 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)\"

Places

File sover.diff of Package Rivet (Revision ba2e99ce07ee2863afc57324418572f6)

Places