diff --git a/libpfm-ldconf.patch b/libpfm-ldconf.patch deleted file mode 100644 index 3fb4aea..0000000 --- a/libpfm-ldconf.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 3749ce3..ec1fd01 100644 --- a/libpfm.spec +++ b/libpfm.spec @@ -10,7 +10,7 @@ Name: libpfm Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to encode performance events for use by perf tool @@ -18,7 +18,6 @@ Group: System Environment/Libraries License: MIT URL: http://perfmon2.sourceforge.net/ Source0: http://sourceforge.net/projects/perfmon2/files/libpfm4/%{name}-%{version}.tar.gz -Patch4: libpfm-ldconf.patch %if %{with python} BuildRequires: python-devel @@ -63,8 +62,6 @@ Python bindings for libpfm4 and perf_event_open system call. %prep %setup -q -%patch4 -p1 - %build %if %{with python} %global python_config CONFIG_PFMLIB_NOPYTHON=n @@ -87,6 +84,7 @@ make \ PREFIX=$RPM_BUILD_ROOT%{_prefix} \ LIBDIR=$RPM_BUILD_ROOT%{_libdir} \ %{python_config} \ + LDCONFIG=/bin/true \ install %post -p /sbin/ldconfig @@ -110,6 +108,9 @@ make \ %endif %changelog +* Tue Aug 28 2012 William Cohen 4.3.0-2 +- Turn off LDCONFIG and remove patch. + * Tue Aug 28 2012 William Cohen 4.3.0-1 - Rebase on libpfm-4.3.0.