Hello community, here is the log from the commit of package papi for openSUSE:Factory checked in at 2013-01-11 13:49:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/papi (Old) and /work/SRC/openSUSE:Factory/.papi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "papi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/papi/papi.changes 2013-01-02 12:59:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.papi.new/papi.changes 2013-01-11 13:49:11.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Jan 8 01:52:04 UTC 2013 - [email protected] + +- Switch to external libpfm. + Discussion: http://lists.opensuse.org/opensuse-factory/2013-01/msg00010.html +- Drop papi-no_test_for_pfm_msg_t_type.patch (added in 4.0.0 commit) +- Drop i586-libpfm4-compile-fix.diff (since we are using external libpfm it is + no longer necessary) + +------------------------------------------------------------------- Old: ---- i586-libpfm4-compile-fix.diff papi-no_test_for_pfm_msg_t_type.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ papi.spec ++++++ --- /var/tmp/diff_new_pack.hckfDD/_old 2013-01-11 13:49:12.000000000 +0100 +++ /var/tmp/diff_new_pack.hckfDD/_new 2013-01-11 13:49:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package papi # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -30,13 +30,10 @@ %endif %endif +BuildRequires: libpfm-devel >= 4.3.0 +BuildRequires: libpfm-devel-static >= 4.3.0 BuildRequires: linux-kernel-headers BuildRequires: ncurses-devel -%if 0%suse_version < 1102 -%ifarch ia64 -BuildRequires: libpfm-devel -%endif -%endif %ifarch ppc64 BuildRequires: gcc-32bit BuildRequires: gcc-fortran-32bit @@ -52,38 +49,14 @@ Source1: %{name}-rpmlintrc #PAPI doesn't support the s390 architecture ExcludeArch: s390, s390x -Patch1: papi-codecleanup.patch -Patch4: papi-no_test_for_pfm_msg_t_type.patch -Patch9: papi-use_major_in_soname.patch -Patch10: i586-libpfm4-compile-fix.diff +Patch: papi-codecleanup.patch +Patch1: papi-use_major_in_soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.61 BuildRequires: automake BuildRequires: libsensors4-devel #BuildRequires: libibmad-devel -%ifarch ia64 -%if 0%{suse_version} < 1102 -%define libpfm_package 0 -%define pfm_opt --with-pfm-prefix=%_prefix -%else -%define libpfm_package 1 -%define pfm_opt "" -%endif -%else -%define libpfm_package 1 -%define pfm_opt "" -%endif - -%ifnarch ia64 -%if 0%{suse_version} >= 1102 -%define libpfm_package 1 -%define pfm_opt "" -%endif -%endif - -%define pfm_so_major 4 - %description PAPI aims to provide the tool designer and application engineer with a @@ -119,21 +92,10 @@ %description -n libpapi This package contains the PAPI runtime library. -%if %{libpfm_package} -%package -n libpfm%{pfm_so_major} -Summary: Libpfm runtime library -Group: System/Libraries - -%description -n libpfm%{pfm_so_major} -This package contains the libpfm runtime library. -%endif - %prep %setup -q +%patch %patch1 -%patch4 -%patch9 -%patch10 %build #export SUSE_ASNEEDED=0 @@ -143,14 +105,14 @@ cd components/$c autoconf ./configure --with-sensors_incdir=/usr/include/sensors \ - --with-sensors_libdir=%{_libdir}; + --with-sensors_libdir=%{_libdir} cd - done export CFLAGS="%{optflags} -Wno-unused-parameter" %configure --with-components="lmsensors coretemp example net" \ --with-perf-events --with-shared-lib=yes --with-shlib --with-pthread-mutexes \ - %{pfm_opt} + --with-pfm-incdir=%{_includedir} --with-pfm-libdir=%{_libdir} #DBG workaround to make sure libpfm just uses the normal CFLAGS DBG="" make DOCDIR=%{_defaultdocdir}/%{name} %{?_smp_mflags} @@ -164,10 +126,6 @@ %postun -n libpapi -p /sbin/ldconfig -%post -n libpfm%{pfm_so_major} -p /sbin/ldconfig - -%postun -n libpfm%{pfm_so_major} -p /sbin/ldconfig - %files %defattr(-,root,root) %{_bindir}/papi_clockres @@ -196,10 +154,6 @@ %doc %{_mandir}/man3/*.gz %doc %{_mandir}/man1/* %{_libdir}/libpapi.so -%ifnarch ia64 -%{_includedir}/perfmon -%{_libdir}/libpfm.so -%endif %files devel-static %defattr(-,root,root) @@ -209,10 +163,4 @@ %defattr(-,root,root) %{_libdir}/libpapi.so.* -%if %{libpfm_package} -%files -n libpfm%{pfm_so_major} -%defattr(-,root,root) -%{_libdir}/libpfm.so.* -%endif - %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
