diff --git a/.gitignore b/.gitignore index a8cf22c..4ae814b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /otf2-1.4.tar.gz /otf2-1.5.1.tar.gz /otf2-2.0.tar.gz +/otf2-2.1.tar.gz diff --git a/otf2-jinja2.patch b/otf2-jinja2.patch index 68df256..aaf1437 100644 --- a/otf2-jinja2.patch +++ b/otf2-jinja2.patch @@ -1,83 +1,11 @@ -diff -up otf2-2.0/Makefile.in.jinja2 otf2-2.0/Makefile.in ---- otf2-2.0/Makefile.in.jinja2 2015-11-25 06:52:15.002855782 -0700 -+++ otf2-2.0/Makefile.in 2016-04-14 16:57:22.301420357 -0600 -@@ -526,26 +526,6 @@ EXTRA_DIST = $(srcdir)/vendor/common/bui - $(jinja2pythonpkgdata_DATA) $(jinja2pythonpkgdata_PYTHON) \ - $(_markupsafejinja2pythonpkgdata_PYTHON) \ - $(jinja2eggpythonpkgdata_DATA) \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/security.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/__init__.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/doctests.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/debug.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/loader.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/imports.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/core_tags.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/lexnparse.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/utils.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/inheritance.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/api.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/filters.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/regression.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/ext.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/tests.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/res/__init__.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/res/templates/syntaxerror.html \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/res/templates/foo/test.html \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/res/templates/test.html \ -- $(srcdir)/vendor/python/site-packages/jinja2/testsuite/res/templates/broken.html \ - $(srcdir)/templates/Makefile.inc.tmpl.am \ - $(srcdir)/templates/sig.py $(srcdir)/templates/remake.py \ - $(srcdir)/templates/templates.py \ -@@ -735,48 +715,15 @@ otf2pythonpkgdata_PYTHON = $(srcdir)/sha - $(builddir)/share/otf2/__version__.py +--- otf2-2.1/Makefile.am~ 2017-08-11 01:08:30.540222375 +0100 ++++ otf2-2.1/Makefile.am 2017-09-16 11:48:21.974285025 +0100 +@@ -158,7 +158,7 @@ - jinja2pythonpkgdatadir = $(pkgdatadir)/python/jinja2 --jinja2pythonpkgdata_DATA = $(srcdir)/vendor/python/site-packages/jinja2/AUTHORS \ -- $(srcdir)/vendor/python/site-packages/jinja2/LICENSE \ -- $(srcdir)/vendor/python/site-packages/jinja2/_debugsupport.c -+jinja2pythonpkgdata_DATA = + include share/Makefile.inc.am + include src/tools/otf2_template/Makefile.inc.am +-include vendor/python/Makefile.inc.am ++# include vendor/python/Makefile.inc.am --jinja2pythonpkgdata_PYTHON = $(srcdir)/vendor/python/site-packages/jinja2/__init__.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/debug.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/bccache.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/visitor.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/exceptions.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/nodes.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/optimizer.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/utils.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/lexer.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/environment.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/sandbox.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/defaults.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/_stringdefs.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/loaders.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/parser.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/filters.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/runtime.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/meta.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/compiler.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/constants.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/ext.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/tests.py -+jinja2pythonpkgdata_PYTHON = + include templates/Makefile.inc.am - _markupsafejinja2pythonpkgdatadir = $(pkgdatadir)/python/jinja2/_markupsafe --_markupsafejinja2pythonpkgdata_PYTHON = $(srcdir)/vendor/python/site-packages/jinja2/_markupsafe/__init__.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/_markupsafe/_native.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/_markupsafe/_constants.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/_markupsafe/_bundle.py \ -- $(srcdir)/vendor/python/site-packages/jinja2/_markupsafe/tests.py -+_markupsafejinja2pythonpkgdata_PYTHON = - - jinja2eggpythonpkgdatadir = $(pkgdatadir)/python/Jinja2.egg-info --jinja2eggpythonpkgdata_DATA = $(srcdir)/vendor/python/site-packages/Jinja2.egg-info/PKG-INFO \ -- $(srcdir)/vendor/python/site-packages/Jinja2.egg-info/not-zip-safe \ -- $(srcdir)/vendor/python/site-packages/Jinja2.egg-info/requires.txt \ -- $(srcdir)/vendor/python/site-packages/Jinja2.egg-info/entry_points.txt \ -- $(srcdir)/vendor/python/site-packages/Jinja2.egg-info/SOURCES.txt \ -- $(srcdir)/vendor/python/site-packages/Jinja2.egg-info/top_level.txt \ -- $(srcdir)/vendor/python/site-packages/Jinja2.egg-info/dependency_links.txt -+jinja2eggpythonpkgdata_DATA = - - template_sources = $(srcdir)/include/otf2/OTF2_GeneralDefinitions.h \ - $(srcdir)/include/otf2/OTF2_Definitions.h \ diff --git a/otf2.spec b/otf2.spec index 9df754f..cd92aaa 100644 --- a/otf2.spec +++ b/otf2.spec @@ -2,8 +2,8 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: otf2 -Version: 2.0 -Release: 4%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: Open Trace Format 2 library License: BSD @@ -11,9 +11,10 @@ URL: http://www.vi-hps.org/projects/score-p/ Source0: http://www.vi-hps.org/upload/packages/%{name}/%{name}-%{version}.tar.gz # Remove jinja2 Patch0: otf2-jinja2.patch - +# Avoid -rpath in otf2-config output +Patch1: otf2-rpath.patch BuildRequires: python2-devel -BuildRequires: libtool +BuildRequires: libtool automake chrpath dos2unix Requires: python-jinja2 @@ -43,10 +44,13 @@ The %{name}-doc package contains documentation files for %{name}. %prep %setup -q %patch0 -p1 -b .jinja2 +%patch1 -p1 -b .rpath # Bundled modified jinja2 in vendor/ rm -r vendor/python/site-packages +autoreconf -fiv # Remove ldflags sed -i -s '/deps.GetLDFlags/d' src/tools/otf2_config/otf2_config.cpp +dos2unix doc/examples/otf2_high_level_writer_example.py %build @@ -59,6 +63,8 @@ make %{?_smp_mflags} %make_install find %{buildroot} -name '*.la' -delete cp -p AUTHORS ChangeLog README %{buildroot}%{_pkgdocdir}/ +chrpath -d %{buildroot}%{_bindir}/otf2-{marker,print,snapshots,estimator,config} +rm %{buildroot}%{_pkgdocdir}/python/.buildinfo %check @@ -101,9 +107,15 @@ make check %{_pkgdocdir}/html/ %{_pkgdocdir}/pdf/ %{_pkgdocdir}/tags/ +%{_pkgdocdir}/python/ %changelog +* Fri Sep 15 2017 Dave Love - 2.1-1 +- Update to 2.1 +- Re-do jinja patch +- Fix line endings and use of rpath; add otf2-rpath.patch + * Thu Aug 03 2017 Fedora Release Engineering - 2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 5b35289..d51eb91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b546188b25bc1c4e285e06dddf75dfc otf2-2.0.tar.gz +SHA512 (otf2-2.1.tar.gz) = 96ed6938ba510d86bddc5d4a4ff42b287f86f049535ce4090011ee2e154648bd036ec8e2aff6fc11b743f3813154769988e366b7b2daae3408456b6b654b0942