[pythia8/el5: 2/2] Update to version 8.1.80
Mattias Ellert
ellert at fedoraproject.org
Wed Dec 4 08:30:33 UTC 2013
commit 81d417ca10bfea652d620463cf92d09b45a01245
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed Dec 4 09:29:41 2013 +0100
Update to version 8.1.80
- Use full version in soname
pythia8-fix-soname.patch | 57 ++++++++++++++++++---------------------------
pythia8-xmldir.patch | 4 +-
pythia8.spec | 48 +++++++++++++++++++-------------------
sources | 2 +-
4 files changed, 50 insertions(+), 61 deletions(-)
---
diff --git a/pythia8-fix-soname.patch b/pythia8-fix-soname.patch
index 9e85e1d..4a2b0ce 100644
--- a/pythia8-fix-soname.patch
+++ b/pythia8-fix-soname.patch
@@ -1,28 +1,19 @@
-diff -ur pythia8176.orig/Makefile pythia8176/Makefile
---- pythia8176.orig/Makefile 2013-04-18 23:16:15.000000000 +0200
-+++ pythia8176/Makefile 2013-05-23 04:44:09.403414002 +0200
-@@ -37,18 +37,15 @@
- # Location of libraries to be built.
+diff -ur pythia8180.orig/Makefile pythia8180/Makefile
+--- pythia8180.orig/Makefile 2013-09-21 18:43:06.000000000 +0200
++++ pythia8180/Makefile 2013-11-06 11:56:52.820286793 +0100
+@@ -40,11 +40,8 @@
ifeq ($(SHAREDLIBS),yes)
targets=$(LIBDIRARCH)/libpythia8.a
-- targets+=$(LIBDIR)/libpythia8.$(SHAREDSUFFIX)
+ targets+=$(LIBDIR)/libpythia8.$(SHAREDSUFFIX)
- targets+=$(LIBDIRARCH)/liblhapdfdummy.a
- targets+=$(LIBDIR)/liblhapdfdummy.$(SHAREDSUFFIX)
-+ targets+=$(LIBDIR)/libpythia.$(SHAREDSUFFIX).8
else
targets=$(LIBDIRARCH)/libpythia8.a
- targets+=$(LIBDIRARCH)/liblhapdfdummy.a
endif
ifneq (x$(HEPMCLOCATION),x)
- targets+=$(LIBDIRARCH)/libhepmcinterface.a
- ifeq ($(SHAREDLIBS),yes)
-- targets+=$(LIBDIR)/libhepmcinterface.$(SHAREDSUFFIX)
-+ targets+=$(LIBDIR)/libhepmcinterface.$(SHAREDSUFFIX).8
- endif
- endif
-
-@@ -68,14 +65,6 @@
+@@ -72,14 +69,6 @@
@mkdir -p $(MYTMPDIR)/archive
$(CXX) $(CXXFLAGS) -c -I$(INCDIR) $< -o $@
@@ -37,19 +28,15 @@ diff -ur pythia8176.orig/Makefile pythia8176/Makefile
# Creating the dependency files *.d
# The compiler with option -M is used to build the dependency strings. They
# are further edited with sed (stream editor). The first sed command adds the
-@@ -104,25 +93,18 @@
- objects := $(patsubst $(SRCDIR)/%.cc,$(MYTMPDIR)/%.o,$(wildcard $(SRCDIR)/*.cc))
- objectsarch := $(patsubst $(SRCDIR)/%.cc,$(MYTMPDIR)/archive/%.o,$(wildcard $(SRCDIR)/*.cc))
+@@ -110,23 +99,15 @@
--$(LIBDIR)/libpythia8.$(SHAREDSUFFIX): $(objects)
-+$(LIBDIR)/libpythia.$(SHAREDSUFFIX): $(LIBDIR)/libpythia.$(SHAREDSUFFIX).8
-+
-+$(LIBDIR)/libpythia.$(SHAREDSUFFIX).8: $(objects)
+ $(LIBDIR)/libpythia8.$(SHAREDSUFFIX): $(objects)
@mkdir -p $(LIBDIR)
- $(CXX) $(LDFLAGSSHARED) -o $@ $(objects) $(LDFLAGLIBNAME),$(notdir $@)
+ $(CXX) $(LDFLAGSSHARED) -o $@ $(objects) $(LDFLAGLIBNAME),$(notdir $@) -lLHAPDF
-+ ln -s $(notdir $@) $(LIBDIR)/libpythia8.$(SHAREDSUFFIX)
-+ ln -s $(notdir $@) $(LIBDIR)/libpythia.$(SHAREDSUFFIX)
++ if [ $(SHAREDSUFFIX) != 'so' ] ; then \
++ ln -s $(notdir $@) $(LIBDIR)/libpythia8.so ; \
++ fi
$(LIBDIRARCH)/libpythia8.a: $(objectsarch)
@mkdir -p $(LIBDIRARCH)
@@ -69,23 +56,25 @@ diff -ur pythia8176.orig/Makefile pythia8176/Makefile
deps := $(patsubst $(SRCDIR)/%.cc,$(MYTMPDIR)/%.d,$(wildcard $(SRCDIR)/*.cc))
depsarch := $(patsubst $(SRCDIR)/%.cc,$(MYTMPDIR)/archive/%.d,$(wildcard $(SRCDIR)/*.cc))
-@@ -169,9 +151,10 @@
- objectsI := $(patsubst hepmcinterface/%.cc,$(MYTMPDIR)/%.o,$(wildcard hepmcinterface/*.cc))
- objectsIarch := $(patsubst hepmcinterface/%.cc,$(MYTMPDIR)/archive/%.o,$(wildcard hepmcinterface/*.cc))
+@@ -173,9 +154,12 @@
+ objectsI := $(patsubst pythia8tohepmc/%.cc,$(MYTMPDIR)/%.o,$(wildcard pythia8tohepmc/*.cc))
+ objectsIarch := $(patsubst pythia8tohepmc/%.cc,$(MYTMPDIR)/archive/%.o,$(wildcard pythia8tohepmc/*.cc))
-- $(LIBDIR)/libhepmcinterface.$(SHAREDSUFFIX) : $(objectsI)
-+ $(LIBDIR)/libhepmcinterface.$(SHAREDSUFFIX).8 : $(objectsI) $(LIBDIR)/libpythia.$(SHAREDSUFFIX)
+- $(LIBDIR)/libpythia8tohepmc.$(SHAREDSUFFIX) : $(objectsI)
++ $(LIBDIR)/libpythia8tohepmc.$(SHAREDSUFFIX) : $(objectsI) $(LIBDIR)/libpythia8.$(SHAREDSUFFIX)
@mkdir -p $(LIBDIR)
- $(CXX) $(LDFLAGSSHARED) $(objectsI) -o $@ $(LDFLAGLIBNAME),$(notdir $@)
-+ $(CXX) $(LDFLAGSSHARED) $(objectsI) -o $@ $(LDFLAGLIBNAME),$(notdir $@) -lHepMC -L$(LIBDIR) -lpythia
-+ ln -s $(notdir $@) $(LIBDIR)/libhepmcinterface.$(SHAREDSUFFIX)
++ $(CXX) $(LDFLAGSSHARED) $(objectsI) -o $@ $(LDFLAGLIBNAME),$(notdir $@) -lHepMC -L$(LIBDIR) -lpythia8
++ if [ $(SHAREDSUFFIX) != 'so' ] ; then \
++ ln -s $(notdir $@) $(LIBDIR)/libpythia8tohepmc.so ; \
++ fi
- $(LIBDIRARCH)/libhepmcinterface.a : $(objectsIarch)
+ $(LIBDIRARCH)/libpythia8tohepmc.a : $(objectsIarch)
@mkdir -p $(LIBDIRARCH)
-@@ -247,7 +230,6 @@
+@@ -252,7 +236,6 @@
cd htmldoc; rm -f *~; rm -f \#*; cd -
cd phpdoc; rm -f *~; rm -f \#*; cd -
- cd hepmcinterface; rm -f *~; rm -f \#*; cd -
+ cd pythia8tohepmc; rm -f *~; rm -f \#*; cd -
- cd lhapdfdummy; rm -f *~; rm -f \#*; cd -
cd examples; rm -f *~; rm -f \#*; rm -f core*; rm -f config.*; cd -
cd rootexamples; rm -f *~; rm -f \#*; rm -f core*; rm -f config.*; cd -
diff --git a/pythia8-xmldir.patch b/pythia8-xmldir.patch
index 0eb0fe7..d1d4d9e 100644
--- a/pythia8-xmldir.patch
+++ b/pythia8-xmldir.patch
@@ -1,5 +1,5 @@
---- a/include/Pythia.h
-+++ b/include/Pythia.h
+--- a/include/Pythia8/Pythia.h
++++ b/include/Pythia8/Pythia.h
@@ -48,7 +48,7 @@
public:
diff --git a/pythia8.spec b/pythia8.spec
index 2dc386f..b2d3cca 100644
--- a/pythia8.spec
+++ b/pythia8.spec
@@ -1,19 +1,19 @@
Name: pythia8
-Version: 8.1.76
-Release: 4%{?dist}
+Version: 8.1.80
+Release: 1%{?dist}
Summary: Pythia Event Generator for High Energy Physics
Group: System Environment/Libraries
License: GPLv2
URL: http://home.thep.lu.se/~torbjorn/Pythia.html
-Source0: http://home.thep.lu.se/~torbjorn/pythia8/pythia8176.tgz
+Source0: http://home.thep.lu.se/~torbjorn/pythia8/pythia8180.tgz
Patch0: %{name}-fix-soname.patch
Patch1: %{name}-hepmc-version.patch
Patch2: %{name}-xmldir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: lhapdf-devel%{?_isa}
-BuildRequires: HepMC-devel%{?_isa}
+BuildRequires: lhapdf-devel
+BuildRequires: HepMC-devel
BuildRequires: dos2unix
Requires: %{name}-data = %{version}-%{release}
@@ -84,7 +84,7 @@ BuildArch: noarch
This package provides documentation for Pythia 8.
%prep
-%setup -q -n pythia8176
+%setup -q -n pythia8180
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -94,28 +94,25 @@ rm -rf lhapdfdummy
# Remove DOS end-of-line
dos2unix examples/softsusy.spc xmldoc/mrstlostarstar.00.dat \
- phpdoc/pythia.css htmldoc/pythia.css include/History.h
+ phpdoc/pythia.css htmldoc/pythia.css
%build
export USRCXXFLAGS="%{optflags}"
export USRLDFLAGSSHARED="%{?__global_ldflags} -Wl,-z,defs"
%configure --enable-shared --with-hepmc=/usr
-make %{?_smp_mflags}
+make %{?_smp_mflags} SHAREDSUFFIX=so.%{version}
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}
-install -m 755 lib/libpythia.so.8 %{buildroot}%{_libdir}/libpythia.so.%{version}
-ln -s libpythia.so.%{version} %{buildroot}%{_libdir}/libpythia.so.8
-ln -s libpythia.so.%{version} %{buildroot}%{_libdir}/libpythia8.so
-ln -s libpythia.so.%{version} %{buildroot}%{_libdir}/libpythia.so
-install -m 755 lib/libhepmcinterface.so.8 %{buildroot}%{_libdir}/libhepmcinterface.so.%{version}
-ln -s libhepmcinterface.so.%{version} %{buildroot}%{_libdir}/libhepmcinterface.so.8
-ln -s libhepmcinterface.so.%{version} %{buildroot}%{_libdir}/libhepmcinterface.so
+install -m 755 lib/libpythia8.so.%{version} %{buildroot}%{_libdir}
+ln -s libpythia8.so.%{version} %{buildroot}%{_libdir}/libpythia8.so
+install -m 755 lib/libpythia8tohepmc.so.%{version} %{buildroot}%{_libdir}
+ln -s libpythia8tohepmc.so.%{version} %{buildroot}%{_libdir}/libpythia8tohepmc.so
-mkdir -p %{buildroot}%{_includedir}/%{name}
-install -m 644 -p include/* %{buildroot}%{_includedir}/%{name}
+mkdir -p %{buildroot}%{_includedir}/Pythia8
+install -m 644 -p include/Pythia8/* %{buildroot}%{_includedir}/Pythia8
mkdir -p %{buildroot}%{_datadir}/%{name}-data/xmldoc
install -m 644 -p xmldoc/*.xml %{buildroot}%{_datadir}/%{name}-data/xmldoc
@@ -136,22 +133,21 @@ rm -rf %{buildroot}
%postun hepmcinterface -p /sbin/ldconfig
%files
-%{_libdir}/libpythia.so.*
+%{_libdir}/libpythia8.so.*
%doc AUTHORS COPYING GUIDELINES
%files devel
-%{_libdir}/libpythia.so
%{_libdir}/libpythia8.so
-%{_includedir}/%{name}
-%exclude %{_includedir}/%{name}/HepMCInterface.h
+%{_includedir}/Pythia8
+%exclude %{_includedir}/Pythia8/Pythia8ToHepMC.h
%doc CODINGSTYLE
%files hepmcinterface
-%{_libdir}/libhepmcinterface.so.*
+%{_libdir}/libpythia8tohepmc.so.*
%files hepmcinterface-devel
-%{_libdir}/libhepmcinterface.so
-%{_includedir}/%{name}/HepMCInterface.h
+%{_libdir}/libpythia8tohepmc.so
+%{_includedir}/Pythia8/Pythia8ToHepMC.h
%files data
%{_datadir}/%{name}-data
@@ -164,6 +160,10 @@ rm -rf %{buildroot}
%doc COPYING htmldoc/*.html htmldoc/*.css htmldoc/*.gif htmldoc/*.pdf
%changelog
+* Wed Oct 30 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.1.80-1
+- Update to version 8.1.80
+- Use full version in soname
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.1.76-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 8379cb4..5157b4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62dd1eacb6f5929b7d87b33d2ffd581a pythia8176.tgz
+09872d9494d4f03bb5c2a3c2b3e47492 pythia8180.tgz
More information about the scm-commits
mailing list