diff --git a/.gitignore b/.gitignore index 3a28af5..65250a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libpfm-4.2.0.tar.gz +/libpfm-4.3.0.tar.gz diff --git a/libpfm-ldconf.patch b/libpfm-ldconf.patch new file mode 100644 index 0000000..3fb4aea --- /dev/null +++ b/libpfm-ldconf.patch @@ -0,0 +1,11 @@ +diff -up libpfm-4.2.0/lib/Makefile.orig libpfm-4.2.0/lib/Makefile +--- libpfm-4.2.0/lib/Makefile.orig 2012-08-27 14:22:31.855449622 -0400 ++++ libpfm-4.2.0/lib/Makefile 2012-08-27 14:23:01.783526784 -0400 +@@ -244,7 +244,6 @@ ifeq ($(CONFIG_PFMLIB_SHARED),y) + $(INSTALL) $(SLIBPFM) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) $(VLIBPFM) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) libpfm.$(SOLIBEXT) +- $(LDCONFIG) + endif + + tags: diff --git a/libpfm-siginfo_t.patch b/libpfm-siginfo_t.patch deleted file mode 100644 index 06f4561..0000000 --- a/libpfm-siginfo_t.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up libpfm-4.2.0/perf_examples/notify_group.c.siginfo_t libpfm-4.2.0/perf_examples/notify_group.c ---- libpfm-4.2.0/perf_examples/notify_group.c.siginfo_t 2012-06-07 14:48:30.969999948 -0400 -+++ libpfm-4.2.0/perf_examples/notify_group.c 2012-06-07 14:49:13.124000197 -0400 -@@ -51,7 +51,7 @@ static int num_fds; - static int buffer_pages = 1; /* size of buffer payload (must be power of 2) */ - - static void --sigio_handler(int n, struct siginfo *info, struct sigcontext *sc) -+sigio_handler(int n, siginfo_t *info, struct sigcontext *sc) - { - struct perf_event_mmap_page *hdr; - struct perf_event_header ehdr; -diff -up libpfm-4.2.0/perf_examples/notify_self.c.siginfo_t libpfm-4.2.0/perf_examples/notify_self.c ---- libpfm-4.2.0/perf_examples/notify_self.c.siginfo_t 2012-06-07 14:48:39.559998906 -0400 -+++ libpfm-4.2.0/perf_examples/notify_self.c 2012-06-07 14:49:02.143000006 -0400 -@@ -47,7 +47,7 @@ static int num_fds = 0; - static int buffer_pages = 1; /* size of buffer payload (must be power of 2)*/ - - static void --sigio_handler(int n, struct siginfo *info, void *uc) -+sigio_handler(int n, siginfo_t *info, void *uc) - { - struct perf_event_header ehdr; - int ret, id; diff --git a/libpfm-swig.patch b/libpfm-swig.patch deleted file mode 100644 index 12d31d8..0000000 --- a/libpfm-swig.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up libpfm-4.2.0/python/src/perfmon_int.i.ill libpfm-4.2.0/python/src/perfmon_int.i ---- libpfm-4.2.0/python/src/perfmon_int.i.ill 2012-06-08 12:39:16.872998571 -0400 -+++ libpfm-4.2.0/python/src/perfmon_int.i 2012-06-08 12:39:30.183000006 -0400 -@@ -92,7 +92,6 @@ ptr_argout(pfm_event_attr_info_t); - - /* Kernel interface */ - %include --ptr_argout(perf_event_attr_t); - - /* Library interface */ - /* We never set the const char * members. So no memory leak */ diff --git a/libpfm.spec b/libpfm.spec index d441032..3749ce3 100644 --- a/libpfm.spec +++ b/libpfm.spec @@ -9,8 +9,8 @@ %endif Name: libpfm -Version: 4.2.0 -Release: 8%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: Library to encode performance events for use by perf tool @@ -18,9 +18,7 @@ Group: System Environment/Libraries License: MIT URL: http://perfmon2.sourceforge.net/ Source0: http://sourceforge.net/projects/perfmon2/files/libpfm4/%{name}-%{version}.tar.gz -Patch1: libpfm4-python.patch -Patch2: libpfm-siginfo_t.patch -Patch3: libpfm-swig.patch +Patch4: libpfm-ldconf.patch %if %{with python} BuildRequires: python-devel @@ -65,9 +63,7 @@ Python bindings for libpfm4 and perf_event_open system call. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch4 -p1 %build %if %{with python} @@ -114,6 +110,9 @@ make \ %endif %changelog +* Tue Aug 28 2012 William Cohen 4.3.0-1 +- Rebase on libpfm-4.3.0. + * Thu Jul 19 2012 Fedora Release Engineering - 4.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/libpfm4-python.patch b/libpfm4-python.patch deleted file mode 100644 index 6f0e907..0000000 --- a/libpfm4-python.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fe0b30189334f048db0cab10987b9e2295c5b93c Mon Sep 17 00:00:00 2001 -From: Arun Sharma -Date: Thu, 26 Apr 2012 17:37:02 +0200 -Subject: [PATCH] drop shbang from python scripts - -do not make then executable by dropping the -!/usr/bin/env python invocation. - -Signed-off-by: Arun Sharma ---- - python/src/pmu.py | 1 - - python/src/session.py | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/python/src/pmu.py b/python/src/pmu.py -index e90b72a..47c3e75 100644 ---- a/python/src/pmu.py -+++ b/python/src/pmu.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # - # Copyright (c) 2008 Google, Inc. - # Contributed by Arun Sharma -diff --git a/python/src/session.py b/python/src/session.py -index df22ea6..f598aa4 100644 ---- a/python/src/session.py -+++ b/python/src/session.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # - # Copyright (c) 2008 Google, Inc. - # Contributed by Arun Sharma --- -1.7.4.1 - diff --git a/sources b/sources index 30a9666..b15d7c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09e298572ee810cc6319494f3fd5979c libpfm-4.2.0.tar.gz +0ab272dbdbb759b852ba8bd06db030ef libpfm-4.3.0.tar.gz