Hello community,
here is the log from the commit of package pythia for openSUSE:Factory checked
in at 2015-08-21 07:40:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pythia (Old)
and /work/SRC/openSUSE:Factory/.pythia.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pythia/pythia.changes 2015-08-15
11:39:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pythia.new/pythia.changes 2015-08-21
07:40:48.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Aug 14 23:52:54 UTC 2015 - badshah...@gmail.com
+
+- Fix the location pointed to by PYTHIA8DATA env variable saved in
+ /etc/profile.d/pythia.*; remove %{appname} macro as nothing uses
+ it any more.
+- Use %configure instead of ./configure (remove duplicate
+ specification of "--prefix=PATH").
+- Add pythia-honour-env-cxxflags.patch to allow compilation with
+ CXXFLAGS set by env appended to default compilation flags; this
+ allows the build to honour RPM_OPT_FLAGS.
+- Fix some unusual characters in the descriptions.
+
+-------------------------------------------------------------------
New:
----
pythia-honour-env-cxxflags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pythia.spec ++++++
--- /var/tmp/diff_new_pack.pnYfCN/_old 2015-08-21 07:40:49.000000000 +0200
+++ /var/tmp/diff_new_pack.pnYfCN/_new 2015-08-21 07:40:49.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pythia
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -18,7 +18,6 @@
%define ver 8210
%define soname lib%{name}8
-%define appname Pythia8
Name: pythia
Version: 8.210
@@ -30,6 +29,8 @@
Source: http://home.thep.lu.se/~torbjorn/pythia8/%{name}%{ver}.tgz
# PATCH-FIX-UPSTREAM pythia-makefile-destdir-support.patch
badshah...@gmail.com -- Add DESTDIR support to makefile to prevent touching of
buildroot in the %%build section
Patch0: pythia-makefile-destdir-support.patch
+# PATCH-FIX-UPSTREAM pythia-honour-env-cxxflags.patch badshah...@gmail.com --
Append CXXFLAGS from env to default compilations flags; this allows us to pass
RPM_OPT_FLAGS during compilation
+Patch1: pythia-honour-env-cxxflags.patch
BuildRequires: HepMC-devel
BuildRequires: LHAPDF-devel
BuildRequires: boost-devel
@@ -42,7 +43,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets
+Pythia can be used to generate high-energy-physics events, i.e. sets
of outgoing particles produced in the interactions between two
incoming particles. The objective is to provide as accurate as
possible a representation of event properties in a wide range of
@@ -61,7 +62,7 @@
Group: Development/Libraries/C and C++
%description -n %{soname}
-Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets
+Pythia can be used to generate high-energy-physics events, i.e. sets
of outgoing particles produced in the interactions between two
incoming particles. The objective is to provide as accurate as
possible a representation of event properties in a wide range of
@@ -82,7 +83,7 @@
Group: Development/Libraries/C and C++
%description -n %{soname}lhapdf6
-Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets
+Pythia can be used to generate high-energy-physics events, i.e. sets
of outgoing particles produced in the interactions between two
incoming particles. The objective is to provide as accurate as
possible a representation of event properties in a wide range of
@@ -107,7 +108,7 @@
Recommends: %{name}-doc
%description devel
-Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets
+Pythia can be used to generate high-energy-physics events, i.e. sets
of outgoing particles produced in the interactions between two
incoming particles. The objective is to provide as accurate as
possible a representation of event properties in a wide range of
@@ -129,7 +130,7 @@
Group: Documentation/HTML
%description doc
-Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets
+Pythia can be used to generate high-energy-physics events, i.e. sets
of outgoing particles produced in the interactions between two
incoming particles. The objective is to provide as accurate as
possible a representation of event properties in a wide range of
@@ -148,6 +149,7 @@
%prep
%setup -q -n %{name}%{ver}
%patch0 -p1
+%patch1 -p1
%build
# FIX EOF ENCODINGS
@@ -156,8 +158,7 @@
sed -i 's/\r$//' share/Pythia8/phpdoc/pythia.css
sed -i 's/\r$//' examples/main29.cc
-./configure \
- --prefix=%{_prefix} \
+%configure \
--prefix-lib=%{_libdir} \
--prefix-share=%{_docdir}/%{name} \
--enable-shared \
@@ -169,11 +170,11 @@
# EXPORT PYTHIA8DATA ENV VARIABLE
cat << EOF >> %{name}.sh
-export PYTHIA8DATA=%{_docdir}/%{appname}/xmldoc
+export PYTHIA8DATA=%{_docdir}/%{name}/xmldoc
EOF
cat << EOF >> %{name}.csh
-setenv PYTHIA8DATA %{_docdir}/%{appname}/xmldoc
+setenv PYTHIA8DATA %{_docdir}/%{name}/xmldoc
EOF
install -D -m0644 %{name}.csh %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
++++++ pythia-honour-env-cxxflags.patch ++++++
Index: pythia8210/configure
===================================================================
--- pythia8210.orig/configure
+++ pythia8210/configure
@@ -208,7 +208,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" !
echo "WARNING: Unknown architecture $ARCH."; fi
if [ -z "$CXX" ]; then CXX="g++"; fi
if [ -z "$CXX_COMMON" ]; then
- CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}-ansi"
+ CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}-ansi ${CXXFLAGS}"
CXX_COMMON="$CXX_COMMON -pedantic -W -Wall -Wshadow -fPIC"; fi
if [ -z "$CXX_SHARED" ]; then
if [ "$ARCH" = "LINUX" ]; then CXX_SHARED="-shared"; fi
