[libpfm] Rebase to libpfm-4.3.0.

William Eden Cohen wcohen at fedoraproject.org
Tue Aug 28 14:10:32 UTC 2012


commit 95ba25063d12b62bb6bd804f5f2840c9f3d6852d
Author: William Cohen <wcohen at redhat.com>
Date:   Tue Aug 28 10:09:57 2012 -0400

    Rebase to libpfm-4.3.0.

 .gitignore             |    2 +-
 libpfm-ldconf.patch    |   11 +++++++++++
 libpfm-siginfo_t.patch |   24 ------------------------
 libpfm-swig.patch      |   11 -----------
 libpfm.spec            |   15 +++++++--------
 libpfm4-python.patch   |   35 -----------------------------------
 sources                |    2 +-
 7 files changed, 20 insertions(+), 80 deletions(-)
---
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.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 <wcohen at redhat.com> 4.3.0-1
+- Rebase on libpfm-4.3.0.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
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


More information about the scm-commits mailing list