Author: qboosh Date: Mon Aug 15 07:26:19 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 0.9.7 - default to qt4 for GUI
---- Files affected: packages/oprofile: oprofile.spec (1.55 -> 1.56) ---- Diffs: ================================================================ Index: packages/oprofile/oprofile.spec diff -u packages/oprofile/oprofile.spec:1.55 packages/oprofile/oprofile.spec:1.56 --- packages/oprofile/oprofile.spec:1.55 Thu Jul 28 07:56:39 2011 +++ packages/oprofile/oprofile.spec Mon Aug 15 09:26:14 2011 @@ -1,20 +1,35 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with qt3 # Qt 3 instead of Qt 4 +%bcond_without gui # no Qt-based GUI +# Summary: System-wide profiler Summary(pl.UTF-8): Ogólnosystemowy profiler Name: oprofile -Version: 0.9.6 -Release: 9 -License: GPL v2 +Version: 0.9.7 +Release: 1 +License: GPL v2 (oprofile), LGPL v2.1+ (libopagent) Group: Applications/System -Source0: http://dl.sourceforge.net/oprofile/%{name}-%{version}.tar.gz -# Source0-md5: 4e407093ac06200185d5a5e6437d7242 +Source0: http://downloads.sourceforge.net/oprofile/%{name}-%{version}.tar.gz +# Source0-md5: 8b5d1d9b65f84420bcc3234777ad3be3 URL: http://oprofile.sourceforge.net/ # not used directly, but build fails without it BuildRequires: autoconf BuildRequires: binutils-devel +BuildRequires: libstdc++-devel BuildRequires: popt-devel -BuildRequires: qt-devel BuildRequires: rpmbuild(macros) >= 1.217 +%if %{with gui} +%if %{with qt3} +BuildRequires: qt-devel >= 3.0 +%else +BuildRequires: Qt3Support-devel >= 4 +BuildRequires: QtCore-devel >= 4 +BuildRequires: QtGui-devel >= 4 +BuildRequires: qt4-build >= 4 +%endif +%endif Requires: uname(release) >= 2.6 Conflicts: kernel < 2.6 ExclusiveArch: alpha arm %{ix86} ia64 mips ppc ppc64 %{x8664} @@ -45,27 +60,55 @@ programowych, moduły jądra, jądro, biblioteki współdzielone oraz aplikacje. +%package devel +Summary: Header file for libopagent library +Summary(pl.UTF-8): Plik nagłówkowy biblioteki libopagent +License: LGPL v2.1+ +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header file for libopagent library. + +%description devel -l pl.UTF-8 +Plik nagłówkowy biblioteki libopagent. + +%package static +Summary: Static libopagent library +Summary(pl.UTF-8): Statyczna biblioteka libopagent +License: LGPL v2.1+ +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static libopagent library. + +%description static -l pl.UTF-8 +Statyczna biblioteka libopagent. + %package gui -Summary: GUI for OProfile -Summary(pl.UTF-8): Graficzny interfejs użytkownika do OProfile +Summary: Qt-based GUI for OProfile +Summary(pl.UTF-8): Oparty na Qt graficzny interfejs użytkownika do OProfile Group: X11/Applications Requires: %{name} = %{version}-%{release} %description gui -GUI for OProfile. +Qt-based GUI for OProfile. %description gui -l pl.UTF-8 -Graficzny interfejs użytkownika do OProfile. +Oparty na Qt graficzny interfejs użytkownika do OProfile. %prep %setup -q %build %configure \ + --enable-gui%{?with_gui:%{!?with_qt3:=qt4}}%{!?with_gui:=no} \ --with-kernel-support \ - --with-qt-includes=%{_includedir}/qt + %{?with_qt3:--with-qt-includes=%{_includedir}/qt} -%{__make} +%{__make} \ + %{?with_gui:%{!?with_qt3:UIC=uic3}} %install rm -rf $RPM_BUILD_ROOT @@ -85,14 +128,40 @@ %files %defattr(644,root,root,755) -%doc ChangeLog README TODO doc/*.html -%attr(755,root,root) %{_bindir}/* +%doc ChangeLog* README TODO doc/*.html +%attr(755,root,root) %{_bindir}/opannotate +%attr(755,root,root) %{_bindir}/oparchive +%attr(755,root,root) %{_bindir}/opcontrol +%attr(755,root,root) %{_bindir}/opgprof +%attr(755,root,root) %{_bindir}/ophelp +%attr(755,root,root) %{_bindir}/opimport +%attr(755,root,root) %{_bindir}/opjitconv +%attr(755,root,root) %{_bindir}/opreport +%attr(755,root,root) %{_bindir}/oprofiled %exclude %{_bindir}/oprof_start %dir %{_libdir}/oprofile -%attr(755,root,root) %{_libdir}/oprofile/lib*.so.* +%attr(755,root,root) %{_libdir}/oprofile/libopagent.so.*.*.* +%attr(755,root,root) %{_libdir}/oprofile/libopagent.so.1 %{_datadir}/%{name} -%{_mandir}/man1/*.1* %dir %{_var}/lib/oprofile +%{_mandir}/man1/opannotate.1* +%{_mandir}/man1/oparchive.1* +%{_mandir}/man1/opcontrol.1* +%{_mandir}/man1/opgprof.1* +%{_mandir}/man1/ophelp.1* +%{_mandir}/man1/opimport.1* +%{_mandir}/man1/opreport.1* +%{_mandir}/man1/oprofile.1* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/oprofile/libopagent.so +%{_libdir}/oprofile/libopagent.la +%{_includedir}/opagent.h + +%files static +%defattr(644,root,root,755) +%{_libdir}/oprofile/libopagent.a %files gui %defattr(644,root,root,755) @@ -104,6 +173,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.56 2011/08/15 07:26:14 qboosh +- updated to 0.9.7 +- default to qt4 for GUI + Revision 1.55 2011/07/28 05:56:39 arekm - release 9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/oprofile/oprofile.spec?r1=1.55&r2=1.56&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
