Hello community, here is the log from the commit of package phonon for openSUSE:Factory checked in at Thu Sep 29 12:53:14 CEST 2011. -------- --- openSUSE:Factory/phonon/phonon.changes 2011-09-26 10:36:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/phonon/phonon.changes 2011-09-29 11:34:22.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 29 09:31:58 UTC 2011 - idonmez@suse.com + +- Fix detection of PulseAudio 1.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- phonon-pulseaudio-1.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon.spec ++++++ --- /var/tmp/diff_new_pack.CjbCAO/_old 2011-09-29 12:53:09.000000000 +0200 +++ /var/tmp/diff_new_pack.CjbCAO/_new 2011-09-29 12:53:09.000000000 +0200 @@ -26,7 +26,8 @@ Group: System/GUI/KDE Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf -Patch0: phonon-math-include.patch +Patch1: phonon-math-include.patch +Patch2: phonon-pulseaudio-1.0.patch BuildRequires: QtZeitgeist-devel BuildRequires: automoc4 BuildRequires: cmake @@ -73,7 +74,10 @@ %prep %setup -q -%patch0 +%patch1 +%if 0%{?suse_version} == 1210 +%patch2 +%endif %build %cmake_kde4 -d build ++++++ phonon-pulseaudio-1.0.patch ++++++ --- cmake/FindPulseAudio.cmake 2011-03-25 14:55:56.000000000 +0100 +++ cmake/FindPulseAudio.cmake 2011-09-29 11:30:03.646172984 +0200 @@ -53,7 +53,7 @@ file(STRINGS "${PULSEAUDIO_INCLUDE_DIR}/pulse/version.h" pulse_version_h REGEX ".*pa_get_headers_version\\(\\).*" ) - string(REGEX REPLACE ".*pa_get_headers_version\\(\\)\ \\(\"([0-9]+\\.[0-9]+\\.[0-9]+)\"\\).*" "\\1" + string(REGEX REPLACE ".*pa_get_headers_version\\(\\)\ \\(\"([0-9]+\\.[0-9]+)\"\\).*" "\\1" PULSEAUDIO_VERSION "${pulse_version_h}") macro_ensure_version("${PULSEAUDIO_MINIMUM_VERSION}" "${PULSEAUDIO_VERSION}" PULSEAUDIO_FOUND) else (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org