Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Tue Oct 18 14:17:23 CEST 2011.
-------- --- openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2011-10-13 16:26:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4-apidocs.changes 2011-10-17 13:23:19.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Oct 17 11:20:33 UTC 2011 - [email protected] + +- make branding requires for old distros backwards - will hopefully + fade out as time goes by + +------------------------------------------------------------------- +Sun Oct 16 20:09:02 UTC 2011 - [email protected] + +- Patch PulseAudio cmake module with same fix as phonon + +------------------------------------------------------------------- kdelibs4.changes: same change calling whatdependson for head-i586 New: ---- kdelibs-pulseaudio-1.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.0ELtu4/_old 2011-10-18 14:17:18.000000000 +0200 +++ /var/tmp/diff_new_pack.0ELtu4/_new 2011-10-18 14:17:18.000000000 +0200 @@ -65,7 +65,15 @@ BuildRequires: xz-devel Version: 4.7.2 Release: 1 +%if %suse_version > 1140 %define brandingversion 4.7 +%endif +%if %suse_version == 1130 +%define brandingversion 11.3 +%endif +%if %suse_version == 1140 +%define brandingversion 11.4 +%endif License: LGPLv2.1+ Summary: KDE Base Libraries Url: http://www.kde.org @@ -90,6 +98,7 @@ Patch20: ignore-inline-menu.diff Patch24: ksuseinstall.diff Patch25: 82c463cf8e66850417ea4f8b7ff801cff860871e.diff +Patch26: kdelibs-pulseaudio-1.0.patch PreReq: permissions Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -150,6 +159,10 @@ %patch20 %patch24 %patch25 -p1 +%if 0%{?suse_version} == 1210 +%patch26 -p1 +%endif + # # define KDE version exactly # ++++++ kdelibs-pulseaudio-1.0.patch ++++++ Index: kdelibs-4.7.2/cmake/modules/FindPulseAudio.cmake =================================================================== --- kdelibs-4.7.2.orig/cmake/modules/FindPulseAudio.cmake +++ kdelibs-4.7.2/cmake/modules/FindPulseAudio.cmake @@ -57,7 +57,7 @@ if (PULSEAUDIO_INCLUDE_DIR AND NOT PUL 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}") set(PULSEAUDIO_VERSION "${_PULSEAUDIO_VERSION}" CACHE STRING "Version number of PulseAudio" FORCE) continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
